Skip to content

Commit ddc2abd

Browse files
MyonKemintati-chi-bot
MyonKeminta
authored and
ti-chi-bot
committed
This is an automated cherry-pick of pingcap#58054
Signed-off-by: ti-chi-bot <[email protected]>
1 parent 272589d commit ddc2abd

File tree

23 files changed

+4420
-39
lines changed

23 files changed

+4420
-39
lines changed

‎DEPS.bzl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4179,8 +4179,19 @@ def go_deps():
41794179
name = "com_github_tikv_client_go_v2",
41804180
build_file_proto_mode = "disable_global",
41814181
importpath = "github.com/tikv/client-go/v2",
4182+
<<<<<<< HEAD
41824183
sum = "h1:E+JsLmxpa4rsT0rS9m52+FhiiRbQxZYn079T4JD12jU=",
41834184
version = "v2.0.8-0.20241204085508-80a6b021f0f6",
4185+
=======
4186+
sha256 = "844684ee6ae7decc5cadcab3f95c526b66878f8401c71cf82af68ec0cc5257d5",
4187+
strip_prefix = "github.com/tikv/client-go/[email protected]",
4188+
urls = [
4189+
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241209094930-06d7f4b9233b.zip",
4190+
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241209094930-06d7f4b9233b.zip",
4191+
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241209094930-06d7f4b9233b.zip",
4192+
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241209094930-06d7f4b9233b.zip",
4193+
],
4194+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054))
41844195
)
41854196
go_repository(
41864197
name = "com_github_tikv_pd",

‎ddl/column_change_test.go

Lines changed: 68 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"time"
2323

2424
"github.com/pingcap/errors"
25+
<<<<<<< HEAD:ddl/column_change_test.go
2526
"github.com/pingcap/tidb/ddl"
2627
"github.com/pingcap/tidb/ddl/util/callback"
2728
"github.com/pingcap/tidb/kv"
@@ -36,6 +37,21 @@ import (
3637
"github.com/pingcap/tidb/testkit/external"
3738
"github.com/pingcap/tidb/types"
3839
"github.com/pingcap/tidb/util/mock"
40+
=======
41+
"github.com/pingcap/tidb/pkg/ddl"
42+
"github.com/pingcap/tidb/pkg/kv"
43+
"github.com/pingcap/tidb/pkg/meta"
44+
"github.com/pingcap/tidb/pkg/meta/model"
45+
"github.com/pingcap/tidb/pkg/sessionctx"
46+
"github.com/pingcap/tidb/pkg/sessiontxn"
47+
"github.com/pingcap/tidb/pkg/table"
48+
"github.com/pingcap/tidb/pkg/table/tables"
49+
"github.com/pingcap/tidb/pkg/tablecodec"
50+
"github.com/pingcap/tidb/pkg/testkit"
51+
"github.com/pingcap/tidb/pkg/testkit/external"
52+
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
53+
"github.com/pingcap/tidb/pkg/types"
54+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
3955
"github.com/stretchr/testify/require"
4056
)
4157

@@ -48,10 +64,14 @@ func TestColumnAdd(t *testing.T) {
4864
tk.MustExec("create table t (c1 int, c2 int);")
4965
tk.MustExec("insert t values (1, 2);")
5066

67+
<<<<<<< HEAD:ddl/column_change_test.go
5168
d := dom.DDL()
5269
tc := &callback.TestDDLCallback{Do: dom}
5370

5471
ct := testNewContext(store)
72+
=======
73+
ct := testNewContext(t, store)
74+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
5575
// set up hook
5676
var (
5777
deleteOnlyTable table.Table
@@ -129,8 +149,14 @@ func TestColumnAdd(t *testing.T) {
129149
} else {
130150
return
131151
}
152+
<<<<<<< HEAD:ddl/column_change_test.go
132153
sess := testNewContext(store)
133154
err := sessiontxn.NewTxn(context.Background(), sess)
155+
=======
156+
first = false
157+
sess := testNewContext(t, store)
158+
txn, err := newTxn(sess)
159+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
134160
require.NoError(t, err)
135161
_, err = writeOnlyTable.AddRecord(sess, types.MakeDatums(10, 10))
136162
require.NoError(t, err)
@@ -225,7 +251,15 @@ func checkAddWriteOnly(ctx sessionctx.Context, deleteOnlyTable, writeOnlyTable t
225251
if err != nil {
226252
return errors.Trace(err)
227253
}
254+
<<<<<<< HEAD:ddl/column_change_test.go
228255
err = sessiontxn.NewTxn(context.Background(), ctx)
256+
=======
257+
err = txn.Commit(context.Background())
258+
if err != nil {
259+
return errors.Trace(err)
260+
}
261+
txn, err = newTxn(ctx)
262+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
229263
if err != nil {
230264
return errors.Trace(err)
231265
}
@@ -263,7 +297,15 @@ func checkAddWriteOnly(ctx sessionctx.Context, deleteOnlyTable, writeOnlyTable t
263297
if err != nil {
264298
return errors.Trace(err)
265299
}
300+
<<<<<<< HEAD:ddl/column_change_test.go
266301
err = sessiontxn.NewTxn(context.Background(), ctx)
302+
=======
303+
err = txn.Commit(context.Background())
304+
if err != nil {
305+
return errors.Trace(err)
306+
}
307+
txn, err = newTxn(ctx)
308+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
267309
if err != nil {
268310
return errors.Trace(err)
269311
}
@@ -280,7 +322,15 @@ func checkAddWriteOnly(ctx sessionctx.Context, deleteOnlyTable, writeOnlyTable t
280322
if err != nil {
281323
return errors.Trace(err)
282324
}
325+
<<<<<<< HEAD:ddl/column_change_test.go
283326
err = sessiontxn.NewTxn(context.Background(), ctx)
327+
=======
328+
err = txn.Commit(context.Background())
329+
if err != nil {
330+
return errors.Trace(err)
331+
}
332+
_, err = newTxn(ctx)
333+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
284334
if err != nil {
285335
return errors.Trace(err)
286336
}
@@ -310,7 +360,15 @@ func checkAddPublic(sctx sessionctx.Context, writeOnlyTable, publicTable table.T
310360
if err != nil {
311361
return errors.Trace(err)
312362
}
363+
<<<<<<< HEAD:ddl/column_change_test.go
313364
err = sessiontxn.NewTxn(ctx, sctx)
365+
=======
366+
err = txn.Commit(context.Background())
367+
if err != nil {
368+
return errors.Trace(err)
369+
}
370+
txn, err = newTxn(sctx)
371+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
314372
if err != nil {
315373
return errors.Trace(err)
316374
}
@@ -327,7 +385,15 @@ func checkAddPublic(sctx sessionctx.Context, writeOnlyTable, publicTable table.T
327385
if err != nil {
328386
return errors.Trace(err)
329387
}
388+
<<<<<<< HEAD:ddl/column_change_test.go
330389
err = sessiontxn.NewTxn(ctx, sctx)
390+
=======
391+
err = txn.Commit(context.Background())
392+
if err != nil {
393+
return errors.Trace(err)
394+
}
395+
_, err = newTxn(sctx)
396+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
331397
if err != nil {
332398
return errors.Trace(err)
333399
}
@@ -433,10 +499,8 @@ func testCheckJobDone(t *testing.T, store kv.Storage, jobID int64, isAdd bool) {
433499
}
434500
}
435501

436-
func testNewContext(store kv.Storage) sessionctx.Context {
437-
ctx := mock.NewContext()
438-
ctx.Store = store
439-
return ctx
502+
func testNewContext(t *testing.T, store kv.Storage) sessionctx.Context {
503+
return testkit.NewSession(t, store)
440504
}
441505

442506
func TestIssue40150(t *testing.T) {

‎ddl/column_test.go

Lines changed: 81 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,13 @@ func TestColumnBasic(t *testing.T) {
167167
tk.MustExec(fmt.Sprintf("insert into t1 values(%d, %d, %d)", i, 10*i, 100*i))
168168
}
169169

170+
<<<<<<< HEAD:ddl/column_test.go
170171
ctx := testNewContext(store)
171172
err := sessiontxn.NewTxn(context.Background(), ctx)
173+
=======
174+
ctx := testNewContext(t, store)
175+
txn, err := newTxn(ctx)
176+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
172177
require.NoError(t, err)
173178

174179
var tableID int64
@@ -214,7 +219,13 @@ func TestColumnBasic(t *testing.T) {
214219

215220
h, err := tbl.AddRecord(ctx, types.MakeDatums(11, 12, 13, 14))
216221
require.NoError(t, err)
222+
<<<<<<< HEAD:ddl/column_test.go
217223
err = sessiontxn.NewTxn(context.Background(), ctx)
224+
=======
225+
err = txn.Commit(context.Background())
226+
require.NoError(t, err)
227+
_, err = newTxn(ctx)
228+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
218229
require.NoError(t, err)
219230
values, err := tables.RowWithCols(tbl, ctx, h, tbl.Cols())
220231
require.NoError(t, err)
@@ -385,7 +396,13 @@ func checkDeleteOnlyColumn(t *testing.T, ctx sessionctx.Context, tableID int64,
385396
newRow := types.MakeDatums(int64(11), int64(22), int64(33))
386397
newHandle, err := tbl.AddRecord(ctx, newRow)
387398
require.NoError(t, err)
399+
<<<<<<< HEAD:ddl/column_test.go
388400
err = sessiontxn.NewTxn(context.Background(), ctx)
401+
=======
402+
err = txn.Commit(context.Background())
403+
require.NoError(t, err)
404+
txn, err = newTxn(ctx)
405+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
389406
require.NoError(t, err)
390407

391408
rows := [][]types.Datum{row, newRow}
@@ -407,7 +424,13 @@ func checkDeleteOnlyColumn(t *testing.T, ctx sessionctx.Context, tableID int64,
407424

408425
err = tbl.RemoveRecord(ctx, newHandle, newRow)
409426
require.NoError(t, err)
427+
<<<<<<< HEAD:ddl/column_test.go
410428
err = sessiontxn.NewTxn(context.Background(), ctx)
429+
=======
430+
err = txn.Commit(context.Background())
431+
require.NoError(t, err)
432+
txn, err = newTxn(ctx)
433+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
411434
require.NoError(t, err)
412435
i = 0
413436
err = tables.IterRecords(tbl, ctx, tbl.Cols(), func(_ kv.Handle, data []types.Datum, cols []*table.Column) (bool, error) {
@@ -447,7 +470,13 @@ func checkWriteOnlyColumn(t *testing.T, ctx sessionctx.Context, tableID int64, h
447470
newRow := types.MakeDatums(int64(11), int64(22), int64(33))
448471
newHandle, err := tbl.AddRecord(ctx, newRow)
449472
require.NoError(t, err)
473+
<<<<<<< HEAD:ddl/column_test.go
450474
err = sessiontxn.NewTxn(context.Background(), ctx)
475+
=======
476+
err = txn.Commit(context.Background())
477+
require.NoError(t, err)
478+
txn, err = newTxn(ctx)
479+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
451480
require.NoError(t, err)
452481

453482
rows := [][]types.Datum{row, newRow}
@@ -469,7 +498,14 @@ func checkWriteOnlyColumn(t *testing.T, ctx sessionctx.Context, tableID int64, h
469498

470499
err = tbl.RemoveRecord(ctx, newHandle, newRow)
471500
require.NoError(t, err)
501+
<<<<<<< HEAD:ddl/column_test.go
472502
err = sessiontxn.NewTxn(context.Background(), ctx)
503+
=======
504+
505+
err = txn.Commit(context.Background())
506+
require.NoError(t, err)
507+
txn, err = newTxn(ctx)
508+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
473509
require.NoError(t, err)
474510

475511
i = 0
@@ -507,7 +543,13 @@ func checkReorganizationColumn(t *testing.T, ctx sessionctx.Context, tableID int
507543
newRow := types.MakeDatums(int64(11), int64(22), int64(33))
508544
newHandle, err := tbl.AddRecord(ctx, newRow)
509545
require.NoError(t, err)
546+
<<<<<<< HEAD:ddl/column_test.go
510547
err = sessiontxn.NewTxn(context.Background(), ctx)
548+
=======
549+
err = txn.Commit(context.Background())
550+
require.NoError(t, err)
551+
txn, err = newTxn(ctx)
552+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
511553
require.NoError(t, err)
512554

513555
rows := [][]types.Datum{row, newRow}
@@ -530,7 +572,13 @@ func checkReorganizationColumn(t *testing.T, ctx sessionctx.Context, tableID int
530572

531573
err = tbl.RemoveRecord(ctx, newHandle, newRow)
532574
require.NoError(t, err)
575+
<<<<<<< HEAD:ddl/column_test.go
533576
err = sessiontxn.NewTxn(context.Background(), ctx)
577+
=======
578+
err = txn.Commit(context.Background())
579+
require.NoError(t, err)
580+
txn, err = newTxn(ctx)
581+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
534582
require.NoError(t, err)
535583

536584
i = 0
@@ -573,7 +621,13 @@ func checkPublicColumn(t *testing.T, ctx sessionctx.Context, tableID int64, newC
573621
}
574622
handle, err := tbl.AddRecord(ctx, newRow)
575623
require.NoError(t, err)
624+
<<<<<<< HEAD:ddl/column_test.go
576625
err = sessiontxn.NewTxn(context.Background(), ctx)
626+
=======
627+
err = txn.Commit(context.Background())
628+
require.NoError(t, err)
629+
txn, err = newTxn(ctx)
630+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
577631
require.NoError(t, err)
578632

579633
rows := [][]types.Datum{updatedRow, newRow}
@@ -593,8 +647,14 @@ func checkPublicColumn(t *testing.T, ctx sessionctx.Context, tableID int64, newC
593647

594648
err = tbl.RemoveRecord(ctx, handle, newRow)
595649
require.NoError(t, err)
650+
err = txn.Commit(context.Background())
651+
require.NoError(t, err)
596652

653+
<<<<<<< HEAD:ddl/column_test.go
597654
err = sessiontxn.NewTxn(context.Background(), ctx)
655+
=======
656+
txn, err = newTxn(ctx)
657+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
598658
require.NoError(t, err)
599659

600660
i = 0
@@ -610,8 +670,13 @@ func checkPublicColumn(t *testing.T, ctx sessionctx.Context, tableID int64, newC
610670
require.NoError(t, err)
611671
}
612672

673+
<<<<<<< HEAD:ddl/column_test.go
613674
func checkAddColumn(t *testing.T, state model.SchemaState, tableID int64, handle kv.Handle, newCol *table.Column, oldRow []types.Datum, columnValue interface{}, dom *domain.Domain, store kv.Storage, columnCnt int) {
614675
ctx := testNewContext(store)
676+
=======
677+
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) {
678+
ctx := testNewContext(t, store)
679+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
615680
switch state {
616681
case model.StateNone:
617682
checkNoneColumn(t, ctx, tableID, handle, newCol, columnValue, dom)
@@ -655,8 +720,13 @@ func TestAddColumn(t *testing.T) {
655720
tableID = int64(tableIDi)
656721
tbl := testGetTable(t, dom, tableID)
657722

723+
<<<<<<< HEAD:ddl/column_test.go
658724
ctx := testNewContext(store)
659725
err := sessiontxn.NewTxn(context.Background(), ctx)
726+
=======
727+
ctx := testNewContext(t, store)
728+
txn, err := newTxn(ctx)
729+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
660730
require.NoError(t, err)
661731
oldRow := types.MakeDatums(int64(1), int64(2), int64(3))
662732
handle, err := tbl.AddRecord(ctx, oldRow)
@@ -728,8 +798,13 @@ func TestAddColumns(t *testing.T) {
728798
tableID = int64(tableIDi)
729799
tbl := testGetTable(t, dom, tableID)
730800

801+
<<<<<<< HEAD:ddl/column_test.go
731802
ctx := testNewContext(store)
732803
err := sessiontxn.NewTxn(context.Background(), ctx)
804+
=======
805+
ctx := testNewContext(t, store)
806+
txn, err := newTxn(ctx)
807+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
733808
require.NoError(t, err)
734809
oldRow := types.MakeDatums(int64(1), int64(2), int64(3))
735810
handle, err := tbl.AddRecord(ctx, oldRow)
@@ -791,7 +866,7 @@ func TestDropColumnInColumnTest(t *testing.T) {
791866
tableID = int64(tableIDi)
792867
tbl := testGetTable(t, dom, tableID)
793868

794-
ctx := testNewContext(store)
869+
ctx := testNewContext(t, store)
795870
colName := "c4"
796871
defaultColValue := int64(4)
797872
row := types.MakeDatums(int64(1), int64(2), int64(3))
@@ -852,8 +927,13 @@ func TestDropColumns(t *testing.T) {
852927
tableID = int64(tableIDi)
853928
tbl := testGetTable(t, dom, tableID)
854929

930+
<<<<<<< HEAD:ddl/column_test.go
855931
ctx := testNewContext(store)
856932
err := sessiontxn.NewTxn(context.Background(), ctx)
933+
=======
934+
ctx := testNewContext(t, store)
935+
txn, err := newTxn(ctx)
936+
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
857937
require.NoError(t, err)
858938

859939
colNames := []string{"c3", "c4"}

0 commit comments

Comments
 (0)