Expand the log message for case when we reached the threshold of hits…

…, add some code level comments Signed-off-by: Martin Gaievski <[email protected]>
opensearch-project · Nov 25, 2024 · 8e650b3 · 8e650b3
1 parent 0efb1a3
commit 8e650b3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/test_aggregations.yml b/.github/workflows/test_aggregations.yml
@@ -10,7 +10,6 @@ on:
     branches:
       - "*"
       - "feature/**"
-
 jobs:
   Get-CI-Image-Tag:
     uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main

diff --git a/src/main/java/org/opensearch/neuralsearch/query/HybridQueryScorer.java b/src/main/java/org/opensearch/neuralsearch/query/HybridQueryScorer.java
@@ -189,7 +189,12 @@ public int docID() {
      */
     public float[] hybridScores() throws IOException {
         float[] scores = new float[numSubqueries];
+         //retrieves sub-matches using DisjunctionDisiScorer's two-phase iteration process.
+         //while the two-phase iterator can efficiently skip blocks of document IDs during matching,
+         //the DisiWrapper (obtained from subScorersPQ.topList()) ensures sequential document ID iteration.
+         //this is necessary for maintaining correct scoring order.
         DisiWrapper topList = getSubMatches();
+
         for (HybridDisiWrapper disiWrapper = (HybridDisiWrapper) topList; disiWrapper != null; disiWrapper =
             (HybridDisiWrapper) disiWrapper.next) {
             // check if this doc has match in the subQuery. If not, add score as 0.0 and continue

diff --git a/src/main/java/org/opensearch/neuralsearch/search/collector/HybridTopScoreDocCollector.java b/src/main/java/org/opensearch/neuralsearch/search/collector/HybridTopScoreDocCollector.java
@@ -116,7 +116,11 @@ public void collect(int doc) throws IOException {
                         continue;
                     }
                     if (hitsThresholdChecker.isThresholdReached() && totalHitsRelation == TotalHits.Relation.EQUAL_TO) {
-                        log.info("reached hits threshold check");
+                        log.info(
+                            "hit count threshold reached: total hits={}, threshold={}, action=updating_results",
+                            totalHits,
+                            hitsThresholdChecker.getTotalHitsThreshold()
+                        );
                         totalHitsRelation = TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO;
                     }
                     collectedHitsPerSubQuery[i]++;