has_child query AVG score mode does not always work correctly

fixes elastic#2750
mute · Mar 8, 2013 · 1297ad9 · 1297ad9
1 parent fb10cc6
commit 1297ad9
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java b/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java
@@ -303,6 +303,23 @@ public int nextDoc() throws IOException {
                 }
             }
         }
+
+        @Override
+        public int advance(int target) throws IOException {
+            currentDocId = parentsIterator.advance(target);
+            if (currentDocId == DocIdSetIterator.NO_MORE_DOCS) {
+                return currentDocId;
+            }
+
+            HashedBytesArray uid = idTypeCache.idByDoc(currentDocId);
+            currentScore = uidToScore.get(uid);
+            if (Float.compare(currentScore, 0) > 0) {
+                currentScore /= uidToCount.get(currentUid);
+                return currentDocId;
+            } else {
+                return nextDoc();
+            }
+        }
     }
 
     static class ChildUidCollector extends NoopCollector {