ddl: remove useless logs

pingcap · Feb 7, 2023 · d456da2 · d456da2
1 parent a1af116
commit d456da2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/ddl/db_partition_test.go b/ddl/db_partition_test.go
@@ -3142,7 +3142,6 @@ func testPartitionAddIndexOrPK(t *testing.T, tk *testkit.TestKit, key string) {
 	partition p6 values less than (2012),
 	partition p7 values less than (2018)
 	);`)
-	logutil.BgLogger().Warn("xxx$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ 111")
 	testPartitionAddIndex(tk, t, key)
 
 	// test hash partition table.
@@ -3152,7 +3151,6 @@ func testPartitionAddIndexOrPK(t *testing.T, tk *testkit.TestKit, key string) {
 	id int not null,
 	hired date not null
 	) partition by hash( year(hired) ) partitions 4;`)
-	logutil.BgLogger().Warn("xxx$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ 222")
 	testPartitionAddIndex(tk, t, key)
 
 	// Test hash partition for pr 10475.
@@ -3200,7 +3198,6 @@ func testPartitionAddIndex(tk *testkit.TestKit, t *testing.T, key string) {
 	tk.MustExec(dml)
 
 	tk.MustExec(fmt.Sprintf("alter table partition_add_idx add %s idx1 (hired)", key))
-	logutil.BgLogger().Warn("xxx@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@")
 	tk.MustExec("alter table partition_add_idx add index idx2 (id, hired)")
 	ctx := tk.Session()
 	is := domain.GetDomain(ctx).InfoSchema()

diff --git a/ddl/dist_backfilling.go b/ddl/dist_backfilling.go
@@ -232,9 +232,8 @@ func GetTasks(d *ddlCtx, sess *session, tbl table.Table, runningJobID int64, con
 	// TODO: At present, only add index is processed. In the future, different elements need to be distinguished.
 	var err error
 	var pTblID int64
-	bJobs := make([]*BackfillJob, 0, concurrency)
 	for i := 0; i < retrySQLTimes; i++ {
-		bJobs, err = GetAndMarkBackfillJobsForOneEle(sess, concurrency, runningJobID, d.uuid, pTblID, InstanceLease)
+		bJobs, err := GetAndMarkBackfillJobsForOneEle(sess, concurrency, runningJobID, d.uuid, pTblID, InstanceLease)
 		if err != nil {
 			// TODO: add test: if all tidbs can't get the unmark backfill job(a tidb mark a backfill job, other tidbs returned, then the tidb can't handle this job.)
 			if dbterror.ErrDDLJobNotFound.Equal(err) {

diff --git a/ddl/dist_owner.go b/ddl/dist_owner.go
@@ -282,7 +282,7 @@ func (dc *ddlCtx) controlWriteTableRecord(sessPool *sessionPool, t table.Table,
 	return checkReorgJobFinished(dc.ctx, sess, &dc.reorgCtx, ddlJobID, currEle)
 }
 
-func (dc *ddlCtx) splitPhysicalTableToBackfillJobs(sess *session, reorgInfo *reorgInfo, sJobCtx *splitJobContext) error {
+func (dc *ddlCtx) splitPhysicalTableToBackfillJobs(sess *session, reorgInfo *reorgInfo, sJobCtx *splitJobContext) {
 	defaultSQLMode := sess.GetSessionVars().SQLMode
 	defer func() { sess.GetSessionVars().SQLMode = defaultSQLMode }()
 	// Make timestamp type can be inserted ZeroTimestamp.
@@ -309,20 +309,20 @@ func (dc *ddlCtx) splitPhysicalTableToBackfillJobs(sess *session, reorgInfo *reo
 			logutil.BgLogger().Info("[ddl] split backfill jobs to table start", zap.Int64("jobID", reorgInfo.Job.ID),
 				zap.Stringer("ele", reorgInfo.currElement), zap.Int("donePTbls", pTblMetaCnt), zap.Bool("more", ok))
 			if !ok {
-				return nil
+				return
 			}
 			if err = dc.isReorgRunnable(reorgInfo.Job.ID, false); err != nil {
-				return err
+				return
 			}
 
 			err = dc.splitTableToBackfillJobs(sess, reorgInfo, sJobCtx, pTblMeta)
 			if err != nil {
-				return err
+				return
 			}
 			pTblMetaCnt++
 		}
 	}
-	return nil
+	return
 }
 
 func checkReorgJobFinished(ctx context.Context, sess *session, reorgCtxs *reorgContexts, ddlJobID int64, currEle *meta.Element) error {