Limit seek to greedy search by 2 partition periods

flant · Mar 27, 2018 · 38f42ad · 38f42ad
1 parent b9c65c4
commit 38f42ad
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -14,3 +14,4 @@ gem 'chronic'
 gem 'kubeclient'
 
 gem 'pry', group: :development
+gem 'dotenv', require: 'dotenv/load', group: :development
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -28,6 +28,7 @@ GEM
     concurrent-ruby (1.0.5)
     domain_name (0.5.20161021)
       unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.2.1)
     erubis (2.7.0)
     faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
@@ -103,6 +104,7 @@ DEPENDENCIES
   activesupport
   chronic
   clickhouse!
+  dotenv
   json
   kubeclient
   parslet

diff --git a/lib/loghouse_query/clickhouse.rb b/lib/loghouse_query/clickhouse.rb
@@ -73,11 +73,17 @@ def result_newer(start_time, lim, stop_at = nil)
     def result_from_seek_to
       lim = limit || Pagination::DEFAULT_PER_PAGE
 
+      seek_to_max_periods = 2
+
+      max_search_before = parsed_seek_to - (LogsTables::PARTITION_PERIOD.hours * seek_to_max_periods)
+      max_search_after  = parsed_seek_to + (LogsTables::PARTITION_PERIOD.hours * seek_to_max_periods)
+      max_search_after = Time.zone.now if max_search_after > Time.zone.now
+
       # search before part
-      before = result_older(parsed_seek_to, lim)
+      before = result_older(parsed_seek_to, lim, max_search_before)
 
       # search after part
-      after = result_newer(parsed_seek_to, lim, Time.zone.now)
+      after = result_newer(parsed_seek_to, lim, max_search_after)
 
       res = after.last([before.count, lim / 2].min)
       res += before.first(lim - res.count)