worked version

Author: s00d

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "php_rocksdb_rc"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 
 [lib]
@@ -9,7 +9,9 @@ crate-type = ["cdylib"]
 
 [dependencies]
 ext-php-rs = "*"
+json-patch = "2.0.0"
 rust-rocksdb = { version = "^0.26", features = ["multi-threaded-cf"] }
+serde_json = "1.0.117"
 
 [profile.integration-test]
 inherits = "dev"

Cargo.toml

@@ -371,16 +371,18 @@ echo $value; // Outputs: value2
 ```
 
 #### `merge(key: String, value: String, cf_name: Option<String>)`
-Merges a value into the database.
+Merges a value into the database using JSON Patch.
 
 ```php
 <?php
-$db->merge("json_obj_key", "{ employees: [ {first_name: john, last_name: doe}, {first_name: adam, last_name: smith}] }");
-$db->merge("json_obj_key", "employees[1].first_name = lucy");
-$db->merge("json_obj_key", "employees[0].last_name = dow");
+$db->merge("json_obj_key", '[ { "op": "replace", "path": "/employees/1/first_name", "value": "lucy" } ]');
+$db->merge("json_obj_key", '[ { "op": "replace", "path": "/employees/0/last_name", "value": "dow" } ]');
 ?>
 ```
 
+
+This method uses JSON Patch to update the JSON object in the database. For more details on JSON Patch, refer to  [RFC 6902](https://datatracker.ietf.org/doc/html/rfc6902).
+
 #### `delete(key: String, cf_name: Option<String>)`
 Deletes the key-value pair associated with the given key.
 

README.md

@@ -6,14 +6,42 @@ use ext_php_rs::convert::IntoZval;
 use ext_php_rs::error::Error;
 use ext_php_rs::prelude::*;
 use ext_php_rs::types::{ZendHashTable, Zval};
-use rust_rocksdb::{Options, DB};
+use json_patch::Patch;
+use rust_rocksdb::{
+    ColumnFamilyDescriptor, DBWithThreadMode, MergeOperands, Options, SingleThreaded, DB,
+};
+use serde_json::{from_value, Value};
 use std::collections::HashMap;
 use std::time::Duration;
 
 use crate::backup::RocksDBBackup;
 use crate::transaction::RocksDBTransaction;
 use crate::write_batch::RocksDBWriteBatch;
 
+fn json_merge(
+    _new_key: &[u8],
+    existing_val: Option<&[u8]>,
+    operands: &MergeOperands,
+) -> Option<Vec<u8>> {
+    // Decode the existing value
+    let mut doc: Value = if let Some(val) = existing_val {
+        serde_json::from_slice(val).unwrap_or(Value::Array(vec![]))
+    } else {
+        Value::Array(vec![])
+    };
+
+    // Process each operand
+    for op in operands {
+        if let Ok(patch) = serde_json::from_slice::<Value>(op) {
+            let p: Patch = from_value(patch).unwrap();
+            json_patch::patch(&mut doc, &p).unwrap();
+        }
+    }
+
+    // Serialize the updated JSON object back to bytes
+    Some(serde_json::to_vec(&doc).unwrap())
+}
+
 #[derive(Debug)]
 pub struct KeyValueResult {
     pub key: Option<String>,
@@ -34,7 +62,7 @@ impl IntoZval for KeyValueResult {
 
 #[php_class]
 pub struct RocksDB {
-    pub db: DB,
+    pub db: DBWithThreadMode<SingleThreaded>,
     position: Option<Vec<u8>>,
 }
 
@@ -46,13 +74,29 @@ impl RocksDB {
         opts.create_if_missing(true);
         opts.set_max_open_files(1000);
         opts.set_log_level(rust_rocksdb::LogLevel::Warn);
+        opts.set_merge_operator_associative("json_merge", json_merge);
+
+        let cf_names = DB::list_cf(&opts, &path).unwrap_or(vec!["default".to_string()]);
+        let cf_descriptors: Vec<ColumnFamilyDescriptor> = cf_names
+            .iter()
+            .map(|name| {
+                let mut cf_opts = Options::default();
+                cf_opts.set_merge_operator_associative("json_merge", json_merge);
+                ColumnFamilyDescriptor::new(name, cf_opts)
+            })
+            .collect();
 
         let db = match ttl_secs {
             Some(ttl) => {
                 let duration = Duration::from_secs(ttl);
-                DB::open_with_ttl(&opts, &path, duration)
+                DBWithThreadMode::open_cf_descriptors_with_ttl(
+                    &opts,
+                    &path,
+                    cf_descriptors,
+                    duration,
+                )
             }
-            None => DB::open(&opts, &path),
+            None => DBWithThreadMode::open_cf_descriptors(&opts, &path, cf_descriptors),
         };
 
         match db {
@@ -146,14 +190,15 @@ impl RocksDB {
         }
     }
 
-    pub fn create_column_family(&self, cf_name: String) -> PhpResult<()> {
-        let opts = Options::default();
+    pub fn create_column_family(&mut self, cf_name: String) -> PhpResult<()> {
+        let mut opts = Options::default();
+        opts.set_merge_operator_associative("json_merge", json_merge);
         self.db
             .create_cf(&cf_name, &opts)
             .map_err(|e| e.to_string().into())
     }
 
-    pub fn drop_column_family(&self, cf_name: String) -> PhpResult<()> {
+    pub fn drop_column_family(&mut self, cf_name: String) -> PhpResult<()> {
         self.db.drop_cf(&cf_name).map_err(|e| e.to_string().into())
     }
 

src/lib.rs

@@ -38,16 +38,21 @@ pub fn php_request(code: &str) -> String {
 }
 
 pub fn php_request_file(script_filename: &str) -> String {
-    let output = Command::new("php")
-        // .arg(format!(
-        //     "-dextension={}/target/debug/lib{}.{}",
-        //     env::current_dir().unwrap().to_str().unwrap(),
-        //     env!("CARGO_PKG_NAME"),
-        //     std::env::consts::DLL_EXTENSION,
-        // ))
-        .arg(script_filename)
-        .output()
-        .expect("failed to execute PHP script");
+    let mut command = Command::new("php");
+
+    // Check if the environment variable is set to disable the extension argument
+    if env::var("DISABLE_EXTENSION_ARG").is_err() {
+        command.arg(format!(
+            "-dextension={}/target/debug/lib{}.{}",
+            env::current_dir().unwrap().to_str().unwrap(),
+            env!("CARGO_PKG_NAME"),
+            std::env::consts::DLL_EXTENSION,
+        ));
+    }
+
+    command.arg(script_filename);
+
+    let output = command.output().expect("failed to execute PHP script");
 
     if output.status.success() {
         String::from_utf8(output.stdout).unwrap()