Skip to content

Commit 82626f4

Browse files
authored
executor: Remove useless error logs for indexLoopUp executor when context canceled (pingcap#61073) (pingcap#61112)
close pingcap#61072
1 parent a306ff4 commit 82626f4

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

executor/distsql.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,9 @@ func (e *IndexLookUpExecutor) buildTableReader(ctx context.Context, task *lookup
785785
tableReaderExec.buildVirtualColumnInfo()
786786
tableReader, err := e.dataReaderBuilder.buildTableReaderFromHandles(ctx, tableReaderExec, task.handles, true)
787787
if err != nil {
788-
logutil.Logger(ctx).Error("build table reader from handles failed", zap.Error(err))
788+
if ctx.Err() != context.Canceled {
789+
logutil.Logger(ctx).Error("build table reader from handles failed", zap.Error(err))
790+
}
789791
return nil, err
790792
}
791793
return tableReader, nil
@@ -1419,7 +1421,9 @@ func (w *tableWorker) executeTask(ctx context.Context, task *lookupTableTask) er
14191421
tableReader, err := w.idxLookup.buildTableReader(ctx, task)
14201422
task.buildDoneTime = time.Now()
14211423
if err != nil {
1422-
logutil.Logger(ctx).Error("build table reader failed", zap.Error(err))
1424+
if ctx.Err() != context.Canceled {
1425+
logutil.Logger(ctx).Error("build table reader failed", zap.Error(err))
1426+
}
14231427
return err
14241428
}
14251429
defer terror.Call(tableReader.Close)
@@ -1438,7 +1442,9 @@ func (w *tableWorker) executeTask(ctx context.Context, task *lookupTableTask) er
14381442
chk := tryNewCacheChunk(tableReader)
14391443
err = Next(ctx, tableReader, chk)
14401444
if err != nil {
1441-
logutil.Logger(ctx).Error("table reader fetch next chunk failed", zap.Error(err))
1445+
if ctx.Err() != context.Canceled {
1446+
logutil.Logger(ctx).Error("table reader fetch next chunk failed", zap.Error(err))
1447+
}
14421448
return err
14431449
}
14441450
if chk.NumRows() == 0 {

0 commit comments

Comments
 (0)