Remove deprecated constant Block APIs (#103723)

This PR continues the removal of deprecated Block APIs.
elastic · Dec 27, 2023 · eced6aa · eced6aa
1 parent eec1c28
commit eced6aa
Show file tree

Hide file tree

Showing 27 changed files with 34 additions and 122 deletions.
diff --git a/...n/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorImplementer.java b/...n/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorImplementer.java
@@ -499,22 +499,13 @@ private MethodSpec evaluateFinal() {
     private void primitiveStateToResult(MethodSpec.Builder builder) {
         switch (stateType.toString()) {
             case "org.elasticsearch.compute.aggregation.IntState":
-                builder.addStatement(
-                    "blocks[offset] = $T.newConstantBlockWith(state.intValue(), 1, driverContext.blockFactory())",
-                    INT_BLOCK
-                );
+                builder.addStatement("blocks[offset] = driverContext.blockFactory().newConstantIntBlockWith(state.intValue(), 1)");
                 return;
             case "org.elasticsearch.compute.aggregation.LongState":
-                builder.addStatement(
-                    "blocks[offset] = $T.newConstantBlockWith(state.longValue(), 1, driverContext.blockFactory())",
-                    LONG_BLOCK
-                );
+                builder.addStatement("blocks[offset] = driverContext.blockFactory().newConstantLongBlockWith(state.longValue(), 1)");
                 return;
             case "org.elasticsearch.compute.aggregation.DoubleState":
-                builder.addStatement(
-                    "blocks[offset] = $T.newConstantBlockWith(state.doubleValue(), 1, driverContext.blockFactory())",
-                    DOUBLE_BLOCK
-                );
+                builder.addStatement("blocks[offset] = driverContext.blockFactory().newConstantDoubleBlockWith(state.doubleValue(), 1)");
                 return;
             default:
                 throw new IllegalArgumentException("don't know how to convert state to result: " + stateType);

diff --git a/...ugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanBlock.java b/...ugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanBlock.java
@@ -175,15 +175,6 @@ static Builder newBlockBuilder(int estimatedSize, BlockFactory blockFactory) {
         return blockFactory.newBooleanBlockBuilder(estimatedSize);
     }
 
-    /**
-     * Returns a constant block.
-     * @deprecated use {@link BlockFactory#newConstantBooleanBlockWith}
-     */
-    @Deprecated
-    static BooleanBlock newConstantBlockWith(boolean value, int positions, BlockFactory blockFactory) {
-        return blockFactory.newConstantBooleanBlockWith(value, positions);
-    }
-
     /**
      * Builder for {@link BooleanBlock}
      */

diff --git a/...gin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefBlock.java b/...gin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefBlock.java
@@ -180,15 +180,6 @@ static Builder newBlockBuilder(int estimatedSize, BlockFactory blockFactory) {
         return blockFactory.newBytesRefBlockBuilder(estimatedSize);
     }
 
-    /**
-     * Returns a constant block.
-     * @deprecated use {@link BlockFactory#newConstantBytesRefBlockWith}
-     */
-    @Deprecated
-    static BytesRefBlock newConstantBlockWith(BytesRef value, int positions, BlockFactory blockFactory) {
-        return blockFactory.newConstantBytesRefBlockWith(value, positions);
-    }
-
     /**
      * Builder for {@link BytesRefBlock}
      */

diff --git a/...lugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleBlock.java b/...lugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleBlock.java
@@ -176,15 +176,6 @@ static Builder newBlockBuilder(int estimatedSize, BlockFactory blockFactory) {
         return blockFactory.newDoubleBlockBuilder(estimatedSize);
     }
 
-    /**
-     * Returns a constant block.
-     * @deprecated use {@link BlockFactory#newConstantDoubleBlockWith}
-     */
-    @Deprecated
-    static DoubleBlock newConstantBlockWith(double value, int positions, BlockFactory blockFactory) {
-        return blockFactory.newConstantDoubleBlockWith(value, positions);
-    }
-
     /**
      * Builder for {@link DoubleBlock}
      */

diff --git a/...k/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntBlock.java b/...k/plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntBlock.java
@@ -175,15 +175,6 @@ static Builder newBlockBuilder(int estimatedSize, BlockFactory blockFactory) {
         return blockFactory.newIntBlockBuilder(estimatedSize);
     }
 
-    /**
-     * Returns a constant block.
-     * @deprecated use {@link BlockFactory#newConstantIntBlockWith}
-     */
-    @Deprecated
-    static IntBlock newConstantBlockWith(int value, int positions, BlockFactory blockFactory) {
-        return blockFactory.newConstantIntBlockWith(value, positions);
-    }
-
     /**
      * Builder for {@link IntBlock}
      */

diff --git a/.../plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongBlock.java b/.../plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongBlock.java
@@ -176,15 +176,6 @@ static Builder newBlockBuilder(int estimatedSize, BlockFactory blockFactory) {
         return blockFactory.newLongBlockBuilder(estimatedSize);
     }
 
-    /**
-     * Returns a constant block.
-     * @deprecated use {@link BlockFactory#newConstantLongBlockWith}
-     */
-    @Deprecated
-    static LongBlock newConstantBlockWith(long value, int positions, BlockFactory blockFactory) {
-        return blockFactory.newConstantLongBlockWith(value, positions);
-    }
-
     /**
      * Builder for {@link LongBlock}
      */

diff --git a/...src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleAggregatorFunction.java b/...src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleAggregatorFunction.java
@@ -119,7 +119,7 @@ public void evaluateFinal(Block[] blocks, int offset, DriverContext driverContex
       blocks[offset] = Block.constantNullBlock(1, driverContext.blockFactory());
       return;
     }
-    blocks[offset] = DoubleBlock.newConstantBlockWith(state.doubleValue(), 1, driverContext.blockFactory());
+    blocks[offset] = driverContext.blockFactory().newConstantDoubleBlockWith(state.doubleValue(), 1);
   }
 
   @Override

diff --git a/...te/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntAggregatorFunction.java b/...te/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntAggregatorFunction.java
@@ -119,7 +119,7 @@ public void evaluateFinal(Block[] blocks, int offset, DriverContext driverContex
       blocks[offset] = Block.constantNullBlock(1, driverContext.blockFactory());
       return;
     }
-    blocks[offset] = IntBlock.newConstantBlockWith(state.intValue(), 1, driverContext.blockFactory());
+    blocks[offset] = driverContext.blockFactory().newConstantIntBlockWith(state.intValue(), 1);
   }
 
   @Override

diff --git a/...e/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongAggregatorFunction.java b/...e/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongAggregatorFunction.java
@@ -119,7 +119,7 @@ public void evaluateFinal(Block[] blocks, int offset, DriverContext driverContex
       blocks[offset] = Block.constantNullBlock(1, driverContext.blockFactory());
       return;
     }
-    blocks[offset] = LongBlock.newConstantBlockWith(state.longValue(), 1, driverContext.blockFactory());
+    blocks[offset] = driverContext.blockFactory().newConstantLongBlockWith(state.longValue(), 1);
   }
 
   @Override

diff --git a/...src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleAggregatorFunction.java b/...src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleAggregatorFunction.java
@@ -119,7 +119,7 @@ public void evaluateFinal(Block[] blocks, int offset, DriverContext driverContex
       blocks[offset] = Block.constantNullBlock(1, driverContext.blockFactory());
       return;
     }
-    blocks[offset] = DoubleBlock.newConstantBlockWith(state.doubleValue(), 1, driverContext.blockFactory());
+    blocks[offset] = driverContext.blockFactory().newConstantDoubleBlockWith(state.doubleValue(), 1);
   }
 
   @Override

