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

Fix compiler warning

Browse Source
This commit is contained in:
Andrew Noyes
2024-08-07 16:25:49 -07:00
parent ded6e7fc2c
commit 2fa954ed36
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ConflictSet.cpp
View File

@@ -2915,8 +2915,7 @@ checkMaxBetweenExclusiveImpl<true>(Node *n, int begin, int end,
// Consume the partial key of `self` (which must exist), and update `self` and // Consume the partial key of `self` (which must exist), and update `self` and
// `key` such that `self` is along the search path of `key` // `key` such that `self` is along the search path of `key`
void consumePartialKey(Node *&self, std::span<const uint8_t> &key, void consumePartialKey(Node *&self, std::span<const uint8_t> &key,
InternalVersionT writeVersion, WriteContext *tls, InternalVersionT writeVersion, WriteContext *tls) {
ConflictSet::Impl *impl) {
assert(self->partialKeyLen > 0); assert(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());
@@ -2968,7 +2967,7 @@ Node *insert(Node **self, std::span<const uint8_t> key,
ConflictSet::Impl *impl) { ConflictSet::Impl *impl) {
if ((*self)->partialKeyLen > 0) { if ((*self)->partialKeyLen > 0) {
consumePartialKey(*self, key, writeVersion, tls, impl); consumePartialKey(*self, key, writeVersion, tls);
} }
assert(maxVersion(*self, impl) <= writeVersion); assert(maxVersion(*self, impl) <= writeVersion);
setMaxVersion(*self, impl, writeVersion); setMaxVersion(*self, impl, writeVersion);
@@ -2996,7 +2995,7 @@ Node *insert(Node **self, std::span<const uint8_t> key,
key = key.subspan(1, key.size() - 1); key = key.subspan(1, key.size() - 1);
if ((*self)->partialKeyLen > 0) { if ((*self)->partialKeyLen > 0) {
consumePartialKey(*self, key, writeVersion, tls, impl); consumePartialKey(*self, key, writeVersion, tls);
assert(maxVersion(*self, impl) <= writeVersion); assert(maxVersion(*self, impl) <= writeVersion);
setMaxVersion(*self, impl, writeVersion); setMaxVersion(*self, impl, writeVersion);
} }