Skip to content

[DNM] *: Merge upstream 08fddd3#34

Closed
pingyu wants to merge 71 commits into
tidbcloud:release-7.5-serverlessfrom
pingyu:upstream-08fddd3
Closed

[DNM] *: Merge upstream 08fddd3#34
pingyu wants to merge 71 commits into
tidbcloud:release-7.5-serverlessfrom
pingyu:upstream-08fddd3

Conversation

@pingyu

@pingyu pingyu commented Jun 25, 2025

Copy link
Copy Markdown
Contributor

rleungx and others added 30 commits October 17, 2023 13:56
Signed-off-by: Ryan Leung <rleungx@gmail.com>
Signed-off-by: Ryan Leung <rleungx@gmail.com>
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
Signed-off-by: qupeng <qupeng@pingcap.com>
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
Co-authored-by: disksing <i@disksing.com>
* added basic proto

Signed-off-by: hillium <yujuncen@pingcap.com>

* finish

Signed-off-by: hillium <yujuncen@pingcap.com>

* update new version of advanced prepare

Signed-off-by: hillium <yujuncen@pingcap.com>

* added some comments and a new request type

Signed-off-by: hillium <yujuncen@pingcap.com>

* added more comments

Signed-off-by: hillium <yujuncen@pingcap.com>

* make go

Signed-off-by: hillium <yujuncen@pingcap.com>

* address comments

Signed-off-by: hillium <yujuncen@pingcap.com>

---------

Signed-off-by: hillium <yujuncen@pingcap.com>
* add grpc exec details

Signed-off-by: bufferflies <1045931706@qq.com>

* add comment

Signed-off-by: bufferflies <1045931706@qq.com>

* lock

Signed-off-by: bufferflies <1045931706@qq.com>

---------

Signed-off-by: bufferflies <1045931706@qq.com>
* add grpc exec details

Signed-off-by: bufferflies <1045931706@qq.com>
* add Flush and BufferGet requests

Signed-off-by: ekexium <eke@fastmail.com>

* remove BufferGet; add BufferBatchGet

Signed-off-by: ekexium <eke@fastmail.com>

* rename to pipelined DML

Signed-off-by: ekexium <eke@fastmail.com>

* add rpc to Tikv service

Signed-off-by: ekexium <eke@fastmail.com>

* FlushResponse: change the errors field to return locks

Signed-off-by: ekexium <eke@fastmail.com>

* FlushRequest: introduce the generation field

Signed-off-by: ekexium <eke@fastmail.com>

* make go

Signed-off-by: ekexium <eke@fastmail.com>

* fix typo

Signed-off-by: ekexium <eke@fastmail.com>

* introduce lock_ttl and assertion_level for Flush

Signed-off-by: ekexium <eke@fastmail.com>

* re make go

Signed-off-by: ekexium <eke@fastmail.com>

* empty line

