Skip to content

[ES|QL] Prof of concept : making RuleExecutor async #130571

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.

Sign up for GitHub

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

Closed
wants to merge 5 commits into from
Closed

[ES|QL] Prof of concept : making RuleExecutor async #130571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9058064
Introduce an async API in the RuleExecutor
afoucret Jul 3, 2025
a87871e
Make Analyzer::execute an async function.
afoucret Jul 3, 2025
e723e5c
Create async versions of Node::transformUp and Node::transformDown
afoucret Jul 3, 2025
ac3f7d4
Make LocalLogicalPlanOptimizer async
afoucret Jul 3, 2025
cab533b
[CI] Auto commit changes from spotless
Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions ...marks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

package org.elasticsearch.benchmark._nightly.esql;

import org.elasticsearch.action.ActionListener;
import org.elasticsearch.common.logging.LogConfigurator;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.IndexMode;
Expand Down Expand Up @@ -115,15 +116,27 @@ public void setup() {
defaultOptimizer = new LogicalPlanOptimizer(new LogicalOptimizerContext(config, FoldContext.small()));
}

private LogicalPlan plan(EsqlParser parser, Analyzer analyzer, LogicalPlanOptimizer optimizer, String query) {
private void plan(
EsqlParser parser,
Analyzer analyzer,
LogicalPlanOptimizer optimizer,
String query,
ActionListener<LogicalPlan> listener
) {
var parsed = parser.createStatement(query, new QueryParams(), telemetry);
var analyzed = analyzer.analyze(parsed);
var optimized = optimizer.optimize(analyzed);
return optimized;
analyzer.analyze(parsed, listener.map(optimizer::optimize));
}

@Benchmark
public void manyFields(Blackhole blackhole) {
blackhole.consume(plan(defaultParser, manyFieldsAnalyzer, defaultOptimizer, "FROM test | LIMIT 10"));
plan(
defaultParser,
manyFieldsAnalyzer,
defaultOptimizer,
"FROM test | LIMIT 10",
ActionListener.wrap(p -> blackhole.consume(p), e -> {
throw new RuntimeException("Unexpected exception", e);
})
);
}
}
105 changes: 104 additions & 1 deletion x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/tree/Node.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
*/
package org.elasticsearch.xpack.esql.core.tree;

import org.apache.lucene.util.SetOnce;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.CountDownActionListener;
import org.elasticsearch.common.io.stream.NamedWriteable;
import org.elasticsearch.xpack.esql.core.QlIllegalArgumentException;

Expand All @@ -14,6 +17,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Predicate;
Expand Down Expand Up @@ -187,16 +192,45 @@ public T transformDown(Function<? super T, ? extends T> rule) {
return node.transformChildren(child -> child.transformDown(rule));
}

@SuppressWarnings("unchecked")
public void transformDown(BiConsumer<T, ActionListener<T>> rule, ActionListener<T> listener) {
// First apply the rule to the current node (top-down)
rule.accept((T) this, listener.delegateFailureAndWrap((l, transformedNode) -> {
// Then recursively transform the children with the same rule
transformedNode.transformChildren((child, childListener) -> child.transformDown(rule, childListener), l);
}));
}

@SuppressWarnings("unchecked")
public <E extends T> T transformDown(Class<E> typeToken, Function<E, ? extends T> rule) {
return transformDown((t) -> (typeToken.isInstance(t) ? rule.apply((E) t) : t));
}

@SuppressWarnings("unchecked")
public <E extends T> void transformDown(Class<E> typeToken, BiConsumer<E, ActionListener<T>> rule, ActionListener<T> listener) {
transformDown(typeToken::isInstance, rule, listener);
}

@SuppressWarnings("unchecked")
public <E extends T> T transformDown(Predicate<Node<?>> nodePredicate, Function<E, ? extends T> rule) {
return transformDown((t) -> (nodePredicate.test(t) ? rule.apply((E) t) : t));
}

