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

Prepare to add fdb implementation

Browse Source 
Fixes a end iter deref and remove rpath from test
This commit is contained in:
Andrew Noyes
2024-05-28 13:22:15 -07:00
parent 37f972145e
commit 42298a911a
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Facade.h
View File

@@ -44,9 +44,6 @@ struct Facade {
return result;
}
static const uint8_t zero_[] = {0};
static const String zero{zero_, 1};
if (reverse) {
weaselab::VersionedMap::Iterator iter = versionedIter[1];
weaselab::VersionedMap::Iterator endIter = versionedIter[0];
@@ -123,13 +120,11 @@ struct Facade {
m.type == weaselab::VersionedMap::Set || m.param2Len == 0
? weaselab::VersionedMap::Key{m.param1, m.param1Len + 1}
: weaselab::VersionedMap::Key{m.param2, m.param2Len};
auto c = unversionedIter->first <=> mBegin;
for (; unversionedIter != facade->unversioned.end() && c < 0 &&
limit > 0;) {
for (; unversionedIter != facade->unversioned.end() &&
(unversionedIter->first <=> mBegin) < 0 && limit > 0;) {
result.push_back(*unversionedIter);
--limit;
++unversionedIter;
c = unversionedIter->first <=> mBegin;
}
if (limit == 0) {
return result;
@@ -147,7 +142,8 @@ struct Facade {
break;
}
if (m.type == weaselab::VersionedMap::Set || m.param2Len == 0) {
if (unversionedIter != facade->unversioned.end() && c == 0) {
if (unversionedIter != facade->unversioned.end() &&
(unversionedIter->first <=> mBegin) == 0) {
++unversionedIter;
}
assert(unversionedIter ==