Added options to simpleWithMode() method

Author: ivancea

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/AggregatorFunctionTestCase.java

@@ -61,7 +61,7 @@ protected final int aggregatorIntermediateBlockCount() {
     protected abstract void assertSimpleOutput(List<Block> input, Block result);
 
     @Override
-    protected Operator.OperatorFactory simpleWithMode(AggregatorMode mode) {
+    protected Operator.OperatorFactory simpleWithMode(SimpleOptions options, AggregatorMode mode) {
         return simpleWithMode(mode, Function.identity());
     }
 

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunctionTestCase.java

@@ -90,15 +90,16 @@ protected DataType acceptedDataType() {
     };
 
     @Override
-    protected final Operator.OperatorFactory simpleWithMode(AggregatorMode mode) {
-        return simpleWithMode(mode, Function.identity());
+    protected final Operator.OperatorFactory simpleWithMode(SimpleOptions options, AggregatorMode mode) {
+        return simpleWithMode(options, mode, Function.identity());
     }
 
     protected List<Integer> channels(AggregatorMode mode) {
         return mode.isInputPartial() ? range(1, 1 + aggregatorIntermediateBlockCount()).boxed().toList() : List.of(1);
     }
 
     private Operator.OperatorFactory simpleWithMode(
+        SimpleOptions options,
         AggregatorMode mode,
         Function<AggregatorFunctionSupplier, AggregatorFunctionSupplier> wrap
     ) {
@@ -109,16 +110,16 @@ private Operator.OperatorFactory simpleWithMode(
             supplier = chunkGroups(emitChunkSize, supplier);
         }
 
-        if (shouldRandomizeBlocks()) {
-            return new RandomizingHashAggregationOperatorFactory(
+        if (options.requiresDeterministicFactory()) {
+            return new HashAggregationOperator.HashAggregationOperatorFactory(
                 List.of(new BlockHash.GroupSpec(0, ElementType.LONG)),
                 mode,
                 List.of(supplier.groupingAggregatorFactory(mode, channels(mode))),
                 randomPageSize(),
                 null
             );
         } else {
-            return new HashAggregationOperator.HashAggregationOperatorFactory(
+            return new RandomizingHashAggregationOperatorFactory(
                 List.of(new BlockHash.GroupSpec(0, ElementType.LONG)),
                 mode,
                 List.of(supplier.groupingAggregatorFactory(mode, channels(mode))),
@@ -400,6 +401,7 @@ public final void testEmptyInput() {
 
     public final void testAllFiltered() {
         Operator.OperatorFactory factory = simpleWithMode(
+            SimpleOptions.DEFAULT,
             AggregatorMode.SINGLE,
             agg -> new FilteredAggregatorFunctionSupplier(agg, ConstantBooleanExpressionEvaluator.factory(false))
         );
@@ -412,6 +414,7 @@ public final void testAllFiltered() {
 
     public final void testNoneFiltered() {
         Operator.OperatorFactory factory = simpleWithMode(
+            SimpleOptions.DEFAULT,
             AggregatorMode.SINGLE,
             agg -> new FilteredAggregatorFunctionSupplier(agg, ConstantBooleanExpressionEvaluator.factory(true))
         );
@@ -425,6 +428,7 @@ public final void testNoneFiltered() {
 
     public void testSomeFiltered() {
         Operator.OperatorFactory factory = simpleWithMode(
+            SimpleOptions.DEFAULT,
             AggregatorMode.SINGLE,
             agg -> new FilteredAggregatorFunctionSupplier(agg, AddGarbageRowsSourceOperator.filterFactory())
         );

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/AggregationOperatorTests.java

@@ -35,7 +35,7 @@ protected SourceOperator simpleInput(BlockFactory blockFactory, int size) {
     }
 
     @Override
-    protected Operator.OperatorFactory simpleWithMode(AggregatorMode mode) {
+    protected Operator.OperatorFactory simpleWithMode(SimpleOptions options, AggregatorMode mode) {
         List<Integer> sumChannels, maxChannels;
         if (mode.isInputPartial()) {
             int sumInterChannelCount = SumLongAggregatorFunction.intermediateStateDesc().size();

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/ForkingOperatorTestCase.java

@@ -54,11 +54,18 @@ public abstract class ForkingOperatorTestCase extends OperatorTestCase {
 
     private static final String ESQL_TEST_EXECUTOR = "esql_test_executor";
 
-    protected abstract Operator.OperatorFactory simpleWithMode(AggregatorMode mode);
+    protected abstract Operator.OperatorFactory simpleWithMode(SimpleOptions options, AggregatorMode mode);
+
+    /**
+     * Calls {@link #simpleWithMode(SimpleOptions, AggregatorMode)} with the default options.
+     */
+    protected final Operator.OperatorFactory simpleWithMode(AggregatorMode mode) {
+        return simpleWithMode(SimpleOptions.DEFAULT, mode);
+    }
 
     @Override
     protected final Operator.OperatorFactory simple(SimpleOptions options) {
-        return simpleWithMode(AggregatorMode.SINGLE);
+        return simpleWithMode(options, AggregatorMode.SINGLE);
     }
 
     public final void testInitialFinal() {

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/HashAggregationOperatorTests.java

@@ -41,7 +41,7 @@ protected SourceOperator simpleInput(BlockFactory blockFactory, int size) {
     }
 
     @Override
-    protected Operator.OperatorFactory simpleWithMode(AggregatorMode mode) {
+    protected Operator.OperatorFactory simpleWithMode(SimpleOptions options, AggregatorMode mode) {
         List<Integer> sumChannels, maxChannels;
         if (mode.isInputPartial()) {
             int sumChannelCount = SumLongAggregatorFunction.intermediateStateDesc().size();

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/LimitOperatorTests.java

@@ -55,7 +55,7 @@ protected void assertSimpleOutput(List<Page> input, List<Page> results) {
 
     public void testStatus() {
         BlockFactory blockFactory = driverContext().blockFactory();
-        LimitOperator op = simple().get(driverContext());
+        LimitOperator op = simple(SimpleOptions.DEFAULT).get(driverContext());
 
         LimitOperator.Status status = op.status();
         assertThat(status.limit(), equalTo(100));
@@ -77,7 +77,7 @@ public void testStatus() {
 
     public void testNeedInput() {
         BlockFactory blockFactory = driverContext().blockFactory();
-        try (LimitOperator op = simple().get(driverContext())) {
+        try (LimitOperator op = simple(SimpleOptions.DEFAULT).get(driverContext())) {
             assertTrue(op.needsInput());
             Page p = new Page(blockFactory.newConstantNullBlock(10));
             op.addInput(p);

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/SampleOperatorTests.java

@@ -59,7 +59,7 @@ public void testAccuracy() {
         int totalPositionCount = 0;
 
         for (int iter = 0; iter < 10000; iter++) {
-            SampleOperator operator = simple().get(driverContext());
+            SampleOperator operator = simple(SimpleOptions.DEFAULT).get(driverContext());
             operator.addInput(new Page(blockFactory.newConstantNullBlock(20000)));
             Page output = operator.getOutput();
             // 10000 expected rows, stddev=sqrt(10000)=100, so this is 10 stddevs.

x-pack/plugin/esql/compute/test/src/main/java/org/elasticsearch/compute/test/AnyOperatorTestCase.java

@@ -34,8 +34,8 @@
 public abstract class AnyOperatorTestCase extends ComputeTestCase {
     /**
      * @param requiresDeterministicFactory
-     *          True if the returned {@link Operator.OperatorFactory} should always return a deterministic operator.
-     *          That is, for two different calls, both operators should work in the same way.
+     *          True if the returned {@link Operator.OperatorFactory} should always generate an identical deterministic operator.
+     *          That is, for two different calls, both operators should do "exactly" the same.
      */
     protected record SimpleOptions(boolean requiresDeterministicFactory) {
         public static final SimpleOptions DEFAULT = new SimpleOptions(false);

x-pack/plugin/esql/compute/test/src/main/java/org/elasticsearch/compute/test/OperatorTestCase.java

@@ -98,7 +98,7 @@ protected ByteSizeValue enoughMemoryForSimple() {
      */
     public final void testSimpleCircuitBreaking() {
         ByteSizeValue memoryLimitForSimple = enoughMemoryForSimple();
-        Operator.OperatorFactory simple = simple();
+        Operator.OperatorFactory simple = simple(new SimpleOptions(true));
         DriverContext inputFactoryContext = driverContext();
         List<Page> input = CannedSourceOperator.collectPages(simpleInput(inputFactoryContext.blockFactory(), between(1_000, 10_000)));
         try {