From 7cb996bdcbd9f96ea2500c1ed2da63d5de99eb9f Mon Sep 17 00:00:00 2001
From: Ziyang Hu <hu.ziyang@cantab.net>
Date: Wed, 29 Nov 2023 13:21:33 +0800
Subject: [PATCH] update RocksDB version
 https://github.com/cozodb/cozo/issues/205

---
 Cargo.toml                        | 1 +
 cozorocks/rocksdb                 | 2 +-
 cozorocks/rocksdb_lib_sources.txt | 2 ++
 cozorocks/src/bridge/mod.rs       | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 47b78328..35282861 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "cozo-core",
     "cozorocks",
diff --git a/cozorocks/rocksdb b/cozorocks/rocksdb
index f3252166..986b8b9f 160000
--- a/cozorocks/rocksdb
+++ b/cozorocks/rocksdb
@@ -1 +1 @@
-Subproject commit f32521662acf3352397d438b732144c7813bbbec
+Subproject commit 986b8b9f20893dec811d8ecdb97b6a47f20d322d
diff --git a/cozorocks/rocksdb_lib_sources.txt b/cozorocks/rocksdb_lib_sources.txt
index 661e0da2..31017f29 100644
--- a/cozorocks/rocksdb_lib_sources.txt
+++ b/cozorocks/rocksdb_lib_sources.txt
@@ -10,6 +10,7 @@ cache/compressed_secondary_cache.cc
 cache/secondary_cache.cc
 cache/secondary_cache_adapter.cc
 cache/sharded_cache.cc
+cache/tiered_secondary_cache.cc
 db/arena_wrapped_db_iter.cc
 db/blob/blob_contents.cc
 db/blob/blob_fetcher.cc
@@ -92,6 +93,7 @@ db/wal_edit.cc
 db/wal_manager.cc
 db/wide/wide_column_serialization.cc
 db/wide/wide_columns.cc
+db/wide/wide_columns_helper.cc
 db/write_batch.cc
 db/write_batch_base.cc
 db/write_controller.cc
diff --git a/cozorocks/src/bridge/mod.rs b/cozorocks/src/bridge/mod.rs
index 9e2388c7..e242e4af 100644
--- a/cozorocks/src/bridge/mod.rs
+++ b/cozorocks/src/bridge/mod.rs
@@ -90,6 +90,7 @@ pub(crate) mod ffi {
         kTxnNotPrepared = 13,
         kIOFenced = 14,
         kMergeOperatorFailed = 15,
+        kMergeOperandThresholdExceeded = 16,
         kMaxSubCode,
     }