diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock index 551dec93f13..6de7a8e9c64 100644 --- a/quickwit/Cargo.lock +++ b/quickwit/Cargo.lock @@ -929,6 +929,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64-simd" version = "0.8.0" @@ -4611,7 +4617,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "ownedbytes" version = "0.6.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ec37295#ec37295b2ff42aeabb8ae84d2fbdbee03fc95273" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=67ebba3#67ebba3c3ce155d8c1199224943b9c3dd0f47a98" dependencies = [ "stable_deref_trait", ] @@ -7962,11 +7968,11 @@ dependencies = [ [[package]] name = "tantivy" version = "0.22.0-dev" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ec37295#ec37295b2ff42aeabb8ae84d2fbdbee03fc95273" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=67ebba3#67ebba3c3ce155d8c1199224943b9c3dd0f47a98" dependencies = [ "aho-corasick", "arc-swap", - "base64 0.21.7", + "base64 0.22.0", "bitpacking", "byteorder", "census", @@ -8015,7 +8021,7 @@ dependencies = [ [[package]] name = "tantivy-bitpacker" version = "0.5.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ec37295#ec37295b2ff42aeabb8ae84d2fbdbee03fc95273" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=67ebba3#67ebba3c3ce155d8c1199224943b9c3dd0f47a98" dependencies = [ "bitpacking", ] @@ -8023,8 +8029,9 @@ dependencies = [ [[package]] name = "tantivy-columnar" version = "0.2.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ec37295#ec37295b2ff42aeabb8ae84d2fbdbee03fc95273" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=67ebba3#67ebba3c3ce155d8c1199224943b9c3dd0f47a98" dependencies = [ + "downcast-rs", "fastdivide", "itertools 0.12.1", "serde", @@ -8037,7 +8044,7 @@ dependencies = [ [[package]] name = "tantivy-common" version = "0.6.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ec37295#ec37295b2ff42aeabb8ae84d2fbdbee03fc95273" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=67ebba3#67ebba3c3ce155d8c1199224943b9c3dd0f47a98" dependencies = [ "async-trait", "byteorder", @@ -8060,7 +8067,7 @@ dependencies = [ [[package]] name = "tantivy-query-grammar" version = "0.21.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ec37295#ec37295b2ff42aeabb8ae84d2fbdbee03fc95273" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=67ebba3#67ebba3c3ce155d8c1199224943b9c3dd0f47a98" dependencies = [ "nom", ] @@ -8068,7 +8075,7 @@ dependencies = [ [[package]] name = "tantivy-sstable" version = "0.2.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ec37295#ec37295b2ff42aeabb8ae84d2fbdbee03fc95273" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=67ebba3#67ebba3c3ce155d8c1199224943b9c3dd0f47a98" dependencies = [ "tantivy-bitpacker", "tantivy-common", @@ -8079,7 +8086,7 @@ dependencies = [ [[package]] name = "tantivy-stacker" version = "0.2.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ec37295#ec37295b2ff42aeabb8ae84d2fbdbee03fc95273" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=67ebba3#67ebba3c3ce155d8c1199224943b9c3dd0f47a98" dependencies = [ "murmurhash32", "rand_distr", @@ -8089,7 +8096,7 @@ dependencies = [ [[package]] name = "tantivy-tokenizer-api" version = "0.2.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ec37295#ec37295b2ff42aeabb8ae84d2fbdbee03fc95273" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=67ebba3#67ebba3c3ce155d8c1199224943b9c3dd0f47a98" dependencies = [ "serde", ] diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml index edc7bb0e821..7bdf8e3f0de 100644 --- a/quickwit/Cargo.toml +++ b/quickwit/Cargo.toml @@ -322,7 +322,7 @@ quickwit-serve = { path = "quickwit-serve" } quickwit-storage = { path = "quickwit-storage" } quickwit-telemetry = { path = "quickwit-telemetry" } -tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "ec37295", default-features = false, features = [ +tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "67ebba3", default-features = false, features = [ "lz4-compression", "mmap", "quickwit", diff --git a/quickwit/rest-api-tests/scenarii/aggregations/0001-aggregations.yaml b/quickwit/rest-api-tests/scenarii/aggregations/0001-aggregations.yaml index afdb8143ddf..6e6184d6aab 100644 --- a/quickwit/rest-api-tests/scenarii/aggregations/0001-aggregations.yaml +++ b/quickwit/rest-api-tests/scenarii/aggregations/0001-aggregations.yaml @@ -117,8 +117,6 @@ expected: key: 192.168.0.1 - doc_count: 1 key: 192.168.0.11 - - doc_count: 1 - key: 192.168.0.15 doc_count_error_upper_bound: 0 sum_other_doc_count: 0 tags: diff --git a/quickwit/rest-api-tests/scenarii/aggregations/_setup.quickwit.yaml b/quickwit/rest-api-tests/scenarii/aggregations/_setup.quickwit.yaml index d9b3bd54d80..05962fe8828 100644 --- a/quickwit/rest-api-tests/scenarii/aggregations/_setup.quickwit.yaml +++ b/quickwit/rest-api-tests/scenarii/aggregations/_setup.quickwit.yaml @@ -67,5 +67,5 @@ ndjson: - {"name": "Fritz", "response": 30, "id": 0} - {"name": "Holger", "response": 30, "id": 4, "date": "2015-02-06T00:00:00Z", "host": "192.168.0.10"} - {"name": "Werner", "response": 20, "id": 5, "date": "2015-01-02T00:00:00Z", "host": "192.168.0.10"} - - {"name": "Bernhard", "response": 130, "id": 14, "date": "2015-02-16T00:00:00Z", "host": "192.168.0.15"} + - {"name": "Bernhard", "response": 130, "id": 14, "date": "2015-02-16T00:00:00Z"}