Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ parking_lot = { version = "0.12", features = ["arc_lock"] }
petgraph = { version = "0.6" }
recursive = { version = "0.1" }
regex = { version = "1" }
rocksdb = { version = "0.22" }
rocksdb = { version = "0.23" }
rust_decimal = { version = "1" }
serde = { version = "1", features = ["derive", "rc"] }
kite_sql_serde_macros = { version = "0.1.0", path = "kite_sql_serde_macros" }
Expand Down
1 change: 1 addition & 0 deletions docs/features.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ let kite_sql = DataBaseBuilder::path("./data")
- Volcano

### MVCC Transaction
- Pessimistic (Default)
- Optimistic

### Field options
Expand Down
2 changes: 1 addition & 1 deletion examples/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use kite_sql::db::{DataBaseBuilder, ResultIter};
use kite_sql::errors::DatabaseError;

fn main() -> Result<(), DatabaseError> {
let database = DataBaseBuilder::path("./transaction").build()?;
let database = DataBaseBuilder::path("./transaction").build_optimistic()?;
let mut transaction = database.new_transaction()?;

transaction
Expand Down
68 changes: 65 additions & 3 deletions src/db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use crate::optimizer::rule::implementation::ImplementationRuleImpl;
use crate::optimizer::rule::normalization::NormalizationRuleImpl;
use crate::parser::parse_sql;
use crate::planner::LogicalPlan;
use crate::storage::rocksdb::RocksStorage;
use crate::storage::rocksdb::{OptimisticRocksStorage, RocksStorage};
use crate::storage::{StatisticsMetaCache, Storage, TableCache, Transaction, ViewCache};
use crate::types::tuple::{SchemaRef, Tuple};
use crate::types::value::DataValue;
Expand Down Expand Up @@ -86,6 +86,21 @@ impl DataBaseBuilder {

pub fn build(self) -> Result<Database<RocksStorage>, DatabaseError> {
let storage = RocksStorage::new(self.path)?;

Self::_build::<RocksStorage>(storage, self.scala_functions, self.table_functions)
}

pub fn build_optimistic(self) -> Result<Database<OptimisticRocksStorage>, DatabaseError> {
let storage = OptimisticRocksStorage::new(self.path)?;

Self::_build::<OptimisticRocksStorage>(storage, self.scala_functions, self.table_functions)
}

fn _build<T: Storage>(
storage: T,
scala_functions: ScalaFunctions,
table_functions: TableFunctions,
) -> Result<Database<T>, DatabaseError> {
let meta_cache = SharedLruCache::new(256, 8, RandomState::new())?;
let table_cache = SharedLruCache::new(48, 4, RandomState::new())?;
let view_cache = SharedLruCache::new(12, 4, RandomState::new())?;
Expand All @@ -94,8 +109,8 @@ impl DataBaseBuilder {
storage,
mdl: Default::default(),
state: Arc::new(State {
scala_functions: self.scala_functions,
table_functions: self.table_functions,
scala_functions,
table_functions,
meta_cache,
table_cache,
view_cache,
Expand Down Expand Up @@ -662,6 +677,53 @@ pub(crate) mod test {
tx_1.run("insert into t1 values(0, 0)")?.done()?;
tx_1.run("insert into t1 values(1, 1)")?.done()?;

assert!(tx_2.run("insert into t1 values(0, 0)")?.done().is_err());
tx_2.run("insert into t1 values(3, 3)")?.done()?;

let mut iter_1 = tx_1.run("select * from t1")?;
let mut iter_2 = tx_2.run("select * from t1")?;

assert_eq!(
iter_1.next().unwrap()?.values,
vec![DataValue::Int32(0), DataValue::Int32(0)]
);
assert_eq!(
iter_1.next().unwrap()?.values,
vec![DataValue::Int32(1), DataValue::Int32(1)]
);

assert_eq!(
iter_2.next().unwrap()?.values,
vec![DataValue::Int32(3), DataValue::Int32(3)]
);
drop(iter_1);
drop(iter_2);

tx_1.commit()?;
tx_2.commit()?;

let mut tx_3 = kite_sql.new_transaction()?;
let res = tx_3.run("create table t2 (a int primary key, b int)");
assert!(res.is_err());

Ok(())
}

#[test]
fn test_optimistic_transaction_sql() -> Result<(), DatabaseError> {
let temp_dir = TempDir::new().expect("unable to create temporary working directory");
let kite_sql = DataBaseBuilder::path(temp_dir.path()).build_optimistic()?;

kite_sql
.run("create table t1 (a int primary key, b int)")?
.done()?;

let mut tx_1 = kite_sql.new_transaction()?;
let mut tx_2 = kite_sql.new_transaction()?;

tx_1.run("insert into t1 values(0, 0)")?.done()?;
tx_1.run("insert into t1 values(1, 1)")?.done()?;

tx_2.run("insert into t1 values(0, 0)")?.done()?;
tx_2.run("insert into t1 values(3, 3)")?.done()?;

Expand Down
Loading
Loading