Skip to content
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

Update components for txn file in serverless #9224

Merged
merged 7 commits into from
Jul 12, 2024
Merged

Update components for txn file in serverless #9224

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6292c14
a
CalvinNeo Jul 12, 2024
695429e
a
CalvinNeo Jul 12, 2024
1a0f9aa
fmt
CalvinNeo Jul 12, 2024
0260ea7
Merge branch 'master' into upd-comp
CalvinNeo Jul 12, 2024
e6a57fa
Update dbms/src/Storages/KVStore/TiKVHelpers/DecodedLockCFValue.cpp
CalvinNeo Jul 12, 2024
1296c13
Update dbms/src/Storages/KVStore/TiKVHelpers/DecodedLockCFValue.h
CalvinNeo Jul 12, 2024
fb8dd19
Update dbms/src/Storages/KVStore/TiKVHelpers/DecodedLockCFValue.h
CalvinNeo Jul 12, 2024
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
2 changes: 1 addition & 1 deletion contrib/client-c
Open in desktop
Submodule client-c updated 3 files
+3 −1 include/pingcap/kv/LockResolver.h
+5 −2 src/kv/LockResolver.cc
+1 −1 third_party/kvproto
2 changes: 1 addition & 1 deletion contrib/kvproto
Open in desktop
Submodule kvproto updated 24 files
+2 −0 .github/workflows/cpp-test.yaml
+2 −0 .github/workflows/rust-test.yaml
+1 −1 Dockerfile
+3 −0 OWNERS
+28 −0 OWNERS_ALIASES
+18 −1 build.rs
+2,708 −1,022 pkg/brpb/brpb.pb.go
+208 −109 pkg/cdcpb/cdcpb.pb.go
+4,030 −1,276 pkg/kvrpcpb/kvrpcpb.pb.go
+753 −76 pkg/meta_storagepb/meta_storagepb.pb.go
+1,763 −803 pkg/pdpb/pdpb.pb.go
+262 −116 pkg/resource_manager/resource_manager.pb.go
+852 −174 pkg/tikvpb/tikvpb.pb.go
+76 −0 proto/OWNERS
+83 −0 proto/brpb.proto
+5 −0 proto/cdcpb.proto
+99 −0 proto/kvrpcpb.proto
+61 −33 proto/meta_storagepb.proto
+28 −1 proto/pdpb.proto
+6 −0 proto/raft_serverpb.proto
+7 −1 proto/resource_manager.proto
+15 −0 proto/tikvpb.proto
+4 −3 scripts/check.sh
+822 −115 scripts/proto.lock
2 changes: 1 addition & 1 deletion contrib/tiflash-proxy
Open in desktop
Submodule tiflash-proxy updated 7 files
+1 −0 Cargo.lock
+28 −27 proxy_components/proxy_ffi/src/jemalloc_utils.rs
+1 −1 proxy_components/proxy_ffi/src/lib.rs
+1 −0 proxy_components/proxy_server/Cargo.toml
+4 −3 proxy_components/proxy_server/src/status_server/mod.rs
+2 −2 proxy_components/proxy_server/src/status_server/profile.rs
+50 −0 proxy_components/proxy_server/src/status_server/vendored_utils.rs
10 changes: 9 additions & 1 deletion dbms/src/Storages/KVStore/TiKVHelpers/DecodedLockCFValue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ inline void decodeLockCfValue(DecodedLockCFValue & res)
res.txn_size = readUInt64(data, len);
break;
}
#if SERVERLESS_PROXY != 0
case IS_TXN_FILE_PREFIX:
{
res.is_txn_file = true;
break;
}
CalvinNeo marked this conversation as resolved.
Show resolved Hide resolved
#endif
case ASYNC_COMMIT_PREFIX:
{
res.use_async_commit = true;
Expand Down Expand Up @@ -159,6 +166,7 @@ void DecodedLockCFValue::intoLockInfo(kvrpcpb::LockInfo & res) const
res.set_txn_size(txn_size);
res.set_use_async_commit(use_async_commit);
res.set_key(decodeTiKVKey(*key));
res.set_is_txn_file(is_txn_file);

if (use_async_commit)
{
Expand All @@ -185,4 +193,4 @@ bool DecodedLockCFValue::isLargeTxn() const
}

} // namespace RecordKVFormat
} // namespace DB
} // namespace DB
3 changes: 2 additions & 1 deletion dbms/src/Storages/KVStore/TiKVHelpers/DecodedLockCFValue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ struct DecodedLockCFValue : boost::noncopyable
UInt64 min_commit_ts{0};
std::string_view secondaries;
std::string_view primary_lock;
bool is_txn_file{false};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to keep same format with bool use_async_commit{0};

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
bool is_txn_file{false};
bool is_txn_file{0};

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, i changed back /cc @JaySon-Huang

// For large txn, generation is not zero.
UInt64 generation{0};
};

} // namespace DB::RecordKVFormat
} // namespace DB::RecordKVFormat
1 change: 1 addition & 0 deletions dbms/src/Storages/KVStore/TiKVHelpers/TiKVRecordFormat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ static const char SHORT_VALUE_PREFIX = 'v';
static const char MIN_COMMIT_TS_PREFIX = 'c';
static const char FOR_UPDATE_TS_PREFIX = 'f';
static const char TXN_SIZE_PREFIX = 't';
static const char IS_TXN_FILE_PREFIX = 'T';
static const char ASYNC_COMMIT_PREFIX = 'a';
static const char ROLLBACK_TS_PREFIX = 'r';
static const char FLAG_OVERLAPPED_ROLLBACK = 'R';
Expand Down