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

Remove redundant int conversions

Browse Source
This commit is contained in:
Andrew Noyes
2024-10-30 11:48:55 -07:00
parent 3b858551f3
commit b6bfc6f48d
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
ConflictSet.cpp
View File

@@ -2872,7 +2872,7 @@ bool checkRangeStartsWith(NodeT *nTyped, TrivialSpan key, int begin, int end,
goto downLeftSpine; goto downLeftSpine;
} }
} }
assert(n->partialKeyLen > int(remaining.size())); assert(n->partialKeyLen > remaining.size());
if (begin < n->partialKey()[remaining.size()] && if (begin < n->partialKey()[remaining.size()] &&
n->partialKey()[remaining.size()] < end) { n->partialKey()[remaining.size()] < end) {
if (n->entryPresent && n->entry.rangeVersion > readVersion) { if (n->entryPresent && n->entry.rangeVersion > readVersion) {
@@ -3177,7 +3177,7 @@ void addWriteRange(TaggedNodePointer &root, TrivialSpan begin, TrivialSpan end,
ConflictSet::Impl *impl) { ConflictSet::Impl *impl) {
int lcp = longestCommonPrefix(begin.data(), end.data(), int lcp = longestCommonPrefix(begin.data(), end.data(),
std::min(begin.size(), end.size())); std::min(begin.size(), end.size()));
if (lcp == int(begin.size()) && end.size() == begin.size() + 1 && if (lcp == begin.size() && end.size() == begin.size() + 1 &&
end.back() == 0) { end.back() == 0) {
return addPointWrite(root, begin, writeVersion, writeContext); return addPointWrite(root, begin, writeVersion, writeContext);
} }
@@ -3235,7 +3235,7 @@ Node *firstGeqPhysical(Node *n, const TrivialSpan key) {
if (commonLen == n->partialKeyLen) { if (commonLen == n->partialKeyLen) {
// partial key matches // partial key matches
remaining = remaining.subspan(commonLen, remaining.size() - commonLen); remaining = remaining.subspan(commonLen, remaining.size() - commonLen);
} else if (n->partialKeyLen > int(remaining.size())) { } else if (n->partialKeyLen > remaining.size()) {
// n is the first physical node greater than remaining, and there's no // n is the first physical node greater than remaining, and there's no
// eq node // eq node
return n; return n;
@@ -3411,7 +3411,7 @@ template <class NodeT> void iter(Job *job, Context *context) {
if (commonLen == n->partialKeyLen) { if (commonLen == n->partialKeyLen) {
// partial key matches // partial key matches
job->begin = job->begin.subspan(commonLen, job->begin.size() - commonLen); job->begin = job->begin.subspan(commonLen, job->begin.size() - commonLen);
} else if (n->partialKeyLen > int(job->begin.size())) [[unlikely]] { } else if (n->partialKeyLen > job->begin.size()) [[unlikely]] {
// n is the first physical node greater than remaining, and there's no // n is the first physical node greater than remaining, and there's no
// eq node // eq node
MUSTTAIL return down_left_spine<NodeT>(job, context); MUSTTAIL return down_left_spine<NodeT>(job, context);
@@ -3533,7 +3533,7 @@ template <class NodeT> void iter(Job *job, Context *context) {
if (commonLen == n->partialKeyLen) { if (commonLen == n->partialKeyLen) {
// partial key matches // partial key matches
job->begin = job->begin.subspan(commonLen, job->begin.size() - commonLen); job->begin = job->begin.subspan(commonLen, job->begin.size() - commonLen);
} else if (n->partialKeyLen > int(job->begin.size())) [[unlikely]] { } else if (n->partialKeyLen > job->begin.size()) [[unlikely]] {
// n is the first physical node greater than remaining, and there's no // n is the first physical node greater than remaining, and there's no
// eq node. All physical nodes that start with prefix are reachable from // eq node. All physical nodes that start with prefix are reachable from
// n. // n.
@@ -3631,14 +3631,14 @@ static Continuation rightSideIterTable[] = {
PRESERVE_NONE void begin(Job *job, Context *context) { PRESERVE_NONE void begin(Job *job, Context *context) {
job->lcp = longestCommonPrefix(job->begin.data(), job->end.data(), job->lcp = longestCommonPrefix(job->begin.data(), job->end.data(),
std::min(job->begin.size(), job->end.size())); std::min(job->begin.size(), job->end.size()));
if (job->lcp == int(job->begin.size()) && if (job->lcp == job->begin.size() &&
job->end.size() == job->begin.size() + 1 && job->end.back() == 0) { job->end.size() == job->begin.size() + 1 && job->end.back() == 0) {
// Call directly since we have nothing to prefetch // Call directly since we have nothing to prefetch
MUSTTAIL return check::point_read_state_machine::begin(job, context); MUSTTAIL return check::point_read_state_machine::begin(job, context);
} }
if (job->lcp == int(job->begin.size() - 1) && if (job->lcp == job->begin.size() - 1 &&
job->end.size() == job->begin.size() && job->end.size() == job->begin.size() &&
int(job->begin.back()) + 1 == int(job->end.back())) { job->begin.back() + 1 == job->end.back()) {
// Call directly since we have nothing to prefetch // Call directly since we have nothing to prefetch
MUSTTAIL return check::prefix_read_state_machine::begin(job, context); MUSTTAIL return check::prefix_read_state_machine::begin(job, context);
} }
@@ -3721,12 +3721,12 @@ PRESERVE_NONE void done_common_prefix_iter(Job *job, Context *context) {
const int consumed = job->lcp - job->remaining.size(); const int consumed = job->lcp - job->remaining.size();
assume(consumed >= 0); assume(consumed >= 0);
job->begin = job->begin.subspan(consumed, int(job->begin.size()) - consumed); job->begin = job->begin.subspan(consumed, job->begin.size() - consumed);
job->end = job->end.subspan(consumed, int(job->end.size()) - consumed); job->end = job->end.subspan(consumed, job->end.size() - consumed);
job->lcp -= consumed; job->lcp -= consumed;
job->commonPrefixNode = n; job->commonPrefixNode = n;
if (job->lcp == int(job->begin.size())) { if (job->lcp == job->begin.size()) {
job->remaining = job->end; job->remaining = job->end;
if (job->lcp == 0) { if (job->lcp == 0) {
if (n->entryPresent && n->entry.pointVersion > job->readVersion) { if (n->entryPresent && n->entry.pointVersion > job->readVersion) {
@@ -3855,7 +3855,7 @@ PRESERVE_NONE void left_side_iter(Job *job, Context *context) {
// partial key matches // partial key matches
job->remaining = job->remaining =
job->remaining.subspan(commonLen, job->remaining.size() - commonLen); job->remaining.subspan(commonLen, job->remaining.size() - commonLen);
} else if (n->partialKeyLen > int(job->remaining.size())) { } else if (n->partialKeyLen > job->remaining.size()) {
if (n->entryPresent && n->entry.rangeVersion > job->readVersion) { if (n->entryPresent && n->entry.rangeVersion > job->readVersion) {
job->setResult(false); job->setResult(false);
MUSTTAIL return complete(job, context); MUSTTAIL return complete(job, context);
@@ -4005,7 +4005,7 @@ PRESERVE_NONE void right_side_iter(Job *job, Context *context) {
// partial key matches // partial key matches
job->remaining = job->remaining =
job->remaining.subspan(commonLen, job->remaining.size() - commonLen); job->remaining.subspan(commonLen, job->remaining.size() - commonLen);
} else if (n->partialKeyLen > int(job->remaining.size())) { } else if (n->partialKeyLen > job->remaining.size()) {
MUSTTAIL return down_left_spine<NodeT>(job, context); MUSTTAIL return down_left_spine<NodeT>(job, context);
} }
} }
@@ -4288,7 +4288,7 @@ void Job::init(Context *context, int index) {
commonPrefixLen = longestCommonPrefix(begin.data(), end.data(), commonPrefixLen = longestCommonPrefix(begin.data(), end.data(),
std::min(begin.size(), end.size())); std::min(begin.size(), end.size()));
if (commonPrefixLen == int(begin.size()) && end.size() == begin.size() + 1 && if (commonPrefixLen == begin.size() && end.size() == begin.size() + 1 &&
end.back() == 0) { end.back() == 0) {
goto pointWrite; goto pointWrite;
} }
@@ -4378,7 +4378,7 @@ bool checkPointRead(Node *n, const TrivialSpan key,
if (commonLen == n->partialKeyLen) { if (commonLen == n->partialKeyLen) {
// partial key matches // partial key matches
remaining = remaining.subspan(commonLen, remaining.size() - commonLen); remaining = remaining.subspan(commonLen, remaining.size() - commonLen);
} else if (n->partialKeyLen > int(remaining.size())) { } else if (n->partialKeyLen > remaining.size()) {
// n is the first physical node greater than remaining, and there's no // n is the first physical node greater than remaining, and there's no
// eq node // eq node
goto downLeftSpine; goto downLeftSpine;
@@ -4449,7 +4449,7 @@ bool checkPrefixRead(Node *n, const TrivialSpan key,
if (commonLen == n->partialKeyLen) { if (commonLen == n->partialKeyLen) {
// partial key matches // partial key matches
remaining = remaining.subspan(commonLen, remaining.size() - commonLen); remaining = remaining.subspan(commonLen, remaining.size() - commonLen);
} else if (n->partialKeyLen > int(remaining.size())) { } else if (n->partialKeyLen > remaining.size()) {
// n is the first physical node greater than remaining, and there's no // n is the first physical node greater than remaining, and there's no
// eq node. All physical nodes that start with prefix are reachable from // eq node. All physical nodes that start with prefix are reachable from
// n. // n.
@@ -4540,7 +4540,7 @@ bool checkRangeLeftSide(Node *n, TrivialSpan key, int prefixLen,
if (commonLen == n->partialKeyLen) { if (commonLen == n->partialKeyLen) {
// partial key matches // partial key matches
remaining = remaining.subspan(commonLen, remaining.size() - commonLen); remaining = remaining.subspan(commonLen, remaining.size() - commonLen);
} else if (n->partialKeyLen > int(remaining.size())) { } else if (n->partialKeyLen > remaining.size()) {
assert(searchPathLen >= prefixLen); assert(searchPathLen >= prefixLen);
if (n->entryPresent && n->entry.rangeVersion > readVersion) { if (n->entryPresent && n->entry.rangeVersion > readVersion) {
return false; return false;
@@ -4567,7 +4567,7 @@ bool checkRangeRightSide(Node *n, TrivialSpan key, int prefixLen,
int searchPathLen = 0; int searchPathLen = 0;
for (;; ++readContext->range_read_iterations_accum) { for (;; ++readContext->range_read_iterations_accum) {
assert(searchPathLen <= int(key.size())); assert(searchPathLen <= key.size());
if (remaining.size() == 0) { if (remaining.size() == 0) {
goto downLeftSpine; goto downLeftSpine;
} }
@@ -4623,7 +4623,7 @@ bool checkRangeRightSide(Node *n, TrivialSpan key, int prefixLen,
if (commonLen == n->partialKeyLen) { if (commonLen == n->partialKeyLen) {
// partial key matches // partial key matches
remaining = remaining.subspan(commonLen, remaining.size() - commonLen); remaining = remaining.subspan(commonLen, remaining.size() - commonLen);
} else if (n->partialKeyLen > int(remaining.size())) { } else if (n->partialKeyLen > remaining.size()) {
goto downLeftSpine; goto downLeftSpine;
} }
} }
@@ -4657,12 +4657,12 @@ bool checkRangeRead(Node *n, TrivialSpan begin, TrivialSpan end,
InternalVersionT readVersion, ReadContext *readContext) { InternalVersionT readVersion, ReadContext *readContext) {
int lcp = longestCommonPrefix(begin.data(), end.data(), int lcp = longestCommonPrefix(begin.data(), end.data(),
std::min(begin.size(), end.size())); std::min(begin.size(), end.size()));
if (lcp == int(begin.size()) && end.size() == begin.size() + 1 && if (lcp == begin.size() && end.size() == begin.size() + 1 &&
end.back() == 0) { end.back() == 0) {
return checkPointRead(n, begin, readVersion, readContext); return checkPointRead(n, begin, readVersion, readContext);
} }
if (lcp == int(begin.size() - 1) && end.size() == begin.size() && if (lcp == begin.size() - 1 && end.size() == begin.size() &&
int(begin.back()) + 1 == int(end.back())) { begin.back() + 1 == end.back()) {
return checkPrefixRead(n, begin, readVersion, readContext); return checkPrefixRead(n, begin, readVersion, readContext);
} }
@@ -4708,11 +4708,11 @@ bool checkRangeRead(Node *n, TrivialSpan begin, TrivialSpan end,
const int consumed = lcp - remaining.size(); const int consumed = lcp - remaining.size();
assume(consumed >= 0); assume(consumed >= 0);
begin = begin.subspan(consumed, int(begin.size()) - consumed); begin = begin.subspan(consumed, begin.size() - consumed);
end = end.subspan(consumed, int(end.size()) - consumed); end = end.subspan(consumed, end.size() - consumed);
lcp -= consumed; lcp -= consumed;
if (lcp == int(begin.size())) { if (lcp == begin.size()) {
return checkRangeRightSide(n, end, lcp, readVersion, readContext); return checkRangeRightSide(n, end, lcp, readVersion, readContext);
} }
@@ -5399,7 +5399,7 @@ Node *firstGeqLogical(Node *n, const TrivialSpan key) {
if (commonLen == n->partialKeyLen) { if (commonLen == n->partialKeyLen) {
// partial key matches // partial key matches
remaining = remaining.subspan(commonLen, remaining.size() - commonLen); remaining = remaining.subspan(commonLen, remaining.size() - commonLen);
} else if (n->partialKeyLen > int(remaining.size())) { } else if (n->partialKeyLen > remaining.size()) {
// n is the first physical node greater than remaining, and there's no // n is the first physical node greater than remaining, and there's no
// eq node // eq node
goto downLeftSpine; goto downLeftSpine;