Skip to content

Commit

Permalink
This is an automated cherry-pick of #58054
Browse files Browse the repository at this point in the history 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
  • Loading branch information
@MyonKeminta @ti-chi-bot
MyonKeminta authored and ti-chi-bot committed Jan 14, 2025
1 parent 7c3ca2e commit 801c2a5
Show file tree
Hide file tree
Showing 23 changed files with 6,297 additions and 31 deletions.
11 changes: 11 additions & 0 deletions DEPS.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3603,8 +3603,19 @@ def go_deps():
name = "com_github_tikv_client_go_v2",
build_file_proto_mode = "disable_global",
importpath = "github.com/tikv/client-go/v2",
<<<<<<< HEAD
sum = "h1:0YcirnuxtXC9eQRb231im1M5w/n7JFuOo0IgE/K9ffM=",
version = "v2.0.4-0.20241125064444-5f59e4e34c62",
=======
sha256 = "844684ee6ae7decc5cadcab3f95c526b66878f8401c71cf82af68ec0cc5257d5",
strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20241209094930-06d7f4b9233b",
urls = [
"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",
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241209094930-06d7f4b9233b.zip",
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20241209094930-06d7f4b9233b.zip",
"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",
],
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054))
)
go_repository(
name = "com_github_tikv_pd_client",
Expand Down
72 changes: 68 additions & 4 deletions ddl/column_change_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"time"

"github.com/pingcap/errors"
<<<<<<< HEAD:ddl/column_change_test.go
"github.com/pingcap/tidb/ddl"
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/meta"
Expand All @@ -35,6 +36,21 @@ import (
"github.com/pingcap/tidb/testkit/external"
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util/mock"
=======
"github.com/pingcap/tidb/pkg/ddl"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/meta"
"github.com/pingcap/tidb/pkg/meta/model"
"github.com/pingcap/tidb/pkg/sessionctx"
"github.com/pingcap/tidb/pkg/sessiontxn"
"github.com/pingcap/tidb/pkg/table"
"github.com/pingcap/tidb/pkg/table/tables"
"github.com/pingcap/tidb/pkg/tablecodec"
"github.com/pingcap/tidb/pkg/testkit"
"github.com/pingcap/tidb/pkg/testkit/external"
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
"github.com/pingcap/tidb/pkg/types"
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
"github.com/stretchr/testify/require"
)

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

<<<<<<< HEAD:ddl/column_change_test.go
d := dom.DDL()
tc := &ddl.TestDDLCallback{Do: dom}

ct := testNewContext(store)
=======
ct := testNewContext(t, store)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
// set up hook
var (
deleteOnlyTable table.Table
Expand Down Expand Up @@ -128,8 +148,14 @@ func TestColumnAdd(t *testing.T) {
} else {
return
}
<<<<<<< HEAD:ddl/column_change_test.go
sess := testNewContext(store)
err := sessiontxn.NewTxn(context.Background(), sess)
=======
first = false
sess := testNewContext(t, store)
txn, err := newTxn(sess)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
require.NoError(t, err)
_, err = writeOnlyTable.AddRecord(sess, types.MakeDatums(10, 10))
require.NoError(t, err)
Expand Down Expand Up @@ -224,7 +250,15 @@ func checkAddWriteOnly(ctx sessionctx.Context, deleteOnlyTable, writeOnlyTable t
if err != nil {
return errors.Trace(err)
}
<<<<<<< HEAD:ddl/column_change_test.go
err = sessiontxn.NewTxn(context.Background(), ctx)
=======
err = txn.Commit(context.Background())
if err != nil {
return errors.Trace(err)
}
txn, err = newTxn(ctx)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
if err != nil {
return errors.Trace(err)
}
Expand Down Expand Up @@ -262,7 +296,15 @@ func checkAddWriteOnly(ctx sessionctx.Context, deleteOnlyTable, writeOnlyTable t
if err != nil {
return errors.Trace(err)
}
<<<<<<< HEAD:ddl/column_change_test.go
err = sessiontxn.NewTxn(context.Background(), ctx)
=======
err = txn.Commit(context.Background())
if err != nil {
return errors.Trace(err)
}
txn, err = newTxn(ctx)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
if err != nil {
return errors.Trace(err)
}
Expand All @@ -279,7 +321,15 @@ func checkAddWriteOnly(ctx sessionctx.Context, deleteOnlyTable, writeOnlyTable t
if err != nil {
return errors.Trace(err)
}
<<<<<<< HEAD:ddl/column_change_test.go
err = sessiontxn.NewTxn(context.Background(), ctx)
=======
err = txn.Commit(context.Background())
if err != nil {
return errors.Trace(err)
}
_, err = newTxn(ctx)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
if err != nil {
return errors.Trace(err)
}
Expand Down Expand Up @@ -309,7 +359,15 @@ func checkAddPublic(sctx sessionctx.Context, writeOnlyTable, publicTable table.T
if err != nil {
return errors.Trace(err)
}
<<<<<<< HEAD:ddl/column_change_test.go
err = sessiontxn.NewTxn(ctx, sctx)
=======
err = txn.Commit(context.Background())
if err != nil {
return errors.Trace(err)
}
txn, err = newTxn(sctx)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
if err != nil {
return errors.Trace(err)
}
Expand All @@ -326,7 +384,15 @@ func checkAddPublic(sctx sessionctx.Context, writeOnlyTable, publicTable table.T
if err != nil {
return errors.Trace(err)
}
<<<<<<< HEAD:ddl/column_change_test.go
err = sessiontxn.NewTxn(ctx, sctx)
=======
err = txn.Commit(context.Background())
if err != nil {
return errors.Trace(err)
}
_, err = newTxn(sctx)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_change_test.go
if err != nil {
return errors.Trace(err)
}
Expand Down Expand Up @@ -432,8 +498,6 @@ 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)
}
82 changes: 81 additions & 1 deletion ddl/column_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,13 @@ func TestColumnBasic(t *testing.T) {
tk.MustExec(fmt.Sprintf("insert into t1 values(%d, %d, %d)", i, 10*i, 100*i))
}

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

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

h, err := tbl.AddRecord(ctx, types.MakeDatums(11, 12, 13, 14))
require.NoError(t, err)
<<<<<<< HEAD:ddl/column_test.go
err = sessiontxn.NewTxn(context.Background(), ctx)
=======
err = txn.Commit(context.Background())
require.NoError(t, err)
_, err = newTxn(ctx)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
require.NoError(t, err)
values, err := tables.RowWithCols(tbl, ctx, h, tbl.Cols())
require.NoError(t, err)
Expand Down Expand Up @@ -385,7 +396,13 @@ func checkDeleteOnlyColumn(t *testing.T, ctx sessionctx.Context, tableID int64,
newRow := types.MakeDatums(int64(11), int64(22), int64(33))
newHandle, err := tbl.AddRecord(ctx, newRow)
require.NoError(t, err)
<<<<<<< HEAD:ddl/column_test.go
err = sessiontxn.NewTxn(context.Background(), ctx)
=======
err = txn.Commit(context.Background())
require.NoError(t, err)
txn, err = newTxn(ctx)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
require.NoError(t, err)

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

err = tbl.RemoveRecord(ctx, newHandle, newRow)
require.NoError(t, err)
<<<<<<< HEAD:ddl/column_test.go
err = sessiontxn.NewTxn(context.Background(), ctx)
=======
err = txn.Commit(context.Background())
require.NoError(t, err)
txn, err = newTxn(ctx)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
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 @@ -447,7 +470,13 @@ 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, newRow)
require.NoError(t, err)
<<<<<<< HEAD:ddl/column_test.go
err = sessiontxn.NewTxn(context.Background(), ctx)
=======
err = txn.Commit(context.Background())
require.NoError(t, err)
txn, err = newTxn(ctx)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
require.NoError(t, err)

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

err = tbl.RemoveRecord(ctx, newHandle, newRow)
require.NoError(t, err)
<<<<<<< HEAD:ddl/column_test.go
err = sessiontxn.NewTxn(context.Background(), ctx)
=======

err = txn.Commit(context.Background())
require.NoError(t, err)
txn, err = newTxn(ctx)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
require.NoError(t, err)

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

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

err = tbl.RemoveRecord(ctx, newHandle, newRow)
require.NoError(t, err)
<<<<<<< HEAD:ddl/column_test.go
err = sessiontxn.NewTxn(context.Background(), ctx)
=======
err = txn.Commit(context.Background())
require.NoError(t, err)
txn, err = newTxn(ctx)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
require.NoError(t, err)

i = 0
Expand Down Expand Up @@ -573,7 +621,13 @@ func checkPublicColumn(t *testing.T, ctx sessionctx.Context, tableID int64, newC
}
handle, err := tbl.AddRecord(ctx, newRow)
require.NoError(t, err)
<<<<<<< HEAD:ddl/column_test.go
err = sessiontxn.NewTxn(context.Background(), ctx)
=======
err = txn.Commit(context.Background())
require.NoError(t, err)
txn, err = newTxn(ctx)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
require.NoError(t, err)

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

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

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

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

<<<<<<< HEAD:ddl/column_test.go
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) {
ctx := testNewContext(store)
=======
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(t, store)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
switch state {
case model.StateNone:
checkNoneColumn(t, ctx, tableID, handle, newCol, columnValue, dom)
Expand Down Expand Up @@ -655,8 +720,13 @@ func TestAddColumn(t *testing.T) {
tableID = int64(tableIDi)
tbl := testGetTable(t, dom, tableID)

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

<<<<<<< HEAD:ddl/column_test.go
ctx := testNewContext(store)
err := sessiontxn.NewTxn(context.Background(), ctx)
=======
ctx := testNewContext(t, store)
txn, err := newTxn(ctx)
>>>>>>> 0bf3e019002 (*: Update client-go and verify all read ts (#58054)):pkg/ddl/column_test.go
require.NoError(t, err)
oldRow := types.MakeDatums(int64(1), int64(2), int64(3))
handle, err := tbl.AddRecord(ctx, oldRow)
Expand Down Expand Up @@ -791,7 +866,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 @@ -852,8 +927,13 @@ func TestDropColumns(t *testing.T) {
tableID = int64(tableIDi)
tbl := testGetTable(t, dom, tableID)

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

colNames := []string{"c3", "c4"}
Expand Down
Loading

0 comments on commit 801c2a5

Please sign in to comment.