diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock index f790606f0a1..1f2df7b8bbb 100644 --- a/quickwit/Cargo.lock +++ b/quickwit/Cargo.lock @@ -4234,7 +4234,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "ownedbytes" version = "0.5.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=59460c7#59460c767f8205ebd5dbb32eb3f19265adeee11d" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=e6cacc4#e6cacc40a98d57b06ce29bc2d0ccbff9e15e6116" dependencies = [ "stable_deref_trait", ] @@ -7232,7 +7232,7 @@ dependencies = [ [[package]] name = "tantivy" version = "0.20.2" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=59460c7#59460c767f8205ebd5dbb32eb3f19265adeee11d" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=e6cacc4#e6cacc40a98d57b06ce29bc2d0ccbff9e15e6116" dependencies = [ "aho-corasick", "arc-swap", @@ -7286,7 +7286,7 @@ dependencies = [ [[package]] name = "tantivy-bitpacker" version = "0.4.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=59460c7#59460c767f8205ebd5dbb32eb3f19265adeee11d" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=e6cacc4#e6cacc40a98d57b06ce29bc2d0ccbff9e15e6116" dependencies = [ "bitpacking", ] @@ -7294,7 +7294,7 @@ dependencies = [ [[package]] name = "tantivy-columnar" version = "0.1.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=59460c7#59460c767f8205ebd5dbb32eb3f19265adeee11d" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=e6cacc4#e6cacc40a98d57b06ce29bc2d0ccbff9e15e6116" dependencies = [ "fastdivide", "fnv", @@ -7309,7 +7309,7 @@ dependencies = [ [[package]] name = "tantivy-common" version = "0.5.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=59460c7#59460c767f8205ebd5dbb32eb3f19265adeee11d" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=e6cacc4#e6cacc40a98d57b06ce29bc2d0ccbff9e15e6116" dependencies = [ "async-trait", "byteorder", @@ -7332,7 +7332,7 @@ dependencies = [ [[package]] name = "tantivy-query-grammar" version = "0.20.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=59460c7#59460c767f8205ebd5dbb32eb3f19265adeee11d" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=e6cacc4#e6cacc40a98d57b06ce29bc2d0ccbff9e15e6116" dependencies = [ "nom", ] @@ -7340,7 +7340,7 @@ dependencies = [ [[package]] name = "tantivy-sstable" version = "0.1.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=59460c7#59460c767f8205ebd5dbb32eb3f19265adeee11d" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=e6cacc4#e6cacc40a98d57b06ce29bc2d0ccbff9e15e6116" dependencies = [ "tantivy-common", "tantivy-fst", @@ -7350,7 +7350,7 @@ dependencies = [ [[package]] name = "tantivy-stacker" version = "0.1.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=59460c7#59460c767f8205ebd5dbb32eb3f19265adeee11d" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=e6cacc4#e6cacc40a98d57b06ce29bc2d0ccbff9e15e6116" dependencies = [ "murmurhash32", "tantivy-common", @@ -7359,7 +7359,7 @@ dependencies = [ [[package]] name = "tantivy-tokenizer-api" version = "0.1.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=59460c7#59460c767f8205ebd5dbb32eb3f19265adeee11d" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=e6cacc4#e6cacc40a98d57b06ce29bc2d0ccbff9e15e6116" dependencies = [ "serde", ] diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml index d5af40fd091..c230399cc5d 100644 --- a/quickwit/Cargo.toml +++ b/quickwit/Cargo.toml @@ -232,7 +232,7 @@ quickwit-serve = { version = "0.6.3", path = "./quickwit-serve" } quickwit-storage = { version = "0.6.3", path = "./quickwit-storage" } quickwit-telemetry = { version = "0.6.3", path = "./quickwit-telemetry" } -tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "59460c7", default-features = false, features = [ +tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "e6cacc4", default-features = false, features = [ "mmap", "lz4-compression", "zstd-compression", diff --git a/quickwit/quickwit-search/src/root.rs b/quickwit/quickwit-search/src/root.rs index 45555f8b0ce..f266c79e219 100644 --- a/quickwit/quickwit-search/src/root.rs +++ b/quickwit/quickwit-search/src/root.rs @@ -2514,8 +2514,9 @@ mod tests { assert!(search_response.is_err()); assert_eq!( search_response.unwrap_err().to_string(), - "Invalid aggregation request: no variant of enum AggregationVariants found in \ - flattened data at line 17 column 17" + "Invalid aggregation request: unknown variant `termss`, expected one of `range`, \ + `histogram`, `date_histogram`, `terms`, `avg`, `value_count`, `max`, `min`, `stats`, \ + `sum`, `percentiles` at line 18 column 13" ); Ok(()) }