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

Preserve version in clearConflictSet in fdb patch

Browse Source 
Closes #24
This commit is contained in:
Andrew Noyes
2024-04-19 11:00:43 -07:00
parent 4d7ad075b2
commit f2678de811
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fdb-patch.txt
View File

@@ -13,7 +13,7 @@ index 3f353c2ef..074a18628 100644
# Setup the Swift sources in FDBServer. # Setup the Swift sources in FDBServer.
include(FindSwiftLibs) include(FindSwiftLibs)
diff --git a/fdbserver/SkipList.cpp b/fdbserver/SkipList.cpp diff --git a/fdbserver/SkipList.cpp b/fdbserver/SkipList.cpp
index b48d32c6b..da99e03aa 100644 index b48d32c6b..c83ae4f7a 100644
--- a/fdbserver/SkipList.cpp --- a/fdbserver/SkipList.cpp
+++ b/fdbserver/SkipList.cpp +++ b/fdbserver/SkipList.cpp
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
@@ -53,11 +53,10 @@ index b48d32c6b..da99e03aa 100644
return new ConflictSet; return new ConflictSet;
} }
void clearConflictSet(ConflictSet* cs, Version v) { void clearConflictSet(ConflictSet* cs, Version v) {
- SkipList(v).swap(cs->versionHistory);
+#if USE_RADIX_TREE +#if USE_RADIX_TREE
+ cs->versionHistory = weaselab::ConflictSet{ 0 }; + cs->versionHistory = weaselab::ConflictSet{ v };
+#else +#else
+ SkipList().swap(cs->versionHistory); SkipList(v).swap(cs->versionHistory);
+#endif +#endif
} }
void destroyConflictSet(ConflictSet* cs) { void destroyConflictSet(ConflictSet* cs) {