Completed initial rewrite and refactored tests.

status-im · Feb 19, 2024 · 2fbbe53 · 2fbbe53
1 parent 656e521
commit 2fbbe53
Show file tree

Hide file tree

Showing 8 changed files with 336 additions and 465 deletions.
diff --git a/rocksdb.nim b/rocksdb.nim
@@ -7,6 +7,6 @@
 #
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-import ./rocksdb/[rocksdb_old, rocksdb]
+import ./rocksdb/[rocksdb]
 
-export rocksdb_old, rocksdb
+export rocksdb
diff --git a/rocksdb/columnfamily/cfdescriptor.nim b/rocksdb/columnfamily/cfdescriptor.nim
@@ -12,7 +12,7 @@
 import
   ./cfopts
 
-const DEFAULT_COLUMN_FAMILY_NAME* = "default"
+export cfopts
 
 type
   ColFamilyDescriptor* = object

diff --git a/rocksdb/columnfamily/cfhandle.nim b/rocksdb/columnfamily/cfhandle.nim
@@ -10,8 +10,9 @@
 {.push raises: [].}
 
 import
-  ../lib/librocksdb,
-  ./cfdescriptor
+  ../lib/librocksdb
+
+const DEFAULT_COLUMN_FAMILY_NAME* = "default"
 
 type
   ColFamilyHandlePtr* = ptr rocksdb_column_family_handle_t
@@ -41,9 +42,6 @@ proc getName*(handle: ColFamilyHandleRef): string =
 template isDefault*(handle: ColFamilyHandleRef): bool =
   handle.getName() == DEFAULT_COLUMN_FAMILY_NAME
 
-# proc getDescriptor*(handle: ColFamilyHandleRef): ColumnFamilyDescriptor =
-#   doAssert not handle.isClosed()
-
 proc close*(handle: var ColFamilyHandleRef) =
   if not handle.isClosed():
     rocksdb_column_family_handle_destroy(handle.cPtr)

diff --git a/rocksdb/options/dbopts.nim b/rocksdb/options/dbopts.nim
@@ -39,7 +39,7 @@ proc setCreateIfMissing*(dbOpts: var DbOptionsRef, flag: bool) =
   rocksdb_options_set_create_if_missing(dbOpts.cPtr, flag.uint8)
 
 proc setMaxOpenFiles*(dbOpts: var DbOptionsRef, maxOpenFiles: int) =
-  doAssert maxOpenFiles > -1
+  doAssert maxOpenFiles >= -1
   doAssert not dbOpts.isClosed()
   rocksdb_options_set_max_open_files(dbOpts.cPtr, maxOpenFiles.cint)