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

Bug fixes, moveFirst/Last didn't handle tree size of 1 correctly.

This commit is contained in:
Steve Atherton 2021-04-26 23:14:04 -07:00
parent 65cfd31221
commit d208d3f3ec
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fdbserver/DeltaTree.h
View File

@ -1003,11 +1003,11 @@ public:
}
};
#pragma pack(pop)
struct DecodeCache : FastAllocated<DecodeCache> {
struct DecodeCache : FastAllocated<DecodeCache>, ReferenceCounted<DecodeCache> {
DecodeCache(const T& lowerBound = T(), const T& upperBound = T())
: lowerBound(arena, lowerBound), upperBound(arena, upperBound) {
decodedNodes.reserve(10);
printf("DecodedNode size: %d\n", sizeof(DecodedNode));
deltatree_printf("DecodedNode size: %d\n", sizeof(DecodedNode));
}
Arena arena;
@ -1100,7 +1100,7 @@ public:
const T get() const { return get(cache->get(nodeIndex)); }
// const T getOrUpperBound() const { return valid() ? node->item : *mirror->upperBound(); }
const T getOrUpperBound() const { return valid() ? get() : cache->upperBound; }
bool operator==(const Cursor& rhs) const { return nodeIndex == rhs.nodeIndex; }
bool operator!=(const Cursor& rhs) const { return nodeIndex != rhs.nodeIndex; }
@ -1229,11 +1229,9 @@ public:
int nIndex = rootIndex();
deltatree_printf("moveFirst start %s\n", toString().c_str());
while (nIndex != -1) {
nodeIndex = nIndex;
deltatree_printf("moveFirst moved %s\n", toString().c_str());
nIndex = getLeftChildIndex(nIndex);
if (nIndex != -1) {
nodeIndex = nIndex;
deltatree_printf("moveFirst move %s\n", toString().c_str());
}
}
return _hideDeletedForward();
}
@ -1243,11 +1241,9 @@ public:
int nIndex = rootIndex();
deltatree_printf("moveLast start %s\n", toString().c_str());
while (nIndex != -1) {
nodeIndex = nIndex;
deltatree_printf("moveLast moved %s\n", toString().c_str());
nIndex = getRightChildIndex(nIndex);
if (nIndex != -1) {
nodeIndex = nIndex;
deltatree_printf("moveLast move %s\n", toString().c_str());
}
}
return _hideDeletedBackward();
}