This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new a10f56524ad branch-4.0: [improve](cloud) Report read/write conflict
range #59437 (#59577)
a10f56524ad is described below
commit a10f56524ade864be7fb9c0bb2118f2b3de340b5
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jan 7 18:18:25 2026 +0800
branch-4.0: [improve](cloud) Report read/write conflict range #59437
(#59577)
Cherry-picked from #59437
Co-authored-by: walter <[email protected]>
---
cloud/src/meta-store/txn_kv.cpp | 128 +++++++++++++++++++++++++++++++++++++++-
cloud/src/meta-store/txn_kv.h | 4 ++
2 files changed, 131 insertions(+), 1 deletion(-)
diff --git a/cloud/src/meta-store/txn_kv.cpp b/cloud/src/meta-store/txn_kv.cpp
index f83b0cbd98b..0e11bbc531a 100644
--- a/cloud/src/meta-store/txn_kv.cpp
+++ b/cloud/src/meta-store/txn_kv.cpp
@@ -875,6 +875,94 @@ TxnErrorCode Transaction::get_conflicting_range(
return TxnErrorCode::TXN_OK;
}
+TxnErrorCode Transaction::get_read_conflict_range(
+ std::vector<std::pair<std::string, std::string>>* values) {
+ constexpr std::string_view start =
"\xff\xff/transaction/read_conflict_range/";
+ constexpr std::string_view end =
"\xff\xff/transaction/read_conflict_range/\xff";
+
+ int limit = 0;
+ int target_bytes = 0;
+ FDBStreamingMode mode = FDB_STREAMING_MODE_WANT_ALL;
+ int iteration = 0;
+ fdb_bool_t snapshot = 0;
+ fdb_bool_t reverse = 0;
+ FDBFuture* future = fdb_transaction_get_range(
+ txn_, FDB_KEYSEL_FIRST_GREATER_OR_EQUAL((uint8_t*)start.data(),
start.size()),
+ FDB_KEYSEL_FIRST_GREATER_OR_EQUAL((uint8_t*)end.data(),
end.size()), limit,
+ target_bytes, mode, iteration, snapshot, reverse);
+
+ DORIS_CLOUD_DEFER {
+ fdb_future_destroy(future);
+ };
+
+ RETURN_IF_ERROR(await_future(future));
+
+ FDBKeyValue const* out_kvs;
+ int out_kvs_count;
+ fdb_bool_t out_more;
+ do {
+ fdb_error_t err =
+ fdb_future_get_keyvalue_array(future, &out_kvs,
&out_kvs_count, &out_more);
+ if (err) {
+ LOG(WARNING) << "get_conflicting_range get keyvalue array error: "
+ << fdb_get_error(err);
+ return cast_as_txn_code(err);
+ }
+ for (int i = 0; i < out_kvs_count; i++) {
+ std::string_view key((char*)out_kvs[i].key, out_kvs[i].key_length);
+ std::string_view value((char*)out_kvs[i].value,
out_kvs[i].value_length);
+ key.remove_prefix(start.size());
+ values->emplace_back(key, value);
+ }
+ } while (out_more);
+
+ return TxnErrorCode::TXN_OK;
+}
+
+TxnErrorCode Transaction::get_write_conflict_range(
+ std::vector<std::pair<std::string, std::string>>* values) {
+ constexpr std::string_view start =
"\xff\xff/transaction/write_conflict_range/";
+ constexpr std::string_view end =
"\xff\xff/transaction/write_conflict_range/\xff";
+
+ int limit = 0;
+ int target_bytes = 0;
+ FDBStreamingMode mode = FDB_STREAMING_MODE_WANT_ALL;
+ int iteration = 0;
+ fdb_bool_t snapshot = 0;
+ fdb_bool_t reverse = 0;
+ FDBFuture* future = fdb_transaction_get_range(
+ txn_, FDB_KEYSEL_FIRST_GREATER_OR_EQUAL((uint8_t*)start.data(),
start.size()),
+ FDB_KEYSEL_FIRST_GREATER_OR_EQUAL((uint8_t*)end.data(),
end.size()), limit,
+ target_bytes, mode, iteration, snapshot, reverse);
+
+ DORIS_CLOUD_DEFER {
+ fdb_future_destroy(future);
+ };
+
+ RETURN_IF_ERROR(await_future(future));
+
+ FDBKeyValue const* out_kvs;
+ int out_kvs_count;
+ fdb_bool_t out_more;
+ do {
+ fdb_error_t err =
+ fdb_future_get_keyvalue_array(future, &out_kvs,
&out_kvs_count, &out_more);
+ if (err) {
+ LOG(WARNING) << "get_conflicting_range get keyvalue array error: "
+ << fdb_get_error(err);
+ return cast_as_txn_code(err);
+ }
+ for (int i = 0; i < out_kvs_count; i++) {
+ std::string_view key((char*)out_kvs[i].key, out_kvs[i].key_length);
+ std::string_view value((char*)out_kvs[i].value,
out_kvs[i].value_length);
+ key.remove_prefix(start.size());
+ values->emplace_back(key, value);
+ }
+ } while (out_more);
+
+ return TxnErrorCode::TXN_OK;
+}
+
TxnErrorCode Transaction::report_conflicting_range() {
if (!config::enable_logging_conflict_keys) {
return TxnErrorCode::TXN_OK;
@@ -900,7 +988,45 @@ TxnErrorCode Transaction::report_conflicting_range() {
out += fmt::format("[{}, {}): {}", hex(start), hex(end),
conflict_count);
}
- LOG(WARNING) << "conflicting key ranges: " << out;
+ key_values.clear();
+ RETURN_IF_ERROR(get_read_conflict_range(&key_values));
+ if (key_values.size() % 2 != 0) {
+ LOG(WARNING) << "the read conflict range is not well-formed, size=" <<
key_values.size();
+ return TxnErrorCode::TXN_INVALID_DATA;
+ }
+ std::string read_conflict_range_out;
+ for (size_t i = 0; i < key_values.size(); i += 2) {
+ std::string_view start = key_values[i].first;
+ std::string_view end = key_values[i + 1].first;
+ std::string_view conflict_count = key_values[i].second;
+ if (!read_conflict_range_out.empty()) {
+ read_conflict_range_out += ", ";
+ }
+ read_conflict_range_out +=
+ fmt::format("[{}, {}): {}", hex(start), hex(end),
conflict_count);
+ }
+
+ key_values.clear();
+ RETURN_IF_ERROR(get_write_conflict_range(&key_values));
+ if (key_values.size() % 2 != 0) {
+ LOG(WARNING) << "the write conflict range is not well-formed, size="
<< key_values.size();
+ return TxnErrorCode::TXN_INVALID_DATA;
+ }
+ std::string write_conflict_range_out;
+ for (size_t i = 0; i < key_values.size(); i += 2) {
+ std::string_view start = key_values[i].first;
+ std::string_view end = key_values[i + 1].first;
+ std::string_view conflict_count = key_values[i].second;
+ if (!write_conflict_range_out.empty()) {
+ write_conflict_range_out += ", ";
+ }
+ write_conflict_range_out +=
+ fmt::format("[{}, {}): {}", hex(start), hex(end),
conflict_count);
+ }
+
+ LOG(WARNING) << "conflicting key ranges: " << out
+ << ", read conflict range: " << read_conflict_range_out
+ << ", write conflict range: " << write_conflict_range_out;
return TxnErrorCode::TXN_OK;
}
diff --git a/cloud/src/meta-store/txn_kv.h b/cloud/src/meta-store/txn_kv.h
index d91542a48dd..ee35ca4b4d3 100644
--- a/cloud/src/meta-store/txn_kv.h
+++ b/cloud/src/meta-store/txn_kv.h
@@ -827,6 +827,10 @@ private:
// It only works when the report_conflicting_ranges option is enabled.
TxnErrorCode get_conflicting_range(
std::vector<std::pair<std::string, std::string>>* key_values);
+ TxnErrorCode get_read_conflict_range(
+ std::vector<std::pair<std::string, std::string>>* key_values);
+ TxnErrorCode get_write_conflict_range(
+ std::vector<std::pair<std::string, std::string>>* key_values);
TxnErrorCode report_conflicting_range();
std::shared_ptr<Database> db_ {nullptr};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
