Don't set default compression as it forces us to require the compress…

…ion library when linking or at runtime. Let RocksBb pick the best default.
status-im · Mar 29, 2024 · 47d613d · 47d613d
1 parent 90027f1
commit 47d613d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/rocksdb/columnfamily/cfopts.nim b/rocksdb/columnfamily/cfopts.nim
@@ -35,7 +35,7 @@ proc setCreateMissingColumnFamilies*(cfOpts: ColFamilyOptionsRef, flag: bool) =
 proc defaultColFamilyOptions*(): ColFamilyOptionsRef =
   let opts = newColFamilyOptions()
 
-  rocksdb_options_set_compression(opts.cPtr, rocksdb_lz4_compression)
+  # rocksdb_options_set_compression(opts.cPtr, rocksdb_lz4_compression)
   # rocksdb_options_set_bottommost_compression(opts.cPtr, rocksdb_zstd_compression)
 
   # Enable creating column families if they do not exist

diff --git a/rocksdb/lib/librocksdb.nim b/rocksdb/lib/librocksdb.nim
@@ -120,15 +120,12 @@ when defined(rocksdb_static_linking):
     topLevelPath = currentSourcePath.parentDir().parentDir().parentDir()
     libsDir = topLevelPath.replace('\\', '/') & "/build/lib"
 
+  {.passL: libsDir & "/librocksdb.a".}
+  {.passL: libsDir & "/liblz4.a".}
+  {.passL: libsDir & "/libzstd.a".}
+
   when defined(windows):
     {.passL: "-lshlwapi -lrpcrt4".}
-    {.passL: libsDir & "/rocksdb.lib".}
-    {.passL: libsDir & "/lz4.lib".}
-    {.passL: libsDir & "/zstd.lib".}
-  else:
-    {.passL: libsDir & "/librocksdb.a".}
-    {.passL: libsDir & "/liblz4.a".}
-    {.passL: libsDir & "/libzstd.a".}
 
 else:
   when shouldUseNativeLinking():

diff --git a/rocksdb/options/backupopts.nim b/rocksdb/options/backupopts.nim
@@ -32,7 +32,7 @@ proc cPtr*(engineOpts: BackupEngineOptionsRef): BackupEngineOptionsPtr =
 
 proc defaultBackupEngineOptions*(): BackupEngineOptionsRef {.inline.} =
   let opts = newBackupEngineOptions()
-  rocksdb_options_set_compression(opts.cPtr, rocksdb_lz4_compression)
+  # rocksdb_options_set_compression(opts.cPtr, rocksdb_lz4_compression)
   # rocksdb_options_set_bottommost_compression(opts.cPtr, rocksdb_zstd_compression)
   opts
 

diff --git a/rocksdb/options/dbopts.nim b/rocksdb/options/dbopts.nim
@@ -50,7 +50,7 @@ proc setCreateMissingColumnFamilies*(dbOpts: DbOptionsRef, flag: bool) =
 proc defaultDbOptions*(): DbOptionsRef =
   let opts: DbOptionsRef = newDbOptions()
 
-  rocksdb_options_set_compression(opts.cPtr, rocksdb_lz4_compression)
+  # rocksdb_options_set_compression(opts.cPtr, rocksdb_lz4_compression)
   # rocksdb_options_set_bottommost_compression(opts.cPtr, rocksdb_zstd_compression)
 
   # Optimize RocksDB. This is the easiest way to get RocksDB to perform well: