wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refine part of the code

This commit is contained in:
chaoguang 2020-03-31 01:36:07 -07:00
parent 2a0bb34005
commit 53a04740be
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fdbclient/SpecialKeySpace.actor.cpp
View File

@ -84,16 +84,16 @@ ACTOR Future<Standalone<RangeResultRef>> SpecialKeySpace::getRangeAggregationAct
wait(beginIter->value()->normalizeKeySelectorActor(beginIter->value(), ryw, &begin)); wait(beginIter->value()->normalizeKeySelectorActor(beginIter->value(), ryw, &begin));
begin.offset < 1 ? --beginIter : ++beginIter; begin.offset < 1 ? --beginIter : ++beginIter;
} }
// TODO : change to is FirstGreaterOrEqual
actualBeginOffset = begin.offset; actualBeginOffset = begin.offset;
if (beginIter == pks->impls.ranges().begin()) if (beginIter == pks->impls.ranges().begin())
begin.setKey(normalKeys.begin); begin.setKey(normalKeys.begin);
else if (beginIter == pks->impls.ranges().end()) else if (beginIter == pks->impls.ranges().end())
begin.setKey(normalKeys.end); begin.setKey(normalKeys.end);
if (begin.offset != 1) { if (!begin.isFirstGreaterOrEqual()) {
// The Key Selector points to key outside the whole special key space // The Key Selector points to key outside the whole special key space
TraceEvent(SevInfo, "IllegalBeginKeySelector") TraceEvent(SevInfo, "BeginKeySelectorPointsOutside")
.detail("TerminateKey", begin.getKey()) .detail("TerminateKey", begin.getKey())
.detail("TerminateOffset", begin.offset); .detail("TerminateOffset", begin.offset);
if (begin.offset < 1 && beginIter == pks->impls.ranges().begin()) if (begin.offset < 1 && beginIter == pks->impls.ranges().begin())
@ -109,16 +109,16 @@ ACTOR Future<Standalone<RangeResultRef>> SpecialKeySpace::getRangeAggregationAct
if (endIter->value() != nullptr) wait(endIter->value()->normalizeKeySelectorActor(endIter->value(), ryw, &end)); if (endIter->value() != nullptr) wait(endIter->value()->normalizeKeySelectorActor(endIter->value(), ryw, &end));
end.offset < 1 ? --endIter : ++endIter; end.offset < 1 ? --endIter : ++endIter;
} }
// TODO : change to is FirstGreaterOrEqual
actualEndOffset = end.offset; actualEndOffset = end.offset;
if (endIter == pks->impls.ranges().begin()) if (endIter == pks->impls.ranges().begin())
end.setKey(normalKeys.begin); end.setKey(normalKeys.begin);
else if (endIter == pks->impls.ranges().end()) else if (endIter == pks->impls.ranges().end())
end.setKey(normalKeys.end); end.setKey(normalKeys.end);
if (end.offset != 1) { if (!end.isFirstGreaterOrEqual()) {
// The Key Selector points to key outside the whole special key space // The Key Selector points to key outside the whole special key space
TraceEvent(SevInfo, "IllegalEndKeySelector") TraceEvent(SevInfo, "EndKeySelectorPointsOutside")
.detail("TerminateKey", end.getKey()) .detail("TerminateKey", end.getKey())
.detail("TerminateOffset", end.offset); .detail("TerminateOffset", end.offset);
if (end.offset < 1 && endIter == pks->impls.ranges().begin()) if (end.offset < 1 && endIter == pks->impls.ranges().begin())
@ -133,7 +133,9 @@ ACTOR Future<Standalone<RangeResultRef>> SpecialKeySpace::getRangeAggregationAct
TEST(true); TEST(true);
return RangeResultRef(false, false); return RangeResultRef(false, false);
} }
// If touches begin or end, return with readToBegin and readThroughEnd flags
if (beginIter == pks->impls.ranges().end() || endIter == pks->impls.ranges().begin()) { if (beginIter == pks->impls.ranges().end() || endIter == pks->impls.ranges().begin()) {
TEST(true);
return result; return result;
} }
state RangeMap<Key, SpecialKeyRangeBaseImpl*, KeyRangeRef>::Ranges ranges = state RangeMap<Key, SpecialKeyRangeBaseImpl*, KeyRangeRef>::Ranges ranges =
@ -199,7 +201,6 @@ Future<Standalone<RangeResultRef>> SpecialKeySpace::getRange(Reference<ReadYourW
TEST(true); // read limit 0 TEST(true); // read limit 0
return Standalone<RangeResultRef>(); return Standalone<RangeResultRef>();
} }
// TODO : transform limits like in NativeAPI.actor.cpp there
// ignore snapshot, which is not used // ignore snapshot, which is not used
return getRangeAggregationActor(this, ryw, begin, end, limits, reverse); return getRangeAggregationActor(this, ryw, begin, end, limits, reverse);
} }
@ -208,7 +209,7 @@ ACTOR Future<Optional<Value>> SpecialKeySpace::getActor(SpecialKeySpace* pks, Re
KeyRef key) { KeyRef key) {
// use getRange to workaround this // use getRange to workaround this
Standalone<RangeResultRef> result = wait(pks->getRange( Standalone<RangeResultRef> result = wait(pks->getRange(
ryw, KeySelector(firstGreaterOrEqual(key)), KeySelector(firstGreaterOrEqual(keyAfter(key))), GetRangeLimits())); ryw, KeySelector(firstGreaterOrEqual(key)), KeySelector(firstGreaterOrEqual(keyAfter(key))), GetRangeLimits(CLIENT_KNOBS->TOO_MANY)));
ASSERT(result.size() <= 1); ASSERT(result.size() <= 1);
if (result.size()) { if (result.size()) {
return Optional<Value>(result[0].value); return Optional<Value>(result[0].value);

3
fdbserver/workloads/SpecialKeySpaceCorrectness.actor.cpp
View File

@ -22,12 +22,9 @@ struct SpecialKeySpaceCorrectnessWorkload : TestWorkload {
int actorCount, minKeysPerRange, maxKeysPerRange, rangeCount, keyBytes, valBytes; int actorCount, minKeysPerRange, maxKeysPerRange, rangeCount, keyBytes, valBytes;
double testDuration, absoluteRandomProb, transactionsPerSecond; double testDuration, absoluteRandomProb, transactionsPerSecond;
PerfIntCounter wrongResults, keysCount; PerfIntCounter wrongResults, keysCount;
Reference<ReadYourWritesTransaction> ryw; // used to store all populated data Reference<ReadYourWritesTransaction> ryw; // used to store all populated data
std::vector<std::shared_ptr<SPSCTestImpl>> impls; std::vector<std::shared_ptr<SPSCTestImpl>> impls;
Standalone<VectorRef<KeyRangeRef>> keys; Standalone<VectorRef<KeyRangeRef>> keys;
SpecialKeySpaceCorrectnessWorkload(WorkloadContext const& wcx) SpecialKeySpaceCorrectnessWorkload(WorkloadContext const& wcx)