[ETCM-52] Upgrade RocksDB

Author: kapke

build.sbt

@@ -13,14 +13,11 @@ val commonSettings = Seq(
     .Argument(TestFrameworks.ScalaTest, "-l", "EthashMinerSpec") // miner tests disabled by default
 )
 
-// Resolver for rocksDb
-resolvers += "rocksDb" at "https://dl.bintray.com/ethereum/maven/"
-
 val dep = {
   val akkaVersion = "2.6.9"
   val akkaHttpVersion = "10.2.0"
   val circeVersion = "0.9.3"
-  val rocksDb = "5.9.2"
+  val rocksDb = "6.11.4"
 
   Seq(
     "com.typesafe.akka" %% "akka-actor" % akkaVersion,
@@ -32,7 +29,7 @@ val dep = {
     "org.json4s" %% "json4s-native" % "3.5.4",
     "de.heikoseeberger" %% "akka-http-json4s" % "1.34.0",
     "io.suzaku" %% "boopickle" % "1.3.0",
-    "org.ethereum" % "rocksdbjni" % rocksDb,
+    "org.rocksdb" % "rocksdbjni" % rocksDb,
     "io.circe" %% "circe-core" % circeVersion,
     "io.circe" %% "circe-generic" % circeVersion,
     "io.circe" %% "circe-parser" % circeVersion,
@@ -85,19 +82,20 @@ val Snappy = config("snappy") extend Test
 val Rpc = config("rpcTest") extend Test
 
 val root = {
-  val root = project.in(file("."))
+  val root = project
+    .in(file("."))
     .configs(Integration, Benchmark, Evm, Ets, Snappy, Rpc)
     .settings(commonSettings: _*)
     .settings(
       libraryDependencies ++= dep,
       executableScriptName := name.value
     )
-    .settings(inConfig(Integration)(Defaults.testSettings) : _*)
-    .settings(inConfig(Benchmark)(Defaults.testSettings) : _*)
-    .settings(inConfig(Evm)(Defaults.testSettings) : _*)
-    .settings(inConfig(Ets)(Defaults.testSettings) : _*)
-    .settings(inConfig(Snappy)(Defaults.testSettings) : _*)
-    .settings(inConfig(Rpc)(Defaults.testSettings) : _*)
+    .settings(inConfig(Integration)(Defaults.testSettings): _*)
+    .settings(inConfig(Benchmark)(Defaults.testSettings): _*)
+    .settings(inConfig(Evm)(Defaults.testSettings): _*)
+    .settings(inConfig(Ets)(Defaults.testSettings): _*)
+    .settings(inConfig(Snappy)(Defaults.testSettings): _*)
+    .settings(inConfig(Rpc)(Defaults.testSettings): _*)
 
   if (!nixBuild)
     root
@@ -145,7 +143,6 @@ unmanagedResourceDirectories in Compile += baseDirectory.value / "src" / "main"
 scalastyleSources in Test ++= { (unmanagedSourceDirectories in Integration).value }
 
 // Packaging
-enablePlugins(JavaAppPackaging)
 mainClass in Compile := Some("io.iohk.ethereum.App")
 discoveredMainClasses in Compile := Seq("io.iohk.ethereum.mallet.main.Mallet")
 // Requires the 'ant-javafx.jar' that comes with Oracle JDK
@@ -161,7 +158,6 @@ jdkPackagerJVMArgs := Seq(
   "-Xss10M"
 )
 
-
 coverageExcludedPackages := "io\\.iohk\\.ethereum\\.extvm\\.msg.*"
 
 addCommandAlias(

src/main/scala/io/iohk/ethereum/db/dataSource/RocksDbDataSource.scala

@@ -83,7 +83,7 @@ class RocksDbDataSource(
     try {
       withResources(new WriteOptions()){ writeOptions =>
         withResources(new WriteBatch()){ batch =>
-          toRemove.foreach{ key => batch.remove(handles(namespace), key.toArray) }
+          toRemove.foreach{ key => batch.delete(handles(namespace), key.toArray) }
           toUpsert.foreach{ case (k, v) => batch.put(handles(namespace), k.toArray, v.toArray) }
 
           db.write(writeOptions, batch)
@@ -115,7 +115,7 @@ class RocksDbDataSource(
     try {
       withResources(new WriteOptions()){ writeOptions =>
         withResources(new WriteBatch()){ batch =>
-          toRemove.foreach{ key => batch.remove(key) }
+          toRemove.foreach{ key => batch.delete(key) }
           toUpsert.foreach{ case (k, v) => batch.put(k, v) }
 
           db.write(writeOptions, batch)
@@ -193,10 +193,10 @@ class RocksDbDataSource(
 
       val tableCfg = new BlockBasedTableConfig()
         .setBlockSize(blockSize)
-        .setBlockCacheSize(blockCacheSize)
+        .setBlockCache(new ClockCache(blockCacheSize))
         .setCacheIndexAndFilterBlocks(true)
         .setPinL0FilterAndIndexBlocksInCache(true)
-        .setFilter(new BloomFilter(10, false))
+        .setFilterPolicy(new BloomFilter(10, false))
 
       val options = new Options()
         .setCreateIfMissing(createIfMissing)
@@ -253,10 +253,10 @@ object RocksDbDataSource {
 
       val tableCfg = new BlockBasedTableConfig()
         .setBlockSize(blockSize)
-        .setBlockCacheSize(blockCacheSize)
+        .setBlockCache(new ClockCache(blockCacheSize))
         .setCacheIndexAndFilterBlocks(true)
         .setPinL0FilterAndIndexBlocksInCache(true)
-        .setFilter(new BloomFilter(10, false))
+        .setFilterPolicy(new BloomFilter(10, false))
 
       val options = new DBOptions()
         .setCreateIfMissing(createIfMissing)