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

Non-recursive insert

Browse Source
This commit is contained in:
Andrew Noyes
2024-01-23 10:41:20 -08:00
parent d68bd52122
commit 3a720ca3ec
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ConflictSet.cpp
View File

@@ -905,22 +905,26 @@ void debugPrintDot(FILE *file, Node *node) {
fprintf(file, "}\n");
}
static Node *insert(Node *&self, std::span<const uint8_t> key,
int64_t writeVersion) {
self->maxVersion = writeVersion;
if (key.size() == 0) {
self->entryPresent = true;
self->entry.pointVersion = writeVersion;
// TODO set correct rangeVersion
return self;
static void insert(Node **self_, std::span<const uint8_t> key,
int64_t writeVersion) {
for (;;) {
auto &self = *self_;
self->maxVersion = writeVersion;
if (key.size() == 0) {
self->entryPresent = true;
self->entry.pointVersion = writeVersion;
// TODO set correct rangeVersion
return;
}
auto &child = getOrCreateChild(self, key.front());
if (!child) {
child = newNode();
child->parent = self;
child->parentsIndex = key.front();
}
self_ = &child;
key = key.subspan(1, key.size() - 1);
}
auto &child = getOrCreateChild(self, key.front());
if (!child) {
child = newNode();
child->parent = self;
child->parentsIndex = key.front();
}
return insert(child, key.subspan(1, key.size() - 1), writeVersion);
}
struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
@@ -930,7 +934,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
const auto &w = writes[i];
// TODO support non-point writes
assert(w.end.len == 0);
insert(root, std::span<const uint8_t>(w.begin.p, w.begin.len),
insert(&root, std::span<const uint8_t>(w.begin.p, w.begin.len),
w.writeVersion);
}
}