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

Remove longestCommonPrefixPartialKey

Browse Source
This commit is contained in:
Andrew Noyes
2024-03-08 17:14:45 -08:00
parent 06fcb2531e
commit 34430dbbe7
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ConflictSet.cpp
View File

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