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

Simplify slightly in checkMaxBetweenExclusive
Some checks failed
Tests / Clang total: 2500, passed: 2500
Details
Clang |Total|New|Outstanding|Fixed|Trend |:-:|:-:|:-:|:-:|:-: |0|0|0|0|:clap:
Details
weaselab/conflict-set/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Andrew Noyes
2024-08-17 14:28:36 -07:00
parent a3cc14c807
commit 3634b6a59b
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ConflictSet.cpp
View File

@@ -2340,10 +2340,8 @@ bool checkMaxBetweenExclusiveImpl(Node *n, int begin, int end,
int c = self->bitSet.firstSetGeq(begin + 1); int c = self->bitSet.firstSetGeq(begin + 1);
if (c >= 0 && c < end) { if (c >= 0 && c < end) {
auto *child = self->children[self->index[c]]; auto *child = self->children[self->index[c]];
if (child->entryPresent) { if (child->entryPresent && child->entry.rangeVersion > readVersion) {
if (!(child->entry.rangeVersion <= readVersion)) { return false;
return false;
};
} }
begin = c; begin = c;
} else { } else {
@@ -2376,10 +2374,8 @@ bool checkMaxBetweenExclusiveImpl(Node *n, int begin, int end,
int c = self->bitSet.firstSetGeq(begin + 1); int c = self->bitSet.firstSetGeq(begin + 1);
if (c >= 0 && c < end) { if (c >= 0 && c < end) {
auto *child = self->children[c]; auto *child = self->children[c];
if (child->entryPresent) { if (child->entryPresent && child->entry.rangeVersion > readVersion) {
if (!(child->entry.rangeVersion <= readVersion)) { return false;
return false;
};
} }
begin = c; begin = c;
} else { } else {
@@ -2422,9 +2418,7 @@ bool checkMaxBetweenExclusiveImpl(Node *n, int begin, int end,
} }
} }
// Check inner pages // Check inner pages
const int innerPageBegin = (begin >> Node256::kMaxOfMaxShift) + 1; return scan16<kAVX512>(self->maxOfMax, firstPage + 1, lastPage,
const int innerPageEnd = (end - 1) >> Node256::kMaxOfMaxShift;
return scan16<kAVX512>(self->maxOfMax, innerPageBegin, innerPageEnd,
readVersion); readVersion);
} }
default: // GCOVR_EXCL_LINE default: // GCOVR_EXCL_LINE