Skip to content

Commit 372d955

Browse files
committed
fix overrides
1 parent 1170bcd commit 372d955

File tree

6 files changed

+11
-13
lines changed

6 files changed

+11
-13
lines changed

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EnrichIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
127127
}
128128

129129
@Override
130-
protected EsqlQueryResponse run(EsqlQueryRequest request) {
130+
public EsqlQueryResponse run(EsqlQueryRequest request) {
131131
final Client client;
132132
if (randomBoolean()) {
133133
client = client(randomFrom(clusterService().state().nodes().getCoordinatingOnlyNodes().values()).getName());

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionBreakerIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private EsqlQueryResponse runWithBreaking(EsqlQueryRequest request) throws Circu
112112
}
113113

114114
@Override
115-
protected EsqlQueryResponse run(EsqlQueryRequest request) {
115+
public EsqlQueryResponse run(EsqlQueryRequest request) {
116116
if (randomBoolean()) {
117117
request.allowPartialResults(randomBoolean());
118118
}

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlAsyncActionIT.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717
import org.elasticsearch.compute.data.Page;
1818
import org.elasticsearch.compute.test.TestBlockFactory;
1919
import org.elasticsearch.core.TimeValue;
20-
import org.elasticsearch.index.query.QueryBuilder;
2120
import org.elasticsearch.plugins.Plugin;
2221
import org.elasticsearch.xpack.core.LocalStateCompositeXPackPlugin;
2322
import org.elasticsearch.xpack.core.async.DeleteAsyncResultRequest;
2423
import org.elasticsearch.xpack.core.async.GetAsyncResultRequest;
2524
import org.elasticsearch.xpack.core.async.TransportDeleteAsyncResultAction;
2625
import org.elasticsearch.xpack.core.esql.action.ColumnInfo;
27-
import org.elasticsearch.xpack.esql.plugin.QueryPragmas;
2826

2927
import java.nio.file.Path;
3028
import java.util.ArrayList;
@@ -52,18 +50,18 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
5250
}
5351

5452
@Override
55-
protected EsqlQueryResponse run(String esqlCommands, QueryPragmas pragmas, QueryBuilder filter) {
53+
public EsqlQueryResponse run(EsqlQueryRequest original) {
5654
EsqlQueryRequest request = EsqlQueryRequest.asyncEsqlQueryRequest();
57-
request.query(esqlCommands);
58-
request.pragmas(pragmas);
55+
request.query(original.query());
56+
request.pragmas(original.pragmas());
5957
// deliberately small timeout, to frequently trigger incomplete response
6058
request.waitForCompletionTimeout(TimeValue.timeValueNanos(1));
6159
request.keepOnCompletion(randomBoolean());
62-
if (filter != null) {
63-
request.filter(filter);
60+
if (original.filter() != null) {
61+
request.filter(original.filter());
6462
}
6563

66-
var response = run(request);
64+
var response = super.run(request);
6765
if (response.asyncExecutionId().isPresent()) {
6866
List<ColumnInfo> initialColumns = null;
6967
List<Page> initialPages = null;

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlDisruptionIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
6868
}
6969

7070
@Override
71-
protected EsqlQueryResponse run(EsqlQueryRequest request) {
71+
public EsqlQueryResponse run(EsqlQueryRequest request) {
7272
// IndexResolver currently ignores failures from field-caps responses and can resolve to a smaller set of concrete indices.
7373
boolean singleIndex = request.query().startsWith("from test |");
7474
if (singleIndex && randomIntBetween(0, 100) <= 20) {

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/TimeSeriesIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
public class TimeSeriesIT extends AbstractEsqlIntegTestCase {
3737

3838
@Override
39-
protected EsqlQueryResponse run(EsqlQueryRequest request) {
39+
public EsqlQueryResponse run(EsqlQueryRequest request) {
4040
assumeTrue("time series available in snapshot builds only", Build.current().isSnapshot());
4141
return super.run(request);
4242
}

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/TermIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void setupIndex() {
3030
}
3131

3232
@Override
33-
protected EsqlQueryResponse run(EsqlQueryRequest request) {
33+
public EsqlQueryResponse run(EsqlQueryRequest request) {
3434
assumeTrue("term function capability not available", EsqlCapabilities.Cap.TERM_FUNCTION.isEnabled());
3535
return super.run(request);
3636
}

0 commit comments

Comments
 (0)