diff --git a/ddl/export_test.go b/ddl/export_test.go index 8d06495f5a070..633c28c8a9de6 100644 --- a/ddl/export_test.go +++ b/ddl/export_test.go @@ -60,9 +60,8 @@ func FetchChunk4Test(copCtx *copContext, tbl table.PhysicalTable, startKey, endK } func ConvertRowToHandleAndIndexDatum(row chunk.Row, copCtx *copContext) (kv.Handle, []types.Datum, error) { - sVars := copCtx.sessCtx.GetSessionVars() - idxData := extractDatumByOffsets(row, copCtx.idxColOutputOffsets, copCtx.expColInfos, sVars, nil) - handleData := extractDatumByOffsets(row, copCtx.handleOutputOffsets, copCtx.expColInfos, sVars, nil) + idxData := extractDatumByOffsets(row, copCtx.idxColOutputOffsets, copCtx.expColInfos, nil) + handleData := extractDatumByOffsets(row, copCtx.handleOutputOffsets, copCtx.expColInfos, nil) handle, err := buildHandle(handleData, copCtx.tblInfo, copCtx.pkInfo, &stmtctx.StatementContext{TimeZone: time.Local}) return handle, idxData, err } diff --git a/ddl/index.go b/ddl/index.go index 46e9cc8dd6073..2d3b2ef5cd9c4 100644 --- a/ddl/index.go +++ b/ddl/index.go @@ -1679,8 +1679,8 @@ func writeChunkToLocal(writer ingest.Writer, defer unlock() for row := iter.Begin(); row != iter.End(); row = iter.Next() { idxDataBuf, handleDataBuf = idxDataBuf[:0], handleDataBuf[:0] - idxDataBuf = extractDatumByOffsets(row, copCtx.idxColOutputOffsets, copCtx.expColInfos, vars, idxDataBuf) - handleDataBuf := extractDatumByOffsets(row, copCtx.handleOutputOffsets, copCtx.expColInfos, vars, handleDataBuf) + idxDataBuf = extractDatumByOffsets(row, copCtx.idxColOutputOffsets, copCtx.expColInfos, idxDataBuf) + handleDataBuf := extractDatumByOffsets(row, copCtx.handleOutputOffsets, copCtx.expColInfos, handleDataBuf) handle, err := buildHandle(handleDataBuf, copCtx.tblInfo, copCtx.pkInfo, sCtx) if err != nil { return 0, nil, errors.Trace(err) diff --git a/ddl/index_cop.go b/ddl/index_cop.go index a1d20abf3ab94..88dabda331951 100644 --- a/ddl/index_cop.go +++ b/ddl/index_cop.go @@ -510,7 +510,6 @@ func extractDatumByOffsets( row chunk.Row, offsets []int, expCols []*expression.Column, - vars *variable.SessionVars, buf []types.Datum, ) []types.Datum { for _, offset := range offsets {