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

Update fdb patch
All checks were successful
Tests / Release [gcc] total: 704, passed: 704
Details
GNU C Compiler (gcc) |Total|New|Outstanding|Fixed|Trend |:-:|:-:|:-:|:-:|:-: |0|0|0|0|:clap: Reference build: <a href="https://jenkins.weaselab.dev/job/weaselab/job/conflict-set/job/main/60//gcc">weaselab » conflict-set » main #60</a>
Details
Tests / Release [gcc,aarch64] total: 703, passed: 703
Details
Tests / Coverage total: 702, passed: 702
Details
weaselab/conflict-set/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Andrew Noyes
2024-03-06 18:25:23 -08:00
parent 04f75d57e9
commit 00389936a8
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fdb-patch.txt
View File

@@ -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 index 3f353c2ef..cd0834761 100644
--- a/fdbserver/CMakeLists.txt --- a/fdbserver/CMakeLists.txt
+++ b/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 // Use LogSystem as backend for txnStateStore. However, the real commit
diff --git a/fdbserver/SkipList.cpp b/fdbserver/SkipList.cpp diff --git a/fdbserver/SkipList.cpp b/fdbserver/SkipList.cpp
index b48d32c6b..269acfc99 100644 index b48d32c6b..da106b5d2 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 @@
@@ -141,7 +141,7 @@ index b48d32c6b..269acfc99 100644
} }
void ConflictBatch::addConflictRanges(Version now, 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()) if (combinedWriteConflictRanges.empty())
return; return;
@@ -151,21 +151,20 @@ index b48d32c6b..269acfc99 100644
+ +
+ for (int i = 0; i < combinedWriteConflictRanges.size(); ++i) { + for (int i = 0; i < combinedWriteConflictRanges.size(); ++i) {
+ auto& write = writes[i]; + auto& write = writes[i];
+ write.writeVersion = now;
+ write.begin.p = combinedWriteConflictRanges[i].first.begin(); + write.begin.p = combinedWriteConflictRanges[i].first.begin();
+ write.begin.len = combinedWriteConflictRanges[i].first.size(); + write.begin.len = combinedWriteConflictRanges[i].first.size();
+ write.end.p = combinedWriteConflictRanges[i].second.begin(); + write.end.p = combinedWriteConflictRanges[i].second.begin();
+ write.end.len = combinedWriteConflictRanges[i].second.size(); + write.end.len = combinedWriteConflictRanges[i].second.size();
+ } + }
+ +
+ cs->versionHistory.addWrites(writes, combinedWriteConflictRanges.size()); + cs->versionHistory.addWrites(writes, combinedWriteConflictRanges.size(), now);
+#else +#else
addConflictRanges(now, combinedWriteConflictRanges.begin(), combinedWriteConflictRanges.end(), &cs->versionHistory); addConflictRanges(now, combinedWriteConflictRanges.begin(), combinedWriteConflictRanges.end(), &cs->versionHistory);
+#endif +#endif
} }
void ConflictBatch::combineWriteConflictRanges() { void ConflictBatch::combineWriteConflictRanges() {
@@ -1115,7 +1172,7 @@ void skipListTest() { @@ -1115,7 +1171,7 @@ void skipListTest() {
double start; double start;
@@ -174,7 +173,7 @@ index b48d32c6b..269acfc99 100644
Arena testDataArena; Arena testDataArena;
VectorRef<VectorRef<KeyRangeRef>> testData; VectorRef<VectorRef<KeyRangeRef>> testData;
@@ -1197,6 +1254,4 @@ void skipListTest() { @@ -1197,6 +1253,4 @@ void skipListTest() {
for (const auto& counter : skc) { for (const auto& counter : skc) {
printf("%20s: %s\n", counter->getMetric().name().c_str(), counter->getMetric().formatted().c_str()); printf("%20s: %s\n", counter->getMetric().name().c_str(), counter->getMetric().formatted().c_str());
} }