forked from quickwit-oss/tantivy
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
support ff range queries on json fields (quickwit-oss#2456)
* support ff range queries on json fields * fix term date truncation * use inverted index range query for phrase prefix queries * rename to InvertedIndexRangeQuery * fix column filter, add mixed column test
- Loading branch information
1 parent
be2f941
commit a3243d8
Showing
15 changed files
with
1,317 additions
and
284 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| use std::io; | ||
| use std::ops::Bound; | ||
|
|
||
| #[derive(Clone, Debug)] | ||
| pub struct BoundsRange<T> { | ||
| pub lower_bound: Bound<T>, | ||
| pub upper_bound: Bound<T>, | ||
| } | ||
| impl<T> BoundsRange<T> { | ||
| pub fn new(lower_bound: Bound<T>, upper_bound: Bound<T>) -> Self { | ||
| BoundsRange { | ||
| lower_bound, | ||
| upper_bound, | ||
| } | ||
| } | ||
| pub fn is_unbounded(&self) -> bool { | ||
| matches!(self.lower_bound, Bound::Unbounded) && matches!(self.upper_bound, Bound::Unbounded) | ||
| } | ||
| pub fn map_bound<TTo>(&self, transform: impl Fn(&T) -> TTo) -> BoundsRange<TTo> { | ||
| BoundsRange { | ||
| lower_bound: map_bound(&self.lower_bound, &transform), | ||
| upper_bound: map_bound(&self.upper_bound, &transform), | ||
| } | ||
| } | ||
|
|
||
| pub fn map_bound_res<TTo, Err>( | ||
| &self, | ||
| transform: impl Fn(&T) -> Result<TTo, Err>, | ||
| ) -> Result<BoundsRange<TTo>, Err> { | ||
| Ok(BoundsRange { | ||
| lower_bound: map_bound_res(&self.lower_bound, &transform)?, | ||
| upper_bound: map_bound_res(&self.upper_bound, &transform)?, | ||
| }) | ||
| } | ||
|
|
||
| pub fn transform_inner<TTo>( | ||
| &self, | ||
| transform_lower: impl Fn(&T) -> TransformBound<TTo>, | ||
| transform_upper: impl Fn(&T) -> TransformBound<TTo>, | ||
| ) -> BoundsRange<TTo> { | ||
| BoundsRange { | ||
| lower_bound: transform_bound_inner(&self.lower_bound, &transform_lower), | ||
| upper_bound: transform_bound_inner(&self.upper_bound, &transform_upper), | ||
| } | ||
| } | ||
|
|
||
| /// Returns the first set inner value | ||
| pub fn get_inner(&self) -> Option<&T> { | ||
| inner_bound(&self.lower_bound).or(inner_bound(&self.upper_bound)) | ||
| } | ||
| } | ||
|
|
||
| pub enum TransformBound<T> { | ||
| /// Overwrite the bounds | ||
| NewBound(Bound<T>), | ||
| /// Use Existing bounds with new value | ||
| Existing(T), | ||
| } | ||
|
|
||
| /// Takes a bound and transforms the inner value into a new bound via a closure. | ||
| /// The bound variant may change by the value returned value from the closure. | ||
| pub fn transform_bound_inner_res<TFrom, TTo>( | ||
| bound: &Bound<TFrom>, | ||
| transform: impl Fn(&TFrom) -> io::Result<TransformBound<TTo>>, | ||
| ) -> io::Result<Bound<TTo>> { | ||
| use self::Bound::*; | ||
| Ok(match bound { | ||
| Excluded(ref from_val) => match transform(from_val)? { | ||
| TransformBound::NewBound(new_val) => new_val, | ||
| TransformBound::Existing(new_val) => Excluded(new_val), | ||
| }, | ||
| Included(ref from_val) => match transform(from_val)? { | ||
| TransformBound::NewBound(new_val) => new_val, | ||
| TransformBound::Existing(new_val) => Included(new_val), | ||
| }, | ||
| Unbounded => Unbounded, | ||
| }) | ||
| } | ||
|
|
||
| /// Takes a bound and transforms the inner value into a new bound via a closure. | ||
| /// The bound variant may change by the value returned value from the closure. | ||
| pub fn transform_bound_inner<TFrom, TTo>( | ||
| bound: &Bound<TFrom>, | ||
| transform: impl Fn(&TFrom) -> TransformBound<TTo>, | ||
| ) -> Bound<TTo> { | ||
| use self::Bound::*; | ||
| match bound { | ||
| Excluded(ref from_val) => match transform(from_val) { | ||
| TransformBound::NewBound(new_val) => new_val, | ||
| TransformBound::Existing(new_val) => Excluded(new_val), | ||
| }, | ||
| Included(ref from_val) => match transform(from_val) { | ||
| TransformBound::NewBound(new_val) => new_val, | ||
| TransformBound::Existing(new_val) => Included(new_val), | ||
| }, | ||
| Unbounded => Unbounded, | ||
| } | ||
| } | ||
|
|
||
| /// Returns the inner value of a `Bound` | ||
| pub fn inner_bound<T>(val: &Bound<T>) -> Option<&T> { | ||
| match val { | ||
| Bound::Included(term) | Bound::Excluded(term) => Some(term), | ||
| Bound::Unbounded => None, | ||
| } | ||
| } | ||
|
|
||
| pub fn map_bound<TFrom, TTo>( | ||
| bound: &Bound<TFrom>, | ||
| transform: impl Fn(&TFrom) -> TTo, | ||
| ) -> Bound<TTo> { | ||
| use self::Bound::*; | ||
| match bound { | ||
| Excluded(ref from_val) => Bound::Excluded(transform(from_val)), | ||
| Included(ref from_val) => Bound::Included(transform(from_val)), | ||
| Unbounded => Unbounded, | ||
| } | ||
| } | ||
|
|
||
| pub fn map_bound_res<TFrom, TTo, Err>( | ||
| bound: &Bound<TFrom>, | ||
| transform: impl Fn(&TFrom) -> Result<TTo, Err>, | ||
| ) -> Result<Bound<TTo>, Err> { | ||
| use self::Bound::*; | ||
| Ok(match bound { | ||
| Excluded(ref from_val) => Excluded(transform(from_val)?), | ||
| Included(ref from_val) => Included(transform(from_val)?), | ||
| Unbounded => Unbounded, | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.