Fixing redundant updates of session file (GoogleCloudPlatform#1006)

pratickchokhani · Feb 6, 2025 · eb655b3 · eb655b3
1 parent 626785e
commit eb655b3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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()
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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)
     	}
     }
@@ Expand Down @@