Fix when to apply BooleanToScoringExpressionEvaluator

Author: carlosdelest

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/FilterScoringOperator.java

@@ -58,7 +58,7 @@ protected Page process(Page page) {
                 return null;
             }
             for (int p = 0; p < page.getPositionCount(); p++) {
-                if (scoreBlock.isNull(p) || scoreBlock.getValueCount(p) != SCORE_BLOCK_INDEX) {
+                if (scoreBlock.isNull(p) || scoreBlock.getValueCount(p) != 1) {
                     // Null is like false
                     // And, for now, multivalued results are like false too
                     continue;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/evaluator/EvalMapper.java

@@ -116,12 +116,12 @@ public ExpressionEvaluator.Factory map(
             var rightEval = toEvaluator(foldCtx, bc.right(), layout, shardContexts, usesScoring);
             final ExpressionEvaluator.Factory leftEvalFactory;
             final ExpressionEvaluator.Factory rightEvalFactory;
-            if (usesScoring && bc.left() instanceof FullTextFunction == false) {
+            if (usesScoring) {
                 leftEvalFactory = new BooleanToScoringExpressionEvaluator.Factory(leftEval);
             } else {
                 leftEvalFactory = leftEval;
             }
-            if (usesScoring && bc.right() instanceof FullTextFunction == false) {
+            if (usesScoring) {
                 rightEvalFactory = new BooleanToScoringExpressionEvaluator.Factory(rightEval);
             } else {
                 rightEvalFactory = rightEval;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/evaluator/mapper/BooleanToScoringExpressionEvaluator.java

@@ -29,23 +29,28 @@ public BooleanToScoringExpressionEvaluator(EvalOperator.ExpressionEvaluator inne
 
     @Override
     public Block eval(Page page) {
-        try (Block innerBlock = inner.eval(page)) {
-            if ((innerBlock == null) || innerBlock.areAllValuesNull()) {
-                return innerBlock;
-            }
+        Block innerBlock = inner.eval(page);
+        if ((innerBlock == null) || innerBlock.areAllValuesNull()) {
+            return innerBlock;
+        }
 
-            if (innerBlock instanceof BooleanBlock == false) {
-                throw new IllegalArgumentException("Unexpected block type: " + innerBlock.getClass());
-            }
+        if (innerBlock instanceof DoubleBlock) {
+            // It's already a scoring block - no need to convert
+            return innerBlock;
+        }
 
-            return eval((BooleanBlock) innerBlock);
+        if (innerBlock instanceof BooleanBlock == false) {
+            throw new IllegalArgumentException("Unexpected block type: " + innerBlock.getClass());
         }
+
+        return eval((BooleanBlock) innerBlock);
     }
 
     private DoubleBlock eval(BooleanBlock booleanBlock) {
-        int positionCount = booleanBlock.getPositionCount();
-
-        try (DoubleBlock.Builder builder = driverContext.blockFactory().newDoubleBlockBuilder(positionCount)) {
+        DoubleBlock.Builder builder = null;
+        try {
+            int positionCount = booleanBlock.getPositionCount();
+            builder = driverContext.blockFactory().newDoubleBlockBuilder(positionCount);
             for (int i = 0; i < positionCount; i++) {
                 boolean value = booleanBlock.getBoolean(i);
                 if (value) {
@@ -56,6 +61,8 @@ private DoubleBlock eval(BooleanBlock booleanBlock) {
             }
 
             return builder.build();
+        } finally {
+            Releasables.closeExpectNoException(builder, booleanBlock);
         }
     }