Skip to content

Commit

Permalink
ddl: assign table record prefix to start/end key if it is empty (#39683)
Browse files Browse the repository at this point in the history
close #39641
  • Loading branch information
tangenta committed Dec 7, 2022
1 parent 8e3cbac commit b6098ef
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
9 changes: 8 additions & 1 deletion ddl/backfilling.go
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ func (dc *ddlCtx) handleRangeTasks(scheduler *backfillScheduler, t table.Table,
// Build reorg tasks.
job := reorgInfo.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 @@ -517,11 +518,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
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,19 @@ func TestAddIndexIngestGeneratedColumns(t *testing.T) {
tk.MustQuery("select * from t;").Check(testkit.Rows("1 1 1 2 1", "2 2 2 4 2", "3 3 3 6 3"))
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)
}

0 comments on commit b6098ef

Please sign in to comment.