move rocksdb support to eth1

only used here / causes unnecessary build deps

.gitignore

@@ -27,9 +27,7 @@ nimcache
 /debug*.json
 /block*.json
 /.update.timestamp
-
 *.generated.nim
-
 /dist
 
 # Nimble user files

nimbus.nimble

@@ -18,7 +18,8 @@ requires "nim >= 1.2.0",
  "libbacktrace",
  "nimcrypto",
  "stew",
- "stint"
+ "stint",
+ "rocksdb"
 
 binDir = "build"
 

nimbus/db/kvstore_rocksdb.nim

@@ -0,0 +1,52 @@
+{.push raises: [Defect].}
+
+import
+ std/os,
+ rocksdb, stew/results,
+ eth/db/kvstore
+
+export results, kvstore
+
+const maxOpenFiles = 512
+
+type
+ RocksStoreRef* = ref object of RootObj
+ store: RocksDBInstance
+
+proc get*(db: RocksStoreRef, key: openArray[byte], onData: kvstore.DataProc): KvResult[bool] =
+ db.store.get(key, onData)
+
+proc find*(db: RocksStoreRef, prefix: openArray[byte], onFind: kvstore.KeyValueProc): KvResult[int] =
+ raiseAssert "Unimplemented"
+
+proc put*(db: RocksStoreRef, key, value: openArray[byte]): KvResult[void] =
+ db.store.put(key, value)
+
+proc contains*(db: RocksStoreRef, key: openArray[byte]): KvResult[bool] =
+ db.store.contains(key)
+
+proc del*(db: RocksStoreRef, key: openArray[byte]): KvResult[void] =
+ db.store.del(key)
+
+proc close*(db: RocksStoreRef) =
+ db.store.close
+
+proc init*(
+ T: type RocksStoreRef, basePath: string, name: string,
+ readOnly = false): KvResult[T] =
+ let
+ dataDir = basePath / name / "data"
+ backupsDir = basePath / name / "backups"
+
+ try:
+ createDir(dataDir)
+ createDir(backupsDir)
+ except OSError, IOError:
+ return err("rocksdb: cannot create database directory")
+
+ var store: RocksDBInstance
+ if (let v = store.init(
+ dataDir, backupsDir, readOnly, maxOpenFiles = maxOpenFiles); v.isErr):
+ return err(v.error)
+
+ ok(T(store: store))

nimbus/db/select_backend.nim

@@ -43,7 +43,7 @@ when dbBackend == sqlite:
  let db = SqStoreRef.init(path, "nimbus").expect("working database")
  ChainDB(kv: kvStore db.openKvStore().expect("working database"))
 elif dbBackend == rocksdb:
- import eth/db/kvstore_rocksdb as database_backend
+ import ./kvstore_rocksdb as database_backend
  proc newChainDB*(path: string): ChainDB =
  ChainDB(kv: kvStore RocksStoreRef.init(path, "nimbus").tryGet())
 elif dbBackend == lmdb:

tests/all_tests.nim

@@ -44,5 +44,5 @@ cliBuilder:
  ./test_configuration,
  ./test_keyed_queue_rlp,
  ./test_txpool,
- ./test_merge
-
+ ./test_merge,
+ ./db/test_kvstore_rocksdb

tests/db/test_kvstore_rocksdb.nim

@@ -0,0 +1,19 @@
+{.used.}
+
+import
+ std/os,
+ unittest2,
+ chronicles,
+ eth/db/kvstore,
+ ../../nimbus/db/kvstore_rocksdb,
+ eth/../tests/db/test_kvstore
+
+suite "RocksStoreRef":
+ test "KvStore interface":
+ let tmp = getTempDir() / "nimbus-test-db"
+ removeDir(tmp)
+
+ let db = RocksStoreRef.init(tmp, "test")[]
+ defer: db.close()
+
+ testKvStore(kvStore db, false)