ddl: use the correct timezone to encode record for adding index

ddl/export_test.go

@@ -60,8 +60,9 @@ func FetchChunk4Test(copCtx *copContext, tbl table.PhysicalTable, startKey, endK
 }
 
 func ConvertRowToHandleAndIndexDatum(row chunk.Row, copCtx *copContext) (kv.Handle, []types.Datum, error) {
-	idxData := extractDatumByOffsets(row, copCtx.idxColOutputOffsets, copCtx.expColInfos, nil)
-	handleData := extractDatumByOffsets(row, copCtx.handleOutputOffsets, copCtx.expColInfos, nil)
+	sVars := copCtx.sessCtx.GetSessionVars()
+	idxData := extractDatumByOffsets(row, copCtx.idxColOutputOffsets, copCtx.expColInfos, sVars, nil)
+	handleData := extractDatumByOffsets(row, copCtx.handleOutputOffsets, copCtx.expColInfos, sVars, nil)
 	handle, err := buildHandle(handleData, copCtx.tblInfo, copCtx.pkInfo, &stmtctx.StatementContext{TimeZone: time.Local})
 	return handle, idxData, err
 }

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, idxDataBuf)
-		handleDataBuf := extractDatumByOffsets(row, copCtx.handleOutputOffsets, copCtx.expColInfos, handleDataBuf)
+		idxDataBuf = extractDatumByOffsets(row, copCtx.idxColOutputOffsets, copCtx.expColInfos, vars, idxDataBuf)
+		handleDataBuf := extractDatumByOffsets(row, copCtx.handleOutputOffsets, copCtx.expColInfos, vars, handleDataBuf)
 		handle, err := buildHandle(handleDataBuf, copCtx.tblInfo, copCtx.pkInfo, sCtx)
 		if err != nil {
 			return 0, nil, errors.Trace(err)

ddl/index_cop.go

@@ -18,6 +18,7 @@
 	"context"
 	"encoding/hex"
 	"sync"
+	"time"
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
@@ -28,6 +29,7 @@
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/metrics"
 	"github.com/pingcap/tidb/parser/model"
+	"github.com/pingcap/tidb/parser/mysql"
 	"github.com/pingcap/tidb/parser/terror"
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
@@ -506,10 +508,26 @@
 	return &tipb.Executor{Tp: tipb.ExecType_TypeTableScan, TblScan: tblScan}, err
 }
 
-func extractDatumByOffsets(row chunk.Row, offsets []int, expCols []*expression.Column, buf []types.Datum) []types.Datum {
+func extractDatumByOffsets(
+	row chunk.Row,
+	offsets []int,
+	expCols []*expression.Column,
+	vars *variable.SessionVars,
+	buf []types.Datum,
+) []types.Datum {
 	for _, offset := range offsets {
 		c := expCols[offset]
-		rowDt := row.GetDatum(offset, c.GetType())
+		ft := c.GetType()
+		rowDt := row.GetDatum(offset, ft)
+		if ft.GetType() == mysql.TypeTimestamp && vars.TimeZone != time.UTC {
+			// Convert from utc to current timezone.
+			t := rowDt.GetMysqlTime()
+			err := t.ConvertTimeZone(time.UTC, vars.TimeZone)
+			if err != nil {
+				logutil.BgLogger().Warn("convert timestamp timezone failed", zap.Error(err))
+			}
+			rowDt.SetMysqlTime(t)
+		}
 		buf = append(buf, rowDt)
 	}
 	return buf

ddl/ingest/BUILD.bazel

@@ -65,7 +65,7 @@ go_test(
     embed = [":ingest"],
     flaky = True,
     race = "on",
-    shard_count = 14,
+    shard_count = 15,
     deps = [
         "//config",
         "//ddl",

ddl/ingest/integration_test.go

@@ -323,3 +323,16 @@ func TestAddIndexIngestRecoverPartition(t *testing.T) {
 	tk.MustExec("alter table t add index idx(b);")
 	tk.MustExec("admin check table t;")
 }
+
+func TestAddIndexIngestTimezone(t *testing.T) {
+	store := testkit.CreateMockStore(t)
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test;")
+	defer injectMockBackendMgr(t, store)()
+
+	tk.MustExec("SET time_zone = '-06:00';")
+	tk.MustExec("create table t (`src` varchar(48),`t` timestamp,`timezone` varchar(100));")
+	tk.MustExec("insert into t values('2000-07-29 23:15:30 -0600','2000-07-29 23:15:30 -0600','-6:00');")
+	tk.MustExec("alter table t add index idx(t);")
+	tk.MustExec("admin check table t;")
+}