weaselab/versioned-map
2
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Logically revert 0071600

Browse Source 
Return mutation intersecting query key if it exists
This commit is contained in:
Andrew Noyes
2024-05-16 16:09:39 -07:00
parent d0bfdcb07d
commit 3819b83d78
3 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Facade.h
View File

@@ -35,6 +35,14 @@ struct Facade {
return result;
}
// Make sure versionedIter[1] param1 is >= `end`
if (versionedIter[1] != facade->versioned.end(version)) {
auto m = *versionedIter[1];
if (String(m.param1, m.param1Len) < end) {
++versionedIter[1];
}
}
static const uint8_t zero_[] = {0};
static const String zero{zero_, 1};
@@ -43,11 +51,10 @@ struct Facade {
weaselab::VersionedMap::Iterator endIter = versionedIter[0];
String readUntil = end;
// Make *iter intersect [begin, end)
--iter;
for (;; --iter) {
do {
--iter;
auto m = *iter;
const auto mBegin = String(m.param1, m.param1Len);
const auto mEnd =
m.type == weaselab::VersionedMap::Set || m.param2Len == 0
? String(m.param1, m.param1Len) + zero
@@ -58,31 +65,31 @@ struct Facade {
}
switch (m.type) {
case weaselab::VersionedMap::Set: {
result.emplace_back(String(m.param1, m.param1Len),
String(m.param2, m.param2Len));
result.emplace_back(mBegin, String(m.param2, m.param2Len));
--limit;
if (limit == 0) {
return result;
}
readUntil = String(m.param1, m.param1Len);
readUntil = mBegin;
} break;
case weaselab::VersionedMap::Clear:
readUntil = String(m.param1, m.param1Len);
readUntil = mBegin;
break;
}
if (iter == endIter) {
break;
}
}
} while (iter != endIter);
facade->unversionedRead(begin, readUntil, limit, true, result);
return result;
} else {
weaselab::VersionedMap::Iterator iter = versionedIter[0];
weaselab::VersionedMap::Iterator endIter = versionedIter[1];
String readFrom = begin;
for (; iter != endIter; ++iter) {
for (auto iter = versionedIter[0]; iter != versionedIter[1]; ++iter) {
auto m = *iter;
const auto mBegin = String(m.param1, m.param1Len);
const auto mEnd =
m.type == weaselab::VersionedMap::Set || m.param2Len == 0
? String(m.param1, m.param1Len) + zero
: String(m.param2, m.param2Len);
facade->unversionedRead(readFrom, mBegin, limit, false, result);
if (limit == 0) {
return result;
@@ -94,13 +101,14 @@ struct Facade {
if (limit == 0) {
return result;
}
readFrom = mBegin + zero;
readFrom = mEnd;
} break;
case weaselab::VersionedMap::Clear:
readFrom = String(m.param2, m.param2Len);
readFrom = mEnd;
break;
}
}
facade->unversionedRead(readFrom, end, limit, false, result);
return result;
}