Skip to content

[8.12] ESQL: Push CIDR_MATCH to Lucene if possible (#105061)#105177

Merged
costin merged 1 commit intoelastic:8.12from
alex-spies:backport/8.12/pr-105061
Feb 6, 2024
Merged

[8.12] ESQL: Push CIDR_MATCH to Lucene if possible (#105061)#105177
costin merged 1 commit intoelastic:8.12from
alex-spies:backport/8.12/pr-105061

Conversation

@alex-spies
Copy link
Copy Markdown
Contributor

@alex-spies alex-spies commented Feb 6, 2024

Backport

This will backport the following commits from main to 8.12:

(cherry picked from commit b5f4c5e)

# Conflicts:
#	x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/EsqlTranslatorHandler.java
#	x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalPhysicalPlanOptimizerTests.java
new ExpressionTranslators.StringQueries(),
new ExpressionTranslators.Matches(),
new ExpressionTranslators.MultiMatches(),
new Scalars()
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only this one is new, we were using the full list of QL translators before.

new AnalyzerContext(config, functionRegistry, getIndexResult, enrichResolution),
new Verifier(new Metrics())
);
private Analyzer makeAnalyzer(String mappingFileName, EnrichResolution enrichResolution) {
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is required for the backported test; to avoid code duplication in init, I updated init as well to be the same as in main.

@costin costin added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Feb 6, 2024
@costin costin merged commit b13d768 into elastic:8.12 Feb 6, 2024
@alex-spies alex-spies deleted the backport/8.12/pr-105061 branch February 6, 2024 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Analytics/ES|QL AKA ESQL auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport v8.12.2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants