truly enable options

Author: iovoid

crates/storage/store_db/rocksdb.rs

@@ -183,6 +183,13 @@ impl Store {
         db_options.set_compression_type(rocksdb::DBCompressionType::None);
         db_options.set_bottommost_compression_type(rocksdb::DBCompressionType::None);
 
+        let mut block_opts = BlockBasedOptions::default();
+        block_opts.set_block_size(16 * 1024); // 16KB
+        block_opts.set_bloom_filter(10.0, false); // 10 bits per key
+        block_opts.set_index_type(rocksdb::BlockBasedIndexType::HashSearch);
+        block_opts.set_data_block_index_type(rocksdb::DataBlockIndexType::BinaryAndHash);
+        db_options.set_block_based_table_factory(&block_opts);
+
         // db_options.enable_statistics();
         // db_options.set_stats_dump_period_sec(600);
 
@@ -243,6 +250,19 @@ impl Store {
             cf_opts.set_level_zero_stop_writes_trigger(36);
             cf_opts.set_compression_type(rocksdb::DBCompressionType::None);
 
+            cf_opts.set_prefix_extractor(if cf_name != CF_FLATKEYVALUE {
+                SliceTransform::create_noop()
+            } else {
+                SliceTransform::create_fixed_prefix(65)
+            });
+
+            let mut block_opts = BlockBasedOptions::default();
+            block_opts.set_block_size(16 * 1024); // 16KB
+            block_opts.set_bloom_filter(10.0, false); // 10 bits per key
+            block_opts.set_index_type(rocksdb::BlockBasedIndexType::HashSearch);
+            block_opts.set_data_block_index_type(rocksdb::DataBlockIndexType::BinaryAndHash);
+            cf_opts.set_block_based_table_factory(&block_opts);
+
             match cf_name.as_str() {
                 CF_HEADERS | CF_BODIES => {
                     cf_opts.set_write_buffer_size(128 * 1024 * 1024); // 128MB
@@ -251,7 +271,7 @@ impl Store {
 
                     let mut block_opts = BlockBasedOptions::default();
                     block_opts.set_block_size(32 * 1024); // 32KB blocks
-                    cf_opts.set_block_based_table_factory(&block_opts);
+                    //cf_opts.set_block_based_table_factory(&block_opts);
                 }
                 CF_CANONICAL_BLOCK_HASHES | CF_BLOCK_NUMBERS => {
                     cf_opts.set_write_buffer_size(64 * 1024 * 1024); // 64MB
@@ -261,7 +281,7 @@ impl Store {
                     let mut block_opts = BlockBasedOptions::default();
                     block_opts.set_block_size(16 * 1024); // 16KB
                     block_opts.set_bloom_filter(10.0, false);
-                    cf_opts.set_block_based_table_factory(&block_opts);
+                    //cf_opts.set_block_based_table_factory(&block_opts);
                 }
                 CF_TRIE_NODES => {
                     cf_opts.set_write_buffer_size(512 * 1024 * 1024); // 512MB
@@ -273,22 +293,14 @@ impl Store {
                     let mut block_opts = BlockBasedOptions::default();
                     block_opts.set_block_size(16 * 1024); // 16KB
                     block_opts.set_bloom_filter(10.0, false); // 10 bits per key
-                    cf_opts.set_block_based_table_factory(&block_opts);
+                    //cf_opts.set_block_based_table_factory(&block_opts);
                 }
                 CF_FLATKEYVALUE => {
                     cf_opts.set_write_buffer_size(512 * 1024 * 1024); // 512MB
                     cf_opts.set_max_write_buffer_number(6);
                     cf_opts.set_min_write_buffer_number_to_merge(2);
                     cf_opts.set_target_file_size_base(256 * 1024 * 1024); // 256MB
                     cf_opts.set_memtable_prefix_bloom_ratio(0.2); // Bloom filter
-
-                    cf_opts.set_prefix_extractor(SliceTransform::create_fixed_prefix(65));
-                    let mut block_opts = BlockBasedOptions::default();
-                    block_opts.set_block_size(16 * 1024); // 16KB
-                    block_opts.set_bloom_filter(10.0, false); // 10 bits per key
-                    block_opts.set_index_type(rocksdb::BlockBasedIndexType::HashSearch);
-                    block_opts.set_data_block_index_type(rocksdb::DataBlockIndexType::BinaryAndHash);
-                    cf_opts.set_block_based_table_factory(&block_opts);
                 }
                 CF_RECEIPTS | CF_ACCOUNT_CODES => {
                     cf_opts.set_write_buffer_size(128 * 1024 * 1024); // 128MB
@@ -297,7 +309,7 @@ impl Store {
 
                     let mut block_opts = BlockBasedOptions::default();
                     block_opts.set_block_size(32 * 1024); // 32KB
-                    cf_opts.set_block_based_table_factory(&block_opts);
+                    //cf_opts.set_block_based_table_factory(&block_opts);
                 }
                 _ => {
                     // Default for other CFs
@@ -307,7 +319,7 @@ impl Store {
 
                     let mut block_opts = BlockBasedOptions::default();
                     block_opts.set_block_size(16 * 1024);
-                    cf_opts.set_block_based_table_factory(&block_opts);
+                    //cf_opts.set_block_based_table_factory(&block_opts);
                 }
             }