merge

nomos-services/storage/Cargo.toml

@@ -25,3 +25,9 @@ tempfile = "3"
 default = []
 mock = []
 sled-backend = ["sled"]
+rocksdb-backend = ["rocksdb"]
+
+[[bin]]
+name = "rocks"
+path = "src/bin/rocks.rs"
+required-features = ["rocksdb-backend"]

nomos-services/storage/src/backends/rocksdb.rs

@@ -92,11 +92,13 @@ impl<SerdeOp: StorageSerde + Send + Sync + 'static> StorageBackend for RocksBack
             (false, None) => {
                 let mut opts = Options::default();
                 opts.create_if_missing(true);
+                opts.create_missing_column_families(true);
                 DB::open(&opts, db_path)?
             }
             (false, Some(cf)) => {
                 let mut opts = Options::default();
                 opts.create_if_missing(true);
+                opts.create_missing_column_families(true);
                 DB::open_cf(&opts, db_path, [cf])?
             }
         };
@@ -129,10 +131,7 @@ impl<SerdeOp: StorageSerde + Send + Sync + 'static> StorageBackend for RocksBack
         &mut self,
         transaction: Self::Transaction,
     ) -> Result<<Self::Transaction as StorageTransaction>::Result, Self::Error> {
-        match transaction.execute() {
+        Ok(transaction.execute())
-            Ok(result) => Ok(Ok(result)),
-            Err(e) => Err(e),
-        }
     }
 }
 

nomos-services/storage/src/bin/rocks.rs

@@ -0,0 +1,58 @@
+use rocksdb::{Options, DB};
+
+const TEMP_ROCKS_PATH: &str = "rocks";
+
+pub fn rocksdb_ro() {
+    let mut opts = Options::default();
+    opts.create_if_missing(true);
+
+    // open in read only mode
+    let db = DB::open_cf_for_read_only(&opts, TEMP_ROCKS_PATH, ["blocks", "da"], false).unwrap();
+
+    let blocks_cf = db.cf_handle("blocks").unwrap();
+    let r = db.get_cf(blocks_cf, b"block1").unwrap().unwrap();
+
+    assert_eq!(r, b"block1data");
+
+    let da_cf = db.cf_handle("da").unwrap();
+    let r = db.get_cf(da_cf, b"da1").unwrap().unwrap();
+    assert_eq!(r, b"da1data");
+
+    loop {
+        std::thread::sleep(std::time::Duration::from_secs(1));
+    }
+}
+
+pub fn rocksdb_rw() {
+    let mut opts = Options::default();
+    opts.create_if_missing(true);
+    opts.create_missing_column_families(true);
+
+    let db = DB::open_cf(&opts, TEMP_ROCKS_PATH, ["blocks", "da"]).unwrap();
+
+    // open blocks column family and insert a block
+    let blocks_cf = db.cf_handle("blocks").unwrap();
+    db.put_cf(blocks_cf, b"block1", b"block1data").unwrap();
+
+    // open da column family and insert a blob
+    let da_cf = db.cf_handle("da").unwrap();
+    db.put_cf(da_cf, b"da1", b"da1data").unwrap();
+
+    // A loop to mock a long running program
+    loop {
+        std::thread::sleep(std::time::Duration::from_secs(1));
+    }
+}
+
+fn main() {
+    let mut args = std::env::args();
+    args.next();
+    let o = args.next();
+    if o.is_none() {
+        println!("open in read-write mode");
+        rocksdb_rw()
+    } else {
+        println!("open in read-only mode");
+        rocksdb_ro()
+    }
+}