ddl: fix ingest checkpoint not resumed for empty partitions (#44271) (#…

…44282) close #44265
pingcap · May 30, 2023 · 635a436 · 635a436
1 parent 2fa7707
commit 635a436
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/ddl/job_table.go b/ddl/job_table.go
@@ -606,6 +606,7 @@ func getDDLReorgHandle(se *sess.Session, job *model.Job) (element *meta.Element,
 }
 
 func getCheckpointReorgHandle(se *sess.Session, job *model.Job) (startKey, endKey kv.Key, physicalTableID int64, err error) {
+	startKey, endKey = kv.Key{}, kv.Key{}
 	sql := fmt.Sprintf("select reorg_meta from mysql.tidb_ddl_reorg where job_id = %d", job.ID)
 	ctx := kv.WithInternalSourceType(context.Background(), getDDLRequestSource(job.Type))
 	rows, err := se.Execute(ctx, sql, "get_handle")
@@ -629,8 +630,12 @@ func getCheckpointReorgHandle(se *sess.Session, job *model.Job) (startKey, endKe
 				zap.String("end", hex.EncodeToString(cp.EndKey)),
 				zap.Int64("checkpoint physical ID", cp.PhysicalID))
 			physicalTableID = cp.PhysicalID
-			startKey = cp.StartKey
-			endKey = cp.EndKey
+			if len(cp.StartKey) > 0 {
+				startKey = cp.StartKey
+			}
+			if len(cp.EndKey) > 0 {
+				endKey = cp.EndKey
+			}
 		}
 	}
 	return

diff --git a/ddl/reorg.go b/ddl/reorg.go
@@ -349,7 +349,7 @@ func overwriteReorgInfoFromGlobalCheckpoint(w *worker, sess *sess.Session, job *
 	if err != nil {
 		return errors.Trace(err)
 	}
-	if len(start) > 0 && len(end) > 0 && pid > 0 {
+	if pid > 0 {
 		reorgInfo.StartKey = start
 		reorgInfo.EndKey = end
 		reorgInfo.PhysicalTableID = pid