diff --git a/ConflictSet.cpp b/ConflictSet.cpp index 1f3843b..e476e26 100644 --- a/ConflictSet.cpp +++ b/ConflictSet.cpp @@ -938,11 +938,6 @@ bytes: return i; } -int longestCommonPrefixPartialKey(const uint8_t *ap, const uint8_t *bp, - int cl) { - return longestCommonPrefix(ap, bp, cl); -} - // Performs a physical search for remaining struct SearchStepWise { Node *n; @@ -963,8 +958,7 @@ struct SearchStepWise { return true; } int cl = std::min(child->partialKeyLen, remaining.size() - 1); - int i = longestCommonPrefixPartialKey(child->partialKey(), - remaining.data() + 1, cl); + int i = longestCommonPrefix(child->partialKey(), remaining.data() + 1, cl); if (i != child->partialKeyLen) { return true; } @@ -1020,8 +1014,7 @@ bool checkPointRead(Node *n, const std::span key, if (n->partialKeyLen > 0) { int commonLen = std::min(n->partialKeyLen, remaining.size()); - int i = longestCommonPrefixPartialKey(n->partialKey(), remaining.data(), - commonLen); + int i = longestCommonPrefix(n->partialKey(), remaining.data(), commonLen); if (i < commonLen) { auto c = n->partialKey()[i] <=> remaining[i]; if (c > 0) { @@ -1168,8 +1161,7 @@ bool checkRangeStartsWith(Node *n, std::span key, int begin, if (n->partialKeyLen > 0) { int commonLen = std::min(n->partialKeyLen, remaining.size()); - int i = longestCommonPrefixPartialKey(n->partialKey(), remaining.data(), - commonLen); + int i = longestCommonPrefix(n->partialKey(), remaining.data(), commonLen); if (i < commonLen) { auto c = n->partialKey()[i] <=> remaining[i]; if (c > 0) { @@ -1275,8 +1267,8 @@ struct CheckRangeLeftSide { if (n->partialKeyLen > 0) { int commonLen = std::min(n->partialKeyLen, remaining.size()); - int i = longestCommonPrefixPartialKey(n->partialKey(), remaining.data(), - commonLen); + int i = + longestCommonPrefix(n->partialKey(), remaining.data(), commonLen); searchPathLen += i; if (i < commonLen) { auto c = n->partialKey()[i] <=> remaining[i]; @@ -1413,8 +1405,8 @@ struct CheckRangeRightSide { if (n->partialKeyLen > 0) { int commonLen = std::min(n->partialKeyLen, remaining.size()); - int i = longestCommonPrefixPartialKey(n->partialKey(), remaining.data(), - commonLen); + int i = + longestCommonPrefix(n->partialKey(), remaining.data(), commonLen); searchPathLen += i; if (i < commonLen) { ++searchPathLen; @@ -1572,8 +1564,8 @@ template if ((*self)->partialKeyLen > 0) { // Handle an existing partial key int commonLen = std::min((*self)->partialKeyLen, key.size()); - int partialKeyIndex = longestCommonPrefixPartialKey( - (*self)->partialKey(), key.data(), commonLen); + int partialKeyIndex = + longestCommonPrefix((*self)->partialKey(), key.data(), commonLen); if (partialKeyIndex < (*self)->partialKeyLen) { auto *old = *self; int64_t oldMaxVersion = maxVersion(old, impl); @@ -1696,8 +1688,8 @@ void addWriteRange(Node *&root, int64_t oldestVersion, if (int(remaining.size()) <= n->partialKeyLen) { break; } - int i = longestCommonPrefixPartialKey(n->partialKey(), remaining.data(), - n->partialKeyLen); + int i = longestCommonPrefix(n->partialKey(), remaining.data(), + n->partialKeyLen); if (i != n->partialKeyLen) { break; } @@ -1804,8 +1796,7 @@ Iterator firstGeq(Node *n, const std::span key) { if (n->partialKeyLen > 0) { int commonLen = std::min(n->partialKeyLen, remaining.size()); - int i = longestCommonPrefixPartialKey(n->partialKey(), remaining.data(), - commonLen); + int i = longestCommonPrefix(n->partialKey(), remaining.data(), commonLen); if (i < commonLen) { auto c = n->partialKey()[i] <=> remaining[i]; if (c > 0) {