RocksDB upgrade to 7.10.2

rsksmart · Oct 3, 2023 · b3e0db2 · b3e0db2
1 parent 6dde0cd
commit b3e0db2
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 4 deletions.
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -898,6 +898,14 @@
             <sha256 value="e7b2cdd2df3a6bc239a231b1775be09e50b748e9c388579fb3ea4f990357722f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jacoco" name="org.jacoco.agent" version="0.8.8">
+         <artifact name="org.jacoco.agent-0.8.8.jar">
+            <sha256 value="072ecbd496896623899a696fff12c01c1615f737616d2792e6d0e10cdf8a610d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.jacoco.agent-0.8.8.pom">
+            <sha256 value="7dd13c80aff315032983357c650a887d6fdb4c8a8870b207bb4802c49809e7b4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jacoco" name="org.jacoco.ant" version="0.8.7">
          <artifact name="org.jacoco.ant-0.8.7.jar">
             <sha256 value="97ca96a382c3f23a44d8eb4c4e6c3742a30cb8005774a76ced0fc4806ce49605" origin="Generated by Gradle"/>
@@ -906,11 +914,24 @@
             <sha256 value="a6084588725cf7e9f28372d5f73eb90ea95ef91976f128fa8059f946831b1fb8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jacoco" name="org.jacoco.ant" version="0.8.8">
+         <artifact name="org.jacoco.ant-0.8.8.jar">
+            <sha256 value="02e33bd2c48dc0be67c2fea84d43beececfd400da6797c58153253d4c30aca15" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.jacoco.ant-0.8.8.pom">
+            <sha256 value="fafff75819609030f4626509313c0861428c2c26c8d36e9a8938334a04478909" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jacoco" name="org.jacoco.build" version="0.8.7">
          <artifact name="org.jacoco.build-0.8.7.pom">
             <sha256 value="83408107930e1683a9b7647da7ab75eb83d80fa470c1641b79b5aecbbef1b783" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jacoco" name="org.jacoco.build" version="0.8.8">
+         <artifact name="org.jacoco.build-0.8.8.pom">
+            <sha256 value="f4ce0b1285fd24fc6c772f42857298315904dde8fd5677267a0fad5ff9ce2aef" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jacoco" name="org.jacoco.core" version="0.8.7">
          <artifact name="org.jacoco.core-0.8.7.jar">
             <sha256 value="ad7739b5fb5969aa1a8aead3d74ed54dc82ed012f1f10f336bd1b96e71c1a13c" origin="Generated by Gradle"/>
@@ -919,6 +940,14 @@
             <sha256 value="6832c751d8cd6071af646fde63baa13bdd183693fd60f7757f68536e5f867825" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jacoco" name="org.jacoco.core" version="0.8.8">
+         <artifact name="org.jacoco.core-0.8.8.jar">
+            <sha256 value="474c782f809d88924713dfdbf0acb79d330f904be576484803463d0465611643" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.jacoco.core-0.8.8.pom">
+            <sha256 value="f5fab5a48df823b83c0ea35026032368cc9b81800efb257cc7a5928298fee225" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jacoco" name="org.jacoco.report" version="0.8.7">
          <artifact name="org.jacoco.report-0.8.7.jar">
             <sha256 value="cc89258623700a6c932592153cb528785876b6da183d5431f97efbba6f020e5b" origin="Generated by Gradle"/>
@@ -927,6 +956,14 @@
             <sha256 value="2fbbc19e3c1dd791a2252efa829d926a7988793e9b78c0b26abc98492950c4ba" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jacoco" name="org.jacoco.report" version="0.8.8">
+         <artifact name="org.jacoco.report-0.8.8.jar">
+            <sha256 value="2c129110f3e3fcaa1f8179578ea3894586199cb0826be5c7790278084c9622a9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.jacoco.report-0.8.8.pom">
+            <sha256 value="5213af2916bb2690be871917d82a0f9c2ba1e88b796a59343fc03df8ae138716" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.java-websocket" name="Java-WebSocket" version="1.5.3">
          <artifact name="Java-WebSocket-1.5.3.jar">
             <sha256 value="4d6fc21dc9b657e76dcd74969079d18f30e7796a563f34c9a61e659a485e7a3f" origin="Generated by Gradle"/>
@@ -1326,6 +1363,14 @@
             <sha256 value="42a868e107aeff1f15ec3e65e993c615ba87db736b8591a5b256cac4cbc2a3fc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.rocksdb" name="rocksdbjni" version="7.10.2">
+         <artifact name="rocksdbjni-7.10.2.jar">
+            <sha256 value="613b6a84a61b74d9b83778697f25ce5b1e159bd517a3b05ee408ae0738f547aa" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="rocksdbjni-7.10.2.pom">
+            <sha256 value="edf496e83b697dbfb7d127a6c58f5951d4777b933ff8db252fbe8567f50206c1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.slf4j" name="log4j-over-slf4j" version="1.7.36">
          <artifact name="log4j-over-slf4j-1.7.36.jar">
             <sha256 value="0a7e032bf5bcdd5b2bf8bf2e5cf02c5646f2aa6fee66933b8150dbe84e651e8a" origin="Generated by Gradle"/>

diff --git a/rskj-core/build.gradle b/rskj-core/build.gradle
@@ -112,7 +112,7 @@ ext {
             spongyCastleVer        : '1.58.0.0',
             bouncyCastleVer        : '1.59',
             ethereumLeveldbJniVer  : '1.18.3',
-            rocksdbJniVer          : '6.27.3',
+            rocksdbJniVer          : '7.10.2',
             slf4jVer               : '1.7.36',
             logbackVer             : '1.2.10',
             jacksonVer             : '2.13.3',

diff --git a/rskj-core/src/test/java/org/ethereum/datasource/RocksDbDataSourceTest.java b/rskj-core/src/test/java/org/ethereum/datasource/RocksDbDataSourceTest.java
@@ -109,15 +109,15 @@ void updateBatchRetriesOnDeleteError() {
         Set<ByteArrayWrapper> deleteKeys = ImmutableSet.of(ByteUtil.wrap(keyToDelete1), ByteUtil.wrap(keyToDelete2));
 
         try (MockedConstruction<WriteBatch> writeBatchMockedConstruction = Mockito.mockConstruction(WriteBatch.class,
-                (mock, context) -> doThrow(new RocksDBException(dbExceptionMessage)).when(mock).delete(any())
+                (mock, context) -> doThrow(new RocksDBException(dbExceptionMessage)).when(mock).delete(any(byte[].class))
         )) {
             RuntimeException updateException = assertThrows(RuntimeException.class, () -> dataSource.updateBatch(batch, deleteKeys));
             assertEquals(RocksDBException.class.getName() + ": " + dbExceptionMessage, updateException.getMessage());
 
             WriteBatch writeBatch1 = writeBatchMockedConstruction.constructed().get(1);
-            verify(writeBatch1, times(1)).delete(any());
+            verify(writeBatch1, times(1)).delete(any(byte[].class));
             WriteBatch writeBatch2 = writeBatchMockedConstruction.constructed().get(1);
-            verify(writeBatch2, times(1)).delete(any());
+            verify(writeBatch2, times(1)).delete(any(byte[].class));
         } catch (RocksDBException e) {
             throw new RuntimeException(e);
         }