apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-06-02 19:25:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove a/ from tracing path in special-key-space

Browse Source
This commit is contained in:
Lukas Joswiak 2020-12-09 13:40:16 -08:00
parent 30db637aef
commit 43fd545f06
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bindings/c/test/unit/unit_tests.cpp
View File

@ -1744,7 +1744,7 @@ TEST_CASE("fdb_transaction_add_conflict_range") {
} }
TEST_CASE("special-key-space valid transaction ID") { TEST_CASE("special-key-space valid transaction ID") {
auto value = get_value("\xff\xff/tracing/a/transaction_id", /* snapshot */ false, {}); auto value = get_value("\xff\xff/tracing/transaction_id", /* snapshot */ false, {});
REQUIRE(value.has_value()); REQUIRE(value.has_value());
uint64_t transaction_id = std::stoul(value.value()); uint64_t transaction_id = std::stoul(value.value());
CHECK(transaction_id > 0); CHECK(transaction_id > 0);
@ -1755,8 +1755,8 @@ TEST_CASE("special-key-space custom transaction ID") {
fdb_check(tr.set_option(FDB_TR_OPTION_SPECIAL_KEY_SPACE_ENABLE_WRITES, fdb_check(tr.set_option(FDB_TR_OPTION_SPECIAL_KEY_SPACE_ENABLE_WRITES,
nullptr, 0)); nullptr, 0));
while (1) { while (1) {
tr.set("\xff\xff/tracing/a/transaction_id", std::to_string(ULONG_MAX)); tr.set("\xff\xff/tracing/transaction_id", std::to_string(ULONG_MAX));
fdb::ValueFuture f1 = tr.get("\xff\xff/tracing/a/transaction_id", fdb::ValueFuture f1 = tr.get("\xff\xff/tracing/transaction_id",
/* snapshot */ false); /* snapshot */ false);
fdb_error_t err = wait_future(f1); fdb_error_t err = wait_future(f1);
@ -1784,8 +1784,8 @@ TEST_CASE("special-key-space set transaction ID after write") {
nullptr, 0)); nullptr, 0));
while (1) { while (1) {
tr.set(key("foo"), "bar"); tr.set(key("foo"), "bar");
tr.set("\xff\xff/tracing/a/transaction_id", "0"); tr.set("\xff\xff/tracing/transaction_id", "0");
fdb::ValueFuture f1 = tr.get("\xff\xff/tracing/a/transaction_id", fdb::ValueFuture f1 = tr.get("\xff\xff/tracing/transaction_id",
/* snapshot */ false); /* snapshot */ false);
fdb_error_t err = wait_future(f1); fdb_error_t err = wait_future(f1);
@ -1813,8 +1813,8 @@ TEST_CASE("special-key-space set token after write") {
nullptr, 0)); nullptr, 0));
while (1) { while (1) {
tr.set(key("foo"), "bar"); tr.set(key("foo"), "bar");
tr.set("\xff\xff/tracing/a/token", "false"); tr.set("\xff\xff/tracing/token", "false");
fdb::ValueFuture f1 = tr.get("\xff\xff/tracing/a/token", fdb::ValueFuture f1 = tr.get("\xff\xff/tracing/token",
/* snapshot */ false); /* snapshot */ false);
fdb_error_t err = wait_future(f1); fdb_error_t err = wait_future(f1);
@ -1837,7 +1837,7 @@ TEST_CASE("special-key-space set token after write") {
} }
TEST_CASE("special-key-space valid token") { TEST_CASE("special-key-space valid token") {
auto value = get_value("\xff\xff/tracing/a/token", /* snapshot */ false, {}); auto value = get_value("\xff\xff/tracing/token", /* snapshot */ false, {});
REQUIRE(value.has_value()); REQUIRE(value.has_value());
uint64_t token = std::stoul(value.value()); uint64_t token = std::stoul(value.value());
CHECK(token > 0); CHECK(token > 0);
@ -1848,8 +1848,8 @@ TEST_CASE("special-key-space disable tracing") {
fdb_check(tr.set_option(FDB_TR_OPTION_SPECIAL_KEY_SPACE_ENABLE_WRITES, fdb_check(tr.set_option(FDB_TR_OPTION_SPECIAL_KEY_SPACE_ENABLE_WRITES,
nullptr, 0)); nullptr, 0));
while (1) { while (1) {
tr.set("\xff\xff/tracing/a/token", "false"); tr.set("\xff\xff/tracing/token", "false");
fdb::ValueFuture f1 = tr.get("\xff\xff/tracing/a/token", fdb::ValueFuture f1 = tr.get("\xff\xff/tracing/token",
/* snapshot */ false); /* snapshot */ false);
fdb_error_t err = wait_future(f1); fdb_error_t err = wait_future(f1);
@ -1874,7 +1874,7 @@ TEST_CASE("special-key-space disable tracing") {
TEST_CASE("FDB_DB_OPTION_TRANSACTION_TRACE_DISABLE") { TEST_CASE("FDB_DB_OPTION_TRANSACTION_TRACE_DISABLE") {
fdb_check(fdb_database_set_option(db, FDB_DB_OPTION_TRANSACTION_TRACE_DISABLE, nullptr, 0)); fdb_check(fdb_database_set_option(db, FDB_DB_OPTION_TRANSACTION_TRACE_DISABLE, nullptr, 0));
auto value = get_value("\xff\xff/tracing/a/token", /* snapshot */ false, {}); auto value = get_value("\xff\xff/tracing/token", /* snapshot */ false, {});
REQUIRE(value.has_value()); REQUIRE(value.has_value());
uint64_t token = std::stoul(value.value()); uint64_t token = std::stoul(value.value());
CHECK(token == 0); CHECK(token == 0);
@ -1889,8 +1889,8 @@ TEST_CASE("FDB_DB_OPTION_TRANSACTION_TRACE_DISABLE enable tracing for transactio
fdb_check(tr.set_option(FDB_TR_OPTION_SPECIAL_KEY_SPACE_ENABLE_WRITES, fdb_check(tr.set_option(FDB_TR_OPTION_SPECIAL_KEY_SPACE_ENABLE_WRITES,
nullptr, 0)); nullptr, 0));
while (1) { while (1) {
tr.set("\xff\xff/tracing/a/token", "true"); tr.set("\xff\xff/tracing/token", "true");
fdb::ValueFuture f1 = tr.get("\xff\xff/tracing/a/token", fdb::ValueFuture f1 = tr.get("\xff\xff/tracing/token",
/* snapshot */ false); /* snapshot */ false);
fdb_error_t err = wait_future(f1); fdb_error_t err = wait_future(f1);
@ -1915,8 +1915,8 @@ TEST_CASE("FDB_DB_OPTION_TRANSACTION_TRACE_DISABLE enable tracing for transactio
} }
TEST_CASE("special-key-space tracing get range") { TEST_CASE("special-key-space tracing get range") {
std::string tracingBegin = "\xff\xff/tracing/a/"; std::string tracingBegin = "\xff\xff/tracing/";
std::string tracingEnd = "\xff\xff/tracing/a0"; std::string tracingEnd = "\xff\xff/tracing0";
fdb::Transaction tr(db); fdb::Transaction tr(db);
fdb_check(tr.set_option(FDB_TR_OPTION_SPECIAL_KEY_SPACE_ENABLE_WRITES, fdb_check(tr.set_option(FDB_TR_OPTION_SPECIAL_KEY_SPACE_ENABLE_WRITES,
@ -1927,7 +1927,7 @@ TEST_CASE("special-key-space tracing get range") {
(const uint8_t *)tracingBegin.c_str(), (const uint8_t *)tracingBegin.c_str(),
tracingBegin.size() tracingBegin.size()
), ),
FDB_KEYSEL_LAST_LESS_OR_EQUAL( FDB_KEYSEL_LAST_LESS_THAN(
(const uint8_t *)tracingEnd.c_str(), (const uint8_t *)tracingEnd.c_str(),
tracingEnd.size() tracingEnd.size()
) + 1, /* limit */ 0, /* target_bytes */ 0, ) + 1, /* limit */ 0, /* target_bytes */ 0,

6
fdbclient/NativeAPI.actor.cpp
View File

@ -948,12 +948,8 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
.withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin))); .withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::MANAGEMENT).begin)));
registerSpecialKeySpaceModule( registerSpecialKeySpaceModule(
SpecialKeySpace::MODULE::TRACING, SpecialKeySpace::IMPLTYPE::READWRITE, SpecialKeySpace::MODULE::TRACING, SpecialKeySpace::IMPLTYPE::READWRITE,
// std::make_unique<TracingOptionsImpl>(
// SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::TRACING)));
// TODO: Temporary fix for an issue with special-key top level ranges.
std::make_unique<TracingOptionsImpl>( std::make_unique<TracingOptionsImpl>(
KeyRangeRef(LiteralStringRef("a/"), LiteralStringRef("a0")) SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::TRACING)));
.withPrefix(SpecialKeySpace::getModuleRange(SpecialKeySpace::MODULE::TRACING).begin)));
} }
if (apiVersionAtLeast(630)) { if (apiVersionAtLeast(630)) {
registerSpecialKeySpaceModule(SpecialKeySpace::MODULE::TRANSACTION, SpecialKeySpace::IMPLTYPE::READONLY, registerSpecialKeySpaceModule(SpecialKeySpace::MODULE::TRANSACTION, SpecialKeySpace::IMPLTYPE::READONLY,