fix data race in ApplyCommit , cherry-pick 14709 (#14822)

matrixorigin · Mar 7, 2024 · f4b88a3 · f4b88a3
1 parent 5d4ff58
commit f4b88a3
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/vm/engine/tae/catalog/table.go b/pkg/vm/engine/tae/catalog/table.go
@@ -532,8 +532,11 @@ func (entry *TableEntry) ApplyCommit() (err error) {
 	if entry.isColumnChangedInSchema() {
 		entry.FreezeAppend()
 	}
+	entry.RLock()
+	schema := entry.GetLatestNodeLocked().BaseNode.Schema
+	entry.RUnlock()
 	// update the shortcut to the lastest schema
-	entry.TableNode.schema.Store(entry.GetLatestNodeLocked().BaseNode.Schema)
+	entry.TableNode.schema.Store(schema)
 	return
 }