From 0e6d67aa5f1befc6b259363743b79765337f2e01 Mon Sep 17 00:00:00 2001 From: Chaoguang Lin Date: Mon, 11 May 2020 19:37:04 -0700 Subject: [PATCH] Rename pks to sks, as the shorthand for special-key-space --- fdbclient/SpecialKeySpace.actor.cpp | 20 ++++++++++---------- tests/fast/RandomUnitTests.txt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fdbclient/SpecialKeySpace.actor.cpp b/fdbclient/SpecialKeySpace.actor.cpp index cf7ca1589f..6bd2406fb6 100644 --- a/fdbclient/SpecialKeySpace.actor.cpp +++ b/fdbclient/SpecialKeySpace.actor.cpp @@ -28,30 +28,30 @@ // It does have overhead here since we query all keys twice in the worst case. // However, moving the KeySelector while handling other parameters like limits makes the code much more complex and hard // to maintain; Thus, separate each part to make the code easy to understand and more compact -ACTOR Future SpecialKeyRangeBaseImpl::normalizeKeySelectorActor(const SpecialKeyRangeBaseImpl* pkrImpl, +ACTOR Future SpecialKeyRangeBaseImpl::normalizeKeySelectorActor(const SpecialKeyRangeBaseImpl* skrImpl, Reference ryw, KeySelector* ks) { ASSERT(!ks->orEqual); // should be removed before calling ASSERT(ks->offset != 1); // never being called if KeySelector is already normalized - state Key startKey(pkrImpl->range.begin); - state Key endKey(pkrImpl->range.end); + state Key startKey(skrImpl->range.begin); + state Key endKey(skrImpl->range.end); if (ks->offset < 1) { // less than the given key - if (pkrImpl->range.contains(ks->getKey())) endKey = keyAfter(ks->getKey()); + if (skrImpl->range.contains(ks->getKey())) endKey = keyAfter(ks->getKey()); } else { // greater than the given key - if (pkrImpl->range.contains(ks->getKey())) startKey = ks->getKey(); + if (skrImpl->range.contains(ks->getKey())) startKey = ks->getKey(); } TraceEvent(SevDebug, "NormalizeKeySelector") .detail("OriginalKey", ks->getKey()) .detail("OriginalOffset", ks->offset) - .detail("SpecialKeyRangeStart", pkrImpl->range.begin) - .detail("SpecialKeyRangeEnd", pkrImpl->range.end); + .detail("SpecialKeyRangeStart", skrImpl->range.begin) + .detail("SpecialKeyRangeEnd", skrImpl->range.end); - Standalone result = wait(pkrImpl->getRange(ryw, KeyRangeRef(startKey, endKey))); + Standalone result = wait(skrImpl->getRange(ryw, KeyRangeRef(startKey, endKey))); if (result.size() == 0) { TraceEvent("ZeroElementsIntheRange").detail("Start", startKey).detail("End", endKey); return Void(); @@ -77,8 +77,8 @@ ACTOR Future SpecialKeyRangeBaseImpl::normalizeKeySelectorActor(const Spec TraceEvent(SevDebug, "NormalizeKeySelector") .detail("NormalizedKey", ks->getKey()) .detail("NormalizedOffset", ks->offset) - .detail("SpecialKeyRangeStart", pkrImpl->range.begin) - .detail("SpecialKeyRangeEnd", pkrImpl->range.end); + .detail("SpecialKeyRangeStart", skrImpl->range.begin) + .detail("SpecialKeyRangeEnd", skrImpl->range.end); return Void(); } diff --git a/tests/fast/RandomUnitTests.txt b/tests/fast/RandomUnitTests.txt index f6795453da..87259fa6bc 100644 --- a/tests/fast/RandomUnitTests.txt +++ b/tests/fast/RandomUnitTests.txt @@ -3,4 +3,4 @@ testName=UnitTests startDelay=0 useDB=false maxTestCases=1 -testsMatching=/ \ No newline at end of file +testsMatching=/fdbclient/SpecialKeySpace