From f2678de81124c14c4ba855adc2a2748c55cd3596 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew@weaselab.dev>
Date: Fri, 19 Apr 2024 11:00:43 -0700
Subject: [PATCH] Preserve version in clearConflictSet in fdb patch

Closes #24
---
 fdb-patch.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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