do not lock table if lock no rows (#20431)

do not lock table if lock no rows Approved by: @m-schen, @aressu1985, @aunjgr, @sukki37
matrixorigin · Nov 29, 2024 · 83ffac2 · 83ffac2
1 parent 2bb1f98
commit 83ffac2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/pkg/sql/colexec/lockop/lock_op.go b/pkg/sql/colexec/lockop/lock_op.go
@@ -1014,10 +1014,6 @@ func lockTalbeIfLockCountIsZero(
 	}
 	for idx := 0; idx < len(lockOp.targets); idx++ {
 		target := lockOp.targets[idx]
-		// do not lock table or rows at the end for hidden table
-		if !target.lockTableAtTheEnd {
-			continue
-		}
 		if target.lockRows != nil {
 			vec, free, err := colexec.GetReadonlyResultFromNoColumnExpression(proc, target.lockRows)
 			if err != nil {
@@ -1039,6 +1035,9 @@ func lockTalbeIfLockCountIsZero(
 				return err
 			}
 		} else {
+			if !target.lockTableAtTheEnd {
+				continue
+			}
 			err := LockTable(lockOp.engine, proc, target.tableID, target.primaryColumnType, false)
 			if err != nil {
 				return err

diff --git a/pkg/sql/plan/opt_misc.go b/pkg/sql/plan/opt_misc.go
@@ -1155,9 +1155,6 @@ func (builder *QueryBuilder) lockTableIfLockNoRowsAtTheEndForDelAndUpdate() (err
 		return
 	}
 	tableDef := baseNode.TableDef
-	if !getLockTableAtTheEnd(tableDef) {
-		return
-	}
 	objRef := baseNode.ObjRef
 	tableIDs := make(map[uint64]bool)
 	tableIDs[tableDef.TblId] = true
@@ -1229,7 +1226,7 @@ func (builder *QueryBuilder) lockTableIfLockNoRowsAtTheEndForDelAndUpdate() (err
 		}
 
 		lockTarget.LockRows = lockRows
-		lockTarget.LockTableAtTheEnd = true
+		lockTarget.LockTableAtTheEnd = false
 	}
 
 	return

diff --git a/pkg/sql/plan/query_builder.go b/pkg/sql/plan/query_builder.go
@@ -2709,7 +2709,6 @@ func (builder *QueryBuilder) bindSelect(stmt *tree.Select, ctx *BindContext, isR
 				PrimaryColTyp:      pkTyp,
 				Block:              true,
 				RefreshTsIdxInBat:  -1, //unsupport now
-				LockTableAtTheEnd:  getLockTableAtTheEnd(tableDef),
 			}
 			if tableDef.Partition != nil {
 				partTableIDs, _ := getPartTableIdsAndNames(builder.compCtx, objRef, tableDef)

diff --git a/pkg/sql/plan/utils.go b/pkg/sql/plan/utils.go
@@ -2711,11 +2711,12 @@ func offsetToString(offset int) string {
 	return fmt.Sprintf("+%02d:%02d", hours, minutes)
 }
 
-func getLockTableAtTheEnd(tableDef *TableDef) bool {
-	if tableDef.Pkey.PkeyColName == catalog.FakePrimaryKeyColName || //fake pk, skip
-		tableDef.Partition != nil || // unsupport partition table
-		len(tableDef.Pkey.Names) > 1 { // unsupport multi-column primary key
-		return false
-	}
-	return !strings.HasPrefix(tableDef.Name, catalog.IndexTableNamePrefix)
-}
+// do not lock table if lock no rows now.
+// if need to lock table, uncomment these codes
+// func getLockTableAtTheEnd(tableDef *TableDef) bool {
+// if tableDef.Pkey.PkeyColName == catalog.FakePrimaryKeyColName || //fake pk, skip
+// 	tableDef.Partition != nil { // unsupport partition table
+// 	return false
+// }
+// return !strings.HasPrefix(tableDef.Name, catalog.IndexTableNamePrefix)
+// }
diff --git a/test/distributed/cases/pessimistic_transaction/select_for_update.sql b/test/distributed/cases/pessimistic_transaction/select_for_update.sql
@@ -696,7 +696,6 @@ select * from su_06 where c1>=2 for update;
 use select_for_update;
 prepare stmt1 from 'delete from su_06 where c3 in (?)';
 set @var = 3;
--- @wait:0:commit
 execute stmt1 using @var;
 select * from su_06;
 -- @session}