Merge pull request #122 from pamburus/feature/time-filter

new: Improved performance of `since` and `until` filters in `sort` mode
pamburus · Jan 27, 2024 · 9f51a7c · 9f51a7c
2 parents de652ab + a579414
commit 9f51a7c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ categories = ["command-line-utilities"]
 description = "Utility for viewing json-formatted log files."
 keywords = ["cli", "human", "log"]
 name = "hl"
-version = "0.25.0"
+version = "0.25.1-beta.1"
 edition = "2021"
 build = "build.rs"
 

diff --git a/src/app.rs b/src/app.rs
@@ -255,15 +255,27 @@ impl App {
                         if src.stat.lines_valid == 0 {
                             return None;
                         }
-                        if let Some(level) = self.options.filter.level {
-                            if !src.match_level(level) {
-                                return None;
+                        if let Some((ts_min, ts_max)) = src.stat.ts_min_max {
+                            if let Some(until) = self.options.filter.until  {
+                                if ts_min > until.into() {
+                                    return None;
+                                }
+                            }
+                            if let Some(since) = self.options.filter.since  {
+                                if ts_max < since.into(){
+                                    return None;
+                                }
                             }
+                            if let Some(level) = self.options.filter.level {
+                                if !src.match_level(level) {
+                                    return None;
+                                }
+                            }
+                            let offset = block.offset();
+                            Some((block, ts_min, ts_max, i, offset))
+                        } else {
+                            None
                         }
-                        let offset = block.offset();
-                        src.stat
-                            .ts_min_max
-                            .map(|(ts_min, ts_max)| (block, ts_min, ts_max, i, offset))
                     })
                     .collect();