Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ddl, parser: implement the normal flow of distributed processing in DDL reorg phase for adding index #40542

Merged
merged 35 commits into from
Feb 6, 2023
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
2565d07
ddl: support dist-reorg
zimulala Jan 5, 2023
4de2861
ddl: pass tests and update
zimulala Jan 6, 2023
b0712f0
tiny update
zimulala Jan 12, 2023
ae940a9
Merge branch 'master' into zimuxia/dist-reorg
zimulala Jan 12, 2023
c64b193
ddl, parser: remove usless file and tiny update
zimulala Jan 12, 2023
0fff15a
Merge branch 'master' into zimuxia/dist-reorg
zimulala Jan 13, 2023
e813a44
util/gpool/spmc, ddl: tiny update and init sess ctx
zimulala Jan 13, 2023
edf840a
add distributereorg feature flag
hawkingrei Jan 17, 2023
7f52b03
Merge branch 'master' into zimuxia/dist-reorg
hawkingrei Jan 17, 2023
114a957
*: fix "pool is existed" test
hawkingrei Jan 17, 2023
9b5025c
ddl, br: don't run backfill jobs when tidb_enable_ddl is enable and s…
zimulala Jan 17, 2023
641c14d
ddl, br: move some codes to dist_* files and make bazel happy
zimulala Jan 17, 2023
a634a39
Merge branch 'master' into zimuxia/dist-reorg
zimulala Jan 18, 2023
6d2d1e8
ddl: address comments and tiny update
zimulala Jan 18, 2023
1353abc
Merge branch 'master' into zimuxia/dist-reorg
zimulala Jan 19, 2023
81e8c5b
ddl: make merge happy
zimulala Jan 19, 2023
bbae32b
ddl: make TestAddIndexMergeConflictWithPessimistic correct and stable
zimulala Jan 20, 2023
618b4ba
*: make InTest worker and tiny update
zimulala Jan 20, 2023
955da08
Merge branch 'master' into zimuxia/dist-reorg
zimulala Jan 30, 2023
36617f4
*: make bazel happy, tiny update and fix primary key issue
zimulala Jan 30, 2023
bef0fb8
ddl/ingest: fix #40881
zimulala Jan 31, 2023
9f2149e
ddl: address comments and make test stable
zimulala Jan 31, 2023
bf25e1b
ddl, parser: fix TestAddIndexIngestAdjustBackfillWorkerCountFail and …
zimulala Feb 1, 2023
71d70cb
Merge branch 'master' into zimuxia/dist-reorg
zimulala Feb 1, 2023
563165e
ddl: make bazel happy
zimulala Feb 1, 2023
90d573c
*: add intest tag
zimulala Feb 2, 2023
35ec0d5
ddl: make test faster
zimulala Feb 2, 2023
2cc4071
Merge branch 'master' into zimuxia/dist-reorg
zimulala Feb 2, 2023
9873b3e
*: update gomod
zimulala Feb 2, 2023
63ff399
*: update deps.bzl
zimulala Feb 2, 2023
7e9b4c9
Merge branch 'master' into zimuxia/dist-reorg
zimulala Feb 3, 2023
1e0403c
*: update .bazelrc
zimulala Feb 6, 2023
8d02ea6
*: revert --test_output
zimulala Feb 6, 2023
90096d0
*: update DEPS.bzl
zimulala Feb 6, 2023
b940076
Merge branch 'master' into zimuxia/dist-reorg
ti-chi-bot Feb 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 40 additions & 2 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2812,8 +2812,8 @@ def go_deps():
name = "com_github_opentracing_basictracer_go",
build_file_proto_mode = "disable_global",
importpath = "github.com/opentracing/basictracer-go",
sum = "h1:YyUAhaEfjoWXclZVJ9sGoNct7j4TVk7lZWlQw5UXuoo=",
version = "v1.0.0",
sum = "h1:Oa1fTSBvAl8pa3U+IJYqrKm0NALwH9OsgwOqDv4xJW0=",
version = "v1.1.0",
)
go_repository(
name = "com_github_opentracing_contrib_go_stdlib",
Expand Down Expand Up @@ -2917,6 +2917,14 @@ def go_deps():
sum = "h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc=",
version = "v0.0.0-20180830031419-95f893ade6f2",
)
go_repository(
name = "com_github_philhofer_fwd",
build_file_proto_mode = "disable",
importpath = "github.com/philhofer/fwd",
sum = "h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ=",
version = "v1.1.1",
)

