Skip to content
This repository was archived by the owner on Mar 12, 2026. It is now read-only.
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
7 changes: 1 addition & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,12 @@ jobs:
run: |
rustup component add clippy
rustup component add rustfmt
cargo install cargo-sort
cargo install --git https://github.com/DevinR528/cargo-sort --rev 55ec890 --locked
- name: Run Style Check
run: |
make clippy
make fmt
make check-cargo-toml
- name: Report Disk Usage
if: always()
run: |
du -sh ./target
df -h

unit-test:
name: unit-test
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ members = [
"src/system_catalog",
"src/table_engine",
"src/tools",
"src/wal",
"src/wal"
]

[workspace.dependencies]
Expand Down
1 change: 1 addition & 0 deletions src/benchmarks/bench.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ runtime_thread_num = 1
bench_measurement_time = "120s"
max_projections = 5
read_batch_row_num = 500
sst_level = 0

[merge_sst_bench.predicate]
start_time_ms = 0
Expand Down
1 change: 1 addition & 0 deletions src/benchmarks/config/bench.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ bench_measurement_time = "30s"
bench_sample_size = 30
max_projections = 5
read_batch_row_num = 500
sst_level = 0

[merge_sst_bench.predicate]
start_time_ms = 0
Expand Down
1 change: 1 addition & 0 deletions src/benchmarks/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ pub struct MergeSstBenchConfig {
pub max_projections: usize,
pub num_rows_per_row_group: usize,
pub predicate: BenchPredicate,
pub sst_level: u16,
}

#[derive(Deserialize)]
Expand Down
4 changes: 3 additions & 1 deletion src/benchmarks/src/merge_sst_bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ pub struct MergeSstBench {
file_handles: Vec<FileHandle>,
_receiver: UnboundedReceiver<Request>,
dedup: bool,
sst_level: Level,
}

impl MergeSstBench {
Expand Down Expand Up @@ -121,6 +122,7 @@ impl MergeSstBench {
file_handles,
_receiver: rx,
dedup: true,
sst_level: config.sst_level.into(),
}
}

Expand Down Expand Up @@ -168,7 +170,7 @@ impl MergeSstBench {

builder
// TODO: make level configurable
.mut_ssts_of_level(Level::MIN)
.mut_ssts_of_level(self.sst_level)
.extend_from_slice(&self.file_handles);

self.runtime.block_on(async {
Expand Down
4 changes: 2 additions & 2 deletions src/benchmarks/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ pub async fn file_handles_from_ssts(

let file_meta = FileMeta {
id: *file_id,
size: 0,
row_num: 0,
size: store.head(&path).await.unwrap().size as u64,
row_num: parquet_metadata.file_metadata().num_rows() as u64,
time_range: sst_meta.time_range,
max_seq: sst_meta.max_sequence,
storage_format: StorageFormat::Columnar,
Expand Down
2 changes: 1 addition & 1 deletion src/df_engine_extensions/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ catalog = { workspace = true, features = ["test"] }
common_types = { workspace = true, features = ["test"] }
datafusion = { workspace = true }
datafusion-proto = { workspace = true }
futures = { workspace = true }
futures = { workspace = true }
generic_error = { workspace = true }
horaedbproto = { workspace = true }
lazy_static = { workspace = true }
Expand Down
5 changes: 1 addition & 4 deletions src/horaedb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ workspace = true
[features]
default = ["wal-rocksdb", "wal-table-kv", "wal-message-queue"]
wal-table-kv = ["wal/wal-table-kv", "analytic_engine/wal-table-kv"]
wal-message-queue = [
"wal/wal-message-queue",
"analytic_engine/wal-message-queue",
]
wal-message-queue = ["wal/wal-message-queue", "analytic_engine/wal-message-queue"]
wal-rocksdb = ["wal/wal-rocksdb", "analytic_engine/wal-rocksdb"]

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion src/meta_client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ reqwest = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
snafu = { workspace = true }
table_engine = { workspace = true }
table_engine = { workspace = true }
time_ext = { workspace = true }
tokio = { workspace = true }
tonic = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions src/wal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ workspace = true
[package.authors]
workspace = true

[package.edition]
workspace = true

[dependencies.rocksdb]
git = "https://github.com/tikv/rust-rocksdb.git"
rev = "f04f4dd8eacc30e67c24bc2529a6d9c6edb85f8f"
features = ["portable"]
optional = true

[package.edition]
workspace = true

[features]
wal-message-queue = ["dep:message_queue"]
wal-table-kv = ["dep:table_kv"]
Expand Down