update

.gitignore

@@ -5,6 +5,7 @@
 /scripts/lib64
 /scripts/share/
 /scripts/.gitignore
+*.png
 *.csv
 pyvenv.cfg
 Cargo.lock

Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-mace-kv = { git = "https://github.com/abbycin/mace" }
+mace = { git = "https://github.com/abbycin/mace" }
 clap = { version = "4.5.48", features = ["derive"] }
 rand = "0.9.2"
 log = "0.4.22"

README.md

@@ -1,28 +0,0 @@
-# mace 0.0.19
-
-## insert performance
-![mace_insert](./scripts/mace_insert.png)
-
-![rocksdb_insert](./scripts/rocksdb_insert.png)
-
----
-
-## random get performance (cold get)
-
-![mace_get](./scripts/mace_get.png)
-
-![rocksdb_get](./scripts/rocksdb_get.png)
-
----
-
-# mixed perfomance (hot get)
-
-![mace_mixed](./scripts/mace_mixed.png)
-
-![rockdb_mixed](./scripts/rocksdb_mixed.png)
-
-# sequential scan perfomance (cold scan)
-
-![mace_scan](./scripts/mace_scan.png)
-
-![rocksdb_scan](./scripts/rocksdb_scan.png)

rocksdb/main.cpp

@@ -1,8 +1,6 @@
 #include <algorithm>
 #include <atomic>
 #include <cstdint>
-#include <cstdio>
-#include <fmt/base.h>
 #include <fmt/format.h>
 #include <memory>
 #include <random>
@@ -46,7 +44,7 @@ int main(int argc, char *argv[]) {
             .path = "/tmp/rocksdb_tmp",
     };
 
-    app.add_option("-m,--mode", args.mode, "Mode: insert, get, mixed, scan");
+    app.add_option("-m,--mode", args.mode, "Mode: insert, get, mixed");
     app.add_option("-t,--threads", args.threads, "Threads");
     app.add_option("-k,--key-size", args.key_size, "Key Size");
     app.add_option("-v,--value-size", args.value_size, "Value Size");
@@ -67,7 +65,7 @@ int main(int argc, char *argv[]) {
         return 1;
     }
 
