Update 50 bucket to 500

stellar · Sep 25, 2024 · df916c8 · df916c8
1 parent df8f2f5
commit df916c8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/src/bucket/BucketManagerImpl.cpp b/src/bucket/BucketManagerImpl.cpp
@@ -1101,16 +1101,19 @@ BucketManagerImpl::getBloomLookupMeter() const
 void
 BucketManagerImpl::calculateSkipValues(LedgerHeader& currentHeader)
 {
+    bool startsFromV22 = protocolVersionStartsFrom(currentHeader.ledgerVersion,
+                                                   ProtocolVersion::V_22);
+    auto skip1 = startsFromV22 ? SKIP_1_V22 : SKIP_1;
 
-    if ((currentHeader.ledgerSeq % SKIP_1) == 0)
+    if ((currentHeader.ledgerSeq % skip1) == 0)
     {
-        int v = currentHeader.ledgerSeq - SKIP_1;
+        int v = currentHeader.ledgerSeq - skip1;
         if (v > 0 && (v % SKIP_2) == 0)
         {
-            v = currentHeader.ledgerSeq - SKIP_2 - SKIP_1;
+            v = currentHeader.ledgerSeq - SKIP_2 - skip1;
             if (v > 0 && (v % SKIP_3) == 0)
             {
-                v = currentHeader.ledgerSeq - SKIP_3 - SKIP_2 - SKIP_1;
+                v = currentHeader.ledgerSeq - SKIP_3 - SKIP_2 - skip1;
                 if (v > 0 && (v % SKIP_4) == 0)
                 {
 
@@ -1121,8 +1124,7 @@ BucketManagerImpl::calculateSkipValues(LedgerHeader& currentHeader)
             currentHeader.skipList[1] = currentHeader.skipList[0];
         }
 
-        if (protocolVersionStartsFrom(currentHeader.ledgerVersion,
-                                      ProtocolVersion::V_22))
+        if (startsFromV22)
         {
             currentHeader.skipList[0] = currentHeader.previousLedgerHash;
         }

diff --git a/src/bucket/BucketManagerImpl.h b/src/bucket/BucketManagerImpl.h
@@ -195,6 +195,8 @@ class BucketManagerImpl : public BucketManager
 };
 
 #define SKIP_1 50
+#define SKIP_1_V22 500
+
 #define SKIP_2 5000
 #define SKIP_3 50000
 #define SKIP_4 500000

diff --git a/src/bucket/test/BucketManagerTests.cpp b/src/bucket/test/BucketManagerTests.cpp
@@ -125,35 +125,38 @@ TEST_CASE("skip list", "[bucket][bucketmanager]")
                 LedgerHeader header;
                 header.ledgerSeq = 5;
                 header.ledgerVersion = i;
-                auto& hashFieldToUse =
-                    protocolVersionIsBefore(header.ledgerVersion,
-                                            ProtocolVersion::V_22)
-                        ? header.bucketListHash
-                        : header.previousLedgerHash;
+
+                bool isBeforeV22 = protocolVersionIsBefore(
+                    header.ledgerVersion, ProtocolVersion::V_22);
+
+                auto& hashFieldToUse = isBeforeV22 ? header.bucketListHash
+                                                   : header.previousLedgerHash;
 
                 calculateSkipValues(header);
                 REQUIRE(header.skipList[0] == h0);
                 REQUIRE(header.skipList[1] == h0);
                 REQUIRE(header.skipList[2] == h0);
                 REQUIRE(header.skipList[3] == h0);
 
-                header.ledgerSeq = SKIP_1;
+                auto skip1 = isBeforeV22 ? SKIP_1 : SKIP_1_V22;
+
+                header.ledgerSeq = skip1;
                 hashFieldToUse = h2;
                 calculateSkipValues(header);
                 REQUIRE(header.skipList[0] == h2);
                 REQUIRE(header.skipList[1] == h0);
                 REQUIRE(header.skipList[2] == h0);
                 REQUIRE(header.skipList[3] == h0);
 
-                header.ledgerSeq = SKIP_1 * 2;
+                header.ledgerSeq = skip1 * 2;
                 hashFieldToUse = h3;
                 calculateSkipValues(header);
                 REQUIRE(header.skipList[0] == h3);
                 REQUIRE(header.skipList[1] == h0);
                 REQUIRE(header.skipList[2] == h0);
                 REQUIRE(header.skipList[3] == h0);
 
-                header.ledgerSeq = SKIP_1 * 2 + 1;
+                header.ledgerSeq = skip1 * 2 + 1;
                 hashFieldToUse = h2;
                 calculateSkipValues(header);
                 REQUIRE(header.skipList[0] == h3);
@@ -169,7 +172,7 @@ TEST_CASE("skip list", "[bucket][bucketmanager]")
                 REQUIRE(header.skipList[2] == h0);
                 REQUIRE(header.skipList[3] == h0);
 
-                header.ledgerSeq = SKIP_2 + SKIP_1;
+                header.ledgerSeq = SKIP_2 + skip1;
                 hashFieldToUse = h5;
                 calculateSkipValues(header);
                 REQUIRE(header.skipList[0] == h5);
@@ -185,7 +188,7 @@ TEST_CASE("skip list", "[bucket][bucketmanager]")
                 REQUIRE(header.skipList[2] == h0);
                 REQUIRE(header.skipList[3] == h0);
 
-                header.ledgerSeq = SKIP_3 + SKIP_2 + SKIP_1;
+                header.ledgerSeq = SKIP_3 + SKIP_2 + skip1;
                 hashFieldToUse = h7;
                 calculateSkipValues(header);
                 REQUIRE(header.skipList[0] == h7);