Prevent unnamed fields #127416
Merged
Prevent unnamed fields #127416
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -87,6 +87,14 @@ field | |||
| : (qualifiedName ASSIGN)? booleanExpression | |||
| ; | |||
|
|
|||
| rerankFields | |||
There was a problem hiding this comment.
Main change
| @@ -826,6 +826,30 @@ public List<Alias> visitFields(EsqlBaseParser.FieldsContext ctx) { | |||
| return ctx != null ? visitList(this, ctx.field(), Alias.class) : new ArrayList<>(); | |||
| } | |||
|
|
|||
| @Override | |||
There was a problem hiding this comment.
Main change
| @@ -3490,6 +3490,30 @@ private void assertEmptyEsRelation(LogicalPlan plan) { | |||
| assertThat(esRelation.output(), equalTo(NO_FIELDS)); | |||
| } | |||
|
|
|||
| public void testResolveRerankInferenceId1() { | |||
There was a problem hiding this comment.
Main change
| assertThat(rerank.inferenceId(), equalTo(string("reranking-inference-id"))); | ||
| } | ||
|
|
||
| public void testResolveRerankInferenceId2() { |
There was a problem hiding this comment.
Fails like this:
line 3:43: mismatched input '(' expecting {'=', ',', '.', 'with'}
org.elasticsearch.xpack.esql.parser.ParsingException: line 3:43: mismatched input '(' expecting {'=', ',', '.', 'with'}
at __randomizedtesting.SeedInfo.seed([44B54C6702F80BAB:54EBDBEBFE2717AA]:0)
at org.elasticsearch.xpack.esql.parser.EsqlParser$1.syntaxError(EsqlParser.java:198)
at org.antlr.v4.runtime.ProxyErrorListener.syntaxError(ProxyErrorListener.java:41)
at org.antlr.v4.runtime.Parser.notifyErrorListeners(Parser.java:544)
at org.antlr.v4.runtime.DefaultErrorStrategy.reportInputMismatch(DefaultErrorStrategy.java:327)
at org.antlr.v4.runtime.DefaultErrorStrategy.reportError(DefaultErrorStrategy.java:139)
at org.elasticsearch.xpack.esql.parser.EsqlBaseParser.rerankCommand(EsqlBaseParser.java:4380)
at org.elasticsearch.xpack.esql.parser.EsqlBaseParser.processingCommand(EsqlBaseParser.java:722)
at org.elasticsearch.xpack.esql.parser.EsqlBaseParser.query(EsqlBaseParser.java:363)
at org.elasticsearch.xpack.esql.parser.EsqlBaseParser.singleStatement(EsqlBaseParser.java:246)
at org.elasticsearch.xpack.esql.parser.EsqlParser.invokeParser(EsqlParser.java:148)
at org.elasticsearch.xpack.esql.parser.EsqlParser.createStatement(EsqlParser.java:114)
at org.elasticsearch.xpack.esql.parser.EsqlParser.createStatement(EsqlParser.java:107)
at org.elasticsearch.xpack.esql.parser.EsqlParser.createStatement(EsqlParser.java:102)
at org.elasticsearch.xpack.esql.analysis.AnalyzerTestUtils.analyze(AnalyzerTestUtils.java:128)
at org.elasticsearch.xpack.esql.analysis.AnalyzerTestUtils.analyze(AnalyzerTestUtils.java:124)
at org.elasticsearch.xpack.esql.analysis.AnalyzerTestUtils.analyze(AnalyzerTestUtils.java:120)
at org.elasticsearch.xpack.esql.analysis.AnalyzerTests.testResolveRerankInferenceId2(AnalyzerTests.java:3509)
at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104)
at java.base/java.lang.reflect.Method.invoke(Method.java:565)
at com.carrotsearch.randomizedtesting.RandomizedRunner.invoke(RandomizedRunner.java:1763)
at com.carrotsearch.randomizedtesting.RandomizedRunner$8.evaluate(RandomizedRunner.java:946)
at com.carrotsearch.randomizedtesting.RandomizedRunner$9.evaluate(RandomizedRunner.java:982)
at com.carrotsearch.randomizedtesting.RandomizedRunner$10.evaluate(RandomizedRunner.java:996)
at com.carrotsearch.randomizedtesting.rules.StatementAdapter.evaluate(StatementAdapter.java:36)
at org.junit.rules.RunRules.evaluate(RunRules.java:20)
at org.apache.lucene.tests.util.TestRuleSetupTeardownChained$1.evaluate(TestRuleSetupTeardownChained.java:48)
at org.apache.lucene.tests.util.AbstractBeforeAfterRule$1.evaluate(AbstractBeforeAfterRule.java:43)
at org.apache.lucene.tests.util.TestRuleThreadAndTestName$1.evaluate(TestRuleThreadAndTestName.java:45)
at org.apache.lucene.tests.util.TestRuleIgnoreAfterMaxFailures$1.evaluate(TestRuleIgnoreAfterMaxFailures.java:60)
at org.apache.lucene.tests.util.TestRuleMarkFailure$1.evaluate(TestRuleMarkFailure.java:44)
at org.junit.rules.RunRules.evaluate(RunRules.java:20)
at com.carrotsearch.randomizedtesting.rules.StatementAdapter.evaluate(StatementAdapter.java:36)
at com.carrotsearch.randomizedtesting.ThreadLeakControl$StatementRunner.run(ThreadLeakControl.java:390)
at com.carrotsearch.randomizedtesting.ThreadLeakControl.forkTimeoutingTask(ThreadLeakControl.java:843)
at com.carrotsearch.randomizedtesting.ThreadLeakControl$3.evaluate(ThreadLeakControl.java:490)
at com.carrotsearch.randomizedtesting.RandomizedRunner.runSingleTest(RandomizedRunner.java:955)
at com.carrotsearch.randomizedtesting.RandomizedRunner$5.evaluate(RandomizedRunner.java:840)
at com.carrotsearch.randomizedtesting.RandomizedRunner$6.evaluate(RandomizedRunner.java:891)
at com.carrotsearch.randomizedtesting.RandomizedRunner$7.evaluate(RandomizedRunner.java:902)
at org.apache.lucene.tests.util.AbstractBeforeAfterRule$1.evaluate(AbstractBeforeAfterRule.java:43)
at com.carrotsearch.randomizedtesting.rules.StatementAdapter.evaluate(StatementAdapter.java:36)
at org.apache.lucene.tests.util.TestRuleStoreClassName$1.evaluate(TestRuleStoreClassName.java:38)
at com.carrotsearch.randomizedtesting.rules.NoShadowingOrOverridesOnMethodsRule$1.evaluate(NoShadowingOrOverridesOnMethodsRule.java:40)
at com.carrotsearch.randomizedtesting.rules.NoShadowingOrOverridesOnMethodsRule$1.evaluate(NoShadowingOrOverridesOnMethodsRule.java:40)
at com.carrotsearch.randomizedtesting.rules.StatementAdapter.evaluate(StatementAdapter.java:36)
at com.carrotsearch.randomizedtesting.rules.StatementAdapter.evaluate(StatementAdapter.java:36)
at org.apache.lucene.tests.util.TestRuleAssertionsRequired$1.evaluate(TestRuleAssertionsRequired.java:53)
at org.apache.lucene.tests.util.AbstractBeforeAfterRule$1.evaluate(AbstractBeforeAfterRule.java:43)
at org.apache.lucene.tests.util.TestRuleMarkFailure$1.evaluate(TestRuleMarkFailure.java:44)
at org.apache.lucene.tests.util.TestRuleIgnoreAfterMaxFailures$1.evaluate(TestRuleIgnoreAfterMaxFailures.java:60)
at org.apache.lucene.tests.util.TestRuleIgnoreTestSuites$1.evaluate(TestRuleIgnoreTestSuites.java:47)
at org.junit.rules.RunRules.evaluate(RunRules.java:20)
at com.carrotsearch.randomizedtesting.rules.StatementAdapter.evaluate(StatementAdapter.java:36)
at com.carrotsearch.randomizedtesting.ThreadLeakControl$StatementRunner.run(ThreadLeakControl.java:390)
at com.carrotsearch.randomizedtesting.ThreadLeakControl.lambda$forkTimeoutingTask$0(ThreadLeakControl.java:850)
at java.base/java.lang.Thread.run(Thread.java:1447)
Caused by: org.antlr.v4.runtime.InputMismatchException
at org.antlr.v4.runtime.DefaultErrorStrategy.recoverInline(DefaultErrorStrategy.java:485)
at org.antlr.v4.runtime.Parser.match(Parser.java:208)
| assumeTrue("Requires RERANK command", EsqlCapabilities.Cap.RERANK.isEnabled()); | ||
|
|
||
| // Substring function is named, should work. | ||
| LogicalPlan plan = analyze(""" |
There was a problem hiding this comment.
Parses correctly (but currently fails because the indexes do not exist). See the following test.
svilen-mihaylov-elastic
changed the title
| @@ -731,7 +731,8 @@ public PlanFactory visitRerankCommand(EsqlBaseParser.RerankCommandContext ctx) { | |||
| ); | |||
| } | |||
|
|
|||
| return p -> new Rerank(source, p, inferenceId(ctx.inferenceId), queryText, visitFields(ctx.fields())); | |||
| // TODO: pass rerank context into visitFields? | |||
| return p -> new Rerank(source, p, inferenceId(ctx.inferenceId), queryText, visitRerankFields(ctx.rerankFields())); | |||
There was a problem hiding this comment.
Main change
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/ParserUtils.java
Outdated
Show resolved
Hide resolved
svilen-mihaylov-elastic
added
the
:Search Relevance/Search
| @@ -3613,6 +3613,19 @@ public void testResolveRerankFields() { | |||
| assertThat(rerank.scoreAttribute(), equalTo(getAttributeByName(relation.output(), MetadataAttribute.SCORE))); | |||
| } | |||
|
|
|||
| { | |||
There was a problem hiding this comment.
New test
svilen-mihaylov-elastic
changed the title
svilen-mihaylov-elastic
changed the title
elasticsearchmachine
added
the
Team:Search Relevance
|
Pinging @elastic/es-search-relevance (Team:Search Relevance) |
afoucret
approved these changes
Apr 30, 2025
There was a problem hiding this comment.
@svilen-mihaylov-elastic This is great. Thank you for doing this.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses #126603
There is a very large number of changes to auto-generated antlr files.
I've commented on the substantial changes.