update: nvm representation

bectl/Cargo.toml

@@ -3,7 +3,7 @@ name = "bectl"
 version = "0.1.0"
 authors = ["tilpner <[email protected]>", "Johannes Wünsche <[email protected]>"]
 edition = "2021"
-rust-version = "1.66.1"
+rust-version = "1.82.0"
 
 [dependencies]
 betree_storage_stack = { path = "../betree", features = [ "internal-api" ] }
@@ -14,7 +14,7 @@ serde_json = "1.0"
 
 jemallocator = { version = "0.3", features = [ "background_threads" ] }
 
-figment = { version = "0.10", features = [ "json" ] }
+figment = { version = "0.10", features = ["json", "yaml"] }
 
 log = "0.4"
 env_logger = "0.9"

bectl/src/main.rs

@@ -8,8 +8,9 @@ use std::{
 use betree_storage_stack::{
     cow_bytes::CowBytes,
     database::{Database, DatabaseConfiguration, Superblock},
+    storage_pool::DiskOffset,
     tree::{DefaultMessageAction, TreeLayer},
-    StoragePreference, storage_pool::DiskOffset,
+    StoragePreference,
 };
 use chrono::{DateTime, Utc};
 use figment::providers::Format;
@@ -126,7 +127,7 @@ enum ObjMode {
     },
     Mv {
         name: String,
-        new_name: String
+        new_name: String,
     },
     Meta {
         obj_name: String,
@@ -179,7 +180,8 @@ fn bectl_main() -> Result<(), Error> {
 
     let cfg: DatabaseConfiguration = figment::Figment::new()
         .merge(DatabaseConfiguration::figment_default())
-        .merge(figment::providers::Json::file(opt.database_config))
+        .merge(figment::providers::Yaml::file(&opt.database_config))
+        .merge(figment::providers::Json::file(&opt.database_config))
         .merge(DatabaseConfiguration::figment_env())
         .extract()?;
 

betree/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.3.1-alpha"
 authors = ["Felix Wiedemann <[email protected]>", "Till Hoeppner <[email protected]>", "Johannes Wünsche <[email protected]>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.66.1"
+rust-version = "1.82.0"
 
 [lib]
 crate-type = ["rlib", "staticlib", "cdylib"]
@@ -61,6 +61,9 @@ rand = { version = "0.8", features = ["std_rng"] }
 pmdk = { path = "./pmdk", optional = true }
 rustc-hash = "1.1.0"
 gxhash = "3.1.1"
+rkyv = { version = "0.7.43", features = ["validation"] }
+lazy_static = "1.4.0"
+serde_yaml = "0.9.34"
 
 [dev-dependencies]
 rand_xorshift = "0.3"
@@ -81,8 +84,7 @@ figment_config = ["figment"]
 # leaf vdev. This requires additional system calls due to time measuring and is
 # therefore safeguarded into it's own feature
 latency_metrics = []
-experimental-api = []
 nvm = ["pmdk"]
 # Log the allocations and deallocations done for later analysis
 allocation_log = []
-
+cache-paranoia = []

betree/haura-benchmarks/Cargo.toml

@@ -8,10 +8,10 @@ edition = "2018"
 members = ["."]
 
 [dependencies]
-betree_storage_stack = { path = "..", features = ["experimental-api"]}
+betree_storage_stack = { path = ".." }
 
 structopt = "0.3"
-figment = { version = "0.10", features = [ "json" ] }
+figment = { version = "0.10", features = [ "json", "yaml" ] }
 serde_json = "1"
 libmedium = "0.7"
 procfs = "0.16"

betree/haura-benchmarks/haura-plots/haura_plots/ycsb_plots.py

@@ -42,6 +42,7 @@ def plot_grouped_c(path, runs, overall=False):
         return
 
     fig, ax = plt.subplots()
+    runs = sorted(runs, key=lambda run: max(run["results"]))
     off = 1 / (len(runs) + 1)
     for idx, run in enumerate(runs):
         if not overall:
@@ -60,8 +61,8 @@ def plot_grouped_c(path, runs, overall=False):
         group = runs[0]["group"].split('/')[-1:][0]
         ax.set_title(f'YCSB Scaling | {group}')
     else:
-        ax.set_title(f'YCSB Scaling')
+        ax.set_title(f'YCSB-C-esque Write Scaling (Key-Value)')
     ax.set_ylabel("Throughput [op/s]")
     ax.set_xlabel("Threads [#]")
     extra = fig.legend(loc="upper left", bbox_to_anchor=(0.9, 0.89))
-    fig.savefig(f"{path}/ycsb_c_comparison.svg", bbox_extra_artists=(extra,), bbox_inches="tight")
+    fig.savefig(f"{path}/ycsb_c_comparison.svg", bbox_extra_artists=(extra,), bbox_inches="tight", transparent=True)