@@ -942,11 +942,6 @@ fn is_simple_all_query(search_request: &SearchRequest) -> bool {
942
942
return false ;
943
943
}
944
944
945
- // TODO: Update the logic to handle start_timestamp end_timestamp ranges
946
- if search_request. start_timestamp . is_some ( ) || search_request. end_timestamp . is_some ( ) {
947
- return false ;
948
- }
949
-
950
945
let Ok ( query_ast) = serde_json:: from_str ( & search_request. query_ast ) else {
951
946
return false ;
952
947
} ;
@@ -1000,6 +995,20 @@ impl CanSplitDoBetter {
1000
995
}
1001
996
}
1002
997
998
+ fn is_contained ( split : & SplitIdAndFooterOffsets , search_request : & SearchRequest ) -> bool {
999
+ if let Some ( start) = search_request. start_timestamp {
1000
+ if split. timestamp_start ( ) < start {
1001
+ return false ;
1002
+ }
1003
+ }
1004
+ if let Some ( end) = search_request. end_timestamp {
1005
+ if split. timestamp_end ( ) >= end {
1006
+ return false ;
1007
+ }
1008
+ }
1009
+ true
1010
+ }
1011
+
1003
1012
/// Optimize the order in which splits will get processed based on how it can skip the most
1004
1013
/// splits.
1005
1014
///
@@ -1009,18 +1018,29 @@ impl CanSplitDoBetter {
1009
1018
/// are the most likely to fill our Top K.
1010
1019
/// In the future, as split get more metadata per column, we may be able to do this more than
1011
1020
/// just for timestamp and "unsorted" request.
1012
- fn optimize_split_order ( & self , splits : & mut [ SplitIdAndFooterOffsets ] ) {
1021
+ ///
1022
+ /// To skip splits in time ranged queries, we sort the splits first by whether they are
1023
+ /// contained in the search request time range.
1024
+ fn optimize_split_order (
1025
+ & self ,
1026
+ splits : & mut [ SplitIdAndFooterOffsets ] ,
1027
+ search_request : & SearchRequest ,
1028
+ ) {
1013
1029
match self {
1014
1030
CanSplitDoBetter :: SplitIdHigher ( _) => {
1015
1031
splits. sort_unstable_by ( |a, b| b. split_id . cmp ( & a. split_id ) )
1016
1032
}
1017
1033
CanSplitDoBetter :: SplitTimestampHigher ( _)
1018
1034
| CanSplitDoBetter :: FindTraceIdsAggregation ( _) => {
1019
- splits. sort_unstable_by_key ( |split| std :: cmp :: Reverse ( split . timestamp_end ( ) ) )
1020
- }
1021
- CanSplitDoBetter :: SplitTimestampLower ( _ ) => {
1022
- splits . sort_unstable_by_key ( |split| split . timestamp_start ( ) )
1035
+ splits. sort_unstable_by_key ( |split| {
1036
+ let contained = Self :: is_contained ( split , search_request ) ;
1037
+ ( !contained , std :: cmp :: Reverse ( split . timestamp_end ( ) ) )
1038
+ } )
1023
1039
}
1040
+ CanSplitDoBetter :: SplitTimestampLower ( _) => splits. sort_unstable_by_key ( |split| {
1041
+ let contained = Self :: is_contained ( split, search_request) ;
1042
+ ( !contained, split. timestamp_start ( ) )
1043
+ } ) ,
1024
1044
CanSplitDoBetter :: Uninformative => ( ) ,
1025
1045
}
1026
1046
}
@@ -1034,7 +1054,7 @@ impl CanSplitDoBetter {
1034
1054
request : Arc < SearchRequest > ,
1035
1055
mut splits : Vec < SplitIdAndFooterOffsets > ,
1036
1056
) -> Result < Vec < ( SplitIdAndFooterOffsets , SearchRequest ) > , SearchError > {
1037
- self . optimize_split_order ( & mut splits) ;
1057
+ self . optimize_split_order ( & mut splits, & request ) ;
1038
1058
1039
1059
if !is_simple_all_query ( & request) {
1040
1060
// no optimization opportunity here.
@@ -1049,6 +1069,8 @@ impl CanSplitDoBetter {
1049
1069
// Calculate the number of splits which are guaranteed to deliver enough documents.
1050
1070
let min_required_splits = splits
1051
1071
. iter ( )
1072
+ // splits are sorted by whether they are contained in the request time range
1073
+ . filter ( |split| Self :: is_contained ( split, & request) )
1052
1074
. map ( |split| split. num_docs )
1053
1075
// computing the partial sum
1054
1076
. scan ( 0u64 , |partial_sum : & mut u64 , num_docs_in_split : u64 | {
0 commit comments