From bf0f178c416a4280deac67e60e043a2431e3e380 Mon Sep 17 00:00:00 2001 From: Tpt Date: Sun, 31 Oct 2021 17:49:53 +0100 Subject: [PATCH] Adds a ColumnFamilyDefinition struct to store column family options --- lib/src/storage/fallback_backend.rs | 8 ++++-- lib/src/storage/mod.rs | 29 ++++++++++++++------- lib/src/storage/rocksdb_backend.rs | 39 +++++++++++++++++------------ lib/src/store.rs | 1 + 4 files changed, 50 insertions(+), 27 deletions(-) diff --git a/lib/src/storage/fallback_backend.rs b/lib/src/storage/fallback_backend.rs index 7b4ae2bc..f2794886 100644 --- a/lib/src/storage/fallback_backend.rs +++ b/lib/src/storage/fallback_backend.rs @@ -4,14 +4,18 @@ use std::collections::BTreeMap; use std::io::Result; use std::sync::{Arc, RwLock}; +pub struct ColumnFamilyDefinition { + pub name: &'static str, +} + #[derive(Clone)] pub struct Db(Arc, Vec>>>>); impl Db { - pub fn new(column_families: &'static [&'static str]) -> Result { + pub fn new(column_families: Vec) -> Result { let mut trees = BTreeMap::new(); for cf in column_families { - trees.insert(ColumnFamily(*cf), BTreeMap::default()); + trees.insert(ColumnFamily(cf.name), BTreeMap::default()); } trees.entry(ColumnFamily("default")).or_default(); // We make sure that "default" key exists. Ok(Self(Arc::new(RwLock::new(trees)))) diff --git a/lib/src/storage/mod.rs b/lib/src/storage/mod.rs index 60fad3fc..eb37c66f 100644 --- a/lib/src/storage/mod.rs +++ b/lib/src/storage/mod.rs @@ -8,9 +8,9 @@ use crate::storage::binary_encoder::{ }; use crate::storage::numeric_encoder::{EncodedQuad, EncodedTerm, StrHash, StrLookup, TermEncoder}; #[cfg(target_arch = "wasm32")] -use fallback_backend::{ColumnFamily, Db, Iter}; +use fallback_backend::{ColumnFamily, ColumnFamilyDefinition, Db, Iter}; #[cfg(not(target_arch = "wasm32"))] -use rocksdb_backend::{ColumnFamily, Db, Iter}; +use rocksdb_backend::{ColumnFamily, ColumnFamilyDefinition, Db, Iter}; #[cfg(not(target_arch = "wasm32"))] use std::path::Path; @@ -36,11 +36,6 @@ const DOSP_CF: &str = "dosp"; const GRAPHS_CF: &str = "graphs"; const DEFAULT_CF: &str = "default"; -const COLUMN_FAMILIES: [&str; 11] = [ - ID2STR_CF, SPOG_CF, POSG_CF, OSPG_CF, GSPO_CF, GPOS_CF, GOSP_CF, DSPO_CF, DPOS_CF, DOSP_CF, - GRAPHS_CF, -]; - /// Low level storage primitives #[derive(Clone)] pub struct Storage { @@ -61,12 +56,28 @@ pub struct Storage { impl Storage { pub fn new() -> std::io::Result { - Self::setup(Db::new(&COLUMN_FAMILIES)?) + Self::setup(Db::new(Self::column_families())?) } #[cfg(not(target_arch = "wasm32"))] pub fn open(path: &Path) -> std::io::Result { - Self::setup(Db::open(path, &COLUMN_FAMILIES)?) + Self::setup(Db::open(path, Self::column_families())?) + } + + fn column_families() -> Vec { + vec![ + ColumnFamilyDefinition { name: ID2STR_CF }, + ColumnFamilyDefinition { name: SPOG_CF }, + ColumnFamilyDefinition { name: POSG_CF }, + ColumnFamilyDefinition { name: OSPG_CF }, + ColumnFamilyDefinition { name: GSPO_CF }, + ColumnFamilyDefinition { name: GPOS_CF }, + ColumnFamilyDefinition { name: GOSP_CF }, + ColumnFamilyDefinition { name: DSPO_CF }, + ColumnFamilyDefinition { name: DPOS_CF }, + ColumnFamilyDefinition { name: DOSP_CF }, + ColumnFamilyDefinition { name: GRAPHS_CF }, + ] } fn setup(db: Db) -> std::io::Result { diff --git a/lib/src/storage/rocksdb_backend.rs b/lib/src/storage/rocksdb_backend.rs index 5b170992..ac607f8f 100644 --- a/lib/src/storage/rocksdb_backend.rs +++ b/lib/src/storage/rocksdb_backend.rs @@ -37,6 +37,10 @@ macro_rules! ffi_result_impl { }} } +pub struct ColumnFamilyDefinition { + pub name: &'static str, +} + #[derive(Clone)] pub struct Db(Arc); @@ -52,7 +56,7 @@ struct DbHandler { low_priority_write_options: *mut rocksdb_writeoptions_t, flush_options: *mut rocksdb_flushoptions_t, env: Option<*mut rocksdb_env_t>, - column_families: Vec<&'static str>, + column_families: Vec, cf_handles: Vec<*mut rocksdb_column_family_handle_t>, } @@ -77,7 +81,7 @@ impl Drop for DbHandler { } impl Db { - pub fn new(column_families: &'static [&'static str]) -> Result { + pub fn new(column_families: Vec) -> Result { let path = if cfg!(target_os = "linux") { "/dev/shm/".into() } else { @@ -87,13 +91,13 @@ impl Db { Ok(Self(Arc::new(Self::do_open(&path, column_families, true)?))) } - pub fn open(path: &Path, column_families: &'static [&'static str]) -> Result { + pub fn open(path: &Path, column_families: Vec) -> Result { Ok(Self(Arc::new(Self::do_open(path, column_families, false)?))) } fn do_open( path: &Path, - column_families: &'static [&'static str], + mut column_families: Vec, in_memory: bool, ) -> Result { let c_path = CString::new( @@ -107,12 +111,16 @@ impl Db { assert!(!options.is_null(), "rocksdb_options_create returned null"); rocksdb_options_set_create_if_missing(options, 1); rocksdb_options_set_create_missing_column_families(options, 1); - if !in_memory { - rocksdb_options_set_compression( - options, - rocksdb_lz4_compression.try_into().unwrap(), - ); - } + rocksdb_options_set_compression( + options, + if in_memory { + rocksdb_no_compression + } else { + rocksdb_lz4_compression + } + .try_into() + .unwrap(), + ); let txn_options = rocksdb_transactiondb_options_create(); assert!( @@ -133,13 +141,12 @@ impl Db { None }; - let mut column_families = column_families.to_vec(); - if !column_families.contains(&"default") { - column_families.push("default") + if !column_families.iter().any(|c| c.name == "default") { + column_families.push(ColumnFamilyDefinition { name: "default" }) } let c_column_families = column_families .iter() - .map(|cf| CString::new(*cf)) + .map(|cf| CString::new(cf.name)) .collect::, _>>() .map_err(invalid_input_error)?; let cf_options: Vec<*const rocksdb_options_t> = vec![options; column_families.len()]; @@ -226,8 +233,8 @@ impl Db { } pub fn column_family(&self, name: &'static str) -> Option { - for (cf_name, cf_handle) in self.0.column_families.iter().zip(&self.0.cf_handles) { - if *cf_name == name { + for (cf, cf_handle) in self.0.column_families.iter().zip(&self.0.cf_handles) { + if cf.name == name { return Some(ColumnFamily(*cf_handle)); } } diff --git a/lib/src/store.rs b/lib/src/store.rs index 11fbebd8..02ff24bd 100644 --- a/lib/src/store.rs +++ b/lib/src/store.rs @@ -33,6 +33,7 @@ use crate::storage::io::{dump_dataset, dump_graph, load_dataset, load_graph}; use crate::storage::numeric_encoder::{Decoder, EncodedQuad, EncodedTerm}; use crate::storage::{ChainedDecodingQuadIterator, DecodingGraphIterator, Storage}; use std::io::{BufRead, Write}; +#[cfg(not(target_arch = "wasm32"))] use std::path::Path; use std::{fmt, io, str};