Skip to content

Commit

Permalink
Merge branch 'master' into fix-sync-error
Browse files Browse the repository at this point in the history
  • Loading branch information
Connor1996 authored Jul 6, 2022
2 parents be369c4 + 5c7235e commit 743a507
Show file tree
Hide file tree
Showing 12 changed files with 800 additions and 67 deletions.
8 changes: 7 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ edition = "2018"
bytes = "1.0"
coarsetime = "0.1.22"
crc = "1.8"
crc32fast = "1.2"
crossbeam-channel = "0.5"
enum_dispatch = "0.3"
farmhash = "1.1"
Expand All @@ -33,8 +34,9 @@ tikv-jemallocator = "0.4.0"

[workspace]
members = [
"agate_bench",
"proto",
"skiplist",
"skiplist"
]

[[bench]]
Expand All @@ -45,6 +47,10 @@ harness = false
name = "bench_table"
harness = false

[[bench]]
name = "bench_iterator"
harness = false

[profile.bench]
opt-level = 3
debug = false
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ optimizations that have been made in [unistore][4].

[1]: https://github.com/tikv/tikv
[2]: https://github.com/tikv/agatedb/projects/1
[3]: https://github.com/dgraph-io/badger/tree/45bca18f24ef5cc04701a1e17448ddfce9372da0
[3]: https://github.com/outcaste-io/badger/tree/45bca18f24ef5cc04701a1e17448ddfce9372da0
[4]: https://github.com/ngaut/unistore

AgateDB is under active development on [develop](https://github.com/tikv/agatedb/tree/develop)
Expand Down
22 changes: 22 additions & 0 deletions agate_bench/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[package]
name = "agate_bench"
version = "0.1.0"
authors = ["Alex Chi <iskyzh@gmail.com>"]
edition = "2018"

[features]
default = []
enable-rocksdb = ["rocksdb"]

[dependencies]
agatedb = { path = "../" }
bytes = "1.0"
clap = "2.33"
indicatif = "0.15"
rand = "0.7"
rocksdb = { version = "0.15", optional = true }
threadpool = "1.8"
yatp = { git = "https://github.com/tikv/yatp.git" }

[target.'cfg(not(target_env = "msvc"))'.dependencies]
tikv-jemallocator = "0.4.0"
Loading

0 comments on commit 743a507

Please sign in to comment.