-
Notifications
You must be signed in to change notification settings - Fork 24.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
QL: Introduce common analyzer base class #65325
Merged
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
84 changes: 84 additions & 0 deletions
84
x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/analyzer/AnalyzerRules.java
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.ql.analyzer; | ||
|
|
||
| import org.elasticsearch.xpack.ql.expression.Expression; | ||
| import org.elasticsearch.xpack.ql.expression.FieldAttribute; | ||
| import org.elasticsearch.xpack.ql.expression.Literal; | ||
| import org.elasticsearch.xpack.ql.expression.predicate.logical.BinaryLogic; | ||
| import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.Equals; | ||
| import org.elasticsearch.xpack.ql.plan.logical.Filter; | ||
| import org.elasticsearch.xpack.ql.plan.logical.LogicalPlan; | ||
| import org.elasticsearch.xpack.ql.rule.Rule; | ||
|
|
||
| import static java.util.Arrays.asList; | ||
|
|
||
| public final class AnalyzerRules { | ||
|
|
||
| public static class AddMissingEqualsToBoolField extends AnalyzerRule<Filter> { | ||
|
|
||
| @Override | ||
| protected LogicalPlan rule(Filter filter) { | ||
| // check the condition itself | ||
| Expression condition = replaceRawBoolFieldWithEquals(filter.condition()); | ||
| // otherwise look for binary logic | ||
| if (condition == filter.condition()) { | ||
| condition = condition.transformUp(b -> | ||
| b.replaceChildren(asList(replaceRawBoolFieldWithEquals(b.left()), replaceRawBoolFieldWithEquals(b.right()))) | ||
| , BinaryLogic.class); | ||
| } | ||
|
|
||
| if (condition != filter.condition()) { | ||
| filter = new Filter(filter.source(), filter.child(), condition); | ||
| } | ||
| return filter; | ||
| } | ||
|
|
||
| private Expression replaceRawBoolFieldWithEquals(Expression e) { | ||
| if (e instanceof FieldAttribute) { | ||
| e = new Equals(e.source(), e, Literal.of(e, Boolean.TRUE)); | ||
| } | ||
| return e; | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean skipResolved() { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
|
|
||
| public abstract static class AnalyzerRule<SubPlan extends LogicalPlan> extends Rule<SubPlan, LogicalPlan> { | ||
|
|
||
| // transformUp (post-order) - that is first children and then the node | ||
| // but with a twist; only if the tree is not resolved or analyzed | ||
| @Override | ||
| public final LogicalPlan apply(LogicalPlan plan) { | ||
| return plan.transformUp(t -> t.analyzed() || skipResolved() && t.resolved() ? t : rule(t), typeToken()); | ||
| } | ||
|
|
||
| @Override | ||
| protected abstract LogicalPlan rule(SubPlan plan); | ||
|
|
||
| protected boolean skipResolved() { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| public abstract static class BaseAnalyzerRule extends AnalyzerRule<LogicalPlan> { | ||
|
|
||
| @Override | ||
| protected LogicalPlan rule(LogicalPlan plan) { | ||
| if (plan.childrenResolved() == false) { | ||
| return plan; | ||
| } | ||
| return doRule(plan); | ||
| } | ||
|
|
||
| protected abstract LogicalPlan doRule(LogicalPlan plan); | ||
| } | ||
| } |
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just as it happens an entry in the dataset failed this condition today (21/11/1985) - I've updated the filter to remain the same for another 9 years :)