use a non-breaking block factory by default

ChrisHegarty · Sep 19, 2023 · b938dd6 · b938dd6
1 parent fbb02ff
commit b938dd6
Show file tree

Hide file tree

Showing 50 changed files with 110 additions and 77 deletions.
diff --git a/...esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanArrayBlock.java b/...esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanArrayBlock.java
@@ -24,7 +24,7 @@ public final class BooleanArrayBlock extends AbstractArrayBlock implements Boole
     private final boolean[] values;
 
     public BooleanArrayBlock(boolean[] values, int positionCount, int[] firstValueIndexes, BitSet nulls, MvOrdering mvOrdering) {
-        this(values, positionCount, firstValueIndexes, nulls, mvOrdering, BlockFactory.getGlobalInstance());
+        this(values, positionCount, firstValueIndexes, nulls, mvOrdering, BlockFactory.getNonBreakingInstance());
     }
 
     public BooleanArrayBlock(

diff --git a/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanArrayVector.java b/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanArrayVector.java
@@ -22,7 +22,7 @@ public final class BooleanArrayVector extends AbstractVector implements BooleanV
     private final boolean[] values;
 
     public BooleanArrayVector(boolean[] values, int positionCount) {
-        this(values, positionCount, BlockFactory.getGlobalInstance());
+        this(values, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public BooleanArrayVector(boolean[] values, int positionCount, BlockFactory blockFactory) {

diff --git a/.../compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanBigArrayVector.java b/.../compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanBigArrayVector.java
@@ -22,7 +22,7 @@ public final class BooleanBigArrayVector extends AbstractVector implements Boole
     private final BitArray values;
 
     public BooleanBigArrayVector(BitArray values, int positionCount) {
-        this(values, positionCount, BlockFactory.getGlobalInstance());
+        this(values, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public BooleanBigArrayVector(BitArray values, int positionCount, BlockFactory blockFactory) {

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
@@ -157,18 +157,20 @@ static int hash(BooleanBlock block) {
         return result;
     }
 
-    /** Returns a builder using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a builder using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static Builder newBlockBuilder(int estimatedSize) {
-        return newBlockBuilder(estimatedSize, BlockFactory.getGlobalInstance());
+        return newBlockBuilder(estimatedSize, BlockFactory.getNonBreakingInstance());
     }
 
     static Builder newBlockBuilder(int estimatedSize, BlockFactory blockFactory) {
         return blockFactory.newBooleanBlockBuilder(estimatedSize);
     }
 
-    /** Returns a block using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a block using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static BooleanBlock newConstantBlockWith(boolean value, int positions) {
-        return newConstantBlockWith(value, positions, BlockFactory.getGlobalInstance());
+        return newConstantBlockWith(value, positions, BlockFactory.getNonBreakingInstance());
     }
 
     static BooleanBlock newConstantBlockWith(boolean value, int positions, BlockFactory blockFactory) {

diff --git a/...gin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanVector.java b/...gin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BooleanVector.java
@@ -100,9 +100,10 @@ default void writeTo(StreamOutput out) throws IOException {
         }
     }
 
-    /** Returns a builder using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a builder using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static Builder newVectorBuilder(int estimatedSize) {
-        return newVectorBuilder(estimatedSize, BlockFactory.getGlobalInstance());
+        return newVectorBuilder(estimatedSize, BlockFactory.getNonBreakingInstance());
     }
 
     static Builder newVectorBuilder(int estimatedSize, BlockFactory blockFactory) {

diff --git a/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefArrayBlock.java b/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefArrayBlock.java
@@ -25,7 +25,7 @@ public final class BytesRefArrayBlock extends AbstractArrayBlock implements Byte
     private final BytesRefArray values;
 
     public BytesRefArrayBlock(BytesRefArray values, int positionCount, int[] firstValueIndexes, BitSet nulls, MvOrdering mvOrdering) {
-        this(values, positionCount, firstValueIndexes, nulls, mvOrdering, BlockFactory.getGlobalInstance());
+        this(values, positionCount, firstValueIndexes, nulls, mvOrdering, BlockFactory.getNonBreakingInstance());
     }
 
     public BytesRefArrayBlock(

diff --git a/...ql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefArrayVector.java b/...ql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefArrayVector.java
@@ -23,7 +23,7 @@ public final class BytesRefArrayVector extends AbstractVector implements BytesRe
     private final BytesRefArray values;
 
     public BytesRefArrayVector(BytesRefArray values, int positionCount) {
-        this(values, positionCount, BlockFactory.getGlobalInstance());
+        this(values, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public BytesRefArrayVector(BytesRefArray values, int positionCount, BlockFactory blockFactory) {

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
@@ -160,18 +160,20 @@ static int hash(BytesRefBlock block) {
         return result;
     }
 
-    /** Returns a builder using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a builder using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static Builder newBlockBuilder(int estimatedSize) {
-        return newBlockBuilder(estimatedSize, BlockFactory.getGlobalInstance());
+        return newBlockBuilder(estimatedSize, BlockFactory.getNonBreakingInstance());
     }
 
     static Builder newBlockBuilder(int estimatedSize, BlockFactory blockFactory) {
         return blockFactory.newBytesRefBlockBuilder(estimatedSize);
     }
 
-    /** Returns a block using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a block using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static BytesRefBlock newConstantBlockWith(BytesRef value, int positions) {
-        return newConstantBlockWith(value, positions, BlockFactory.getGlobalInstance());
+        return newConstantBlockWith(value, positions, BlockFactory.getNonBreakingInstance());
     }
 
     static BytesRefBlock newConstantBlockWith(BytesRef value, int positions, BlockFactory blockFactory) {

diff --git a/...in/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefVector.java b/...in/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/BytesRefVector.java
@@ -100,9 +100,10 @@ default void writeTo(StreamOutput out) throws IOException {
         }
     }
 
-    /** Returns a builder using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a builder using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static Builder newVectorBuilder(int estimatedSize) {
-        return newVectorBuilder(estimatedSize, BlockFactory.getGlobalInstance());
+        return newVectorBuilder(estimatedSize, BlockFactory.getNonBreakingInstance());
     }
 
     static Builder newVectorBuilder(int estimatedSize, BlockFactory blockFactory) {

diff --git a/.../compute/src/main/generated-src/org/elasticsearch/compute/data/ConstantBooleanVector.java b/.../compute/src/main/generated-src/org/elasticsearch/compute/data/ConstantBooleanVector.java
@@ -20,7 +20,7 @@ public final class ConstantBooleanVector extends AbstractVector implements Boole
     private final boolean value;
 
     public ConstantBooleanVector(boolean value, int positionCount) {
-        this(value, positionCount, BlockFactory.getGlobalInstance());
+        this(value, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public ConstantBooleanVector(boolean value, int positionCount, BlockFactory blockFactory) {

diff --git a/...compute/src/main/generated-src/org/elasticsearch/compute/data/ConstantBytesRefVector.java b/...compute/src/main/generated-src/org/elasticsearch/compute/data/ConstantBytesRefVector.java
@@ -21,7 +21,7 @@ public final class ConstantBytesRefVector extends AbstractVector implements Byte
     private final BytesRef value;
 
     public ConstantBytesRefVector(BytesRef value, int positionCount) {
-        this(value, positionCount, BlockFactory.getGlobalInstance());
+        this(value, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public ConstantBytesRefVector(BytesRef value, int positionCount, BlockFactory blockFactory) {

diff --git a/...l/compute/src/main/generated-src/org/elasticsearch/compute/data/ConstantDoubleVector.java b/...l/compute/src/main/generated-src/org/elasticsearch/compute/data/ConstantDoubleVector.java
@@ -20,7 +20,7 @@ public final class ConstantDoubleVector extends AbstractVector implements Double
     private final double value;
 
     public ConstantDoubleVector(double value, int positionCount) {
-        this(value, positionCount, BlockFactory.getGlobalInstance());
+        this(value, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public ConstantDoubleVector(double value, int positionCount, BlockFactory blockFactory) {

diff --git a/...esql/compute/src/main/generated-src/org/elasticsearch/compute/data/ConstantIntVector.java b/...esql/compute/src/main/generated-src/org/elasticsearch/compute/data/ConstantIntVector.java
@@ -20,7 +20,7 @@ public final class ConstantIntVector extends AbstractVector implements IntVector
     private final int value;
 
     public ConstantIntVector(int value, int positionCount) {
-        this(value, positionCount, BlockFactory.getGlobalInstance());
+        this(value, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public ConstantIntVector(int value, int positionCount, BlockFactory blockFactory) {

diff --git a/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/ConstantLongVector.java b/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/ConstantLongVector.java
@@ -20,7 +20,7 @@ public final class ConstantLongVector extends AbstractVector implements LongVect
     private final long value;
 
     public ConstantLongVector(long value, int positionCount) {
-        this(value, positionCount, BlockFactory.getGlobalInstance());
+        this(value, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public ConstantLongVector(long value, int positionCount, BlockFactory blockFactory) {

diff --git a/.../esql/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleArrayBlock.java b/.../esql/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleArrayBlock.java
@@ -24,7 +24,7 @@ public final class DoubleArrayBlock extends AbstractArrayBlock implements Double
     private final double[] values;
 
     public DoubleArrayBlock(double[] values, int positionCount, int[] firstValueIndexes, BitSet nulls, MvOrdering mvOrdering) {
-        this(values, positionCount, firstValueIndexes, nulls, mvOrdering, BlockFactory.getGlobalInstance());
+        this(values, positionCount, firstValueIndexes, nulls, mvOrdering, BlockFactory.getNonBreakingInstance());
     }
 
     public DoubleArrayBlock(

diff --git a/...esql/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleArrayVector.java b/...esql/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleArrayVector.java
@@ -22,7 +22,7 @@ public final class DoubleArrayVector extends AbstractVector implements DoubleVec
     private final double[] values;
 
     public DoubleArrayVector(double[] values, int positionCount) {
-        this(values, positionCount, BlockFactory.getGlobalInstance());
+        this(values, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public DoubleArrayVector(double[] values, int positionCount, BlockFactory blockFactory) {

diff --git a/...l/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleBigArrayVector.java b/...l/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleBigArrayVector.java
@@ -22,7 +22,7 @@ public final class DoubleBigArrayVector extends AbstractVector implements Double
     private final DoubleArray values;
 
     public DoubleBigArrayVector(DoubleArray values, int positionCount) {
-        this(values, positionCount, BlockFactory.getGlobalInstance());
+        this(values, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public DoubleBigArrayVector(DoubleArray values, int positionCount, BlockFactory blockFactory) {

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
@@ -158,18 +158,20 @@ static int hash(DoubleBlock block) {
         return result;
     }
 
-    /** Returns a builder using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a builder using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static Builder newBlockBuilder(int estimatedSize) {
-        return newBlockBuilder(estimatedSize, BlockFactory.getGlobalInstance());
+        return newBlockBuilder(estimatedSize, BlockFactory.getNonBreakingInstance());
     }
 
     static Builder newBlockBuilder(int estimatedSize, BlockFactory blockFactory) {
         return blockFactory.newDoubleBlockBuilder(estimatedSize);
     }
 
-    /** Returns a block using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a block using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static DoubleBlock newConstantBlockWith(double value, int positions) {
-        return newConstantBlockWith(value, positions, BlockFactory.getGlobalInstance());
+        return newConstantBlockWith(value, positions, BlockFactory.getNonBreakingInstance());
     }
 
     static DoubleBlock newConstantBlockWith(double value, int positions, BlockFactory blockFactory) {

diff --git a/...ugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleVector.java b/...ugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/DoubleVector.java
@@ -101,9 +101,10 @@ default void writeTo(StreamOutput out) throws IOException {
         }
     }
 
-    /** Returns a builder using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a builder using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static Builder newVectorBuilder(int estimatedSize) {
-        return newVectorBuilder(estimatedSize, BlockFactory.getGlobalInstance());
+        return newVectorBuilder(estimatedSize, BlockFactory.getNonBreakingInstance());
     }
 
     static Builder newVectorBuilder(int estimatedSize, BlockFactory blockFactory) {

diff --git a/...gin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntArrayBlock.java b/...gin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntArrayBlock.java
@@ -24,7 +24,7 @@ public final class IntArrayBlock extends AbstractArrayBlock implements IntBlock
     private final int[] values;
 
     public IntArrayBlock(int[] values, int positionCount, int[] firstValueIndexes, BitSet nulls, MvOrdering mvOrdering) {
-        this(values, positionCount, firstValueIndexes, nulls, mvOrdering, BlockFactory.getGlobalInstance());
+        this(values, positionCount, firstValueIndexes, nulls, mvOrdering, BlockFactory.getNonBreakingInstance());
     }
 
     public IntArrayBlock(

diff --git a/...in/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntArrayVector.java b/...in/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntArrayVector.java
@@ -22,7 +22,7 @@ public final class IntArrayVector extends AbstractVector implements IntVector {
     private final int[] values;
 
     public IntArrayVector(int[] values, int positionCount) {
-        this(values, positionCount, BlockFactory.getGlobalInstance());
+        this(values, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public IntArrayVector(int[] values, int positionCount, BlockFactory blockFactory) {

diff --git a/...esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntBigArrayVector.java b/...esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntBigArrayVector.java
@@ -22,7 +22,7 @@ public final class IntBigArrayVector extends AbstractVector implements IntVector
     private final IntArray values;
 
     public IntBigArrayVector(IntArray values, int positionCount) {
-        this(values, positionCount, BlockFactory.getGlobalInstance());
+        this(values, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public IntBigArrayVector(IntArray values, int positionCount, BlockFactory blockFactory) {

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
@@ -157,18 +157,20 @@ static int hash(IntBlock block) {
         return result;
     }
 
-    /** Returns a builder using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a builder using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static Builder newBlockBuilder(int estimatedSize) {
-        return newBlockBuilder(estimatedSize, BlockFactory.getGlobalInstance());
+        return newBlockBuilder(estimatedSize, BlockFactory.getNonBreakingInstance());
     }
 
     static Builder newBlockBuilder(int estimatedSize, BlockFactory blockFactory) {
         return blockFactory.newIntBlockBuilder(estimatedSize);
     }
 
-    /** Returns a block using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a block using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static IntBlock newConstantBlockWith(int value, int positions) {
-        return newConstantBlockWith(value, positions, BlockFactory.getGlobalInstance());
+        return newConstantBlockWith(value, positions, BlockFactory.getNonBreakingInstance());
     }
 
     static IntBlock newConstantBlockWith(int value, int positions, BlockFactory blockFactory) {

diff --git a/.../plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntVector.java b/.../plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/IntVector.java
@@ -100,9 +100,10 @@ default void writeTo(StreamOutput out) throws IOException {
         }
     }
 
-    /** Returns a builder using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a builder using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static Builder newVectorBuilder(int estimatedSize) {
-        return newVectorBuilder(estimatedSize, BlockFactory.getGlobalInstance());
+        return newVectorBuilder(estimatedSize, BlockFactory.getNonBreakingInstance());
     }
 
     static Builder newVectorBuilder(int estimatedSize, BlockFactory blockFactory) {

diff --git a/...in/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongArrayBlock.java b/...in/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongArrayBlock.java
@@ -24,7 +24,7 @@ public final class LongArrayBlock extends AbstractArrayBlock implements LongBloc
     private final long[] values;
 
     public LongArrayBlock(long[] values, int positionCount, int[] firstValueIndexes, BitSet nulls, MvOrdering mvOrdering) {
-        this(values, positionCount, firstValueIndexes, nulls, mvOrdering, BlockFactory.getGlobalInstance());
+        this(values, positionCount, firstValueIndexes, nulls, mvOrdering, BlockFactory.getNonBreakingInstance());
     }
 
     public LongArrayBlock(

diff --git a/...n/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongArrayVector.java b/...n/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongArrayVector.java
@@ -22,7 +22,7 @@ public final class LongArrayVector extends AbstractVector implements LongVector
     private final long[] values;
 
     public LongArrayVector(long[] values, int positionCount) {
-        this(values, positionCount, BlockFactory.getGlobalInstance());
+        this(values, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public LongArrayVector(long[] values, int positionCount, BlockFactory blockFactory) {

diff --git a/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongBigArrayVector.java b/...sql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongBigArrayVector.java
@@ -22,7 +22,7 @@ public final class LongBigArrayVector extends AbstractVector implements LongVect
     private final LongArray values;
 
     public LongBigArrayVector(LongArray values, int positionCount) {
-        this(values, positionCount, BlockFactory.getGlobalInstance());
+        this(values, positionCount, BlockFactory.getNonBreakingInstance());
     }
 
     public LongBigArrayVector(LongArray values, int positionCount, BlockFactory blockFactory) {

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
@@ -158,18 +158,20 @@ static int hash(LongBlock block) {
         return result;
     }
 
-    /** Returns a builder using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a builder using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static Builder newBlockBuilder(int estimatedSize) {
-        return newBlockBuilder(estimatedSize, BlockFactory.getGlobalInstance());
+        return newBlockBuilder(estimatedSize, BlockFactory.getNonBreakingInstance());
     }
 
     static Builder newBlockBuilder(int estimatedSize, BlockFactory blockFactory) {
         return blockFactory.newLongBlockBuilder(estimatedSize);
     }
 
-    /** Returns a block using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a block using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static LongBlock newConstantBlockWith(long value, int positions) {
-        return newConstantBlockWith(value, positions, BlockFactory.getGlobalInstance());
+        return newConstantBlockWith(value, positions, BlockFactory.getNonBreakingInstance());
     }
 
     static LongBlock newConstantBlockWith(long value, int positions, BlockFactory blockFactory) {

diff --git a/...plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongVector.java b/...plugin/esql/compute/src/main/generated-src/org/elasticsearch/compute/data/LongVector.java
@@ -101,9 +101,10 @@ default void writeTo(StreamOutput out) throws IOException {
         }
     }
 
-    /** Returns a builder using the {@link BlockFactory#getGlobalInstance block factory}. */
+    /** Returns a builder using the {@link BlockFactory#getNonBreakingInstance block factory}. */
+    // Eventually, this should use the GLOBAL breaking instance
     static Builder newVectorBuilder(int estimatedSize) {
-        return newVectorBuilder(estimatedSize, BlockFactory.getGlobalInstance());
+        return newVectorBuilder(estimatedSize, BlockFactory.getNonBreakingInstance());
     }
 
     static Builder newVectorBuilder(int estimatedSize, BlockFactory blockFactory) {

diff --git a/.../compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/LongBlockHash.java b/.../compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/LongBlockHash.java
@@ -64,7 +64,7 @@ private IntVector add(LongVector vector) {
         for (int i = 0; i < vector.getPositionCount(); i++) {
             groups[i] = Math.toIntExact(hashOrdToGroupNullReserved(longHash.add(vector.getLong(i))));
         }
-        return BlockFactory.getGlobalInstance().newIntArrayVector(groups, groups.length);
+        return vector.blockFactory().newIntArrayVector(groups, groups.length);
     }
 
     private IntBlock add(LongBlock block) {

diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/Block.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/Block.java
@@ -119,10 +119,11 @@ enum MvOrdering {
     Block expand();
 
     /**
-     * {@return a constant null block with the given number of positions, using the global block factory}.
+     * {@return a constant null block with the given number of positions, using the non-breaking block factory}.
      */
+    // Eventually, this should use the GLOBAL breaking instance
     static Block constantNullBlock(int positions) {
-        return new ConstantNullBlock(positions, BlockFactory.getGlobalInstance());
+        return new ConstantNullBlock(positions, BlockFactory.getNonBreakingInstance());
     }
 
     static Block constantNullBlock(int positions, BlockFactory blockFactory) {