*: Merge master to feature/reorganize-partition

DEPS.bzl

@@ -2898,8 +2898,8 @@ def go_deps():
         name = "com_github_pingcap_log",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/pingcap/log",
-        sum = "h1:T7e5Low0BU2ZazI2dz2mh3W1qv+w8wtvq1YR8DneA0c=",
-        version = "v1.1.1-0.20221110065318-21a4942860b3",
+        sum = "h1:crhkw6DD+07Bg1wYhW5Piw+kYNKZqFQqfC2puUf6gMI=",
+        version = "v1.1.1-0.20221116035753-734d527bc87c",
     )
     go_repository(
         name = "com_github_pingcap_sysutil",

Dockerfile

@@ -13,16 +13,24 @@
 # limitations under the License.
 
 # Builder image
-FROM alpine:edge as builder
+FROM rockylinux:9 as builder
 
-ADD . https://raw.githubusercontent.com/njhallett/apk-fastest-mirror/c4ca44caef3385d830fea34df2dbc2ba4a17e021/apk-fastest-mirror.sh ./proxy
-RUN sh ./proxy/apk-fastest-mirror.sh -t 50 && apk add --no-cache git build-base go
+ENV GOLANG_VERSION 1.19.3
+ENV ARCH amd64
+ENV GOLANG_DOWNLOAD_URL https://dl.google.com/go/go$GOLANG_VERSION.linux-$ARCH.tar.gz
+ENV GOPATH /go
+ENV GOROOT /usr/local/go
+ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
+RUN yum update -y && yum groupinstall 'Development Tools' -y \
+    && curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
+	&& tar -C /usr/local -xzf golang.tar.gz \
+	&& rm golang.tar.gz
 
 COPY . /tidb
 ARG GOPROXY
 RUN export GOPROXY=${GOPROXY} && cd /tidb && make server
 
-FROM alpine:latest
+FROM rockylinux:9-minimal
 
 COPY --from=builder /tidb/bin/tidb-server /tidb-server
 

autoid_service/autoid.go

@@ -405,12 +405,30 @@ func (s *Service) allocAutoID(ctx context.Context, req *autoid.AutoIDRequest) (*
 
 	val := s.getAlloc(req.DbID, req.TblID, req.IsUnsigned)
 
-	if req.N == 0 && val.base != 0 {
-		base := val.base
+	if req.N == 0 {
+		if val.base != 0 {
+			return &autoid.AutoIDResponse{
+				Min: val.base,
+				Max: val.base,
+			}, nil
+		}
+		// This item is not initialized, get the data from remote.
+		var currentEnd int64
+		ctx = kv.WithInternalSourceType(ctx, kv.InternalTxnMeta)
+		err := kv.RunInNewTxn(ctx, s.store, true, func(ctx context.Context, txn kv.Transaction) error {
+			idAcc := meta.NewMeta(txn).GetAutoIDAccessors(req.DbID, req.TblID).RowID()
+			var err1 error
+			currentEnd, err1 = idAcc.Get()
+			if err1 != nil {
+				return err1
+			}
+			val.end = currentEnd
+			return nil
+		})
 		return &autoid.AutoIDResponse{
-			Min: base,
-			Max: base,
-		}, nil
+			Min: currentEnd,
+			Max: currentEnd,
+		}, err
 	}
 
 	val.Lock()

ddl/column_test.go

@@ -959,3 +959,29 @@ func TestGetDefaultValueOfColumn(t *testing.T) {
 	tk.MustQuery("select * from t1").Check(testkit.RowsWithSep("|", ""+
 		"1962-03-03 1962-03-03 00:00:00 12:23:23 2020-10-13 2020-03-27"))
 }
+
+func TestIssue39080(t *testing.T) {
+	store := testkit.CreateMockStore(t)
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec("CREATE TABLE t1(id INTEGER PRIMARY KEY, authorId INTEGER AUTO_INCREMENT UNIQUE)")
+
+	tk.MustQuery("show create table t1").Check(testkit.RowsWithSep("|", ""+
+		"t1 CREATE TABLE `t1` (\n"+
+		"  `id` int(11) NOT NULL,\n"+
+		"  `authorId` int(11) NOT NULL AUTO_INCREMENT,\n"+
+		"  PRIMARY KEY (`id`) /*T![clustered_index] CLUSTERED */,\n"+
+		"  UNIQUE KEY `authorId` (`authorId`)\n"+
+		") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
+
+	//Do not affect the specified name
+	tk.MustExec("CREATE TABLE `t2`( `id` INTEGER PRIMARY KEY, `authorId` int(11) AUTO_INCREMENT, UNIQUE KEY `authorIdx` (`authorId`))")
+
+	tk.MustQuery("show create table t2").Check(testkit.RowsWithSep("|", ""+
+		"t2 CREATE TABLE `t2` (\n"+
+		"  `id` int(11) NOT NULL,\n"+
+		"  `authorId` int(11) NOT NULL AUTO_INCREMENT,\n"+
+		"  PRIMARY KEY (`id`) /*T![clustered_index] CLUSTERED */,\n"+
+		"  UNIQUE KEY `authorIdx` (`authorId`)\n"+
+		") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin"))
+}

ddl/db_integration_test.go

@@ -2894,17 +2894,23 @@ func TestAutoIncrementTableOption(t *testing.T) {
 	tk.MustExec("create database test_auto_inc_table_opt;")
 	tk.MustExec("use test_auto_inc_table_opt;")
 
-	// Empty auto_inc allocator should not cause error.
-	tk.MustExec("create table t (a bigint primary key clustered) auto_increment = 10;")
-	tk.MustExec("alter table t auto_increment = 10;")
-	tk.MustExec("alter table t auto_increment = 12345678901234567890;")
-
-	// Rebase the auto_inc allocator to a large integer should work.
-	tk.MustExec("drop table t;")
-	tk.MustExec("create table t (a bigint unsigned auto_increment, unique key idx(a));")
-	tk.MustExec("alter table t auto_increment = 12345678901234567890;")
-	tk.MustExec("insert into t values ();")
-	tk.MustQuery("select * from t;").Check(testkit.Rows("12345678901234567890"))
+	for _, str := range []string{"", " AUTO_ID_CACHE 1"} {
+		// Empty auto_inc allocator should not cause error.
+		tk.MustExec("create table t (a bigint primary key clustered) auto_increment = 10" + str)
+		tk.MustExec("alter table t auto_increment = 10;")
+		tk.MustExec("alter table t auto_increment = 12345678901234567890;")
+		tk.MustExec("drop table t;")
+
+		// Rebase the auto_inc allocator to a large integer should work.
+		tk.MustExec("create table t (a bigint unsigned auto_increment, unique key idx(a))" + str)
+		// Set auto_inc to negative is not supported
+		err := tk.ExecToErr("alter table t auto_increment = -1;")
+		require.Error(t, err)
+		tk.MustExec("alter table t auto_increment = 12345678901234567890;")
+		tk.MustExec("insert into t values ();")
+		tk.MustQuery("select * from t;").Check(testkit.Rows("12345678901234567890"))
+		tk.MustExec("drop table t;")
+	}
 }
 
 func TestAutoIncrementForce(t *testing.T) {
@@ -2919,83 +2925,95 @@ func TestAutoIncrementForce(t *testing.T) {
 		require.NoError(t, err)
 		return gid
 	}
-	// Rebase _tidb_row_id.
-	tk.MustExec("create table t (a int);")
-	tk.MustExec("alter table t force auto_increment = 2;")
-	tk.MustExec("insert into t values (1),(2);")
-	tk.MustQuery("select a, _tidb_rowid from t;").Check(testkit.Rows("1 2", "2 3"))
-	// Cannot set next global ID to 0.
-	tk.MustGetErrCode("alter table t force auto_increment = 0;", errno.ErrAutoincReadFailed)
-	tk.MustExec("alter table t force auto_increment = 1;")
-	require.Equal(t, uint64(1), getNextGlobalID())
-	// inserting new rows can overwrite the existing data.
-	tk.MustExec("insert into t values (3);")
-	require.Equal(t, "[kv:1062]Duplicate entry '2' for key 't.PRIMARY'", tk.ExecToErr("insert into t values (3);").Error())
-	tk.MustQuery("select a, _tidb_rowid from t;").Check(testkit.Rows("3 1", "1 2", "2 3"))
-
-	// Rebase auto_increment.
-	tk.MustExec("drop table if exists t;")
-	tk.MustExec("create table t (a int primary key auto_increment, b int);")
-	tk.MustExec("insert into t values (1, 1);")
-	tk.MustExec("insert into t values (100000000, 1);")
-	tk.MustExec("delete from t where a = 100000000;")
-	require.Greater(t, getNextGlobalID(), uint64(100000000))
-	// Cannot set next global ID to 0.
-	tk.MustGetErrCode("alter table t /*T![force_inc] force */ auto_increment = 0;", errno.ErrAutoincReadFailed)
-	tk.MustExec("alter table t /*T![force_inc] force */ auto_increment = 2;")
-	require.Equal(t, uint64(2), getNextGlobalID())
-	tk.MustExec("insert into t(b) values (2);")
-	tk.MustQuery("select a, b from t;").Check(testkit.Rows("1 1", "2 2"))
-
-	// Rebase auto_random.
-	tk.MustExec("drop table if exists t;")
-	tk.MustExec("create table t (a bigint primary key auto_random(5));")
-	tk.MustExec("insert into t values ();")
-	tk.MustExec("set @@allow_auto_random_explicit_insert = true")
-	tk.MustExec("insert into t values (100000000);")
-	tk.MustExec("delete from t where a = 100000000;")
-	require.Greater(t, getNextGlobalID(), uint64(100000000))
-	// Cannot set next global ID to 0.
-	tk.MustGetErrCode("alter table t force auto_random_base = 0;", errno.ErrAutoincReadFailed)
-	tk.MustExec("alter table t force auto_random_base = 2;")
-	require.Equal(t, uint64(2), getNextGlobalID())
-	tk.MustExec("insert into t values ();")
-	tk.MustQuery("select (a & 3) from t order by 1;").Check(testkit.Rows("1", "2"))
-
-	// Change next global ID.
-	tk.MustExec("drop table if exists t;")
-	tk.MustExec("create table t (a bigint primary key auto_increment);")
-	tk.MustExec("insert into t values (1);")
-	bases := []uint64{1, 65535, 10, math.MaxUint64, math.MaxInt64 + 1, 1, math.MaxUint64, math.MaxInt64, 2}
-	lastBase := fmt.Sprintf("%d", bases[len(bases)-1])
-	for _, b := range bases {
-		tk.MustExec(fmt.Sprintf("alter table t force auto_increment = %d;", b))
-		require.Equal(t, b, getNextGlobalID())
+
+	for _, str := range []string{"", " AUTO_ID_CACHE 1"} {
+		// Rebase _tidb_row_id.
+		tk.MustExec("create table t (a int)" + str)
+		tk.MustExec("alter table t force auto_increment = 2;")
+		tk.MustExec("insert into t values (1),(2);")
+		tk.MustQuery("select a, _tidb_rowid from t;").Check(testkit.Rows("1 2", "2 3"))
+		// Cannot set next global ID to 0.
+		tk.MustGetErrCode("alter table t force auto_increment = 0;", errno.ErrAutoincReadFailed)
+		tk.MustExec("alter table t force auto_increment = 1;")
+		require.Equal(t, uint64(1), getNextGlobalID())
+		// inserting new rows can overwrite the existing data.
+		tk.MustExec("insert into t values (3);")
+		require.Equal(t, "[kv:1062]Duplicate entry '2' for key 't.PRIMARY'", tk.ExecToErr("insert into t values (3);").Error())
+		tk.MustQuery("select a, _tidb_rowid from t;").Check(testkit.Rows("3 1", "1 2", "2 3"))
+		tk.MustExec("drop table if exists t;")
 	}
-	tk.MustExec("insert into t values ();")
-	tk.MustQuery("select a from t;").Check(testkit.Rows("1", lastBase))
-	// Force alter unsigned int auto_increment column.
-	tk.MustExec("drop table if exists t;")
-	tk.MustExec("create table t (a bigint unsigned primary key auto_increment);")
-	for _, b := range bases {
-		tk.MustExec(fmt.Sprintf("alter table t force auto_increment = %d;", b))
-		require.Equal(t, b, getNextGlobalID())
+
+	for _, str := range []string{"", " AUTO_ID_CACHE 1"} {
+		// Rebase auto_increment.
+		tk.MustExec("create table t (a int primary key auto_increment, b int)" + str)
+		tk.MustExec("insert into t values (1, 1);")
+		tk.MustExec("insert into t values (100000000, 1);")
+		tk.MustExec("delete from t where a = 100000000;")
+		require.Greater(t, getNextGlobalID(), uint64(100000000))
+		// Cannot set next global ID to 0.
+		tk.MustGetErrCode("alter table t /*T![force_inc] force */ auto_increment = 0;", errno.ErrAutoincReadFailed)
+		tk.MustExec("alter table t /*T![force_inc] force */ auto_increment = 2;")
+		require.Equal(t, uint64(2), getNextGlobalID())
+		tk.MustExec("insert into t(b) values (2);")
+		tk.MustQuery("select a, b from t;").Check(testkit.Rows("1 1", "2 2"))
+		tk.MustExec("drop table if exists t;")
+	}
+
+	for _, str := range []string{"", " AUTO_ID_CACHE 1"} {
+		// Rebase auto_random.
+		tk.MustExec("create table t (a bigint primary key auto_random(5))" + str)
+		tk.MustExec("insert into t values ();")
+		tk.MustExec("set @@allow_auto_random_explicit_insert = true")
+		tk.MustExec("insert into t values (100000000);")
+		tk.MustExec("delete from t where a = 100000000;")
+		require.Greater(t, getNextGlobalID(), uint64(100000000))
+		// Cannot set next global ID to 0.
+		tk.MustGetErrCode("alter table t force auto_random_base = 0;", errno.ErrAutoincReadFailed)
+		tk.MustExec("alter table t force auto_random_base = 2;")
+		require.Equal(t, uint64(2), getNextGlobalID())
 		tk.MustExec("insert into t values ();")
-		tk.MustQuery("select a from t;").Check(testkit.Rows(fmt.Sprintf("%d", b)))
-		tk.MustExec("delete from t;")
+		tk.MustQuery("select (a & 3) from t order by 1;").Check(testkit.Rows("1", "2"))
+		tk.MustExec("drop table if exists t;")
 	}
 
-	// Force alter with @@auto_increment_increment and @@auto_increment_offset.
-	tk.MustExec("drop table if exists t;")
-	tk.MustExec("create table t(a int key auto_increment);")
-	tk.MustExec("set @@auto_increment_offset=2;")
-	tk.MustExec("set @@auto_increment_increment = 11;")
-	tk.MustExec("insert into t values (500);")
-	tk.MustExec("alter table t force auto_increment=100;")
-	tk.MustExec("insert into t values (), ();")
-	tk.MustQuery("select * from t;").Check(testkit.Rows("101", "112", "500"))
-	tk.MustQuery("select * from t order by a;").Check(testkit.Rows("101", "112", "500"))
-	tk.MustExec("drop table if exists t;")
+	for _, str := range []string{"", " AUTO_ID_CACHE 1"} {
+		// Change next global ID.
+		tk.MustExec("create table t (a bigint primary key auto_increment)" + str)
+		tk.MustExec("insert into t values (1);")
+		bases := []uint64{1, 65535, 10, math.MaxUint64, math.MaxInt64 + 1, 1, math.MaxUint64, math.MaxInt64, 2}
+		lastBase := fmt.Sprintf("%d", bases[len(bases)-1])
+		for _, b := range bases {
+			fmt.Println("execute alter table force increment to ==", b)
+			tk.MustExec(fmt.Sprintf("alter table t force auto_increment = %d;", b))
+			require.Equal(t, b, getNextGlobalID())
+		}
+		tk.MustExec("insert into t values ();")
+		tk.MustQuery("select a from t;").Check(testkit.Rows("1", lastBase))
+		// Force alter unsigned int auto_increment column.
+		tk.MustExec("drop table if exists t;")
+		tk.MustExec("create table t (a bigint unsigned primary key auto_increment)" + str)
+		for _, b := range bases {
+			tk.MustExec(fmt.Sprintf("alter table t force auto_increment = %d;", b))
+			require.Equal(t, b, getNextGlobalID())
+			tk.MustExec("insert into t values ();")
+			tk.MustQuery("select a from t;").Check(testkit.Rows(fmt.Sprintf("%d", b)))
+			tk.MustExec("delete from t;")
+		}
+		tk.MustExec("drop table if exists t;")
+	}
+
+	for _, str := range []string{"", " AUTO_ID_CACHE 1"} {
+		// Force alter with @@auto_increment_increment and @@auto_increment_offset.
+		tk.MustExec("create table t(a int key auto_increment)" + str)
+		tk.MustExec("set @@auto_increment_offset=2;")
+		tk.MustExec("set @@auto_increment_increment = 11;")
+		tk.MustExec("insert into t values (500);")
+		tk.MustExec("alter table t force auto_increment=100;")
+		tk.MustExec("insert into t values (), ();")
+		tk.MustQuery("select * from t;").Check(testkit.Rows("101", "112", "500"))
+		tk.MustQuery("select * from t order by a;").Check(testkit.Rows("101", "112", "500"))
+		tk.MustExec("drop table if exists t;")
+	}
 
 	// Check for warning in case we can't set the auto_increment to the desired value
 	tk.MustExec("create table t(a int primary key auto_increment)")

ddl/ddl_api.go

@@ -1693,7 +1693,7 @@ func setEmptyConstraintName(namesMap map[string]bool, constr *ast.Constraint) {
 			}
 		}
 		if colName == "" {
-			colName = constr.Keys[0].Column.Name.L
+			colName = constr.Keys[0].Column.Name.O
 		}
 		constrName := colName
 		i := 2