From cdf76307d945f002ed22dd645714931a70c61959 Mon Sep 17 00:00:00 2001
From: Tpt <thomaspt@hotmail.fr>
Date: Sat, 18 Mar 2023 09:02:07 +0100
Subject: [PATCH] Upgrades RocksDB to 8.0.0

---
 Cargo.lock               | 2 +-
 lib/Cargo.toml           | 2 +-
 oxrocksdb-sys/Cargo.toml | 2 +-
 oxrocksdb-sys/api/c.h    | 1 +
 oxrocksdb-sys/rocksdb    | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index af81a92c..86b017ac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1032,7 +1032,7 @@ dependencies = [
 
 [[package]]
 name = "oxrocksdb-sys"
-version = "0.3.12-dev"
+version = "0.3.14-dev"
 dependencies = [
  "bindgen",
  "cc",
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index 5a035f38..b01c5c2d 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -44,7 +44,7 @@ sparesults = { version = "0.1.7-dev", path="sparesults", features = ["rdf-star"]
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 libc = "0.2"
-oxrocksdb-sys = { version = "0.3.12-dev", path="../oxrocksdb-sys" }
+oxrocksdb-sys = { version = "0.3.14-dev", path="../oxrocksdb-sys" }
 oxhttp = { version = "0.1", optional = true }
 
 [target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies]
diff --git a/oxrocksdb-sys/Cargo.toml b/oxrocksdb-sys/Cargo.toml
index 84e9f916..d69c718e 100644
--- a/oxrocksdb-sys/Cargo.toml
+++ b/oxrocksdb-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "oxrocksdb-sys"
-version = "0.3.12-dev"
+version = "0.3.14-dev"
 authors = ["Tpt <thomas@pellissier-tanon.fr>"]
 license = "GPL-2.0 OR Apache-2.0"
 repository = "https://github.com/oxigraph/oxigraph/tree/main/oxrocksdb-sys"
diff --git a/oxrocksdb-sys/api/c.h b/oxrocksdb-sys/api/c.h
index 0200b91e..c0b2887d 100644
--- a/oxrocksdb-sys/api/c.h
+++ b/oxrocksdb-sys/api/c.h
@@ -41,6 +41,7 @@ typedef enum rocksdb_status_subcode_t {
   rocksdb_status_subcode_overwritten = 12,
   rocksdb_status_subcode_txn_not_prepared = 13,
   rocksdb_status_subcode_io_fenced = 14,
+  rocksdb_status_subcode_merge_operator_failed = 15,
 } rocksdb_status_subcode_t;
 
 typedef enum rocksdb_status_severity_t {
diff --git a/oxrocksdb-sys/rocksdb b/oxrocksdb-sys/rocksdb
index 5d8d9519..740854a7 160000
--- a/oxrocksdb-sys/rocksdb
+++ b/oxrocksdb-sys/rocksdb
@@ -1 +1 @@
-Subproject commit 5d8d95191c4ce7dd3369f1ad62b3ce0b99007151
+Subproject commit 740854a7b0c09450e67e5e29d9979e743485aebf