Replace overloaded run with builder (#129523)

idegtiarenko · web-flow · commit 25e5bc59cd3a · 2025-06-17T15:25:12.000+02:00
* Replace overloaded `run` with builder

* fix overrides
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/AbstractEsqlIntegTestCase.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/AbstractEsqlIntegTestCase.java
@@ -23,7 +23,6 @@
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.health.node.selection.HealthNode;
-import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService;
 import org.elasticsearch.plugins.Plugin;
@@ -43,6 +42,7 @@
 
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.getValuesList;
+import static org.elasticsearch.xpack.esql.action.EsqlQueryRequest.syncEsqlQueryRequest;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -166,33 +166,10 @@ protected void setRequestCircuitBreakerLimit(ByteSizeValue limit) {
     }
 
     protected final EsqlQueryResponse run(String esqlCommands) {
-        return run(esqlCommands, randomPragmas());
+        return run(syncEsqlQueryRequest().query(esqlCommands).pragmas(randomPragmas()));
     }
 
-    protected final EsqlQueryResponse run(String esqlCommands, QueryPragmas pragmas) {
-        return run(esqlCommands, pragmas, null);
-    }
-
-    protected EsqlQueryResponse run(String esqlCommands, QueryPragmas pragmas, QueryBuilder filter) {
-        return run(esqlCommands, pragmas, filter, null);
-    }
-
-    protected EsqlQueryResponse run(String esqlCommands, QueryPragmas pragmas, QueryBuilder filter, Boolean allowPartialResults) {
-        EsqlQueryRequest request = EsqlQueryRequest.syncEsqlQueryRequest();
-        request.query(esqlCommands);
-        if (pragmas != null) {
-            request.pragmas(pragmas);
-        }
-        if (filter != null) {
-            request.filter(filter);
-        }
-        if (allowPartialResults != null) {
-            request.allowPartialResults(allowPartialResults);
-        }
-        return run(request);
-    }
-
-    protected EsqlQueryResponse run(EsqlQueryRequest request) {
+    public EsqlQueryResponse run(EsqlQueryRequest request) {
         try {
             return client().execute(EsqlQueryAction.INSTANCE, request).actionGet(30, TimeUnit.SECONDS);
         } catch (ElasticsearchTimeoutException e) {
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EnrichIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EnrichIT.java
@@ -127,7 +127,7 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
     }
 
     @Override
-    protected EsqlQueryResponse run(EsqlQueryRequest request) {
+    public EsqlQueryResponse run(EsqlQueryRequest request) {
         final Client client;
         if (randomBoolean()) {
             client = client(randomFrom(clusterService().state().nodes().getCoordinatingOnlyNodes().values()).getName());
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionBreakerIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionBreakerIT.java
@@ -112,7 +112,7 @@ private EsqlQueryResponse runWithBreaking(EsqlQueryRequest request) throws Circu
     }
 
     @Override
-    protected EsqlQueryResponse run(EsqlQueryRequest request) {
+    public EsqlQueryResponse run(EsqlQueryRequest request) {
         if (randomBoolean()) {
             request.allowPartialResults(randomBoolean());
         }
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java
@@ -86,6 +86,7 @@
 import static org.elasticsearch.test.MapMatcher.assertMap;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.getValuesList;
+import static org.elasticsearch.xpack.esql.action.EsqlQueryRequest.syncEsqlQueryRequest;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.contains;
@@ -1916,7 +1917,7 @@ public void testScriptField() throws Exception {
             pragmaSettings.put("data_partitioning", "doc");
             pragmas = new QueryPragmas(pragmaSettings.build());
         }
-        try (EsqlQueryResponse resp = run("FROM test-script | SORT k1 | LIMIT " + numDocs, pragmas)) {
+        try (EsqlQueryResponse resp = run(syncEsqlQueryRequest().query("FROM test-script | SORT k1 | LIMIT " + numDocs).pragmas(pragmas))) {
             List<Object> k1Column = Iterators.toList(resp.column(0));
             assertThat(k1Column, equalTo(LongStream.range(0L, numDocs).boxed().toList()));
             List<Object> k2Column = Iterators.toList(resp.column(1));
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlAsyncActionIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlAsyncActionIT.java
@@ -17,14 +17,12 @@
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.test.TestBlockFactory;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.xpack.core.LocalStateCompositeXPackPlugin;
 import org.elasticsearch.xpack.core.async.DeleteAsyncResultRequest;
 import org.elasticsearch.xpack.core.async.GetAsyncResultRequest;
 import org.elasticsearch.xpack.core.async.TransportDeleteAsyncResultAction;
 import org.elasticsearch.xpack.core.esql.action.ColumnInfo;
-import org.elasticsearch.xpack.esql.plugin.QueryPragmas;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -52,18 +50,18 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
     }
 
     @Override
-    protected EsqlQueryResponse run(String esqlCommands, QueryPragmas pragmas, QueryBuilder filter) {
+    public EsqlQueryResponse run(EsqlQueryRequest original) {
         EsqlQueryRequest request = EsqlQueryRequest.asyncEsqlQueryRequest();
-        request.query(esqlCommands);
-        request.pragmas(pragmas);
+        request.query(original.query());
+        request.pragmas(original.pragmas());
         // deliberately small timeout, to frequently trigger incomplete response
         request.waitForCompletionTimeout(TimeValue.timeValueNanos(1));
         request.keepOnCompletion(randomBoolean());
-        if (filter != null) {
-            request.filter(filter);
+        if (original.filter() != null) {
+            request.filter(original.filter());
         }
 
-        var response = run(request);
+        var response = super.run(request);
         if (response.asyncExecutionId().isPresent()) {
             List<ColumnInfo> initialColumns = null;
             List<Page> initialPages = null;
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlDisruptionIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlDisruptionIT.java
@@ -68,7 +68,7 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
     }
 
     @Override
-    protected EsqlQueryResponse run(EsqlQueryRequest request) {
+    public EsqlQueryResponse run(EsqlQueryRequest request) {
         // IndexResolver currently ignores failures from field-caps responses and can resolve to a smaller set of concrete indices.
         boolean singleIndex = request.query().startsWith("from test |");
         if (singleIndex && randomIntBetween(0, 100) <= 20) {
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/ManyShardsIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/ManyShardsIT.java
@@ -45,6 +45,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static org.elasticsearch.xpack.esql.action.EsqlQueryRequest.syncEsqlQueryRequest;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
@@ -116,7 +117,11 @@ public void testConcurrentQueries() throws Exception {
                         .put("task_concurrency", between(1, 2))
                         .put("exchange_concurrent_clients", between(1, 2));
                 }
-                try (var response = run("from test-* | stats count(user) by tags", new QueryPragmas(pragmas.build()))) {
+                try (
+                    var response = run(
+                        syncEsqlQueryRequest().query("from test-* | stats count(user) by tags").pragmas(new QueryPragmas(pragmas.build()))
+                    )
+                ) {
                     // do nothing
                 } catch (Exception | AssertionError e) {
                     logger.warn("Query failed with exception", e);
@@ -250,7 +255,7 @@ public void testLimitConcurrentShards() {
                     mockSearchService.setOnPutContext(r -> counter.onNewContext());
                     mockSearchService.setOnRemoveContext(r -> counter.onContextReleased());
                 }
-                run(q, pragmas).close();
+                run(syncEsqlQueryRequest().query(q).pragmas(pragmas)).close();
             }
         } finally {
             for (SearchService searchService : searchServices) {
@@ -277,7 +282,7 @@ public void testCancelUnnecessaryRequests() {
             connection.sendRequest(requestId, action, request, options);
         });
 
-        var query = EsqlQueryRequest.syncEsqlQueryRequest();
+        var query = syncEsqlQueryRequest();
         query.query("from test-* | LIMIT 1");
         query.pragmas(new QueryPragmas(Settings.builder().put(QueryPragmas.MAX_CONCURRENT_NODES_PER_CLUSTER.getKey(), 1).build()));
 
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/TimeBasedIndicesIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/TimeBasedIndicesIT.java
@@ -17,6 +17,7 @@
 
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.getValuesList;
+import static org.elasticsearch.xpack.esql.action.EsqlQueryRequest.syncEsqlQueryRequest;
 import static org.hamcrest.Matchers.hasSize;
 
 public class TimeBasedIndicesIT extends AbstractEsqlIntegTestCase {
@@ -39,15 +40,15 @@ public void testFilter() {
         {
             String query = "FROM test | limit 1000";
             var filter = new RangeQueryBuilder("@timestamp").from(epoch - TimeValue.timeValueHours(3).millis()).to("now");
-            try (var resp = run(query, null, filter)) {
+            try (var resp = run(syncEsqlQueryRequest().query(query).filter(filter))) {
                 List<List<Object>> values = getValuesList(resp);
                 assertThat(values, hasSize(oldDocs));
             }
         }
         {
             String query = "FROM test | limit 1000";
             var filter = new RangeQueryBuilder("@timestamp").from("now").to(epoch + TimeValue.timeValueHours(3).millis());
-            try (var resp = run(query, null, filter)) {
+            try (var resp = run(syncEsqlQueryRequest().query(query).filter(filter))) {
                 List<List<Object>> values = getValuesList(resp);
                 assertThat(values, hasSize(newDocs));
             }
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/TimeSeriesIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/TimeSeriesIT.java
@@ -36,7 +36,7 @@
 public class TimeSeriesIT extends AbstractEsqlIntegTestCase {
 
     @Override
-    protected EsqlQueryResponse run(EsqlQueryRequest request) {
+    public EsqlQueryResponse run(EsqlQueryRequest request) {
         assumeTrue("time series available in snapshot builds only", Build.current().isSnapshot());
         return super.run(request);
     }
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/CanMatchIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/CanMatchIT.java
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchOperatorIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchOperatorIT.java
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/TermIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/TermIT.java
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlQueryRequest.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlQueryRequest.java

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`@Override`
`130`		`- protected EsqlQueryResponse run(EsqlQueryRequest request) {`
	`130`	`+ public EsqlQueryResponse run(EsqlQueryRequest request) {`
`131`	`131`	`final Client client;`
`132`	`132`	`if (randomBoolean()) {`
`133`	`133`	`client = client(randomFrom(clusterService().state().nodes().getCoordinatingOnlyNodes().values()).getName());`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ private EsqlQueryResponse runWithBreaking(EsqlQueryRequest request) throws Circu`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`@Override`
`115`		`- protected EsqlQueryResponse run(EsqlQueryRequest request) {`
	`115`	`+ public EsqlQueryResponse run(EsqlQueryRequest request) {`
`116`	`116`	`if (randomBoolean()) {`
`117`	`117`	`request.allowPartialResults(randomBoolean());`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@Override`
`71`		`- protected EsqlQueryResponse run(EsqlQueryRequest request) {`
	`71`	`+ public EsqlQueryResponse run(EsqlQueryRequest request) {`
`72`	`72`	`// IndexResolver currently ignores failures from field-caps responses and can resolve to a smaller set of concrete indices.`
`73`	`73`	`boolean singleIndex = request.query().startsWith("from test \|");`
`74`	`74`	`if (singleIndex && randomIntBetween(0, 100) <= 20) {`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;`
`19`	`19`	`import static org.elasticsearch.xpack.esql.EsqlTestUtils.getValuesList;`
	`20`	`+import static org.elasticsearch.xpack.esql.action.EsqlQueryRequest.syncEsqlQueryRequest;`
`20`	`21`	`import static org.hamcrest.Matchers.hasSize;`
`21`	`22`
`22`	`23`	`public class TimeBasedIndicesIT extends AbstractEsqlIntegTestCase {`
`@@ -39,15 +40,15 @@ public void testFilter() {`
`39`	`40`	`{`
`40`	`41`	`String query = "FROM test \| limit 1000";`
`41`	`42`	`var filter = new RangeQueryBuilder("@timestamp").from(epoch - TimeValue.timeValueHours(3).millis()).to("now");`
`42`		`- try (var resp = run(query, null, filter)) {`
	`43`	`+ try (var resp = run(syncEsqlQueryRequest().query(query).filter(filter))) {`
`43`	`44`	`List<List<Object>> values = getValuesList(resp);`
`44`	`45`	`assertThat(values, hasSize(oldDocs));`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`{`
`48`	`49`	`String query = "FROM test \| limit 1000";`
`49`	`50`	`var filter = new RangeQueryBuilder("@timestamp").from("now").to(epoch + TimeValue.timeValueHours(3).millis());`
`50`		`- try (var resp = run(query, null, filter)) {`
	`51`	`+ try (var resp = run(syncEsqlQueryRequest().query(query).filter(filter))) {`
`51`	`52`	`List<List<Object>> values = getValuesList(resp);`
`52`	`53`	`assertThat(values, hasSize(newDocs));`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`public class TimeSeriesIT extends AbstractEsqlIntegTestCase {`
`37`	`37`
`38`	`38`	`@Override`
`39`		`- protected EsqlQueryResponse run(EsqlQueryRequest request) {`
	`39`	`+ public EsqlQueryResponse run(EsqlQueryRequest request) {`
`40`	`40`	`assumeTrue("time series available in snapshot builds only", Build.current().isSnapshot());`
`41`	`41`	`return super.run(request);`
`42`	`42`	`}`