diff --git a/...te/src/main/generated/org/elasticsearch/compute/aggregation/MinIntAggregatorFunction.java b/...te/src/main/generated/org/elasticsearch/compute/aggregation/MinIntAggregatorFunction.java
@@ -119,7 +119,7 @@ public void evaluateFinal(Block[] blocks, int offset, DriverContext driverContex
       blocks[offset] = Block.constantNullBlock(1, driverContext.blockFactory());
       return;
     }
-    blocks[offset] = IntBlock.newConstantBlockWith(state.intValue(), 1, driverContext.blockFactory());
+    blocks[offset] = driverContext.blockFactory().newConstantIntBlockWith(state.intValue(), 1);
   }
 
   @Override

diff --git a/...e/src/main/generated/org/elasticsearch/compute/aggregation/MinLongAggregatorFunction.java b/...e/src/main/generated/org/elasticsearch/compute/aggregation/MinLongAggregatorFunction.java
@@ -119,7 +119,7 @@ public void evaluateFinal(Block[] blocks, int offset, DriverContext driverContex
       blocks[offset] = Block.constantNullBlock(1, driverContext.blockFactory());
       return;
     }
-    blocks[offset] = LongBlock.newConstantBlockWith(state.longValue(), 1, driverContext.blockFactory());
+    blocks[offset] = driverContext.blockFactory().newConstantLongBlockWith(state.longValue(), 1);
   }
 
   @Override

