From ce3991c894c76f18056f456607166ceb8e15ec57 Mon Sep 17 00:00:00 2001 From: Pascal Seitz Date: Fri, 18 Oct 2024 11:29:18 +0800 Subject: [PATCH 1/2] update tantivy --- quickwit/Cargo.lock | 18 +++++++++--------- quickwit/Cargo.toml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock index 721160f1ed4..b26b4272d0a 100644 --- a/quickwit/Cargo.lock +++ b/quickwit/Cargo.lock @@ -4814,7 +4814,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "ownedbytes" version = "0.7.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=55b0b52#55b0b52457c87df45250243c3310b4ffad85b088" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=2f2db16#2f2db16ec10656f9a7ef37018d38e0c6fb5edbe5" dependencies = [ "stable_deref_trait", ] @@ -8256,7 +8256,7 @@ dependencies = [ [[package]] name = "tantivy" version = "0.23.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=55b0b52#55b0b52457c87df45250243c3310b4ffad85b088" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=2f2db16#2f2db16ec10656f9a7ef37018d38e0c6fb5edbe5" dependencies = [ "aho-corasick", "arc-swap", @@ -8309,7 +8309,7 @@ dependencies = [ [[package]] name = "tantivy-bitpacker" version = "0.6.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=55b0b52#55b0b52457c87df45250243c3310b4ffad85b088" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=2f2db16#2f2db16ec10656f9a7ef37018d38e0c6fb5edbe5" dependencies = [ "bitpacking", ] @@ -8317,7 +8317,7 @@ dependencies = [ [[package]] name = "tantivy-columnar" version = "0.3.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=55b0b52#55b0b52457c87df45250243c3310b4ffad85b088" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=2f2db16#2f2db16ec10656f9a7ef37018d38e0c6fb5edbe5" dependencies = [ "downcast-rs", "fastdivide", @@ -8332,7 +8332,7 @@ dependencies = [ [[package]] name = "tantivy-common" version = "0.7.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=55b0b52#55b0b52457c87df45250243c3310b4ffad85b088" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=2f2db16#2f2db16ec10656f9a7ef37018d38e0c6fb5edbe5" dependencies = [ "async-trait", "byteorder", @@ -8355,7 +8355,7 @@ dependencies = [ [[package]] name = "tantivy-query-grammar" version = "0.22.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=55b0b52#55b0b52457c87df45250243c3310b4ffad85b088" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=2f2db16#2f2db16ec10656f9a7ef37018d38e0c6fb5edbe5" dependencies = [ "nom", ] @@ -8363,7 +8363,7 @@ dependencies = [ [[package]] name = "tantivy-sstable" version = "0.3.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=55b0b52#55b0b52457c87df45250243c3310b4ffad85b088" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=2f2db16#2f2db16ec10656f9a7ef37018d38e0c6fb5edbe5" dependencies = [ "tantivy-bitpacker", "tantivy-common", @@ -8374,7 +8374,7 @@ dependencies = [ [[package]] name = "tantivy-stacker" version = "0.3.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=55b0b52#55b0b52457c87df45250243c3310b4ffad85b088" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=2f2db16#2f2db16ec10656f9a7ef37018d38e0c6fb5edbe5" dependencies = [ "murmurhash32", "rand_distr", @@ -8384,7 +8384,7 @@ dependencies = [ [[package]] name = "tantivy-tokenizer-api" version = "0.3.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=55b0b52#55b0b52457c87df45250243c3310b4ffad85b088" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=2f2db16#2f2db16ec10656f9a7ef37018d38e0c6fb5edbe5" dependencies = [ "serde", ] diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml index 6fcf67c2e10..3bc648caade 100644 --- a/quickwit/Cargo.toml +++ b/quickwit/Cargo.toml @@ -327,7 +327,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 = "55b0b52", default-features = false, features = [ +tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "2f2db16", default-features = false, features = [ "lz4-compression", "mmap", "quickwit", From e34a5d997e22d3c68a94c7d4950bab49efe3e888 Mon Sep 17 00:00:00 2001 From: Pascal Seitz Date: Fri, 18 Oct 2024 12:29:03 +0800 Subject: [PATCH 2/2] update test to cover datetime ns precision --- .../scenarii/multi_splits/0001-request-optimizations.yaml | 4 ++-- .../rest-api-tests/scenarii/multi_splits/_setup.quickwit.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/quickwit/rest-api-tests/scenarii/multi_splits/0001-request-optimizations.yaml b/quickwit/rest-api-tests/scenarii/multi_splits/0001-request-optimizations.yaml index b14c6f99e95..3c224a3783c 100644 --- a/quickwit/rest-api-tests/scenarii/multi_splits/0001-request-optimizations.yaml +++ b/quickwit/rest-api-tests/scenarii/multi_splits/0001-request-optimizations.yaml @@ -72,7 +72,7 @@ expected: hits: - _source: {"timestamp": "2015-01-10T12:00:00Z"} - _source: {"timestamp": "2015-01-10T13:00:00Z"} - - _source: {"timestamp": "2015-01-10T14:00:00Z"} + - _source: {"timestamp": "2015-01-10T14:00:00.000000001Z"} - _source: {"timestamp": "2015-01-11T12:00:00Z"} - _source: {"timestamp": "2015-01-11T12:00:00Z"} --- # ASC + TIMESTAMP filter @@ -129,5 +129,5 @@ expected: - _source: {"timestamp": "2015-01-11T12:00:00Z"} - _source: {"timestamp": "2015-01-11T12:00:00Z"} - _source: {"timestamp": "2015-01-11T12:00:00Z"} - - _source: {"timestamp": "2015-01-10T14:00:00Z"} + - _source: {"timestamp": "2015-01-10T14:00:00.000000001Z"} diff --git a/quickwit/rest-api-tests/scenarii/multi_splits/_setup.quickwit.yaml b/quickwit/rest-api-tests/scenarii/multi_splits/_setup.quickwit.yaml index 48c0f215b4d..dad2ef716cb 100644 --- a/quickwit/rest-api-tests/scenarii/multi_splits/_setup.quickwit.yaml +++ b/quickwit/rest-api-tests/scenarii/multi_splits/_setup.quickwit.yaml @@ -36,7 +36,7 @@ shuffle_ndjson: - {"timestamp": "2015-01-10T13:00:00Z"} - {"timestamp": "2015-01-11T12:00:00Z"} - {"timestamp": "2015-01-10T10:00:00Z"} - - {"timestamp": "2015-01-10T14:00:00Z"} # 1h later than 2.doc + - {"timestamp": "2015-01-10T14:00:00.000000001Z"} # 1h later than 2.doc - {"timestamp": "2015-01-11T12:00:00Z"} - {"timestamp": "2015-01-10T10:00:00Z"} - {"timestamp": "2015-01-10T12:00:00Z"} # 1h earlier than 2. doc