Make Block Cache Optional

Also remove the block cache from the resource database because it's not
worth it.

modules/rocksdb/src/blaze/db/kv/rocksdb.clj

@@ -221,7 +221,7 @@
 
 
 (defmethod ig/pre-init-spec ::kv/rocksdb [_]
-  (s/keys :req-un [::dir ::block-cache ::stats] :opt-un [::opts]))
+  (s/keys :req-un [::dir ::stats] :opt-un [::block-cache ::opts]))
 
 
 (defn- init-log-msg [dir opts]

modules/rocksdb/src/blaze/db/kv/rocksdb/impl.clj

@@ -57,11 +57,13 @@
           (cond->
             (doto (BlockBasedTableConfig.)
               (.setVerifyCompression false)
-              (.setCacheIndexAndFilterBlocks true)
-              (.setPinL0FilterAndIndexBlocksInCache true)
-              (.setPinTopLevelIndexAndFilter true)
-              (.setBlockSize block-size)
-              (.setBlockCache block-cache))
+              (.setBlockSize block-size))
+            (nil? block-cache)
+            (.setNoBlockCache true)
+            (some? block-cache)
+            (-> (.setBlockCache block-cache)
+                (.setCacheIndexAndFilterBlocks true)
+                (.setPinL0FilterAndIndexBlocksInCache true))
             bloom-filter?
             (.setFilterPolicy (BloomFilter. 10 false))
             bloom-filter?

modules/rocksdb/test/blaze/db/kv/rocksdb/impl_spec.clj

@@ -9,7 +9,7 @@
 
 
 (s/fdef impl/column-family-descriptor
-  :args (s/cat :block-cache ::rocksdb/block-cache
+  :args (s/cat :block-cache (s/nilable ::rocksdb/block-cache)
                :opts (s/tuple keyword? (s/nilable map?))))
 
 

modules/rocksdb/test/blaze/db/kv/rocksdb/impl_test.clj

@@ -63,6 +63,7 @@
      :cache-index-and-filter-blocks (.cacheIndexAndFilterBlocks config)
      :pin-l0-filter-and-index-blocks-in-cache (.pinL0FilterAndIndexBlocksInCache config)
      :block-size (.blockSize config)
+     :block-cache? (not (.noBlockCache config))
      :bloom-filter? (some? (.filterPolicy config))})
 
   DBOptions
@@ -85,7 +86,7 @@
 
 
 (deftest column-family-descriptor-test
-  (testing "with defaults"
+  (testing "with defaults and block cache"
     (with-open [block-cache (LRUCache. 0)]
       (given (column-family-descriptor block-cache :default nil)
         :name := "default"
@@ -102,10 +103,17 @@
         [:options :table-format-config :cache-index-and-filter-blocks] := true
         [:options :table-format-config :pin-l0-filter-and-index-blocks-in-cache] := true
         [:options :table-format-config :block-size] := 4096
+        [:options :table-format-config :block-cache?] := true
         [:options :table-format-config :bloom-filter?] := false
         [:options :memtable-whole-key-filtering?] := false
         [:options :optimize-filters-for-hits?] := false)))
 
+  (testing "without block cache"
+    (given (column-family-descriptor nil :default nil)
+      [:options :table-format-config :block-cache?] := false
+      [:options :table-format-config :cache-index-and-filter-blocks] := false
+      [:options :table-format-config :pin-l0-filter-and-index-blocks-in-cache] := false))
+
   (with-open [block-cache (LRUCache. 0)]
     (are [key value]
       (given (column-family-descriptor block-cache :default {key value})

modules/rocksdb/test/blaze/db/kv/rocksdb_test.clj

@@ -49,17 +49,15 @@
       :key := ::kv/rocksdb
       :reason := ::ig/build-failed-spec
       [:explain ::s/problems 0 :pred] := `(fn ~'[%] (contains? ~'% :dir))
-      [:explain ::s/problems 1 :pred] := `(fn ~'[%] (contains? ~'% :block-cache))
-      [:explain ::s/problems 2 :pred] := `(fn ~'[%] (contains? ~'% :stats))))
+      [:explain ::s/problems 1 :pred] := `(fn ~'[%] (contains? ~'% :stats))))
 
   (testing "invalid dir"
     (given-thrown (ig/init {::kv/rocksdb {:dir ::invalid}})
       :key := ::kv/rocksdb
       :reason := ::ig/build-failed-spec
-      [:explain ::s/problems 0 :pred] := `(fn ~'[%] (contains? ~'% :block-cache))
-      [:explain ::s/problems 1 :pred] := `(fn ~'[%] (contains? ~'% :stats))
-      [:explain ::s/problems 2 :pred] := `string?
-      [:explain ::s/problems 2 :val] := ::invalid))
+      [:explain ::s/problems 0 :pred] := `(fn ~'[%] (contains? ~'% :stats))
+      [:explain ::s/problems 1 :pred] := `string?
+      [:explain ::s/problems 1 :val] := ::invalid))
 
   (testing "invalid block-cache"
     (given-thrown (ig/init {::kv/rocksdb {:block-cache ::invalid}})
@@ -75,9 +73,8 @@
       :key := ::kv/rocksdb
       :reason := ::ig/build-failed-spec
       [:explain ::s/problems 0 :pred] := `(fn ~'[%] (contains? ~'% :dir))
-      [:explain ::s/problems 1 :pred] := `(fn ~'[%] (contains? ~'% :block-cache))
-      [:explain ::s/problems 2 :via] := [::rocksdb/stats]
-      [:explain ::s/problems 2 :val] := ::invalid)))
+      [:explain ::s/problems 1 :via] := [::rocksdb/stats]
+      [:explain ::s/problems 1 :val] := ::invalid)))
 
 
 (deftest stats-collector-init-test

resources/blaze.edn

@@ -513,7 +513,6 @@
    ;;
    [:blaze.db.kv/rocksdb :blaze.db/resource-kv-store]
    {:dir #blaze/cfg ["RESOURCE_DB_DIR" string? "resource"]
-    :block-cache #blaze/ref :blaze.db.kv.rocksdb/block-cache
     :stats #blaze/ref :blaze.db.resource-kv-store/stats
     :opts
     {:wal-dir #blaze/cfg ["RESOURCE_DB_WAL_DIR" string? ""]