diff --git a/...te/src/main/generated/org/elasticsearch/compute/aggregation/SumIntAggregatorFunction.java b/...te/src/main/generated/org/elasticsearch/compute/aggregation/SumIntAggregatorFunction.java
@@ -121,7 +121,7 @@ public void evaluateFinal(Block[] blocks, int offset, DriverContext driverContex
       blocks[offset] = Block.constantNullBlock(1, driverContext.blockFactory());
       return;
     }
-    blocks[offset] = LongBlock.newConstantBlockWith(state.longValue(), 1, driverContext.blockFactory());
+    blocks[offset] = driverContext.blockFactory().newConstantLongBlockWith(state.longValue(), 1);
   }
 
   @Override

diff --git a/...e/src/main/generated/org/elasticsearch/compute/aggregation/SumLongAggregatorFunction.java b/...e/src/main/generated/org/elasticsearch/compute/aggregation/SumLongAggregatorFunction.java
@@ -119,7 +119,7 @@ public void evaluateFinal(Block[] blocks, int offset, DriverContext driverContex
       blocks[offset] = Block.constantNullBlock(1, driverContext.blockFactory());
       return;
     }
-    blocks[offset] = LongBlock.newConstantBlockWith(state.longValue(), 1, driverContext.blockFactory());
+    blocks[offset] = driverContext.blockFactory().newConstantLongBlockWith(state.longValue(), 1);
   }
 
   @Override