go_repository(
name = "com_github_pierrec_lz4",
build_file_proto_mode = "disable_global",
Expand Down Expand Up @@ -3360,6 +3368,14 @@ def go_deps():
sum = "h1:ug7PpSOB5RBPK1Kg6qskGBoP3Vnj/aNYFTznWvlkGo0=",
version = "v0.0.0-20181202132449-6a9ea43bcacd",
)
go_repository(
name = "com_github_silentred_gid",
build_file_proto_mode = "disable",
importpath = "github.com/silentred/gid",
sum = "h1:JdsH8McqPUeY8IN4C0gxENnJG2zysvh+/xDJWhPvGVQ=",
version = "v1.0.0",
)

go_repository(
name = "com_github_sirupsen_logrus",
build_file_proto_mode = "disable_global",
Expand Down Expand Up @@ -3585,6 +3601,14 @@ def go_deps():
sum = "h1:B2FNmPDaGirXpIOgQbqxiukIkT8eOT4tKEahqYE2ers=",
version = "v2.0.5-0.20230112062023-fe5b35c5f5dc",
)
go_repository(
name = "com_github_tikv_minitrace_go",
build_file_proto_mode = "disable",
importpath = "github.com/tikv/minitrace-go",
sum = "h1:nvIrUVo5YJZMsCn6yTxrpgrokIo/wug5N/nL5mc7v50=",
version = "v0.0.0-20220923091513-8e6316bb4097",
)

go_repository(
name = "com_github_tikv_pd_client",
build_file_proto_mode = "disable_global",
Expand Down Expand Up @@ -3614,6 +3638,13 @@ def go_deps():
sum = "h1:phZCcypL/vtx6cGxObJgWZ5wexZF5SXFPLOM+ru0e/M=",
version = "v0.1.0",
)
go_repository(
name = "com_github_tinylib_msgp",
build_file_proto_mode = "disable",
importpath = "github.com/tinylib/msgp",
sum = "h1:2gXmtWueD2HefZHQe1QOy9HVzmFrLOVvsXwXBQ0ayy0=",
version = "v1.1.5",
)

go_repository(
name = "com_github_tklauser_go_sysconf",
Expand Down Expand Up @@ -3650,6 +3681,13 @@ def go_deps():
sum = "h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw=",
version = "v2.5.1",
)
go_repository(
name = "com_github_ttacon_chalk",
build_file_proto_mode = "disable",
importpath = "github.com/ttacon/chalk",
sum = "h1:OXcKh35JaYsGMRzpvFkLv/MEyPuL49CThT1pZ8aSml4=",
version = "v0.0.0-20160626202418-22c06c80ed31",
)

go_repository(
name = "com_github_twmb_murmur3",
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,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 \
-- //... -//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,distributereorg \
-- //... -//cmd/... -//tests/graceshutdown/... \
-//tests/globalkilltest/... -//tests/readonlytest/... -//br/pkg/task:task_test -//tests/realtikvtest/...

bazel_build: bazel_ci_prepare
mkdir -p bin
Expand Down
4 changes: 4 additions & 0 deletions ddl/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ go_library(
"ddl_workerpool.go",
"delete_range.go",
"delete_range_util.go",
"dist_backfilling.go",
"foreign_key.go",
"generated_column.go",
"index.go",
Expand Down Expand Up @@ -79,6 +80,8 @@ go_library(
"//parser/opcode",
"//parser/terror",
"//parser/types",
"//resourcemanager/pooltask",
"//resourcemanager/util",
"//sessionctx",
"//sessionctx/binloginfo",
"//sessionctx/stmtctx",
Expand All @@ -104,6 +107,7 @@ go_library(
"//util/filter",
"//util/gcutil",
"//util/generic",
"//util/gpool/spmc",
"//util/hack",
"//util/logutil",
"//util/mathutil",
Expand Down
4 changes: 4 additions & 0 deletions ddl/attributes_sql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
Loading