Skip to content

support bypassing shared lock #10667

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
ti-chi-bot merged 3 commits into from
Feb 9, 2026
+26 −2
Merged

support bypassing shared lock #10667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56b0f83
support bypassing shared lock
you06 Jan 19, 2026
492860f
trigger ci
you06 Feb 5, 2026
e7392c7
add metrics for shared locks
you06 Feb 5, 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
2 changes: 1 addition & 1 deletion contrib/kvproto
Open in desktop
Submodule kvproto updated 28 files
+10 −2 Cargo.lock
+4 −3 Cargo.toml
+8 −133 OWNERS
+181 −20 OWNERS_ALIASES
+351 −306 pkg/brpb/brpb.pb.go
+777 −99 pkg/coprocessor/coprocessor.pb.go
+947 −180 pkg/import_sstpb/import_sstpb.pb.go
+936 −490 pkg/kvrpcpb/kvrpcpb.pb.go
+277 −65 pkg/metapb/metapb.pb.go
+4,212 −1,561 pkg/pdpb/pdpb.pb.go
+205 −132 pkg/resource_manager/resource_manager.pb.go
+480 −34 pkg/resource_usage_agent/resource_usage_agent.pb.go
+383 −0 pkg/routerpb/routerpb.pb.go
+891 −107 pkg/schedulingpb/schedulingpb.pb.go
+131 −59 pkg/tsopb/tsopb.pb.go
+5 −2 proto/OWNERS
+10 −0 proto/brpb.proto
+17 −0 proto/coprocessor.proto
+31 −0 proto/import_sstpb.proto
+53 −5 proto/kvrpcpb.proto
+7 −0 proto/metapb.proto
+79 −1 proto/pdpb.proto
+2 −0 proto/resource_manager.proto
+12 −0 proto/resource_usage_agent.proto
+33 −0 proto/routerpb.proto
+17 −0 proto/schedulingpb.proto
+2 −0 proto/tsopb.proto
+631 −0 scripts/proto.lock
1 change: 1 addition & 0 deletions dbms/src/Common/TiFlashMetrics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,7 @@ static_assert(RAFT_REGION_BIG_WRITE_THRES * 4 < RAFT_REGION_BIG_WRITE_MAX, "Inva
F(type_write_del, {"type", "write_del"}), \
F(type_lock_del, {"type", "lock_del"}), \
F(type_pessimistic_lock_put, {"type", "pessimistic_lock_put"}), \
F(type_shared_lock_put, {"type", "shared_lock_put"}), \
F(type_lock_replaced, {"type", "lock_replaced"}), \
F(type_default_del, {"type", "default_del"}), \
F(type_apply_snapshot, {"type", "apply_snapshot"}), \
Expand Down
11 changes: 10 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 @@ -48,6 +48,10 @@ namespace RecordKVFormat
case LockType::Pessimistic:
lock_type = kvrpcpb::Op::PessimisticLock;
break;
case LockType::Shared:
// Skip parsing shared locks as they do not block any read requests.
res.lock_type = kvrpcpb::Op::SharedLock;
return inner;
}
res.lock_type = lock_type;
res.primary_lock = readVarString<std::string_view>(data, len);
Expand Down Expand Up @@ -166,6 +170,10 @@ DecodedLockCFValue::DecodedLockCFValue(std::shared_ptr<const TiKVKey> key_, std:
{
GET_METRIC(tiflash_raft_process_keys, type_pessimistic_lock_put).Increment(1);
}
else if (parsed->lock_type == kvrpcpb::Op::SharedLock)
{
GET_METRIC(tiflash_raft_process_keys, type_shared_lock_put).Increment(1);
}
if (parsed->generation == 0)
{
// It is not a large txn, we cache the parsed lock.
Expand Down Expand Up @@ -244,7 +252,8 @@ void DecodedLockCFValue::Inner::getLockInfoPtr(
LockInfoPtr & res) const
{
res = nullptr;
if (lock_version > query.read_tso || lock_type == kvrpcpb::Op::Lock || lock_type == kvrpcpb::Op::PessimisticLock)
if (lock_version > query.read_tso || lock_type == kvrpcpb::Op::Lock || lock_type == kvrpcpb::Op::PessimisticLock
|| lock_type == kvrpcpb::Op::SharedLock)
return;
if (min_commit_ts > query.read_tso)
return;
Expand Down
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 @@ -351,6 +351,7 @@ enum LockType : UInt8
Delete = 'D',
Lock = 'L',
Pessimistic = 'S',
Shared = 'H',
};

struct InnerDecodedWriteCFValue
Expand Down
13 changes: 13 additions & 0 deletions dbms/src/Storages/KVStore/tests/gtest_kvstore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,19 @@ TEST_F(RegionKVStoreOldTest, RegionReadWrite)
}
region->clearAllData();
}
{
region->insertFromSnap(
tmt,
"lock",
RecordKVFormat::genKey(table_id, 3),
RecordKVFormat::encodeLockCfValue(RecordKVFormat::LockType::Shared, "PK", 3, 20, nullptr, 5));
{
auto iter = region->createCommittedScanner(true, true);
auto lock = iter.getLockInfo({100, nullptr});
ASSERT_EQ(lock, nullptr);
}
region->clearAllData();
}
{
// Test duplicate and tryCompactionFilter
region->insertFromSnap(
Expand Down