Skip to content

Support return TiFlash system table by grpc #1094

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 3 commits into from
Apr 3, 2023
Merged

Support return TiFlash system table by grpc #1094

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e499461
proto
Lloyd-Pottiger Mar 31, 2023
69ebb56
okg
Lloyd-Pottiger Mar 31, 2023
62e64e3
Merge branch 'master' into return-system-table-by-grpc
Lloyd-Pottiger Apr 3, 2023
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
1,184 changes: 773 additions & 411 deletions pkg/kvrpcpb/kvrpcpb.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

350 changes: 195 additions & 155 deletions pkg/tikvpb/tikvpb.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion pkg/tracepb/tracepb.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions proto/kvrpcpb.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,3 +1468,11 @@ message CompactResponse {
bytes compacted_start_key = 3;
bytes compacted_end_key = 4;
}

message TiFlashSystemTableRequest {
string sql = 1;
}

message TiFlashSystemTableResponse {
bytes data = 1 [(gogoproto.customtype) = "github.com/pingcap/kvproto/pkg/sharedbytes.SharedBytes", (gogoproto.nullable) = false];
}
3 changes: 3 additions & 0 deletions proto/tikvpb.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ service Tikv {
/// Get the information about history lock waiting from TiKV.
rpc GetLockWaitHistory(kvrpcpb.GetLockWaitHistoryRequest) returns (kvrpcpb.GetLockWaitHistoryResponse);

/// Get system table from TiFlash
rpc GetTiFlashSystemTable(kvrpcpb.TiFlashSystemTableRequest) returns (kvrpcpb.TiFlashSystemTableResponse) {}

// These are for TiFlash disaggregated architecture
/// Try to lock a S3 object, atomically
rpc tryAddLock(disaggregated.TryAddLockRequest) returns (disaggregated.TryAddLockResponse) {};
Expand Down
5 changes: 5 additions & 0 deletions scripts/check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ check-protos-compatible() {
# If the output message is encountered, please add proto.lock to git as well.
git diff scripts/proto.lock | cat
git diff --quiet scripts/proto.lock
if [ $? -ne 0 ]; then
echo "Please add proto.lock to git."
return 1
fi
return 0
}

if ! check_protoc_version || ! check-protos-compatible; then
Expand Down
35 changes: 35 additions & 0 deletions scripts/proto.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10476,6 +10476,36 @@
"type": "bytes"
}
]
},
{
"name": "TiFlashSystemTableRequest",
"fields": [
{
"id": 1,
"name": "sql",
"type": "string"
}
]
},
{
"name": "TiFlashSystemTableResponse",
"fields": [
{
"id": 1,
"name": "data",
"type": "bytes",
"options": [
{
"name": "(gogoproto.customtype)",
"value": "github.com/pingcap/kvproto/pkg/sharedbytes.SharedBytes"
},
{
"name": "(gogoproto.nullable)",
"value": "false"
}
]
}
]
}
],
"imports": [
Expand Down Expand Up @@ -18039,6 +18069,11 @@
"in_type": "kvrpcpb.GetLockWaitHistoryRequest",
"out_type": "kvrpcpb.GetLockWaitHistoryResponse"
},
{
"name": "GetTiFlashSystemTable",
"in_type": "kvrpcpb.TiFlashSystemTableRequest",
"out_type": "kvrpcpb.TiFlashSystemTableResponse"
},
{
"name": "tryAddLock",
"in_type": "disaggregated.TryAddLockRequest",
Expand Down