update

pkg/table/tables/index.go

@@ -15,7 +15,6 @@
 package tables
 
 import (
-	"bytes"
 	"context"
 	"sync"
 	"time"
@@ -355,15 +354,6 @@ func (c *index) Create(sctx table.MutateContext, txn kv.Transaction, indexedValu
 			}
 			continue
 		}
-		if c.idxInfo.Global && len(value) != 0 && !bytes.Equal(value, idxVal) {
-			val := idxVal
-			err = txn.GetMemBuffer().Set(key, val)
-			if err != nil {
-				return nil, err
-			}
-			continue
-		}
-
 		if keyIsTempIdxKey && !tempIdxVal.IsEmpty() {
 			value = tempIdxVal.Current().Value
 		}

pkg/table/tables/partition.go

@@ -1766,21 +1766,31 @@ func partitionedTableUpdateRecord(gctx context.Context, ctx table.MutateContext,
 	// The old and new data locate in different partitions.
 	// Remove record from old partition and add record to new partition.
 	if from != to {
-		_, err = t.GetPartition(to).AddRecord(ctx, newData)
+		txn, err := ctx.Txn(true)
 		if err != nil {
 			return errors.Trace(err)
 		}
-		// UpdateRecord should be side effect free, but there're two steps here.
-		// What would happen if step1 succeed but step2 meets error? It's hard
-		// to rollback.
-		// So this special order is chosen: add record first, errors such as
-		// 'Key Already Exists' will generally happen during step1, errors are
-		// unlikely to happen in step2.
+		memBuffer := txn.GetMemBuffer()
+		sh := memBuffer.Staging()
+		defer func() {
+			// NOTICE: Don't create a new `err` in this branch.
+			if err == nil {
+				memBuffer.Release(sh)
+			} else {
+				memBuffer.Cleanup(sh)
+			}
+		}()
+
 		err = t.GetPartition(from).RemoveRecord(ctx, h, currData)
 		if err != nil {
-			logutil.BgLogger().Error("update partition record fails", zap.String("message", "new record inserted while old record is not removed"), zap.Error(err))
 			return errors.Trace(err)
 		}
+
+		_, err = t.GetPartition(to).AddRecord(ctx, newData)
+		if err != nil {
+			return errors.Trace(err)
+		}
+
 		newTo, newFrom := int64(0), int64(0)
 		if _, ok := t.reorganizePartitions[to]; ok {
 			newTo, err = t.locateReorgPartition(ectx, newData)
@@ -1801,17 +1811,16 @@ func partitionedTableUpdateRecord(gctx context.Context, ctx table.MutateContext,
 			tbl := t.GetPartition(newTo)
 			return tbl.UpdateRecord(gctx, ctx, h, currData, newData, touched)
 		}
-		if newTo != 0 && t.Meta().GetPartitionInfo().DDLState != model.StateDeleteOnly {
-			tbl := t.GetPartition(newTo)
-			_, err = tbl.AddRecord(ctx, newData)
+
+		if newFrom != 0 {
+			err = t.GetPartition(newFrom).RemoveRecord(ctx, h, currData)
+			// TODO: Can this happen? When the data is not yet backfilled?
 			if err != nil {
 				return errors.Trace(err)
 			}
 		}
-		if newFrom != 0 {
-			tbl := t.GetPartition(newFrom)
-			err = tbl.RemoveRecord(ctx, h, currData)
-			// TODO: Can this happen? When the data is not yet backfilled?
+		if newTo != 0 && t.Meta().GetPartitionInfo().DDLState != model.StateDeleteOnly {
+			_, err = t.GetPartition(newTo).AddRecord(ctx, newData)
 			if err != nil {
 				return errors.Trace(err)
 			}

tests/integrationtest/r/globalindex/update.result

@@ -0,0 +1,28 @@
+set tidb_enable_global_index=true;
+drop table if exists t;
+CREATE TABLE `t` (
+`a` int(11) NOT NULL,
+`b` int(11) DEFAULT NULL,
+`c` int(11) DEFAULT NULL,
+PRIMARY KEY (`a`) /*T![clustered_index] CLUSTERED */,
+UNIQUE KEY `idx1` (`b`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin
+PARTITION BY HASH (`a`) PARTITIONS 5;
+begin;
+insert into t values (1, 2, 3);
+insert into t values (2, 2, 3);
+Error 1062 (23000): Duplicate entry '2' for key 't.idx1'
+rollback;
+drop table if exists t;
+create table t ( a int, b int, c int, unique key idx(b))
+partition by range( a ) (
+partition p1 values less than (10),
+partition p2 values less than (20),
+partition p3 values less than (30)
+);
+begin;
+insert into t values (1, 1, 1), (8, 8, 8), (11, 11, 11), (12, 12, 12);
+update t set a = 2, b = 12 where a = 11;
+Error 1062 (23000): Duplicate entry '12' for key 't.idx'
+rollback;
+set tidb_enable_global_index=default;

tests/integrationtest/t/globalindex/update.test

@@ -0,0 +1,31 @@
+set tidb_enable_global_index=true;
+drop table if exists t;
+CREATE TABLE `t` (
+  `a` int(11) NOT NULL,
+  `b` int(11) DEFAULT NULL,
+  `c` int(11) DEFAULT NULL,
+  PRIMARY KEY (`a`) /*T![clustered_index] CLUSTERED */,
+  UNIQUE KEY `idx1` (`b`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin
+PARTITION BY HASH (`a`) PARTITIONS 5;
+
+begin;
+insert into t values (1, 2, 3);
+--error 1062
+insert into t values (2, 2, 3);
+rollback;
+
+drop table if exists t;
+create table t ( a int, b int, c int, unique key idx(b))
+partition by range( a ) (
+	partition p1 values less than (10),
+	partition p2 values less than (20),
+	partition p3 values less than (30)
+);
+begin;
+insert into t values (1, 1, 1), (8, 8, 8), (11, 11, 11), (12, 12, 12);
+--error 1062
+update t set a = 2, b = 12 where a = 11;
+rollback;
+
+set tidb_enable_global_index=default;