ddl, parser: implement the normal flow of distributed processing in D…

…DL reorg phase for adding index (#40542) close #37125
pingcap · Feb 6, 2023 · ddaf0d7 · ddaf0d7
1 parent e5477b8
commit ddaf0d7
Show file tree

Hide file tree

Showing 34 changed files with 1,504 additions and 498 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1,4 +1,4 @@
-startup --host_jvm_args=-Xmx8g
+startup --host_jvm_args=-Xmx4g
 startup --unlimit_coredumps
 
 run:ci --color=yes

diff --git a/Makefile b/Makefile
@@ -414,6 +414,10 @@ bazel_coverage_test: failpoint-enable bazel_ci_prepare
 		--build_event_json_file=bazel_1.json --@io_bazel_rules_go//go/config:cover_format=go_cover --define gotags=deadlock,intest \
 		-- //... -//cmd/... -//tests/graceshutdown/... \
 		-//tests/globalkilltest/... -//tests/readonlytest/... -//br/pkg/task:task_test -//tests/realtikvtest/...
+	bazel $(BAZEL_GLOBAL_CONFIG) coverage $(BAZEL_CMD_CONFIG) \
+		--build_event_json_file=bazel_1.json --@io_bazel_rules_go//go/config:cover_format=go_cover --define gotags=deadlock,intest,distributereorg \
+		-- //... -//cmd/... -//tests/graceshutdown/... \
+		-//tests/globalkilltest/... -//tests/readonlytest/... -//br/pkg/task:task_test -//tests/realtikvtest/...
 
 bazel_build: bazel_ci_prepare
 	mkdir -p bin

diff --git a/ddl/BUILD.bazel b/ddl/BUILD.bazel
@@ -24,6 +24,8 @@ go_library(
         "ddl_workerpool.go",
         "delete_range.go",
         "delete_range_util.go",
+        "dist_backfilling.go",
+        "dist_owner.go",
         "foreign_key.go",
         "generated_column.go",
         "index.go",
@@ -81,6 +83,8 @@ go_library(
         "//parser/terror",
         "//parser/types",
         "//privilege",
+        "//resourcemanager/pooltask",
+        "//resourcemanager/util",
         "//sessionctx",
         "//sessionctx/binloginfo",
         "//sessionctx/stmtctx",
@@ -106,6 +110,7 @@ go_library(
         "//util/filter",
         "//util/gcutil",
         "//util/generic",
+        "//util/gpool/spmc",
         "//util/hack",
         "//util/intest",
         "//util/logutil",
@@ -118,6 +123,7 @@ go_library(
         "//util/slice",
         "//util/sqlexec",
         "//util/stringutil",
+        "//util/syncutil",
         "//util/timeutil",
         "//util/topsql",
         "//util/topsql/state",

diff --git a/ddl/attributes_sql_test.go b/ddl/attributes_sql_test.go
@@ -73,6 +73,8 @@ func TestAlterTableAttributes(t *testing.T) {
 	// without equal
 	tk.MustExec(`alter table alter_t attributes " merge_option=allow ";`)
 	tk.MustExec(`alter table alter_t attributes " merge_option=allow , key=value ";`)
+
+	tk.MustExec("drop table alter_t")
 }
 
 func TestAlterTablePartitionAttributes(t *testing.T) {
@@ -134,6 +136,8 @@ PARTITION BY RANGE (c) (
 	require.Len(t, rows4, 1)
 	require.NotEqual(t, rows3[0][3], rows4[0][3])
 	require.NotEqual(t, rows[0][3], rows4[0][3])
+
+	tk.MustExec("drop table alter_p")
 }
 
 func TestTruncateTable(t *testing.T) {