Merge remote-tracking branch 'romseygeek/bug/sort-still-slow' into bug/sort-still-slow

Author: romseygeek

server/src/main/java/org/elasticsearch/lucene/comparators/XNumericComparator.java

@@ -357,7 +357,12 @@ protected int docCount() {
          * @throws IOException i/o exception while fetching min and max values from point values
          */
         void postInitializeCompetitiveIterator() throws IOException {
-            if (queueFull) {
+            if (queueFull && hitsThresholdReached) {
+                // if some documents have missing doc values, check that missing values prohibits
+                // optimization
+                if (docCount() < maxDoc && isMissingValueCompetitive()) {
+                    return;
+                }
                 long bottom = leafComparator.bottomAsComparableLong();
                 long minValue = sortableBytesToLong(pointValues.getMinPackedValue());
                 long maxValue = sortableBytesToLong(pointValues.getMaxPackedValue());
@@ -509,7 +514,12 @@ protected int docCount() {
          * iterator as competitive iterator.
          */
         void postInitializeCompetitiveIterator() {
-            if (queueFull) {
+            if (queueFull && hitsThresholdReached) {
+                // if some documents have missing doc values, check that missing values prohibits
+                // optimization
+                if (docCount() < maxDoc && isMissingValueCompetitive()) {
+                    return;
+                }
                 long bottom = leafComparator.bottomAsComparableLong();
                 if (reverse == false && bottom < skipper.minValue()) {
                     competitiveIterator.update(DocIdSetIterator.empty());