From c779f80289aacab7c34a125e0457bca279f6d21b Mon Sep 17 00:00:00 2001 From: Vardhan Thigle Date: Wed, 5 Feb 2025 11:52:08 +0000 Subject: [PATCH] Fixing redundant updates of session file --- webv2/api/rules.go | 2 +- webv2/api/schema.go | 3 ++- webv2/primarykey/primarykey_handler.go | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/webv2/api/rules.go b/webv2/api/rules.go index 68a6fa1f04..0784e4a1af 100644 --- a/webv2/api/rules.go +++ b/webv2/api/rules.go @@ -396,7 +396,7 @@ func revertShardIdColumnAsPrimaryKey(isAddedAtFirst bool) { pkRequest.Columns = append(pkRequest.Columns, ddl.IndexKey{ColId: pk.ColId, Order: pk.Order - decrement, Desc: pk.Desc}) } } - primarykey.UpdatePrimaryKeyAndSessionFile(pkRequest) + primarykey.UpdatePrimaryKey(pkRequest) } } diff --git a/webv2/api/schema.go b/webv2/api/schema.go index 44563b16d5..17f3450840 100644 --- a/webv2/api/schema.go +++ b/webv2/api/schema.go @@ -1194,6 +1194,7 @@ func (tableHandler *TableAPIHandler) restoreTableHelper(w http.ResponseWriter, t setShardIdColumnAsPrimaryKeyPerTable(isAddedAtFirst, table) addShardIdToForeignKeyPerTable(isAddedAtFirst, table) addShardIdToReferencedTableFks(tableId, isAddedAtFirst) + session.UpdateSessionFile() } } sessionState.Conv = conv @@ -1712,7 +1713,7 @@ func setShardIdColumnAsPrimaryKeyPerTable(isAddedAtFirst bool, table ddl.CreateT size := len(table.PrimaryKeys) pkRequest.Columns = append(pkRequest.Columns, ddl.IndexKey{ColId: table.ShardIdColumn, Order: size + 1}) } - primarykey.UpdatePrimaryKeyAndSessionFile(pkRequest) + primarykey.UpdatePrimaryKey(pkRequest) } func addShardIdColumnToForeignKeys(isAddedAtFirst bool) { diff --git a/webv2/primarykey/primarykey_handler.go b/webv2/primarykey/primarykey_handler.go index 712bb75128..dfe9157398 100644 --- a/webv2/primarykey/primarykey_handler.go +++ b/webv2/primarykey/primarykey_handler.go @@ -100,7 +100,8 @@ func PrimaryKey(w http.ResponseWriter, r *http.Request) { } - UpdatePrimaryKeyAndSessionFile(pkRequest) + UpdatePrimaryKey(pkRequest) + session.UpdateSessionFile() convm := session.ConvWithMetadata{ SessionMetadata: sessionState.SessionMetadata, @@ -113,7 +114,7 @@ func PrimaryKey(w http.ResponseWriter, r *http.Request) { log.Println("request completed", "traceid", id.String(), "method", r.Method, "path", r.URL.Path, "remoteaddr", r.RemoteAddr) } -func UpdatePrimaryKeyAndSessionFile(pkRequest PrimaryKeyRequest) { +func UpdatePrimaryKey(pkRequest PrimaryKeyRequest) { sessionState := session.GetSessionState() spannerTable, _ := getSpannerTable(sessionState, pkRequest) @@ -150,6 +151,5 @@ func UpdatePrimaryKeyAndSessionFile(pkRequest PrimaryKeyRequest) { } common.ComputeNonKeyColumnSize(sessionState.Conv, pkRequest.TableId) RemoveInterleave(sessionState.Conv, spannerTable) - session.UpdateSessionFile() }