TH2-1077 change get nearest message to get current batch

th2-net · Nov 25, 2020 · 92c8578 · 92c8578
1 parent 6b767d7
commit 92c8578
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/src/main/kotlin/com/exactpro/th2/rptdataprovider/handlers/SearchMessagesHandler.kt b/src/main/kotlin/com/exactpro/th2/rptdataprovider/handlers/SearchMessagesHandler.kt
@@ -104,24 +104,30 @@ class SearchMessagesHandler(
         timelineDirection: TimeRelation
     ): StoredMessageId? {
         var daysChecking = 2
+        var isCurrentDay = true
         var timestamp = startTimestamp
         var messageId: StoredMessageId? = null
         while (messageId == null && daysChecking >= 0) {
             messageId = cradle.getFirstMessageIdSuspend(
                 timestamp,
                 stream,
                 direction,
-                timelineDirection
+                // with TimeRelation.BEFORE we always select current batch
+                if (isCurrentDay)
+                    TimeRelation.BEFORE
+                else
+                    timelineDirection
             )
             daysChecking -= 1
+            isCurrentDay = false
             timestamp = nextDay(timestamp, timelineDirection)
         }
         return messageId
     }
 
     private suspend fun initStreamMessageIdMap(request: MessageSearchRequest):
             MutableMap<Pair<String, Direction>, StoredMessageId?> {
-        var timestamp = chooseStartTimestamp(request)
+        val timestamp = chooseStartTimestamp(request)
 
         return mutableMapOf<Pair<String, Direction>, StoredMessageId?>().apply {
             for (stream in request.stream ?: emptyList()) {
@@ -235,18 +241,6 @@ class SearchMessagesHandler(
             .toList()
     }
 
-    private suspend fun getNewStartId(
-        messages: List<StoredMessage>,
-        timelineDirection: TimeRelation
-    ): StoredMessageId? {
-        if (messages.isEmpty()) return null
-        return if (timelineDirection == TimeRelation.AFTER) {
-            messages.last()
-        } else {
-            messages.first()
-        }.id
-    }
-
     private suspend fun pullMoreMerged(
         streamMessageIndexMap: MutableMap<Pair<String, Direction>, StoredMessageId?>,
         timelineDirection: TimeRelation,
@@ -260,7 +254,7 @@ class SearchMessagesHandler(
                     perStreamLimit,
                     timelineDirection
                 ).let {
-                    streamMessageIndexMap[stream] = getNewStartId(it, timelineDirection)
+                    streamMessageIndexMap[stream] = if (it.isNotEmpty()) it.last().id else null
                     it
                 }
             }