Skip to content
Merged
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions pkg/executor/distsql.go
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,9 @@ func (e *IndexLookUpExecutor) buildTableReader(ctx context.Context, task *lookup
tableReaderExec.buildVirtualColumnInfo()
tableReader, err := e.dataReaderBuilder.buildTableReaderFromHandles(ctx, tableReaderExec, task.handles, true)
if err != nil {
logutil.Logger(ctx).Error("build table reader from handles failed", zap.Error(err))
if ctx.Err() != context.Canceled {
logutil.Logger(ctx).Error("build table reader from handles failed", zap.Error(err))
}
return nil, err
}
return tableReader, nil
Expand Down Expand Up @@ -1531,7 +1533,9 @@ func (w *tableWorker) executeTask(ctx context.Context, task *lookupTableTask) er
tableReader, err := w.idxLookup.buildTableReader(ctx, task)
task.buildDoneTime = time.Now()
if err != nil {
logutil.Logger(ctx).Error("build table reader failed", zap.Error(err))
if ctx.Err() != context.Canceled {
logutil.Logger(ctx).Error("build table reader failed", zap.Error(err))
}
return err
}
defer func() { terror.Log(exec.Close(tableReader)) }()
Expand Down Expand Up @@ -1562,7 +1566,9 @@ func (w *tableWorker) executeTask(ctx context.Context, task *lookupTableTask) er
chk := exec.TryNewCacheChunk(tableReader)
err = exec.Next(ctx, tableReader, chk)
if err != nil {
logutil.Logger(ctx).Error("table reader fetch next chunk failed", zap.Error(err))
if ctx.Err() != context.Canceled {
logutil.Logger(ctx).Error("table reader fetch next chunk failed", zap.Error(err))
}
return err
}
if chk.NumRows() == 0 {
Expand Down