tests, executor, br: fix time_zone related bugs in UT (pingcap#49588)

close pingcap#49493

.bazelrc

@@ -18,7 +18,6 @@ build:release --workspace_status_command=./build/print-workspace-status.sh --sta
 build:release --config=ci
 build:race --config=ci
 build:race --@io_bazel_rules_go//go/config:race --test_env=GORACE=halt_on_error=1 --test_sharding_strategy=disabled
-test --test_env=TZ=Asia/Shanghai
 test --test_output=errors --test_summary=detailed
 test:ci --color=yes
 test:ci --verbose_failures --test_verbose_timeout_warnings

br/pkg/task/show/cmd_test.go

@@ -178,6 +178,7 @@ func TestShowViaSQL(t *testing.T) {
 	err := os.WriteFile(metaPath, FullMeta, 0o444)
 	req.NoError(err)
 
+	tk.MustExec("set @@time_zone='+08:00'")
 	res := tk.MustQuery(fmt.Sprintf("SHOW BACKUP METADATA FROM 'local://%s'", tempBackup))
 	fmt.Printf("%#v", res.Sort().Rows())
 	res.Sort().Check([][]interface{}{
@@ -191,4 +192,20 @@ func TestShowViaSQL(t *testing.T) {
 		{"tpcc", "stock", "0", "0", "<nil>", "2023-04-10 11:18:21"},
 		{"tpcc", "warehouse", "0", "0", "<nil>", "2023-04-10 11:18:21"},
 	})
+
+	// Test result in different time_zone
+	tk.MustExec("set @@time_zone='-08:00'")
+	res = tk.MustQuery(fmt.Sprintf("SHOW BACKUP METADATA FROM 'local://%s'", tempBackup))
+	fmt.Printf("%#v", res.Sort().Rows())
+	res.Sort().Check([][]interface{}{
+		{"tpcc", "customer", "0", "0", "<nil>", "2023-04-09 19:18:21"},
+		{"tpcc", "district", "0", "0", "<nil>", "2023-04-09 19:18:21"},
+		{"tpcc", "history", "0", "0", "<nil>", "2023-04-09 19:18:21"},
+		{"tpcc", "item", "0", "0", "<nil>", "2023-04-09 19:18:21"},
+		{"tpcc", "new_order", "0", "0", "<nil>", "2023-04-09 19:18:21"},
+		{"tpcc", "order_line", "0", "0", "<nil>", "2023-04-09 19:18:21"},
+		{"tpcc", "orders", "0", "0", "<nil>", "2023-04-09 19:18:21"},
+		{"tpcc", "stock", "0", "0", "<nil>", "2023-04-09 19:18:21"},
+		{"tpcc", "warehouse", "0", "0", "<nil>", "2023-04-09 19:18:21"},
+	})
 }

pkg/ddl/column_type_change_test.go

@@ -388,6 +388,7 @@ func TestChangingColOriginDefaultValueAfterAddColAndCastSucc(t *testing.T) {
 
 	tk1 := testkit.NewTestKit(t, store)
 	tk1.MustExec("use test")
+	tk1.MustExec("set time_zone = 'UTC'")
 
 	tk.MustExec("set time_zone = 'UTC'")
 	tk.MustExec("drop table if exists t")

pkg/executor/brie.go

@@ -510,11 +510,11 @@ func (e *showMetaExec) Next(ctx context.Context, req *chunk.Chunk) error {
 		req.AppendInt64(2, int64(table.KVCount))
 		req.AppendInt64(3, int64(table.KVSize))
 		if res.StartVersion > 0 {
-			req.AppendTime(4, types.NewTime(types.FromGoTime(startTime), mysql.TypeDatetime, 0))
+			req.AppendTime(4, types.NewTime(types.FromGoTime(startTime.In(e.Ctx().GetSessionVars().Location())), mysql.TypeDatetime, 0))
 		} else {
 			req.AppendNull(4)
 		}
-		req.AppendTime(5, types.NewTime(types.FromGoTime(endTime), mysql.TypeDatetime, 0))
+		req.AppendTime(5, types.NewTime(types.FromGoTime(endTime.In(e.Ctx().GetSessionVars().Location())), mysql.TypeDatetime, 0))
 	}
 	return nil
 }

pkg/executor/slow_query.go

@@ -124,8 +124,8 @@ func (e *slowQueryRetriever) initialize(ctx context.Context, sctx sessionctx.Con
 	if e.extractor != nil {
 		e.checker.enableTimeCheck = e.extractor.Enable
 		for _, tr := range e.extractor.TimeRanges {
-			startTime := types.NewTime(types.FromGoTime(tr.StartTime), mysql.TypeDatetime, types.MaxFsp)
-			endTime := types.NewTime(types.FromGoTime(tr.EndTime), mysql.TypeDatetime, types.MaxFsp)
+			startTime := types.NewTime(types.FromGoTime(tr.StartTime.In(sctx.GetSessionVars().Location())), mysql.TypeDatetime, types.MaxFsp)
+			endTime := types.NewTime(types.FromGoTime(tr.EndTime.In(sctx.GetSessionVars().Location())), mysql.TypeDatetime, types.MaxFsp)
 			timeRange := &timeRange{
 				startTime: startTime,
 				endTime:   endTime,
@@ -689,17 +689,13 @@ func getColumnValueFactoryByName(colName string, columnIdx int) (slowQueryColumn
 			if err != nil {
 				return false, err
 			}
-			timeValue := types.NewTime(types.FromGoTime(t), mysql.TypeTimestamp, types.MaxFsp)
+			timeValue := types.NewTime(types.FromGoTime(t.In(tz)), mysql.TypeTimestamp, types.MaxFsp)
 			if checker != nil {
 				valid := checker.isTimeValid(timeValue)
 				if !valid {
 					return valid, nil
 				}
 			}
-			if t.Location() != tz {
-				t = t.In(tz)
-				timeValue = types.NewTime(types.FromGoTime(t), mysql.TypeTimestamp, types.MaxFsp)
-			}
 			row[columnIdx] = types.NewTimeDatum(timeValue)
 			return true, nil
 		}, nil

pkg/executor/slow_query_sql_test.go

@@ -278,6 +278,7 @@ SELECT original_sql, bind_sql, default_db, status, create_time, update_time, cha
 	store := testkit.CreateMockStore(t)
 	tk := testkit.NewTestKit(t, store)
 
+	tk.MustExec("set @@time_zone='+08:00'")
 	tk.MustExec(fmt.Sprintf("set @@tidb_slow_query_file='%v'", f.Name()))
 	tk.MustQuery("select count(*) from `information_schema`.`slow_query` where time > '2020-10-16 20:08:13' and time < '2020-10-16 21:08:13'").Check(testkit.Rows("1"))
 	tk.MustQuery("select count(*) from `information_schema`.`slow_query` where time > '2019-10-13 20:08:13' and time < '2020-10-16 21:08:13'").Check(testkit.Rows("2"))

pkg/executor/stale_txn_test.go

@@ -46,7 +46,7 @@ func TestExactStalenessTransaction(t *testing.T) {
 			preSQL:           "begin",
 			sql:              `START TRANSACTION READ ONLY AS OF TIMESTAMP '2020-09-06 00:00:00';`,
 			IsStaleness:      true,
-			expectPhysicalTS: 1599321600000,
+			expectPhysicalTS: time.Date(2020, 9, 6, 0, 0, 0, 0, time.Local).UnixMilli(),
 			zone:             "sh",
 		},
 		{
@@ -61,7 +61,7 @@ func TestExactStalenessTransaction(t *testing.T) {
 			preSQL:           "begin",
 			sql:              `START TRANSACTION READ ONLY AS OF TIMESTAMP tidb_bounded_staleness('2015-09-21 00:07:01', NOW());`,
 			IsStaleness:      true,
-			expectPhysicalTS: 1442765221000,
+			expectPhysicalTS: time.Date(2015, 9, 21, 0, 7, 1, 0, time.Local).UnixMilli(),
 			zone:             "bj",
 		},
 		{

pkg/expression/integration_test/integration_test.go

@@ -63,7 +63,7 @@ func TestGetLock(t *testing.T) {
 	// Increase pessimistic txn max retry count to make test more stable.
 	originCfg := config.GetGlobalConfig()
 	newCfg := *originCfg
-	newCfg.PessimisticTxn.MaxRetryCount = 2048
+	newCfg.PessimisticTxn.MaxRetryCount = 10240
 	config.StoreGlobalConfig(&newCfg)
 	defer func() {
 		config.StoreGlobalConfig(originCfg)

pkg/util/stmtsummary/v2/reader_test.go

@@ -17,6 +17,7 @@ package stmtsummary
 import (
 	"bufio"
 	"context"
+	"fmt"
 	"os"
 	"testing"
 	"time"
@@ -59,7 +60,7 @@ func TestStmtFile(t *testing.T) {
 		require.NoError(t, f.file.Close())
 	}()
 	require.Equal(t, int64(1), f.begin)
-	require.Equal(t, int64(1672129280), f.end) // 2022-12-27T16-21-20.245 == 1672129280
+	require.Equal(t, time.Date(2022, 12, 27, 16, 21, 20, 245000000, time.Local).Unix(), f.end)
 
 	// Check if seek 0.
 	firstLine, err := util.ReadLine(bufio.NewReader(f.file), maxLineSize)
@@ -89,10 +90,11 @@ func TestStmtFileInvalidLine(t *testing.T) {
 		require.NoError(t, f.file.Close())
 	}()
 	require.Equal(t, int64(1), f.begin)
-	require.Equal(t, int64(1672129280), f.end) // 2022-12-27T16-21-20.245 == 1672129280
+	require.Equal(t, time.Date(2022, 12, 27, 16, 21, 20, 245000000, time.Local).Unix(), f.end)
 }
 
 func TestStmtFiles(t *testing.T) {
+	t1 := time.Date(2022, 12, 27, 16, 21, 20, 245000000, time.Local)
 	filename1 := "tidb-statements-2022-12-27T16-21-20.245.log"
 	filename2 := "tidb-statements.log"
 
@@ -101,9 +103,9 @@ func TestStmtFiles(t *testing.T) {
 	defer func() {
 		require.NoError(t, os.Remove(filename1))
 	}()
-	_, err = file.WriteString("{\"begin\":1672128520,\"end\":1672128530}\n")
+	_, err = file.WriteString(fmt.Sprintf("{\"begin\":%d,\"end\":%d}\n", t1.Unix()-760, t1.Unix()-750))
 	require.NoError(t, err)
-	_, err = file.WriteString("{\"begin\":1672129270,\"end\":1672129280}\n")
+	_, err = file.WriteString(fmt.Sprintf("{\"begin\":%d,\"end\":%d}\n", t1.Unix()-10, t1.Unix()))
 	require.NoError(t, err)
 	require.NoError(t, file.Close())
 
@@ -112,9 +114,9 @@ func TestStmtFiles(t *testing.T) {
 	defer func() {
 		require.NoError(t, os.Remove(filename2))
 	}()
-	_, err = file.WriteString("{\"begin\":1672129270,\"end\":1672129280}\n")
+	_, err = file.WriteString(fmt.Sprintf("{\"begin\":%d,\"end\":%d}\n", t1.Unix()-10, t1.Unix()))
 	require.NoError(t, err)
-	_, err = file.WriteString("{\"begin\":1672129380,\"end\":1672129390}\n")
+	_, err = file.WriteString(fmt.Sprintf("{\"begin\":%d,\"end\":%d}\n", t1.Unix()+100, t1.Unix()+110))
 	require.NoError(t, err)
 	require.NoError(t, file.Close())
 
@@ -129,7 +131,7 @@ func TestStmtFiles(t *testing.T) {
 
 	func() {
 		files, err := newStmtFiles(context.Background(), []*StmtTimeRange{
-			{Begin: 1672129270, End: 1672129271},
+			{Begin: t1.Unix() - 10, End: t1.Unix() - 9},
 		})
 		require.NoError(t, err)
 		defer files.close()
@@ -140,7 +142,7 @@ func TestStmtFiles(t *testing.T) {
 
 	func() {
 		files, err := newStmtFiles(context.Background(), []*StmtTimeRange{
-			{Begin: 0, End: 1672129270},
+			{Begin: 0, End: t1.Unix() - 10},
 		})
 		require.NoError(t, err)
 		defer files.close()
@@ -151,7 +153,7 @@ func TestStmtFiles(t *testing.T) {
 
 	func() {
 		files, err := newStmtFiles(context.Background(), []*StmtTimeRange{
-			{Begin: 0, End: 1672129269},
+			{Begin: 0, End: t1.Unix() - 11},
 		})
 		require.NoError(t, err)
 		defer files.close()
@@ -170,7 +172,7 @@ func TestStmtFiles(t *testing.T) {
 
 	func() {
 		files, err := newStmtFiles(context.Background(), []*StmtTimeRange{
-			{Begin: 1672129281, End: 0},
+			{Begin: t1.Unix() + 1, End: 0},
 		})
 		require.NoError(t, err)
 		defer files.close()