Skip to content

Commit 6de174d

Browse files
committed
MEGA WIP
1 parent 7f9003f commit 6de174d

File tree

29 files changed

+2513
-970
lines changed

29 files changed

+2513
-970
lines changed

Cargo.lock

Lines changed: 353 additions & 86 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ members = [
99
"test-test",
1010
"test-util",
1111
"tests",
12+
"transactional-store",
1213
"wasm-repl",
1314
"wire-protocol"
1415
]
@@ -24,5 +25,5 @@ debug = true
2425
debug = false
2526
lto = "thin"
2627

27-
# [patch."https://github.com/Axmouth/tree-display-rs"]
28-
# tree-display = { path = "../tree-display/tree-display" }
28+
[patch."https://github.com/Axmouth/tree-display-rs"]
29+
tree-display = { path = "../tree-display/tree-display" }

benchmarks/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ edition = "2021"
66

77
[dependencies]
88
sqlo2 = { path = "../engine" }
9+
transactional-store = { path = "../transactional-store" }
910
criterion = "=0.3"
1011
instant = { version = "=0.1", features = [ "now" ] }
1112
alloc_counter = "=0.0.4"
12-
sysinfo = "=0.23.12"
13+
sysinfo = "=0.24.7"
1314

1415

1516
[[bench]]

benchmarks/benches/bench_main.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,19 @@ pub fn million_row_benchmark(_c: &mut Criterion) {
209209
);
210210
}
211211

212+
fn store_set_benchmark(c: &mut Criterion) {
213+
use transactional_store::{TransactionalStore, TransactionalStoreExt};
214+
let store = TransactionalStore::<isize, &str>::new();
215+
// Bench here
216+
c.bench_function("create", |b| {
217+
b.iter(|| {
218+
for i in 0..100000 {
219+
store.set(i % 999, i.to_string().as_str(), None);
220+
}
221+
})
222+
});
223+
}
224+
212225
criterion_group!(
213226
benches,
214227
lex_benchmark,
@@ -220,5 +233,6 @@ criterion_group!(
220233
insert_benchmark,
221234
select_benchmark,
222235
million_row_benchmark,
236+
store_set_benchmark,
223237
);
224238
criterion_main!(benches);

engine/Cargo.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@ wasm = ["stdweb", "wasm-bindgen"]
1212

1313
[dependencies]
1414
byteorder = "=1.4.3"
15-
bytes = "=1.1.0"
16-
regex = "=1.5.5"
15+
bytes = "=1.2.0"
16+
regex = "=1.6.0"
1717
lazy_static = "=1.4.0"
1818
instant = { version = "=0.1.12", features = [ "now" ] }
19-
serde = { version = "=1.0.137", features = ["derive"] }
20-
jemallocator = {version = "=0.3.2", optional = true }
19+
serde = { version = "=1.0.140", features = ["derive"] }
2120
mimalloc = { version = "=0.1.29", default-features = false, optional = true }
2221
alloc_counter = {version = "=0.0.4", optional = true }
2322
test-util = { path = "../test-util" }
24-
test-macros = { path = "../test-macros" }
2523
tree-display = { git = "https://github.com/Axmouth/tree-display-rs", branch = "main" }
2624

2725
[dev-dependencies]
28-
pretty_assertions = "=1.2.1"
26+
pretty_assertions = "=1.2.1"
27+
test-macros = { path = "../test-macros" }

0 commit comments

Comments
 (0)