Signed-off-by: ekexium <eke@fastmail.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
…responses (#1222)

* put feedback information to batch cmd response

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Renaming

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* rebuild go

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Fix proto lock

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Add store id and seq no

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Address comments

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* apply change of proto.lock

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

---------

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Co-authored-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
* add Delete

Signed-off-by: husharp <jinhao.hu@pingcap.com>
* add cluster id into the kv RPC context

Signed-off-by: cfzjywxk <cfzjywxk@gmail.com>

* add update for CI

Signed-off-by: cfzjywxk <cfzjywxk@gmail.com>

* add update for cpp CI

Signed-off-by: cfzjywxk <cfzjywxk@gmail.com>

---------

Signed-off-by: cfzjywxk <cfzjywxk@gmail.com>
* support txn file transaction (tidbcloud#26)

txn file transactions write entries to S3 first, only txn chunk ids are send to tikv-server, tikv-server load chunk files to apply the write.

Signed-off-by: Evan Zhou <coocood@gmail.com>
Signed-off-by: Ping Yu <yuping@pingcap.com>

* add comments

Signed-off-by: Ping Yu <yuping@pingcap.com>

---------

Signed-off-by: Evan Zhou <coocood@gmail.com>
Signed-off-by: Ping Yu <yuping@pingcap.com>
Co-authored-by: Evan Zhou <coocood@gmail.com>
Signed-off-by: lance6716 <lance6716@gmail.com>
Signed-off-by: hillium <yujuncen@pingcap.com>
Co-authored-by: hillium <yujuncen@pingcap.com>
Co-authored-by: disksing <i@disksing.com>
…236)

* Revert "update import_sstpb and fix go & rust docker image build (#1224)"

This reverts commit 3fa61fc.

* some scripts don't need to be reverted

Signed-off-by: lance6716 <lance6716@gmail.com>

---------

Signed-off-by: lance6716 <lance6716@gmail.com>
…et committed index. (#1240)

* raft_serverpb: supply MsgAckCommittedRequest and MsgAckCommittedResponse.

Supply the command pair `MsgAckCommittedRequest` and `MsgAckCommittedResponse` to check
the latest committed index of a specified peer.

Signed-off-by: lucasliang <nkcs_lykx@hotmail.com>

* Simplify the pair `AckCommittedIndexRequest` and `AckCommittedIndexResponse` with `AckCommittedIndex`

Signed-off-by: lucasliang <nkcs_lykx@hotmail.com>

* Add proto.lock changes.

Signed-off-by: lucasliang <nkcs_lykx@hotmail.com>

* Replace `AckCommittedIndex` with the pair `AckCommittedIndexRequest` and `AckCommittedIndexResponse`.

Signed-off-by: lucasliang <nkcs_lykx@hotmail.com>

* Rename `Ack` with `Fetch`.

Signed-off-by: lucasliang <nkcs_lykx@hotmail.com>

---------

Signed-off-by: lucasliang <nkcs_lykx@hotmail.com>
* chore: add prow OWNERS file
* chore: add default approvers for other folders
* ci: fix build.rs
* ci: fix check.sh
Signed-off-by: qupeng <qupeng@pingcap.com>
…ex` to get committed index. (#1240)" (#1243)

As the committed index can be fetched by the message pair `MsgReadIndex` and `MsgReadIndexResp`, it
can be reverted.

This reverts commit f87719b.
* Add request health feedback request to batch commands

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Add context field

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Make GetHealthFeedback a complete interface

* Fix build

---------

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Co-authored-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
tonyxuqqi is emeritus.
…ck process (#1245)

* Add a new extra message for snapshot send precheck

Signed-off-by: Bisheng Huang <hbisheng@gmail.com>

* use a boolean

Signed-off-by: Bisheng Huang <hbisheng@gmail.com>

* raft_serverpb: add new ExtraMessage types for the snapshot gen precheck process

This commit adds two new new ExtraMessage types that are part of the snapshot
gen precheck process.

Before a leader generates a snapshot, it sends a precheck request to the target
follower. The follower responds with a boolean value indicating whether the
check succeeds.

Signed-off-by: Bisheng Huang <hbisheng@gmail.com>

* make name shorter

Signed-off-by: Bisheng Huang <hbisheng@gmail.com>

* include proto.lock change

Signed-off-by: Bisheng Huang <hbisheng@gmail.com>

---------

Signed-off-by: Bisheng Huang <hbisheng@gmail.com>
Co-authored-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: Ping Yu <yuping@pingcap.com>
Tristan1900 and others added 27 commits September 18, 2024 10:15
…eader (#1270)

* add pre load

Signed-off-by: SpadeA-Tang <u6748471@anu.edu.au>

* update name

Signed-off-by: SpadeA-Tang <u6748471@anu.edu.au>

* add comment

Signed-off-by: SpadeA-Tang <u6748471@anu.edu.au>

* add response

Signed-off-by: SpadeA-Tang <u6748471@anu.edu.au>

---------

Signed-off-by: SpadeA-Tang <u6748471@anu.edu.au>
* added epoch history

Signed-off-by: hillium <yujuncen@pingcap.com>

* make go

Signed-off-by: hillium <yujuncen@pingcap.com>

* added some comments

Signed-off-by: hillium <yujuncen@pingcap.com>

* reshape comments

Signed-off-by: hillium <yujuncen@pingcap.com>

---------

Signed-off-by: hillium <yujuncen@pingcap.com>
…ement (#1265)

* add msg BroadcastTxnStatus; modify Heartbeat

Signed-off-by: ekexium <eke@fastmail.com>

* fix: batch command response

Signed-off-by: ekexium <eke@fastmail.com>

* add field is_completed to TxnStatus

Signed-off-by: ekexium <eke@fastmail.com>

* RPC comment

Signed-off-by: ekexium <eke@fastmail.com>

---------

Signed-off-by: ekexium <eke@fastmail.com>
* Remove unnecessary file

Signed-off-by: Neil Shen <overvenus@gmail.com>

* Unify proto options

* Do not generate XXX_ fields for Go protobuf structs
* Enable lite runtime for Rust protobuf files

Signed-off-by: Neil Shen <overvenus@gmail.com>

* update go files

Signed-off-by: Neil Shen <overvenus@gmail.com>

* update proto lock file

Signed-off-by: Neil Shen <overvenus@gmail.com>

---------

Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: hillium <yujuncen@pingcap.com>
Signed-off-by: okJiang <819421878@qq.com>
* Add last_observed_time for raft messages

Signed-off-by: hhwyt <hhwyt1@gmail.com>

* address comments

* update proto.lock

---------

Signed-off-by: hhwyt <hhwyt1@gmail.com>
Co-authored-by: glorv <glorvs@163.com>
* lock ubuntu at 22.04

Signed-off-by: hillium <yujuncen@pingcap.com>

* allow static_mut_refs

Signed-off-by: hillium <yujuncen@pingcap.com>

---------

Signed-off-by: hillium <yujuncen@pingcap.com>
Signed-off-by: hillium <yujuncen@pingcap.com>
skip-checks: true

Signed-off-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Co-authored-by: wuhuizuo <wuhuizuo@126.com>
* add sub_range_groups into backup request to mark the merged gap

Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>

* make go

Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>

* multi rewrite rules for one SST file

Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>

* add table checksums

Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>

* add table checksums

Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>

* rename from TableChecksum to TableMeta

Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>

* rename: add prefix sorted_

Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>

* add more annotations

Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>

---------

Signed-off-by: Jianjun Liao <jianjun.liao@outlook.com>
Co-authored-by: 山岚 <36239017+YuJuncen@users.noreply.github.com>
* added involved ts for compaction

Signed-off-by: hillium <yu745514916@live.com>

* justify some comment expressions

Signed-off-by: hillium <yu745514916@live.com>

* make the name unique with subcompactions

Signed-off-by: hillium <yu745514916@live.com>

---------

Signed-off-by: hillium <yu745514916@live.com>
* initial

Signed-off-by: hillium <yujuncen@pingcap.com>

* added hint of prefix

Signed-off-by: hillium <yujuncen@pingcap.com>

* added force flush

Signed-off-by: hillium <yujuncen@pingcap.com>

* make result repeated

Signed-off-by: hillium <yujuncen@pingcap.com>

* make full backup a reference

Signed-off-by: hillium <yujuncen@pingcap.com>

* Revert "added force flush"

This reverts commit a51d008f44ca3807a62e46a2de73287d3af07587.

Signed-off-by: hillium <yujuncen@pingcap.com>

* rollback irraltive changes

Signed-off-by: hillium <yu745514916@live.com>

* added more comments

Signed-off-by: hillium <yu745514916@live.com>

* address comments

Signed-off-by: hillium <yu745514916@live.com>

* rename extra full backup to ingested SSTs

Signed-off-by: hillium <yu745514916@live.com>

---------

Signed-off-by: hillium <yujuncen@pingcap.com>
Signed-off-by: hillium <yu745514916@live.com>
…1283)

* restore: support skip some keys due after certain timestamp

* add ignore before timestamp

---------

Co-authored-by: 山岚 <36239017+YuJuncen@users.noreply.github.com>
Signed-off-by: lucasliang <nkcs_lykx@hotmail.com>
…n. (#1293)

Signed-off-by: lucasliang <nkcs_lykx@hotmail.com>
* Introduce QueryRegion stream

Signed-off-by: JmPotato <ghzpotato@gmail.com>

* Add prev_keys to QueryRegionRequest

Signed-off-by: JmPotato <ghzpotato@gmail.com>

---------

Signed-off-by: JmPotato <ghzpotato@gmail.com>
skip-checks: true

Signed-off-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Co-authored-by: wuhuizuo <wuhuizuo@126.com>
* brpb:add filter for pitr map

Signed-off-by: Wenqi Mou <wenqimou@gmail.com>

* address comments

Signed-off-by: Wenqi Mou <wenqimou@gmail.com>

---------

Signed-off-by: Wenqi Mou <wenqimou@gmail.com>
Signed-off-by: Ryan Leung <rleungx@gmail.com>
…info (#1308)

* kvrpcpb: Add more fields in CommitRequest/Response to give more lock info

Signed-off-by: Chao Wang <cclcwangchao@hotmail.com>

* Add `mvcc_info` to `TxnLockNotFound`

* Add debug info

Signed-off-by: Chao Wang <cclcwangchao@hotmail.com>

* Add CommitRole

Signed-off-by: Chao Wang <cclcwangchao@hotmail.com>

* Update proto/kvrpcpb.proto

---------

Signed-off-by: Chao Wang <cclcwangchao@hotmail.com>
Co-authored-by: cfzjywxk <cfzjywxk@gmail.com>
* Add new GC API

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Update definition of keyspace specifier in requests to avoid potential misuses

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Update to the latest design

* Update protocol

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Fix missing field

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

---------

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Co-authored-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
* kvrpcpb: add `UndeterminedResult` to `KeyError`

Signed-off-by: Chao Wang <cclcwangchao@hotmail.com>

* txn: move `UndeterminedResult` to region error

Signed-off-by: Chao Wang <cclcwangchao@hotmail.com>

---------

Signed-off-by: Chao Wang <cclcwangchao@hotmail.com>
skip-checks: true

Signed-off-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Co-authored-by: wuhuizuo <wuhuizuo@126.com>
* feat(resource_manager): add keyspace support

Signed-off-by: JmPotato <github@ipotato.me>

* Use KeyspaceIDValue wrapper

Signed-off-by: JmPotato <github@ipotato.me>

---------

Signed-off-by: JmPotato <github@ipotato.me>
* *: merge proto from next gen

Signed-off-by: Chao Wang <cclcwangchao@hotmail.com>

* *: remove `DelegateCoprocessor`

* *: move `DelegateCoprocessor` back

---------

Signed-off-by: Chao Wang <cclcwangchao@hotmail.com>
@pingcap-cla-assistant

pingcap-cla-assistant Bot commented Jun 25, 2025

Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
3 out of 28 committers have signed the CLA.

✅ pingyu
✅ rleungx
✅ overvenus
❌ LykxSassinator
❌ HuSharp
❌ bufferflies
❌ lance6716
❌ ekexium
❌ YuJuncen
❌ you06
❌ hawkingrei
❌ Leavrth
❌ SpadeA-Tang
❌ glorv
❌ hicqu
❌ xzhangxian1008
❌ wuhuizuo
❌ cfzjywxk
❌ Tristan1900
❌ hbisheng
❌ MyonKeminta
❌ JmPotato
❌ Wenqi Mou
❌ 3pointer
❌ okJiang
❌ hhwyt
❌ 3AceShowHand
❌ lcwangchao


Wenqi Mou seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

…am-08fddd3

Signed-off-by: Ping Yu <yuping@pingcap.com>
@pingyu pingyu closed this Jun 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.