Skip to content

Commit 7cd4f37

Browse files
Address no commits
1 parent e1eaf49 commit 7cd4f37

File tree

6 files changed

+10
-18
lines changed

6 files changed

+10
-18
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/AstBuilder.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77

88
package org.elasticsearch.xpack.esql.parser;
99

10-
import org.elasticsearch.xpack.esql.session.Configuration;
11-
1210
public class AstBuilder extends LogicalPlanBuilder {
13-
public AstBuilder(ParsingContext context, Configuration configuration) {
14-
super(context, configuration);
11+
public AstBuilder(ParsingContext context) {
12+
super(context);
1513
}
1614
}

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private <T> T invokeParser(
153153
log.trace("Parse tree: {}", tree.toStringTree());
154154
}
155155

156-
return result.apply(new AstBuilder(new ExpressionBuilder.ParsingContext(params, metrics), configuration), tree);
156+
return result.apply(new AstBuilder(new ExpressionBuilder.ParsingContext(params, metrics)), tree);
157157
} catch (StackOverflowError e) {
158158
throw new ParsingException("ESQL statement is too large, causing stack overflow when generating the parsing tree: [{}]", query);
159159
// likely thrown by an invalid popMode (such as extra closing parenthesis)

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/ExpressionBuilder.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,10 @@ public abstract class ExpressionBuilder extends IdentifierBuilder {
121121
public static final int MAX_EXPRESSION_DEPTH = 400;
122122

123123
protected final ParsingContext context;
124-
private final Configuration configuration; // NOCOMMIT remove me?
125-
126124
public record ParsingContext(QueryParams params, PlanTelemetry telemetry) {}
127125

128-
ExpressionBuilder(ParsingContext context, Configuration configuration) {
126+
ExpressionBuilder(ParsingContext context) {
129127
this.context = context;
130-
this.configuration = configuration;
131128
}
132129

133130
protected Expression expression(ParseTree ctx) {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
import org.elasticsearch.xpack.esql.plan.logical.join.LookupJoin;
7777
import org.elasticsearch.xpack.esql.plan.logical.show.ShowInfo;
7878
import org.elasticsearch.xpack.esql.plugin.EsqlPlugin;
79-
import org.elasticsearch.xpack.esql.session.Configuration;
8079
import org.joni.exception.SyntaxException;
8180

8281
import java.util.ArrayList;
@@ -91,7 +90,6 @@
9190
import java.util.function.Function;
9291

9392
import static java.util.Collections.emptyList;
94-
import static org.elasticsearch.xpack.esql.common.Failure.fail;
9593
import static org.elasticsearch.xpack.esql.core.type.DataType.KEYWORD;
9694
import static org.elasticsearch.xpack.esql.core.util.StringUtils.WILDCARD;
9795
import static org.elasticsearch.xpack.esql.expression.NamedExpressions.mergeOutputExpressions;
@@ -113,8 +111,8 @@ interface PlanFactory extends Function<LogicalPlan, LogicalPlan> {}
113111
*/
114112
public static final int MAX_QUERY_DEPTH = 500;
115113

116-
public LogicalPlanBuilder(ParsingContext context, Configuration configuration) {
117-
super(context, configuration);
114+
public LogicalPlanBuilder(ParsingContext context) {
115+
super(context);
118116
}
119117

120118
private int queryDepth = 0;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/Configuration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ public Configuration(BlockStreamInput in) throws IOException {
120120
this.allowPartialResults = false;
121121
}
122122
if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)) {
123-
// NOCOMMIT can we look this up without putting it in Configuration?
124123
this.stringLikeOnIndex = in.readBoolean();
125124
} else {
126125
this.stringLikeOnIndex = false;

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/planner/FilterTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import java.util.Set;
5252

5353
import static java.util.Arrays.asList;
54+
import static org.elasticsearch.TransportVersions.V_8_17_0;
5455
import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
5556
import static org.elasticsearch.xpack.esql.ConfigurationTestUtils.randomConfiguration;
5657
import static org.elasticsearch.xpack.esql.EsqlTestUtils.TEST_VERIFIER;
@@ -325,8 +326,8 @@ public void testLikeList() {
325326
|WHERE {} LIKE ("a+", "b+")
326327
""", LAST_NAME);
327328
var plan = plan(query, null);
328-
329-
var filter = filterQueryForTransportNodes(TransportVersion.current(), plan);
329+
// test with an older version, so like list is not supported
330+
var filter = filterQueryForTransportNodes(V_8_17_0, plan);
330331
assertNull(filter);
331332
}
332333

@@ -399,8 +400,7 @@ private QueryBuilder restFilterQuery(String field) {
399400
}
400401

401402
private QueryBuilder filterQueryForTransportNodes(TransportVersion minTransportVersion, PhysicalPlan plan) {
402-
// NOCOMMIT check if null is ok
403-
return PlannerUtils.detectFilter(null, minTransportVersion, plan, Set.of(EMP_NO, LAST_NAME)::contains);
403+
return PlannerUtils.detectFilter(EsqlTestUtils.TEST_CFG, minTransportVersion, plan, Set.of(EMP_NO, LAST_NAME)::contains);
404404
}
405405

406406
@Override

0 commit comments

Comments
 (0)