weaselbot/conflict-set
1
Fork 0
forked from weaselab/conflict-set
Code Pull Requests Activity

Remove unnecessary branch for interleaved range writes

Browse Source
This commit is contained in:
andrew
2024-12-11 21:53:44 -08:00
parent 7166811387
commit 2642d453dc
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ConflictSet.cpp
+1 -2
View File
@@ -4984,7 +4984,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
// encounter invalidated nodes. // encounter invalidated nodes.
for (auto *iter = firstRangeWrite; iter != nullptr; for (auto *iter = firstRangeWrite; iter != nullptr;
iter = iter->nextRangeWrite) { iter = iter->nextRangeWrite) {
if (iter->endInsertionPoint != nullptr) { assert(iter->endInsertionPoint != nullptr);
while (iter->insertionPoint->releaseDeferred) { while (iter->insertionPoint->releaseDeferred) {
iter->insertionPoint = iter->insertionPoint->forwardTo; iter->insertionPoint = iter->insertionPoint->forwardTo;
} }
@@ -4994,7 +4994,6 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
eraseInRange(iter->insertionPoint, iter->endInsertionPoint, eraseInRange(iter->insertionPoint, iter->endInsertionPoint,
&writeContext); &writeContext);
} }
}
if (count > kStackResultMax) [[unlikely]] { if (count > kStackResultMax) [[unlikely]] {
safe_free(context.results, count * sizeof(interleaved_insert::Result)); safe_free(context.results, count * sizeof(interleaved_insert::Result));