Skip to content

Commit 2e54d14

Browse files
tangentati-chi-bot
authored andcommitted
This is an automated cherry-pick of pingcap#57553
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
1 parent 0987792 commit 2e54d14

18 files changed

Lines changed: 24815 additions & 557 deletions

File tree

pkg/ddl/BUILD.bazel

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,15 @@ go_library(
4242
"index.go",
4343
"index_cop.go",
4444
"index_merge_tmp.go",
45+
<<<<<<< HEAD
4546
"job_table.go",
47+
=======
48+
"index_presplit.go",
49+
"job_scheduler.go",
50+
"job_submitter.go",
51+
"job_worker.go",
52+
"metabuild.go",
53+
>>>>>>> 177a03c8e51 (ddl: support pre-split index regions before creating index (#57553))
4654
"mock.go",
4755
"multi_schema_change.go",
4856
"options.go",
@@ -137,6 +145,7 @@ go_library(
137145
"//pkg/util/collate",
138146
"//pkg/util/dbterror",
139147
"//pkg/util/dbterror/exeerrors",
148+
"//pkg/util/dbterror/plannererrors",
140149
"//pkg/util/domainutil",
141150
"//pkg/util/engine",
142151
"//pkg/util/filter",

pkg/ddl/backfilling.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ type reorgBackfillTask struct {
213213
startKey kv.Key
214214
endKey kv.Key
215215
jobID int64
216-
sqlQuery string
217216
priority int
218217
}
219218

0 commit comments

Comments
 (0)