@SuppressWarnings("unchecked")
public <E extends T> void transformDown(
Predicate<Node<?>> nodePredicate,
BiConsumer<E, ActionListener<T>> rule,
ActionListener<T> listener
) {
transformDown((T node, ActionListener<T> l) -> {
if (nodePredicate.test(node)) {
rule.accept((E) node, l);
} else {
l.onResponse(node);
}
}, listener);
}

@SuppressWarnings("unchecked")
public T transformUp(Function<? super T, ? extends T> rule) {
T transformed = transformChildren(child -> child.transformUp(rule));
Expand All @@ -205,15 +239,48 @@ public T transformUp(Function<? super T, ? extends T> rule) {
}

@SuppressWarnings("unchecked")
public void transformUp(BiConsumer<T, ActionListener<T>> rule, ActionListener<T> listener) {
// First, recursively transform the children (depth-first, bottom-up) using the same async rule
transformChildren(
// traversal operation applied to each child
(child, childListener) -> child.transformUp(rule, childListener),
// After all children are transformed, apply the rule to the (possibly) new current node
listener.delegateFailureAndWrap((l, transformedChildrenNode) -> {
T node = transformedChildrenNode.equals(this) ? (T) this : transformedChildrenNode;
rule.accept(node, l);
})
);
}

public <E extends T> T transformUp(Class<E> typeToken, Function<E, ? extends T> rule) {
return transformUp((t) -> (typeToken.isInstance(t) ? rule.apply((E) t) : t));
return transformUp(typeToken::isInstance, rule);
}

public <E extends T> void transformUp(Class<E> typeToken, BiConsumer<E, ActionListener<T>> rule, ActionListener<T> listener) {
transformUp(typeToken::isInstance, rule, listener);
}

@SuppressWarnings("unchecked")
public <E extends T> T transformUp(Predicate<Node<?>> nodePredicate, Function<E, ? extends T> rule) {
return transformUp((t) -> (nodePredicate.test(t) ? rule.apply((E) t) : t));
}

@SuppressWarnings("unchecked")
public <E extends T> void transformUp(
Predicate<Node<?>> nodePredicate,
BiConsumer<E, ActionListener<T>> rule,
ActionListener<T> listener
) {
transformUp((T node, ActionListener<T> l) -> {
if (nodePredicate.test(node)) {
E typedNode = (E) node;
rule.accept((E) node, l);
} else {
l.onResponse(node);
}
}, listener);
}

@SuppressWarnings("unchecked")
protected <R extends Function<? super T, ? extends T>> T transformChildren(Function<T, ? extends T> traversalOperation) {
boolean childrenChanged = false;
Expand All @@ -238,6 +305,42 @@ public <E extends T> T transformUp(Predicate<Node<?>> nodePredicate, Function<E,
return (childrenChanged ? replaceChildrenSameSize(transformedChildren) : (T) this);
}

@SuppressWarnings("unchecked")
protected void transformChildren(BiConsumer<? super T, ActionListener<T>> traversalOperation, ActionListener<T> listener) {
if (children.isEmpty()) {
listener.onResponse((T) this);
return;
}

final SetOnce<List<T>> transformedChildren = new SetOnce<>();
final AtomicBoolean childrenChanged = new AtomicBoolean(false);

CountDownActionListener countDownListener = new CountDownActionListener(
children.size(),
listener.delegateFailureIgnoreResponseAndWrap((l) -> {
if (childrenChanged.get()) {
l.onResponse(replaceChildrenSameSize(transformedChildren.get()));
} else {
l.onResponse((T) this);
}
})
);

for (int i = 0, s = children.size(); i < s; i++) {
T child = children.get(i);
final int childId = i;
traversalOperation.accept(child, countDownListener.map(next -> {
if (child.equals(next) == false) {
if (childrenChanged.compareAndSet(false, true) && transformedChildren.get() == null) {
transformedChildren.trySet(new ArrayList<>(children));
}
transformedChildren.get().set(childId, next);
}
return null;
}));
}
}

public final T replaceChildrenSameSize(List<T> newChildren) {
if (newChildren.size() != children.size()) {
throw new QlIllegalArgumentException(
Expand Down
Loading