Skip to content

*: Update client-go and verify all read ts #58909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 14, 2025
Merged

*: Update client-go and verify all read ts #58909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 6 deletions DEPS.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6933,13 +6933,13 @@ def go_deps():
name = "com_github_tikv_client_go_v2",
build_file_proto_mode = "disable_global",
importpath = "github.com/tikv/client-go/v2",
sha256 = "cdcad188042c4d716dd9d4a304a2e36bc9d4edccaf86a19b85b1682f01df193c",
strip_prefix = "github.com/tikv/client-go/[email protected].20241121061241-006dfb024c26",
sha256 = "f896c60fc81339cc03e7dcb38b70bcfa368bbb2a94c6c7f3f5da6a4795d237f0",
strip_prefix = "github.com/tikv/client-go/[email protected].20250113074216-d66e460ff577",
urls = [
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241121061241-006dfb024c26.zip",
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241121061241-006dfb024c26.zip",
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241121061241-006dfb024c26.zip",
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241121061241-006dfb024c26.zip",
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250113074216-d66e460ff577.zip",
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250113074216-d66e460ff577.zip",
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250113074216-d66e460ff577.zip",
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250113074216-d66e460ff577.zip",
],
)
go_repository(
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ require (
github.com/tdakkota/asciicheck v0.2.0
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
github.com/tidwall/btree v1.7.0
github.com/tikv/client-go/v2 v2.0.8-0.20241121061241-006dfb024c26
github.com/tikv/client-go/v2 v2.0.8-0.20250113074216-d66e460ff577
github.com/tikv/pd/client v0.0.0-20241111073742-238d4d79ea31
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a
github.com/twmb/murmur3 v1.1.6
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,8 +824,8 @@ github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
github.com/tikv/client-go/v2 v2.0.8-0.20241121061241-006dfb024c26 h1:CwiOzQZl7qCJi4QhNbzptX0hJoG10Q/gyLc5QULNW7I=
github.com/tikv/client-go/v2 v2.0.8-0.20241121061241-006dfb024c26/go.mod h1:p9zPFlKBrxhp3b/cBmKBWL9M0X4HtJjgi1ThUtQYF7o=
github.com/tikv/client-go/v2 v2.0.8-0.20250113074216-d66e460ff577 h1:9uW3zya97o4gXvF4AvqJV9Dpb61Gk76CxGD/C3/bFvk=
github.com/tikv/client-go/v2 v2.0.8-0.20250113074216-d66e460ff577/go.mod h1:p9zPFlKBrxhp3b/cBmKBWL9M0X4HtJjgi1ThUtQYF7o=
github.com/tikv/pd/client v0.0.0-20241111073742-238d4d79ea31 h1:oAYc4m5Eu1OY9ogJ103VO47AYPHvhtzbUPD8L8B67Qk=
github.com/tikv/pd/client v0.0.0-20241111073742-238d4d79ea31/go.mod h1:W5a0sDadwUpI9k8p7M77d3jo253ZHdmua+u4Ho4Xw8U=
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a h1:A6uKudFIfAEpoPdaal3aSqGxBzLyU8TqyXImLwo6dIo=
Expand Down
31 changes: 24 additions & 7 deletions pkg/ddl/column_change_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import (
"github.com/pingcap/tidb/pkg/testkit/external"
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
"github.com/pingcap/tidb/pkg/types"
"github.com/pingcap/tidb/pkg/util/mock"
"github.com/stretchr/testify/require"
)

Expand All @@ -48,7 +47,7 @@ func TestColumnAdd(t *testing.T) {
tk.MustExec("create table t (c1 int, c2 int);")
tk.MustExec("insert t values (1, 2);")

ct := testNewContext(store)
ct := testNewContext(t, store)
// set up hook
var (
deleteOnlyTable table.Table
Expand Down Expand Up @@ -120,7 +119,7 @@ func TestColumnAdd(t *testing.T) {
return
}
first = false
sess := testNewContext(store)
sess := testNewContext(t, store)
txn, err := newTxn(sess)
require.NoError(t, err)
_, err = writeOnlyTable.AddRecord(sess.GetTableCtx(), txn, types.MakeDatums(10, 10))
Expand Down Expand Up @@ -210,6 +209,10 @@ func checkAddWriteOnly(ctx sessionctx.Context, deleteOnlyTable, writeOnlyTable t
if err != nil {
return errors.Trace(err)
}
err = txn.Commit(context.Background())
if err != nil {
return errors.Trace(err)
}
txn, err = newTxn(ctx)
if err != nil {
return errors.Trace(err)
Expand Down Expand Up @@ -248,6 +251,10 @@ func checkAddWriteOnly(ctx sessionctx.Context, deleteOnlyTable, writeOnlyTable t
if err != nil {
return errors.Trace(err)
}
err = txn.Commit(context.Background())
if err != nil {
return errors.Trace(err)
}
txn, err = newTxn(ctx)
if err != nil {
return errors.Trace(err)
Expand All @@ -265,6 +272,10 @@ func checkAddWriteOnly(ctx sessionctx.Context, deleteOnlyTable, writeOnlyTable t
if err != nil {
return errors.Trace(err)
}
err = txn.Commit(context.Background())
if err != nil {
return errors.Trace(err)
}
_, err = newTxn(ctx)
if err != nil {
return errors.Trace(err)
Expand Down Expand Up @@ -294,6 +305,10 @@ func checkAddPublic(sctx sessionctx.Context, writeOnlyTable, publicTable table.T
if err != nil {
return errors.Trace(err)
}
err = txn.Commit(context.Background())
if err != nil {
return errors.Trace(err)
}
txn, err = newTxn(sctx)
if err != nil {
return errors.Trace(err)
Expand All @@ -311,6 +326,10 @@ func checkAddPublic(sctx sessionctx.Context, writeOnlyTable, publicTable table.T
if err != nil {
return errors.Trace(err)
}
err = txn.Commit(context.Background())
if err != nil {
return errors.Trace(err)
}
_, err = newTxn(sctx)
if err != nil {
return errors.Trace(err)
Expand Down Expand Up @@ -415,10 +434,8 @@ func testCheckJobDone(t *testing.T, store kv.Storage, jobID int64, isAdd bool) {
}
}

func testNewContext(store kv.Storage) sessionctx.Context {
ctx := mock.NewContext()
ctx.Store = store
return ctx
func testNewContext(t *testing.T, store kv.Storage) sessionctx.Context {
return testkit.NewSession(t, store)
}

func TestIssue40135(t *testing.T) {
Expand Down
47 changes: 33 additions & 14 deletions pkg/ddl/column_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ func TestColumnBasic(t *testing.T) {
tk.MustExec(fmt.Sprintf("insert into t1 values(%d, %d, %d)", i, 10*i, 100*i))
}

ctx := testNewContext(store)
ctx := testNewContext(t, store)
txn, err := newTxn(ctx)
require.NoError(t, err)

Expand Down Expand Up @@ -214,6 +214,8 @@ func TestColumnBasic(t *testing.T) {

h, err := tbl.AddRecord(ctx.GetTableCtx(), txn, types.MakeDatums(11, 12, 13, 14))
require.NoError(t, err)
err = txn.Commit(context.Background())
require.NoError(t, err)
_, err = newTxn(ctx)
require.NoError(t, err)
values, err := tables.RowWithCols(tbl, ctx, h, tbl.Cols())
Expand Down Expand Up @@ -379,7 +381,9 @@ func checkDeleteOnlyColumn(t *testing.T, ctx sessionctx.Context, tableID int64,
newRow := types.MakeDatums(int64(11), int64(22), int64(33))
newHandle, err := tbl.AddRecord(ctx.GetTableCtx(), txn, newRow)
require.NoError(t, err)
_, err = newTxn(ctx)
err = txn.Commit(context.Background())
require.NoError(t, err)
txn, err = newTxn(ctx)
require.NoError(t, err)

rows := [][]types.Datum{row, newRow}
Expand All @@ -401,7 +405,9 @@ func checkDeleteOnlyColumn(t *testing.T, ctx sessionctx.Context, tableID int64,

err = tbl.RemoveRecord(ctx.GetTableCtx(), txn, newHandle, newRow)
require.NoError(t, err)
_, err = newTxn(ctx)
err = txn.Commit(context.Background())
require.NoError(t, err)
txn, err = newTxn(ctx)
require.NoError(t, err)
i = 0
err = tables.IterRecords(tbl, ctx, tbl.Cols(), func(_ kv.Handle, data []types.Datum, cols []*table.Column) (bool, error) {
Expand Down Expand Up @@ -441,7 +447,9 @@ func checkWriteOnlyColumn(t *testing.T, ctx sessionctx.Context, tableID int64, h
newRow := types.MakeDatums(int64(11), int64(22), int64(33))
newHandle, err := tbl.AddRecord(ctx.GetTableCtx(), txn, newRow)
require.NoError(t, err)
_, err = newTxn(ctx)
err = txn.Commit(context.Background())
require.NoError(t, err)
txn, err = newTxn(ctx)
require.NoError(t, err)

rows := [][]types.Datum{row, newRow}
Expand All @@ -463,7 +471,10 @@ func checkWriteOnlyColumn(t *testing.T, ctx sessionctx.Context, tableID int64, h

err = tbl.RemoveRecord(ctx.GetTableCtx(), txn, newHandle, newRow)
require.NoError(t, err)
_, err = newTxn(ctx)

err = txn.Commit(context.Background())
require.NoError(t, err)
txn, err = newTxn(ctx)
require.NoError(t, err)

i = 0
Expand Down Expand Up @@ -501,7 +512,9 @@ func checkReorganizationColumn(t *testing.T, ctx sessionctx.Context, tableID int
newRow := types.MakeDatums(int64(11), int64(22), int64(33))
newHandle, err := tbl.AddRecord(ctx.GetTableCtx(), txn, newRow)
require.NoError(t, err)
_, err = newTxn(ctx)
err = txn.Commit(context.Background())
require.NoError(t, err)
txn, err = newTxn(ctx)
require.NoError(t, err)

rows := [][]types.Datum{row, newRow}
Expand All @@ -524,7 +537,9 @@ func checkReorganizationColumn(t *testing.T, ctx sessionctx.Context, tableID int

err = tbl.RemoveRecord(ctx.GetTableCtx(), txn, newHandle, newRow)
require.NoError(t, err)
_, err = newTxn(ctx)
err = txn.Commit(context.Background())
require.NoError(t, err)
txn, err = newTxn(ctx)
require.NoError(t, err)

i = 0
Expand Down Expand Up @@ -567,7 +582,9 @@ func checkPublicColumn(t *testing.T, ctx sessionctx.Context, tableID int64, newC
}
handle, err := tbl.AddRecord(ctx.GetTableCtx(), txn, newRow)
require.NoError(t, err)
_, err = newTxn(ctx)
err = txn.Commit(context.Background())
require.NoError(t, err)
txn, err = newTxn(ctx)
require.NoError(t, err)

rows := [][]types.Datum{updatedRow, newRow}
Expand All @@ -587,8 +604,10 @@ func checkPublicColumn(t *testing.T, ctx sessionctx.Context, tableID int64, newC

err = tbl.RemoveRecord(ctx.GetTableCtx(), txn, handle, newRow)
require.NoError(t, err)
err = txn.Commit(context.Background())
require.NoError(t, err)

_, err = newTxn(ctx)
txn, err = newTxn(ctx)
require.NoError(t, err)

i = 0
Expand All @@ -605,7 +624,7 @@ func checkPublicColumn(t *testing.T, ctx sessionctx.Context, tableID int64, newC
}

func checkAddColumn(t *testing.T, state model.SchemaState, tableID int64, handle kv.Handle, newCol *table.Column, oldRow []types.Datum, columnValue any, dom *domain.Domain, store kv.Storage, columnCnt int) {
ctx := testNewContext(store)
ctx := testNewContext(t, store)
switch state {
case model.StateNone:
checkNoneColumn(t, ctx, tableID, handle, newCol, columnValue, dom)
Expand Down Expand Up @@ -647,7 +666,7 @@ func TestAddColumn(t *testing.T) {
tableID = int64(tableIDi)
tbl := testGetTable(t, dom, tableID)

ctx := testNewContext(store)
ctx := testNewContext(t, store)
txn, err := newTxn(ctx)
require.NoError(t, err)
oldRow := types.MakeDatums(int64(1), int64(2), int64(3))
Expand Down Expand Up @@ -712,7 +731,7 @@ func TestAddColumns(t *testing.T) {
tableID = int64(tableIDi)
tbl := testGetTable(t, dom, tableID)

ctx := testNewContext(store)
ctx := testNewContext(t, store)
txn, err := newTxn(ctx)
require.NoError(t, err)
oldRow := types.MakeDatums(int64(1), int64(2), int64(3))
Expand Down Expand Up @@ -769,7 +788,7 @@ func TestDropColumnInColumnTest(t *testing.T) {
tableID = int64(tableIDi)
tbl := testGetTable(t, dom, tableID)

ctx := testNewContext(store)
ctx := testNewContext(t, store)
colName := "c4"
defaultColValue := int64(4)
row := types.MakeDatums(int64(1), int64(2), int64(3))
Expand Down Expand Up @@ -823,7 +842,7 @@ func TestDropColumns(t *testing.T) {
tableID = int64(tableIDi)
tbl := testGetTable(t, dom, tableID)

ctx := testNewContext(store)
ctx := testNewContext(t, store)
txn, err := newTxn(ctx)
require.NoError(t, err)

Expand Down
22 changes: 9 additions & 13 deletions pkg/ddl/db_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ import (
contextutil "github.com/pingcap/tidb/pkg/util/context"
"github.com/pingcap/tidb/pkg/util/dbterror"
"github.com/pingcap/tidb/pkg/util/dbterror/plannererrors"
"github.com/pingcap/tidb/pkg/util/mock"
"github.com/stretchr/testify/require"
)

Expand Down Expand Up @@ -523,11 +522,10 @@ func TestChangingTableCharset(t *testing.T) {
tblInfo.Charset = ""
tblInfo.Collate = ""
updateTableInfo := func(tblInfo *model.TableInfo) {
mockCtx := mock.NewContext()
mockCtx.Store = store
err := sessiontxn.NewTxn(context.Background(), mockCtx)
ctx := testkit.NewSession(t, store)
err := sessiontxn.NewTxn(context.Background(), ctx)
require.NoError(t, err)
txn, err := mockCtx.Txn(true)
txn, err := ctx.Txn(true)
require.NoError(t, err)
mt := meta.NewMutator(txn)

Expand Down Expand Up @@ -769,11 +767,10 @@ func TestCaseInsensitiveCharsetAndCollate(t *testing.T) {
tblInfo.Charset = "UTF8MB4"

updateTableInfo := func(tblInfo *model.TableInfo) {
mockCtx := mock.NewContext()
mockCtx.Store = store
err := sessiontxn.NewTxn(context.Background(), mockCtx)
sctx := testkit.NewSession(t, store)
err := sessiontxn.NewTxn(context.Background(), sctx)
require.NoError(t, err)
txn, err := mockCtx.Txn(true)
txn, err := sctx.Txn(true)
require.NoError(t, err)
mt := meta.NewMutator(txn)
require.True(t, ok)
Expand Down Expand Up @@ -1437,11 +1434,10 @@ func TestTreatOldVersionUTF8AsUTF8MB4(t *testing.T) {
tblInfo.Version = model.TableInfoVersion0
tblInfo.Columns[0].Version = model.ColumnInfoVersion0
updateTableInfo := func(tblInfo *model.TableInfo) {
mockCtx := mock.NewContext()
mockCtx.Store = store
err := sessiontxn.NewTxn(context.Background(), mockCtx)
sctx := testkit.NewSession(t, store)
err := sessiontxn.NewTxn(context.Background(), sctx)
require.NoError(t, err)
txn, err := mockCtx.Txn(true)
txn, err := sctx.Txn(true)
require.NoError(t, err)
mt := meta.NewMutator(txn)
require.True(t, ok)
Expand Down
4 changes: 2 additions & 2 deletions pkg/ddl/index_change_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func TestIndexChange(t *testing.T) {
return
}
jobID.Store(job.ID)
ctx1 := testNewContext(store)
ctx1 := testNewContext(t, store)
prevState = job.SchemaState
require.NoError(t, dom.Reload())
tbl, exist := dom.InfoSchema().TableByID(context.Background(), job.TableID)
Expand Down Expand Up @@ -106,7 +106,7 @@ func TestIndexChange(t *testing.T) {
require.NoError(t, dom.Reload())
tbl, exist := dom.InfoSchema().TableByID(context.Background(), job.TableID)
require.True(t, exist)
ctx1 := testNewContext(store)
ctx1 := testNewContext(t, store)
switch job.SchemaState {
case model.StateWriteOnly:
writeOnlyTable = tbl
Expand Down
4 changes: 2 additions & 2 deletions pkg/ddl/job_worker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func TestInvalidDDLJob(t *testing.T) {
BinlogInfo: &model.HistoryInfo{},
InvolvingSchemaInfo: []model.InvolvingSchemaInfo{{}},
}
ctx := testNewContext(store)
ctx := testNewContext(t, store)
ctx.SetValue(sessionctx.QueryString, "skip")
de := dom.DDLExecutor().(ddl.ExecutorForTest)
err := de.DoDDLJobWrapper(ctx, ddl.NewJobWrapperWithArgs(job, &model.EmptyArgs{}, true))
Expand All @@ -62,7 +62,7 @@ func TestInvalidDDLJob(t *testing.T) {

func TestAddBatchJobError(t *testing.T) {
store, dom := testkit.CreateMockStoreAndDomainWithSchemaLease(t, testLease)
ctx := testNewContext(store)
ctx := testNewContext(t, store)

require.Nil(t, failpoint.Enable("github.com/pingcap/tidb/pkg/ddl/mockAddBatchDDLJobsErr", `return(true)`))
// Test the job runner should not hang forever.
Expand Down
3 changes: 2 additions & 1 deletion pkg/executor/set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,8 @@ func (e *SetExecutor) setSysVariable(ctx context.Context, name string, v *expres
newSnapshotTS := getSnapshotTSByName()
newSnapshotIsSet := newSnapshotTS > 0 && newSnapshotTS != oldSnapshotTS
if newSnapshotIsSet {
err = sessionctx.ValidateSnapshotReadTS(ctx, e.Ctx().GetStore(), newSnapshotTS)
isStaleRead := name == variable.TiDBTxnReadTS
err = sessionctx.ValidateSnapshotReadTS(ctx, e.Ctx().GetStore(), newSnapshotTS, isStaleRead)
if name != variable.TiDBTxnReadTS {
// Also check gc safe point for snapshot read.
// We don't check snapshot with gc safe point for read_ts
Expand Down
3 changes: 1 addition & 2 deletions pkg/executor/test/executor/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,7 @@ func TestNotFillCacheFlag(t *testing.T) {
func TestCheckIndex(t *testing.T) {
store, dom := testkit.CreateMockStoreAndDomain(t)

ctx := mock.NewContext()
ctx.Store = store
ctx := testkit.NewSession(t, store)
se, err := session.CreateSession4Test(store)
require.NoError(t, err)
defer se.Close()
Expand Down
Loading