Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
tangenta committed Aug 15, 2023
1 parent 8273a89 commit 40bd40a
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 349 deletions.
5 changes: 0 additions & 5 deletions ddl/ingest/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ go_test(
"mem_root_test.go",
],
flaky = True,
<<<<<<< HEAD
=======
race = "on",
shard_count = 15,
>>>>>>> 5a305400a94 (ddl: use the correct timezone to encode record for adding index (#46055))
deps = [
":ingest",
"//config",
Expand Down
344 changes: 0 additions & 344 deletions ddl/ingest/integration_test.go

This file was deleted.

21 changes: 21 additions & 0 deletions tests/realtikvtest/addindextest/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -367,3 +367,24 @@ func TestAddIndexSplitTableRanges(t *testing.T) {
tk.MustExec("admin check table t;")
ddl.SetBackfillTaskChanSizeForTest(1024)
}

func TestAddIndexIngestTimezone(t *testing.T) {
store := realtikvtest.CreateMockStoreAndSetup(t)
tk := testkit.NewTestKit(t, store)
tk.MustExec("drop database if exists addindexlit;")
tk.MustExec("create database addindexlit;")
tk.MustExec("use addindexlit;")
tk.MustExec(`set global tidb_ddl_enable_fast_reorg=on;`)

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','2000-07-29 23:15:30','-6:00');")
tk.MustExec("alter table t add index idx(t);")
tk.MustExec("admin check table t;")

tk.MustExec("alter table t drop index idx;")
tk.MustExec("SET time_zone = 'Asia/Shanghai';")
tk.MustExec("insert into t values('2000-07-29 23:15:30','2000-07-29 23:15:30', '+8:00');")
tk.MustExec("alter table t add index idx(t);")
tk.MustExec("admin check table t;")
}

0 comments on commit 40bd40a

Please sign in to comment.