Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: replace bloom with xor8 filter #631

Merged
merged 6 commits into from
Feb 13, 2023
Merged

feat: replace bloom with xor8 filter #631

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd552dd
feat: add xor8
jiacai2050 Feb 9, 2023
fbf7092
fix test
jiacai2050 Feb 9, 2023
31c55eb
rename bloom
jiacai2050 Feb 9, 2023
77573b2
remove unsed fns
jiacai2050 Feb 9, 2023
842e5c9
rename files
jiacai2050 Feb 10, 2023
583463e
rename sst filter to parquet filter
jiacai2050 Feb 13, 2023
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
146 changes: 82 additions & 64 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 3 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,10 @@ datafusion-optimizer = "17.0.0"
datafusion-proto = "17.0.0"
df_operator = { path = "df_operator" }
env_logger = "0.6"
ethbloom = "0.13.0"
futures = "0.3"
xorfilter-rs = { git = "https://github.com/datafuse-extras/xorfilter", features = [
"cbordata",
], tag = "databend-alpha.4" }
lazy_static = "1.4.0"
log = "0.4"
logger = { path = "components/logger" }
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ common_types = { workspace = true }
common_util = { workspace = true }
datafusion = { workspace = true }
datafusion-expr = { workspace = true }
ethbloom = { workspace = true }
futures = { workspace = true }
lazy_static = { workspace = true }
log = { workspace = true }
Expand All @@ -49,6 +48,7 @@ table_kv = { workspace = true }
tempfile = { workspace = true, optional = true }
tokio = { workspace = true }
wal = { workspace = true }
xorfilter-rs = { workspace = true }

[dev-dependencies]
common_types = { workspace = true, features = ["test"] }
Expand Down
2 changes: 1 addition & 1 deletion analytic_engine/src/compaction/picker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ mod tests {
time_range,
max_sequence: 200,
schema: build_schema(),
bloom_filter: Default::default(),
sst_filter: Default::default(),
collapsible_cols_idx: Vec::new(),
};

Expand Down
6 changes: 3 additions & 3 deletions analytic_engine/src/sst/meta_data/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ impl MetaData {
/// contains no extended custom information.
pub fn try_new(
parquet_meta_data: &parquet_ext::ParquetMetaData,
ignore_bloom_filter: bool,
ignore_sst_filter: bool,
) -> Result<Self> {
let file_meta_data = parquet_meta_data.file_metadata();
let kv_metas = file_meta_data
Expand All @@ -46,8 +46,8 @@ impl MetaData {
let custom = {
let mut sst_meta =
encoding::decode_sst_meta_data(&kv_metas[0]).context(DecodeCustomMetaData)?;
if ignore_bloom_filter {
sst_meta.bloom_filter = None;
if ignore_sst_filter {
sst_meta.sst_filter = None;
}

Arc::new(sst_meta)
Expand Down
Loading