From 00389936a8397876753f3456eb119bd0b5e5da42 Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Wed, 6 Mar 2024 18:25:23 -0800 Subject: [PATCH] Update fdb patch --- fdb-patch.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/fdb-patch.txt b/fdb-patch.txt index dd6b254..7d042c8 100644 --- a/fdb-patch.txt +++ b/fdb-patch.txt @@ -1,4 +1,4 @@ -diff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt +giff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt index 3f353c2ef..cd0834761 100644 --- a/fdbserver/CMakeLists.txt +++ b/fdbserver/CMakeLists.txt @@ -26,7 +26,7 @@ index bf4118f5f..d3b4eaad8 100644 // Use LogSystem as backend for txnStateStore. However, the real commit diff --git a/fdbserver/SkipList.cpp b/fdbserver/SkipList.cpp -index b48d32c6b..269acfc99 100644 +index b48d32c6b..da106b5d2 100644 --- a/fdbserver/SkipList.cpp +++ b/fdbserver/SkipList.cpp @@ -25,6 +25,7 @@ @@ -141,7 +141,7 @@ index b48d32c6b..269acfc99 100644 } void ConflictBatch::addConflictRanges(Version now, -@@ -1015,7 +1056,23 @@ void ConflictBatch::mergeWriteConflictRanges(Version now) { +@@ -1015,7 +1056,22 @@ void ConflictBatch::mergeWriteConflictRanges(Version now) { if (combinedWriteConflictRanges.empty()) return; @@ -151,21 +151,20 @@ index b48d32c6b..269acfc99 100644 + + for (int i = 0; i < combinedWriteConflictRanges.size(); ++i) { + auto& write = writes[i]; -+ write.writeVersion = now; + write.begin.p = combinedWriteConflictRanges[i].first.begin(); + write.begin.len = combinedWriteConflictRanges[i].first.size(); + write.end.p = combinedWriteConflictRanges[i].second.begin(); + write.end.len = combinedWriteConflictRanges[i].second.size(); + } + -+ cs->versionHistory.addWrites(writes, combinedWriteConflictRanges.size()); ++ cs->versionHistory.addWrites(writes, combinedWriteConflictRanges.size(), now); +#else addConflictRanges(now, combinedWriteConflictRanges.begin(), combinedWriteConflictRanges.end(), &cs->versionHistory); +#endif } void ConflictBatch::combineWriteConflictRanges() { -@@ -1115,7 +1172,7 @@ void skipListTest() { +@@ -1115,7 +1171,7 @@ void skipListTest() { double start; @@ -174,7 +173,7 @@ index b48d32c6b..269acfc99 100644 Arena testDataArena; VectorRef> testData; -@@ -1197,6 +1254,4 @@ void skipListTest() { +@@ -1197,6 +1253,4 @@ void skipListTest() { for (const auto& counter : skc) { printf("%20s: %s\n", counter->getMetric().name().c_str(), counter->getMetric().formatted().c_str()); }