weaselab/conflict-set
2
0
Fork 0
Code Issues 4 Packages Releases 13 Activity

Skip checking for partial key match if partial key len == 0

Browse Source 
This saves instructions according to cachegrind
This commit is contained in:
Andrew Noyes
2024-02-23 14:27:20 -08:00
parent db60782c48
commit 305c218888
1 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ConflictSet.cpp
View File

@@ -1411,11 +1411,14 @@ bool checkRangeRead(Node *n, std::span<const uint8_t> begin,
template <bool kBegin> template <bool kBegin>
[[nodiscard]] Node *insert(Node **self, std::span<const uint8_t> key, [[nodiscard]] Node *insert(Node **self, std::span<const uint8_t> key,
int64_t writeVersion, NodeAllocators *allocators) { int64_t writeVersion, NodeAllocators *allocators) {
for (;;) { for (;;) {
if ((*self)->partialKeyLen > 0) {
// Handle an existing partial key // Handle an existing partial key
int commonLen = std::min<int>((*self)->partialKeyLen, key.size()); int commonLen = std::min<int>((*self)->partialKeyLen, key.size());
int partialKeyIndex = longestCommonPrefixPartialKey((*self)->partialKey, int partialKeyIndex = longestCommonPrefixPartialKey(
key.data(), commonLen); (*self)->partialKey, key.data(), commonLen);
if (partialKeyIndex < (*self)->partialKeyLen) { if (partialKeyIndex < (*self)->partialKeyLen) {
auto *old = *self; auto *old = *self;
@@ -1437,6 +1440,7 @@ template <bool kBegin>
} }
key = key.subspan(partialKeyIndex, key.size() - partialKeyIndex); key = key.subspan(partialKeyIndex, key.size() - partialKeyIndex);
} else {
// Consider adding a partial key // Consider adding a partial key
if ((*self)->numChildren == 0 && !(*self)->entryPresent) { if ((*self)->numChildren == 0 && !(*self)->entryPresent) {
(*self)->partialKeyLen = (*self)->partialKeyLen =
@@ -1445,6 +1449,7 @@ template <bool kBegin>
key = key.subspan((*self)->partialKeyLen, key = key.subspan((*self)->partialKeyLen,
key.size() - (*self)->partialKeyLen); key.size() - (*self)->partialKeyLen);
} }
}
if constexpr (kBegin) { if constexpr (kBegin) {
(*self)->maxVersion = std::max((*self)->maxVersion, writeVersion); (*self)->maxVersion = std::max((*self)->maxVersion, writeVersion);
@@ -1458,10 +1463,10 @@ template <bool kBegin>
(*self)->maxVersion = std::max((*self)->maxVersion, writeVersion); (*self)->maxVersion = std::max((*self)->maxVersion, writeVersion);
} }
auto &child = getOrCreateChild((*self), key.front(), allocators); auto &child = getOrCreateChild(*self, key.front(), allocators);
if (!child) { if (!child) {
child = allocators->node4.allocate(); child = allocators->node4.allocate();
child->parent = (*self); child->parent = *self;
child->parentsIndex = key.front(); child->parentsIndex = key.front();
child->maxVersion = child->maxVersion =
kBegin ? writeVersion : std::numeric_limits<int64_t>::lowest(); kBegin ? writeVersion : std::numeric_limits<int64_t>::lowest();