diff --git a/...e/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctBooleanAggregator.java b/...e/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctBooleanAggregator.java
@@ -40,7 +40,7 @@ public static void combineIntermediate(SingleState current, boolean fbit, boolea
 
     public static Block evaluateFinal(SingleState state, DriverContext driverContext) {
         long result = ((state.bits & BIT_TRUE) >> 1) + (state.bits & BIT_FALSE);
-        return LongBlock.newConstantBlockWith(result, 1, driverContext.blockFactory());
+        return driverContext.blockFactory().newConstantLongBlockWith(result, 1);
     }
 
     public static GroupingState initGrouping(BigArrays bigArrays) {

diff --git a/.../src/main/java/org/elasticsearch/compute/aggregation/CountDistinctBytesRefAggregator.java b/.../src/main/java/org/elasticsearch/compute/aggregation/CountDistinctBytesRefAggregator.java
@@ -35,7 +35,7 @@ public static void combineIntermediate(HllStates.SingleState current, BytesRef i
 
     public static Block evaluateFinal(HllStates.SingleState state, DriverContext driverContext) {
         long result = state.cardinality();
-        return LongBlock.newConstantBlockWith(result, 1, driverContext.blockFactory());
+        return driverContext.blockFactory().newConstantLongBlockWith(result, 1);
     }
 
     public static HllStates.GroupingState initGrouping(BigArrays bigArrays, int precision) {

diff --git a/...te/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctDoubleAggregator.java b/...te/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctDoubleAggregator.java
@@ -35,7 +35,7 @@ public static void combineIntermediate(HllStates.SingleState current, BytesRef i
 
     public static Block evaluateFinal(HllStates.SingleState state, DriverContext driverContext) {
         long result = state.cardinality();
-        return LongBlock.newConstantBlockWith(result, 1, driverContext.blockFactory());
+        return driverContext.blockFactory().newConstantLongBlockWith(result, 1);
     }
 
     public static HllStates.GroupingState initGrouping(BigArrays bigArrays, int precision) {

diff --git a/...mpute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctIntAggregator.java b/...mpute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctIntAggregator.java
@@ -35,7 +35,7 @@ public static void combineIntermediate(HllStates.SingleState current, BytesRef i
 
     public static Block evaluateFinal(HllStates.SingleState state, DriverContext driverContext) {
         long result = state.cardinality();
-        return LongBlock.newConstantBlockWith(result, 1, driverContext.blockFactory());
+        return driverContext.blockFactory().newConstantLongBlockWith(result, 1);
     }
 
     public static HllStates.GroupingState initGrouping(BigArrays bigArrays, int precision) {

diff --git a/...pute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctLongAggregator.java b/...pute/src/main/java/org/elasticsearch/compute/aggregation/CountDistinctLongAggregator.java
@@ -35,7 +35,7 @@ public static void combineIntermediate(HllStates.SingleState current, BytesRef i
 
     public static Block evaluateFinal(HllStates.SingleState state, DriverContext driverContext) {
         long result = state.cardinality();
-        return LongBlock.newConstantBlockWith(result, 1, driverContext.blockFactory());
+        return driverContext.blockFactory().newConstantLongBlockWith(result, 1);
     }
 
     public static HllStates.GroupingState initGrouping(BigArrays bigArrays, int precision) {

diff --git a/...esql/compute/src/main/java/org/elasticsearch/compute/aggregation/SumDoubleAggregator.java b/...esql/compute/src/main/java/org/elasticsearch/compute/aggregation/SumDoubleAggregator.java
@@ -59,7 +59,7 @@ public static void evaluateIntermediate(SumState state, DriverContext driverCont
 
     public static Block evaluateFinal(SumState state, DriverContext driverContext) {
         double result = state.value();
-        return DoubleBlock.newConstantBlockWith(result, 1, driverContext.blockFactory());
+        return driverContext.blockFactory().newConstantDoubleBlockWith(result, 1);
     }
 
     public static GroupingSumState initGrouping(BigArrays bigArrays) {

diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/BlockUtils.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/BlockUtils.java
@@ -225,11 +225,11 @@ public static Block constantBlock(BlockFactory blockFactory, Object val, int siz
     private static Block constantBlock(BlockFactory blockFactory, ElementType type, Object val, int size) {
         return switch (type) {
             case NULL -> blockFactory.newConstantNullBlock(size);
-            case LONG -> LongBlock.newConstantBlockWith((long) val, size, blockFactory);
-            case INT -> IntBlock.newConstantBlockWith((int) val, size, blockFactory);
-            case BYTES_REF -> BytesRefBlock.newConstantBlockWith(toBytesRef(val), size, blockFactory);
-            case DOUBLE -> DoubleBlock.newConstantBlockWith((double) val, size, blockFactory);
-            case BOOLEAN -> BooleanBlock.newConstantBlockWith((boolean) val, size, blockFactory);
+            case LONG -> blockFactory.newConstantLongBlockWith((long) val, size);
+            case INT -> blockFactory.newConstantIntBlockWith((int) val, size);
+            case BYTES_REF -> blockFactory.newConstantBytesRefBlockWith(toBytesRef(val), size);
+            case DOUBLE -> blockFactory.newConstantDoubleBlockWith((double) val, size);
+            case BOOLEAN -> blockFactory.newConstantBooleanBlockWith((boolean) val, size);
             default -> throw new UnsupportedOperationException("unsupported element type [" + type + "]");
         };
     }

diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/X-Block.java.st b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/X-Block.java.st
@@ -212,15 +212,6 @@ $endif$
         return blockFactory.new$Type$BlockBuilder(estimatedSize);
     }
 
-    /**
-     * Returns a constant block.
-     * @deprecated use {@link BlockFactory#newConstant$Type$BlockWith}
-     */
-    @Deprecated
-    static $Type$Block newConstantBlockWith($type$ value, int positions, BlockFactory blockFactory) {
-        return blockFactory.newConstant$Type$BlockWith(value, positions);
-    }
-
     /**
      * Builder for {@link $Type$Block}
      */

diff --git a/...ugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneCountOperator.java b/...ugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneCountOperator.java
@@ -160,8 +160,8 @@ public Page getOutput() {
                 LongBlock count = null;
                 BooleanBlock seen = null;
                 try {
-                    count = LongBlock.newConstantBlockWith(totalHits, PAGE_SIZE, blockFactory);
-                    seen = BooleanBlock.newConstantBlockWith(true, PAGE_SIZE, blockFactory);
+                    count = blockFactory.newConstantLongBlockWith(totalHits, PAGE_SIZE);
+                    seen = blockFactory.newConstantBooleanBlockWith(true, PAGE_SIZE);
                     page = new Page(PAGE_SIZE, count, seen);
                 } finally {
                     if (page == null) {

diff --git a/...gin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneSourceOperator.java b/...gin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneSourceOperator.java
@@ -149,8 +149,8 @@ public Page getOutput() {
                 IntBlock leaf = null;
                 IntVector docs = null;
                 try {
-                    shard = IntBlock.newConstantBlockWith(scorer.shardIndex(), currentPagePos, blockFactory);
-                    leaf = IntBlock.newConstantBlockWith(scorer.leafReaderContext().ord, currentPagePos, blockFactory);
+                    shard = blockFactory.newConstantIntBlockWith(scorer.shardIndex(), currentPagePos);
+                    leaf = blockFactory.newConstantIntBlockWith(scorer.leafReaderContext().ord, currentPagePos);
                     docs = docsBuilder.build();
                     docsBuilder = blockFactory.newIntVectorBuilder(Math.min(remainingDocs, maxPageSize));
                     page = new Page(currentPagePos, new DocVector(shard.asVector(), leaf.asVector(), docs, true).asBlock());

diff --git a/...esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneTopNSourceOperator.java b/...esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneTopNSourceOperator.java
@@ -213,7 +213,7 @@ private Page emit(boolean startEmitting) {
                 currentDocsBuilder.appendInt(doc - leafContexts.get(segment).docBase); // the offset inside the segment
             }
 
-            shard = IntBlock.newConstantBlockWith(perShardCollector.shardIndex, size, blockFactory);
+            shard = blockFactory.newConstantIntBlockWith(perShardCollector.shardIndex, size);
             segments = currentSegmentBuilder.build();
             docs = currentDocsBuilder.build();
             page = new Page(size, new DocVector(shard.asVector(), segments, docs, null).asBlock());

diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BasicBlockTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BasicBlockTests.java
@@ -224,12 +224,7 @@ public void testConstantIntBlock() {
             assertThat(breaker.getUsed(), is(0L));
             int positionCount = randomIntBetween(1, 16 * 1024);
             int value = randomInt();
-            IntBlock block;
-            if (randomBoolean()) {
-                block = IntBlock.newConstantBlockWith(value, positionCount, blockFactory);
-            } else {
-                block = blockFactory.newConstantIntBlockWith(value, positionCount);
-            }
+            IntBlock block = blockFactory.newConstantIntBlockWith(value, positionCount);
             assertThat(positionCount, is(block.getPositionCount()));
             assertThat(value, is(block.getInt(0)));
             assertThat(value, is(block.getInt(positionCount - 1)));
@@ -295,12 +290,7 @@ public void testConstantLongBlock() {
             assertThat(breaker.getUsed(), is(0L));
             int positionCount = randomIntBetween(1, 16 * 1024);
             long value = randomLong();
-            LongBlock block;
-            if (randomBoolean()) {
-                block = LongBlock.newConstantBlockWith(value, positionCount, blockFactory);
-            } else {
-                block = blockFactory.newConstantLongBlockWith(value, positionCount);
-            }
+            LongBlock block = blockFactory.newConstantLongBlockWith(value, positionCount);
             assertThat(positionCount, is(block.getPositionCount()));
             assertThat(value, is(block.getLong(0)));
             assertThat(value, is(block.getLong(positionCount - 1)));
@@ -369,12 +359,7 @@ public void testConstantDoubleBlock() {
         for (int i = 0; i < 1000; i++) {
             int positionCount = randomIntBetween(1, 16 * 1024);
             double value = randomDouble();
-            DoubleBlock block;
-            if (randomBoolean()) {
-                block = DoubleBlock.newConstantBlockWith(value, positionCount, blockFactory);
-            } else {
-                block = blockFactory.newConstantDoubleBlockWith(value, positionCount);
-            }
+            DoubleBlock block = blockFactory.newConstantDoubleBlockWith(value, positionCount);
             assertThat(positionCount, is(block.getPositionCount()));
             assertThat(value, is(block.getDouble(0)));
             assertThat(value, is(block.getDouble(positionCount - 1)));
@@ -496,12 +481,7 @@ public void testConstantBytesRefBlock() {
         for (int i = 0; i < 1000; i++) {
             int positionCount = randomIntBetween(1, 16 * 1024);
             BytesRef value = new BytesRef(randomByteArrayOfLength(between(1, 20)));
-            BytesRefBlock block;
-            if (randomBoolean()) {
-                block = BytesRefBlock.newConstantBlockWith(value, positionCount, blockFactory);
-            } else {
-                block = blockFactory.newConstantBytesRefBlockWith(value, positionCount);
-            }
+            BytesRefBlock block = blockFactory.newConstantBytesRefBlockWith(value, positionCount);
             assertThat(block.getPositionCount(), is(positionCount));
 
             BytesRef bytes = new BytesRef();
@@ -572,12 +552,7 @@ public void testConstantBooleanBlock() {
         for (int i = 0; i < 1000; i++) {
             int positionCount = randomIntBetween(1, 16 * 1024);
             boolean value = randomBoolean();
-            BooleanBlock block;
-            if (randomBoolean()) {
-                block = BooleanBlock.newConstantBlockWith(value, positionCount, blockFactory);
-            } else {
-                block = blockFactory.newConstantBooleanBlockWith(value, positionCount);
-            }
+            BooleanBlock block = blockFactory.newConstantBooleanBlockWith(value, positionCount);
             assertThat(positionCount, is(block.getPositionCount()));
             assertThat(block.getBoolean(0), is(value));
             assertThat(block.getBoolean(positionCount - 1), is(value));

diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/evaluator/EvalMapper.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/evaluator/EvalMapper.java
@@ -267,7 +267,7 @@ record IsNullEvaluator(DriverContext driverContext, EvalOperator.ExpressionEvalu
             public Block eval(Page page) {
                 try (Block fieldBlock = field.eval(page)) {
                     if (fieldBlock.asVector() != null) {
-                        return BooleanBlock.newConstantBlockWith(false, page.getPositionCount(), driverContext.blockFactory());
+                        return driverContext.blockFactory().newConstantBooleanBlockWith(false, page.getPositionCount());
                     }
                     try (var builder = driverContext.blockFactory().newBooleanVectorFixedBuilder(page.getPositionCount())) {
                         for (int p = 0; p < page.getPositionCount(); p++) {
@@ -316,7 +316,7 @@ record IsNotNullEvaluator(DriverContext driverContext, EvalOperator.ExpressionEv
             public Block eval(Page page) {
                 try (Block fieldBlock = field.eval(page)) {
                     if (fieldBlock.asVector() != null) {
-                        return BooleanBlock.newConstantBlockWith(true, page.getPositionCount(), driverContext.blockFactory());
+                        return driverContext.blockFactory().newConstantBooleanBlockWith(true, page.getPositionCount());
                     }
                     try (var builder = driverContext.blockFactory().newBooleanVectorFixedBuilder(page.getPositionCount())) {
                         for (int p = 0; p < page.getPositionCount(); p++) {