Skip to content

*: Cherry-pick pr-65871 into release-8.5-materialized-view branch #66062

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

Closed
xzhangxian1008 wants to merge 14 commits into from
Closed

*: Cherry-pick pr-65871 into release-8.5-materialized-view branch #66062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a44fddb
cp 65871
lcwangchao Jan 30, 2026
c10f48f
update client-go, kvproto; delete some; impl Client related types
xzhangxian1008 Feb 4, 2026
9b28997
delete conflict_handler.go
xzhangxian1008 Feb 5, 2026
87d808d
update bazel and update golang to 1.25.5(cp pr-65043)
ti-chi-bot Dec 16, 2025
edd2f49
fix some
xzhangxian1008 Feb 5, 2026
393e277
remove ActionAlterTableAffinity
xzhangxian1008 Feb 5, 2026
3408c94
fix some flaky tests
xzhangxian1008 Feb 5, 2026
5686dec
fix some flaky
xzhangxian1008 Feb 6, 2026
6f6fc9f
fix some flaky tests
xzhangxian1008 Feb 6, 2026
8d0291c
fix integration test
xzhangxian1008 Feb 6, 2026
2988dc5
merge master
xzhangxian1008 Feb 6, 2026
749da28
fix some tests
Lloyd-Pottiger Jul 29, 2025
abef27d
Revert "update bazel and update golang to 1.25.5(cp pr-65043)"
xzhangxian1008 Feb 9, 2026
b5e9220
update go.mod
xzhangxian1008 Feb 9, 2026
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
24 changes: 12 additions & 12 deletions DEPS.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5815,13 +5815,13 @@ def go_deps():
name = "com_github_pingcap_kvproto",
build_file_proto_mode = "disable_global",
importpath = "github.com/pingcap/kvproto",
sha256 = "c4aec69b94805899f00a60d273c4c7721b0b7507f058ea02db1dbbe56c679f39",
strip_prefix = "github.com/pingcap/kvproto@v0.0.0-20250908061600-97d984880071",
sha256 = "d843feba26184c2aa17709b1e9c772493fa0a1e70258fda9e6c4fe8dd6c1b9a4",
strip_prefix = "github.com/pingcap/kvproto@v0.0.0-20260202074512-b43671caa401",
urls = [
"http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20250908061600-97d984880071.zip",
"http://ats.apps.svc/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20250908061600-97d984880071.zip",
"https://cache.hawkingrei.com/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20250908061600-97d984880071.zip",
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20250908061600-97d984880071.zip",
"http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20260202074512-b43671caa401.zip",
"http://ats.apps.svc/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20260202074512-b43671caa401.zip",
"https://cache.hawkingrei.com/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20260202074512-b43671caa401.zip",
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20260202074512-b43671caa401.zip",
],
)
go_repository(
Expand Down Expand Up @@ -6972,13 +6972,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 = "f3a61ebb5bf510131ada5d6db97008667d4c7fb9dd0366eacfc7c95d35c41c2d",
strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20260113054240-c88e82cf2927",
sha256 = "fed09b72741a15fb5c0022fbe446a23737cd62717b5d35454158cd006742a87f",
strip_prefix = "github.com/xzhangxian1008/client-go/v2@v2.0.0-20260209040955-cf2d43d03080",
urls = [
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20260113054240-c88e82cf2927.zip",
"http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20260113054240-c88e82cf2927.zip",
"https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20260113054240-c88e82cf2927.zip",
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20260113054240-c88e82cf2927.zip",
"http://bazel-cache.pingcap.net:8080/gomod/github.com/xzhangxian1008/client-go/v2/com_github_xzhangxian1008_client_go_v2-v2.0.0-20260209040955-cf2d43d03080.zip",
"http://ats.apps.svc/gomod/github.com/xzhangxian1008/client-go/v2/com_github_xzhangxian1008_client_go_v2-v2.0.0-20260209040955-cf2d43d03080.zip",
"https://cache.hawkingrei.com/gomod/github.com/xzhangxian1008/client-go/v2/com_github_xzhangxian1008_client_go_v2-v2.0.0-20260209040955-cf2d43d03080.zip",
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/xzhangxian1008/client-go/v2/com_github_xzhangxian1008_client_go_v2-v2.0.0-20260209040955-cf2d43d03080.zip",
],
)
go_repository(
Expand Down
4 changes: 3 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ require (
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
github.com/pingcap/fn v1.0.0
github.com/pingcap/kvproto v0.0.0-20250908061600-97d984880071
github.com/pingcap/kvproto v0.0.0-20260202074512-b43671caa401
github.com/pingcap/log v1.1.1-0.20250917021125-19901e015dc9
github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5
github.com/pingcap/tidb/pkg/parser v0.0.0-20211011031125-9b13dc409c5e
Expand Down Expand Up @@ -328,3 +328,5 @@ replace (
sourcegraph.com/sourcegraph/appdash => github.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0
sourcegraph.com/sourcegraph/appdash-data => github.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67
)

replace github.com/tikv/client-go/v2 => github.com/xzhangxian1008/client-go/v2 v2.0.0-20260209040955-cf2d43d03080
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,8 +672,8 @@ github.com/pingcap/fn v1.0.0/go.mod h1:u9WZ1ZiOD1RpNhcI42RucFh/lBuzTu6rw88a+oF2Z
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 h1:surzm05a8C9dN8dIUmo4Be2+pMRb6f55i+UIYrluu2E=
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw=
github.com/pingcap/kvproto v0.0.0-20191211054548-3c6b38ea5107/go.mod h1:WWLmULLO7l8IOcQG+t+ItJ3fEcrL5FxF0Wu+HrMy26w=
github.com/pingcap/kvproto v0.0.0-20250908061600-97d984880071 h1:w1C73NPjdEnVBX9IM8CJRJk1pFTzj8OAIrkD04A3MIs=
github.com/pingcap/kvproto v0.0.0-20250908061600-97d984880071/go.mod h1:rXxWk2UnwfUhLXha1jxRWPADw9eMZGWEWCg92Tgmb/8=
github.com/pingcap/kvproto v0.0.0-20260202074512-b43671caa401 h1:SVuBsIJhZa8mWDMuia0t4SKcNx5mttNTA93wrLO6UTI=
github.com/pingcap/kvproto v0.0.0-20260202074512-b43671caa401/go.mod h1:rXxWk2UnwfUhLXha1jxRWPADw9eMZGWEWCg92Tgmb/8=
github.com/pingcap/log v0.0.0-20210625125904-98ed8e2eb1c7/go.mod h1:8AanEdAHATuRurdGxZXBz0At+9avep+ub7U1AGYLIMM=
github.com/pingcap/log v1.1.0/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
github.com/pingcap/log v1.1.1-0.20250917021125-19901e015dc9 h1:qG9BSvlWFEE5otQGamuWedx9LRm0nrHvsQRQiW8SxEs=
Expand Down Expand Up @@ -826,8 +826,6 @@ github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 h1:mbAskLJ0oJf
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfKggNGDuadAa0LElHrByyrz4JPZ9fFx6Gs7nx7ZZU=
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4=
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
github.com/tikv/client-go/v2 v2.0.8-0.20260113054240-c88e82cf2927 h1:lCRKPcF7jYgovVZ2f+DYqOlS4gtVmj6O7bG4J/KXjC4=
github.com/tikv/client-go/v2 v2.0.8-0.20260113054240-c88e82cf2927/go.mod h1:DrneTzlX66kdfl59PMdaHpeJWzyXXNClNqzhi71AvXc=
github.com/tikv/pd/client v0.0.0-20250901062501-1646b924d286 h1:TBrJ7eyjLfI6xc7rr348sTKPUa96ZUWmfSonqLP0vVM=
github.com/tikv/pd/client v0.0.0-20250901062501-1646b924d286/go.mod h1:kuIEDRLck7LGHiqKYrQR3fNiK06trLmmK02s4r99iWU=
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a h1:A6uKudFIfAEpoPdaal3aSqGxBzLyU8TqyXImLwo6dIo=
Expand Down Expand Up @@ -860,6 +858,8 @@ github.com/xitongsys/parquet-go-source v0.0.0-20190524061010-2b72cbee77d5/go.mod
github.com/xitongsys/parquet-go-source v0.0.0-20200817004010-026bad9b25d0 h1:a742S4V5A15F93smuVxA60LQWsrCnN8bKeWDBARU1/k=
github.com/xitongsys/parquet-go-source v0.0.0-20200817004010-026bad9b25d0/go.mod h1:HYhIKsdns7xz80OgkbgJYrtQY7FjHWHKH6cvN7+czGE=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
github.com/xzhangxian1008/client-go/v2 v2.0.0-20260209040955-cf2d43d03080 h1:SFG08zgK79BZO12ZZ91Y4SKgzpOfQf8iIAJnslFlOoc=
github.com/xzhangxian1008/client-go/v2 v2.0.0-20260209040955-cf2d43d03080/go.mod h1:lURp2rOTM9uxjY6r8EwsZlXI5kBjDvq2mjfPwv+1vBM=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
Expand Down
2 changes: 1 addition & 1 deletion pkg/ddl/column_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ func checkColumnKVExist(ctx sessionctx.Context, t table.Table, handle kv.Handle,
}
}()
key := tablecodec.EncodeRecordKey(t.RecordPrefix(), handle)
data, err := txn.Get(context.TODO(), key)
data, err := kv.GetValue(context.TODO(), txn, key)
if !isExist {
if terror.ErrorEqual(err, kv.ErrNotExist) {
return nil
Expand Down
4 changes: 2 additions & 2 deletions pkg/ddl/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2375,7 +2375,7 @@ func (w *addIndexTxnWorker) batchCheckUniqueKey(txn kv.Transaction, idxRecords [
return nil
}

batchVals, err := txn.BatchGet(context.Background(), uniqueBatchKeys)
batchVals, err := kv.BatchGetValue(context.Background(), txn, uniqueBatchKeys)
if err != nil {
return errors.Trace(err)
}
Expand Down Expand Up @@ -3273,7 +3273,7 @@ func (w *cleanUpIndexWorker) BackfillData(_ context.Context, handleRange reorgBa
}

var found map[string][]byte
found, err = txn.BatchGet(ctx, globalIndexKeys)
found, err = kv.BatchGetValue(ctx, txn, globalIndexKeys)
if err != nil {
return errors.Trace(err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/ddl/index_merge_tmp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (w *mergeIndexWorker) batchCheckTemporaryUniqueKey(
return nil
}

batchVals, err := txn.BatchGet(context.Background(), w.originIdxKeys)
batchVals, err := kv.BatchGetValue(context.Background(), txn, w.originIdxKeys)
if err != nil {
return errors.Trace(err)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/ddl/index_modify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@ func checkGlobalIndexRow(
require.NoError(t, err)
var value []byte
if indexInfo.Unique {
value, err = txn.Get(context.Background(), key)
value, err = kv.GetValue(context.Background(), txn, key)
} else {
var iter kv.Iterator
iter, err = txn.Iter(key, key.PrefixNext())
Expand All @@ -968,7 +968,7 @@ func checkGlobalIndexRow(
require.NoError(t, err)
h := kv.IntHandle(d.GetInt64())
rowKey := tablecodec.EncodeRowKey(pid, h.Encoded())
rowValue, err := txn.Get(context.Background(), rowKey)
rowValue, err := kv.GetValue(context.Background(), txn, rowKey)
require.NoError(t, err)
rowValueDatums, err := tablecodec.DecodeRowToDatumMap(rowValue, tblColMap, time.UTC)
require.NoError(t, err)
Expand Down
14 changes: 8 additions & 6 deletions pkg/ddl/ingest/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,13 +518,15 @@ func TestAddGlobalIndexInIngestWithUpdate(t *testing.T) {
var i atomic.Int32
i.Store(3)
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/ddl/onJobUpdated", func(job *model.Job) {
tk2 := testkit.NewTestKit(t, store)
tmp := i.Add(1)
_, err := tk2.Exec(fmt.Sprintf("insert into test.t values (%d, %d)", tmp, tmp))
assert.Nil(t, err)
if job.State != model.JobStateSynced {
tk2 := testkit.NewTestKit(t, store)
tmp := i.Add(1)
_, err := tk2.Exec(fmt.Sprintf("insert into test.t values (%d, %d)", tmp, tmp))
assert.Nil(t, err)

_, err = tk2.Exec(fmt.Sprintf("update test.t set b = b + 11, a = b where b = %d", tmp-1))
assert.Nil(t, err)
_, err = tk2.Exec(fmt.Sprintf("update test.t set b = b + 11, a = b where b = %d", tmp-1))
assert.Nil(t, err)
}
})
tk.MustExec("alter table t add unique index idx(b) global")
rsGlobalIndex := tk.MustQuery("select *,_tidb_rowid from t use index(idx)").Sort()
Expand Down
2 changes: 1 addition & 1 deletion pkg/ddl/notifier/subscribe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ func (n *DDLNotifier) OnBecomeOwner() {
return
}
// In unit tests, we want to panic directly to find the root cause.
if intest.InTest {
if intest.InTest && !strings.Contains(util.GetRecoverError(r).Error(), "failpoint") {
panic(r)
}
logutil.BgLogger().Error("panic in ddl notifier", zap.Any("recover", r), zap.Stack("stack"))
Expand Down
2 changes: 1 addition & 1 deletion pkg/ddl/partition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3847,7 +3847,7 @@ func (w *reorgPartitionWorker) BackfillData(_ context.Context, handleRange reorg
for i := range w.rowRecords {
newKeys = append(newKeys, w.rowRecords[i].key)
}
found, err = txn.BatchGet(ctx, newKeys)
found, err = kv.BatchGetValue(ctx, txn, newKeys)
if err != nil {
return errors.Trace(err)
}
Expand Down
Loading