-    if (args.mode != "insert" && args.mode != "get" && args.mode != "mixed" && args.mode != "scan") {
+    if (args.mode != "insert" && args.mode != "get" && args.mode != "mixed") {
         fmt::println("Error: Invalid mode");
         return 1;
     }
@@ -104,6 +102,7 @@ int main(int argc, char *argv[]) {
     options.enable_pipelined_write = true;
     options.env->SetBackgroundThreads(4, rocksdb::Env::Priority::HIGH);
 
+    auto ropt = rocksdb::ReadOptions();
     auto wopt = rocksdb::WriteOptions();
     wopt.no_slowdown = true;
     // wopt.disableWAL = true;
@@ -131,16 +130,15 @@ int main(int argc, char *argv[]) {
             tmp.resize(args.key_size, 'x');
             key.emplace_back(std::move(tmp));
         }
-        if (args.mode == "get" || args.random) {
+        if (args.random) {
             std::shuffle(keys.begin(), keys.end(), gen);
         }
         keys.emplace_back(std::move(key));
     }
 
-
     auto *handle = handles[0];
 
-    if (args.mode == "get" || args.mode == "scan") {
+    if (args.mode == "get") {
         auto *kv = db->BeginTransaction(wopt);
         for (size_t tid = 0; tid < args.threads; ++tid) {
             auto *tk = &keys[tid];
@@ -161,11 +159,8 @@ int main(int argc, char *argv[]) {
     handle = handles[0];
     for (size_t tid = 0; tid < args.threads; ++tid) {
         auto *tk = &keys[tid];
-        wg.emplace_back([&, tid] {
+        wg.emplace_back([&] {
             std::string rval(args.value_size, '0');
-            auto prefix = std::format("key_{}", tid);
-            auto ropt = rocksdb::ReadOptions();
-
             barrier.arrive_and_wait();
             if (mtx.try_lock()) {
                 b = nm::Instant::now();
@@ -199,13 +194,6 @@ int main(int argc, char *argv[]) {
                     kv->Commit();
                     delete kv;
                 }
-            } else if (args.mode == "scan") {
-                auto *iter = db->NewIterator(ropt);
-                iter->Seek(prefix);
-                while (iter->Valid()) {
-                    iter->Next();
-                }
-                delete iter;
             }
             total_op.fetch_add(args.iterations, std::memory_order::relaxed);
         });

scripts/mace.sh

@@ -32,12 +32,6 @@ function samples() {
                                 echo "mixed threads $i ksz ${kv_sz[j]} vsz ${kv_sz[j+1]} fail"
                                 exit 1
                         fi
-                        ./target/release/kv_bench --path /home/abby/mace_bench --threads $i --iterations $cnt --mode scan --key-size ${kv_sz[j]} --value-size ${kv_sz[j+1]} --insert-ratio 30
-                        if test $? -ne 0
-                        then
-                                echo "mixed threads $i ksz ${kv_sz[j]} vsz ${kv_sz[j+1]} fail"
-                                exit 1
-                        fi
                 done
         done
 }

scripts/plot.py

@@ -5,12 +5,8 @@ import sys
 
 def real_mode(m):
     if m == "mixed":
-        return "Mixed (70% Get, 30% Insert)"
-    elif m == "get":
-        return "Random Get"
-    elif m == "scan":
-        return "Sequential Scan"
-    return m.capitalize()
+        return "MIXED (70% Get, 30% Insert)"
+    return m.upper()
 
 name = sys.argv[1]
 prefix = name.split(".")[0]

scripts/rocksdb.sh

@@ -31,12 +31,6 @@ function samples() {
                                 echo "mixed threads $i ksz ${kv_sz[j]} vsz ${kv_sz[j+1]} fail"
                                 exit 1
                         fi
-                        ./build/release/rocksdb_bench --path /home/abby/rocksdb_tmp --threads $i --iterations $cnt --mode scan --key-size ${kv_sz[j]} --value-size ${kv_sz[j+1]} --insert-ratio 30
-                        if test $? -ne 0
-                        then
-                                echo "mixed threads $i ksz ${kv_sz[j]} vsz ${kv_sz[j+1]} fail"
-                                exit 1
-                        fi
                 done
         done
 }

src/main.rs

@@ -49,7 +49,7 @@ struct Args {
 fn main() {
     #[cfg(target_os = "linux")]
     {
-        Logger::init().add_file("/tmp/x.log", true);
+        Logger::init().add_file("/Data/x.log", true);
         log::set_max_level(log::LevelFilter::Info);
     }
     let args = Args::parse();
@@ -81,7 +81,7 @@ fn main() {
     opt.sync_on_write = false;
     opt.over_provision = true; // large value will use lots of memeory
     opt.inline_size = args.blob_size;
-    opt.tmp_store = args.mode != "get" && args.mode != "scan";
+    opt.tmp_store = args.mode != "get";
     let mut saved = opt.clone();
     saved.tmp_store = false;
     let mut db = Mace::new(opt.validate().unwrap()).unwrap();
@@ -96,13 +96,13 @@ fn main() {
             key.resize(args.key_size, b'x');
             tk.push(key);
         }
-        if args.random || args.mode == "get" {
+        if args.random {
             tk.shuffle(&mut rng);
         }
         keys.push(tk);
     }
 
-    if args.mode == "get" || args.mode == "scan" {
+    if args.mode == "get" {
         let pre_tx = db.begin().unwrap();
         (0..args.threads).for_each(|tid| {
             for i in 0..args.iterations {
@@ -130,7 +130,6 @@ fn main() {
             let insert_ratio = args.insert_ratio;
             let st = start_time.clone();
             let val = value.clone();
-            let prefix = format!("key_{tid}");
 
             std::thread::spawn(move || {
                 // coreid::bind_core(tid);
@@ -170,13 +169,6 @@ fn main() {
                             }
                         }
                     }
-                    "scan" => {
-                        let view = db.view().unwrap();
-                        let iter = view.seek(prefix);
-                        for x in iter {
-                            std::hint::black_box(x);
-                        }
-                    }
                     _ => panic!("Invalid mode"),
                 }