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:44:02 -07:00
parent 53a04740be
commit 1d790346c9
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fdbclient/SpecialKeySpace.actor.cpp
View File

@ -71,9 +71,6 @@ ACTOR Future<Standalone<RangeResultRef>> SpecialKeySpace::getRangeAggregationAct
state RangeMap<Key, SpecialKeyRangeBaseImpl*, KeyRangeRef>::Iterator iter;
state int actualBeginOffset;
state int actualEndOffset;
// make sure orEqual == false
begin.removeOrEqual(begin.arena());
end.removeOrEqual(end.arena());
// make sure offset == 1
state RangeMap<Key, SpecialKeyRangeBaseImpl*, KeyRangeRef>::Iterator beginIter =
@ -87,9 +84,9 @@ ACTOR Future<Standalone<RangeResultRef>> SpecialKeySpace::getRangeAggregationAct
actualBeginOffset = begin.offset;
if (beginIter == pks->impls.ranges().begin())
begin.setKey(normalKeys.begin);
begin.setKey(pks->range.begin);
else if (beginIter == pks->impls.ranges().end())
begin.setKey(normalKeys.end);
begin.setKey(pks->range.end);
if (!begin.isFirstGreaterOrEqual()) {
// The Key Selector points to key outside the whole special key space
@ -112,9 +109,9 @@ ACTOR Future<Standalone<RangeResultRef>> SpecialKeySpace::getRangeAggregationAct
actualEndOffset = end.offset;
if (endIter == pks->impls.ranges().begin())
end.setKey(normalKeys.begin);
end.setKey(pks->range.begin);
else if (endIter == pks->impls.ranges().end())
end.setKey(normalKeys.end);
end.setKey(pks->range.end);
if (!end.isFirstGreaterOrEqual()) {
// The Key Selector points to key outside the whole special key space
@ -201,6 +198,9 @@ Future<Standalone<RangeResultRef>> SpecialKeySpace::getRange(Reference<ReadYourW
TEST(true); // read limit 0
return Standalone<RangeResultRef>();
}
// make sure orEqual == false
begin.removeOrEqual(begin.arena());
end.removeOrEqual(end.arena());
// ignore snapshot, which is not used
return getRangeAggregationActor(this, ryw, begin, end, limits, reverse);
}

3
fdbclient/SpecialKeySpace.actor.h
View File

@ -45,9 +45,8 @@ public:
KeySelector end, GetRangeLimits limits, bool snapshot = false,
bool reverse = false);
SpecialKeySpace(KeyRef spaceStartKey = Key(), KeyRef spaceEndKey = allKeys.end) {
SpecialKeySpace(KeyRef spaceStartKey = Key(), KeyRef spaceEndKey = normalKeys.end) {
// Default value is nullptr, begin of KeyRangeMap is Key()
// TODO : check do we need stop key here
impls = KeyRangeMap<SpecialKeyRangeBaseImpl*>(nullptr, spaceEndKey);
range = KeyRangeRef(spaceStartKey, spaceEndKey);
}