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.

Sign up for GitHub

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

Jump to bottom

ddl: assign table record prefix to start/end key if it is empty (#39683) #47471

Merged
merged 2 commits into from
Oct 9, 2023
Merged

ddl: assign table record prefix to start/end key if it is empty (#39683) #47471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c620dd
This is an automated cherry-pick of #39683
tangenta Dec 7, 2022
31cd6b2
resolve conflicts
tangenta Oct 9, 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
9 changes: 8 additions & 1 deletion ddl/backfilling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,7 @@ func (dc *ddlCtx) handleRangeTasks(scheduler *backfillScheduler, t table.Table,
job := reorgInfo.Job
source := getDDLRequestSource(job)
for i, keyRange := range kvRanges {
startKey := keyRange.StartKey
endKey := keyRange.EndKey
endK, err := getRangeEndKey(scheduler.jobCtx, dc.store, job.Priority, prefix, keyRange.StartKey, endKey)
if err != nil {
Expand All @@ -512,11 +513,17 @@ func (dc *ddlCtx) handleRangeTasks(scheduler *backfillScheduler, t table.Table,
zap.String("end key", hex.EncodeToString(endKey)), zap.String("current end key", hex.EncodeToString(endK)))
endKey = endK
}
if len(startKey) == 0 {
startKey = prefix
}
if len(endKey) == 0 {
endKey = prefix.PrefixNext()
}

task := &reorgBackfillTask{
id: i,
physicalTableID: physicalTableID,
startKey: keyRange.StartKey,
startKey: startKey,
endKey: endKey,
// If the boundaries overlap, we should ignore the preceding endKey.
endInclude: endK.Cmp(keyRange.EndKey) != 0 || i == len(kvRanges)-1,
Expand Down
16 changes: 16 additions & 0 deletions tests/realtikvtest/addindextest/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,22 @@ func TestAddIndexIngestGeneratedColumns(t *testing.T) {
assertLastNDDLUseIngest(4)
}

func TestAddIndexIngestEmptyTable(t *testing.T) {
store := realtikvtest.CreateMockStoreAndSetup(t)
tk := testkit.NewTestKit(t, store)
tk.MustExec("drop database if exists addindexlit;")
tk.MustExec("create database addindexlit;")
tk.MustExec("use addindexlit;")
tk.MustExec("create table t (a int);")
tk.MustExec(`set global tidb_ddl_enable_fast_reorg=on;`)
tk.MustExec("alter table t add index idx(a);")

rows := tk.MustQuery("admin show ddl jobs 1;").Rows()
require.Len(t, rows, 1)
jobTp := rows[0][3].(string)
require.True(t, strings.Contains(jobTp, "ingest"), jobTp)
}

func TestAddIndexIngestRestoredData(t *testing.T) {
store := realtikvtest.CreateMockStoreAndSetup(t)
tk := testkit.NewTestKit(t, store)
Expand Down