Skip to content

[8.19] ESQL: Move some mappers into their expressions (#128342) #128600

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

Merged
merged 3 commits into from
Jun 11, 2025
Merged

[8.19] ESQL: Move some mappers into their expressions (#128342) #128600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38c5141
ESQL: Move some mappers into their expressions (#128342)
nik9000 May 29, 2025
4ae5dc0
Merge branch '8.19' into backport/8.19/pr-128342
nik9000 Jun 10, 2025
05212a6
Merge branch '8.19' into backport/8.19/pr-128342
nik9000 Jun 11, 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
2 changes: 1 addition & 1 deletion ...dicate/operator/logical/NotEvaluator.java → ...ssion/predicate/logical/NotEvaluator.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

118 changes: 1 addition & 117 deletions x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/evaluator/EvalMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import org.elasticsearch.compute.data.Page;
import org.elasticsearch.compute.data.Vector;
import org.elasticsearch.compute.operator.DriverContext;
import org.elasticsearch.compute.operator.EvalOperator;
import org.elasticsearch.compute.operator.EvalOperator.ExpressionEvaluator;
import org.elasticsearch.core.Releasables;
import org.elasticsearch.xpack.esql.core.QlIllegalArgumentException;
Expand All @@ -28,9 +27,6 @@
import org.elasticsearch.xpack.esql.evaluator.mapper.EvaluatorMapper;
import org.elasticsearch.xpack.esql.evaluator.mapper.ExpressionMapper;
import org.elasticsearch.xpack.esql.expression.predicate.logical.BinaryLogic;
import org.elasticsearch.xpack.esql.expression.predicate.logical.Not;
import org.elasticsearch.xpack.esql.expression.predicate.nulls.IsNotNull;
import org.elasticsearch.xpack.esql.expression.predicate.nulls.IsNull;
import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.InsensitiveEqualsMapper;
import org.elasticsearch.xpack.esql.planner.EsPhysicalOperationProviders.ShardContext;
import org.elasticsearch.xpack.esql.planner.Layout;
Expand All @@ -42,11 +38,8 @@ public final class EvalMapper {
private static final List<ExpressionMapper<?>> MAPPERS = List.of(
new InsensitiveEqualsMapper(),
new BooleanLogic(),
new Nots(),
new Attributes(),
new Literals(),
new IsNotNulls(),
new IsNulls()
new Literals()
);

private EvalMapper() {}
Expand Down Expand Up @@ -174,18 +167,6 @@ public void close() {
}
}

static class Nots extends ExpressionMapper<Not> {
@Override
public ExpressionEvaluator.Factory map(FoldContext foldCtx, Not not, Layout layout, List<ShardContext> shardContexts) {
var expEval = toEvaluator(foldCtx, not.field(), layout, shardContexts);
return dvrCtx -> new org.elasticsearch.xpack.esql.evaluator.predicate.operator.logical.NotEvaluator(
not.source(),
expEval.get(dvrCtx),
dvrCtx
);
}
}

static class Attributes extends ExpressionMapper<Attribute> {
@Override
public ExpressionEvaluator.Factory map(FoldContext foldCtx, Attribute attr, Layout layout, List<ShardContext> shardContexts) {
Expand Down Expand Up @@ -276,101 +257,4 @@ private static Block block(Literal lit, BlockFactory blockFactory, int positions
return BlockUtils.constantBlock(blockFactory, value, positions);
}
}

static class IsNulls extends ExpressionMapper<IsNull> {

@Override
public ExpressionEvaluator.Factory map(FoldContext foldCtx, IsNull isNull, Layout layout, List<ShardContext> shardContexts) {
var field = toEvaluator(foldCtx, isNull.field(), layout, shardContexts);
return new IsNullEvaluatorFactory(field);
}

record IsNullEvaluatorFactory(EvalOperator.ExpressionEvaluator.Factory field) implements ExpressionEvaluator.Factory {
@Override
public ExpressionEvaluator get(DriverContext context) {
return new IsNullEvaluator(context, field.get(context));
}

@Override
public String toString() {
return "IsNullEvaluator[field=" + field + ']';
}
}

record IsNullEvaluator(DriverContext driverContext, EvalOperator.ExpressionEvaluator field) implements ExpressionEvaluator {
@Override
public Block eval(Page page) {
try (Block fieldBlock = field.eval(page)) {
if (fieldBlock.asVector() != null) {
return driverContext.blockFactory().newConstantBooleanBlockWith(false, page.getPositionCount());
}
try (var builder = driverContext.blockFactory().newBooleanVectorFixedBuilder(page.getPositionCount())) {
for (int p = 0; p < page.getPositionCount(); p++) {
builder.appendBoolean(p, fieldBlock.isNull(p));
}
return builder.build().asBlock();
}
}
}

@Override
public void close() {
Releasables.closeExpectNoException(field);
}

@Override
public String toString() {
return "IsNullEvaluator[field=" + field + ']';
}
}
}

static class IsNotNulls extends ExpressionMapper<IsNotNull> {

@Override
public ExpressionEvaluator.Factory map(FoldContext foldCtx, IsNotNull isNotNull, Layout layout, List<ShardContext> shardContexts) {
return new IsNotNullEvaluatorFactory(toEvaluator(foldCtx, isNotNull.field(), layout, shardContexts));
}

record IsNotNullEvaluatorFactory(EvalOperator.ExpressionEvaluator.Factory field) implements ExpressionEvaluator.Factory {
@Override
public ExpressionEvaluator get(DriverContext context) {
return new IsNotNullEvaluator(context, field.get(context));
}

@Override
public String toString() {
return "IsNotNullEvaluator[field=" + field + ']';
}
}

record IsNotNullEvaluator(DriverContext driverContext, EvalOperator.ExpressionEvaluator field)
implements
EvalOperator.ExpressionEvaluator {
@Override
public Block eval(Page page) {
try (Block fieldBlock = field.eval(page)) {
if (fieldBlock.asVector() != null) {
return driverContext.blockFactory().newConstantBooleanBlockWith(true, page.getPositionCount());
}
try (var builder = driverContext.blockFactory().newBooleanVectorFixedBuilder(page.getPositionCount())) {
for (int p = 0; p < page.getPositionCount(); p++) {
builder.appendBoolean(p, fieldBlock.isNull(p) == false);
}
return builder.build().asBlock();
}
}
}

@Override
public void close() {
Releasables.closeExpectNoException(field);
}

@Override
public String toString() {
return "IsNotNullEvaluator[field=" + field + ']';
}
}
}
}
17 changes: 0 additions & 17 deletions .../src/main/java/org/elasticsearch/xpack/esql/evaluator/predicate/operator/logical/Not.java
View file
Open in desktop

This file was deleted.

30 changes: 29 additions & 1 deletion ...gin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/predicate/logical/Not.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.compute.ann.Evaluator;
import org.elasticsearch.compute.operator.DriverContext;
import org.elasticsearch.compute.operator.EvalOperator;
import org.elasticsearch.xpack.esql.capabilities.TranslationAware;
import org.elasticsearch.xpack.esql.core.QlIllegalArgumentException;
import org.elasticsearch.xpack.esql.core.expression.Expression;
Expand All @@ -18,6 +21,7 @@
import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
import org.elasticsearch.xpack.esql.core.tree.Source;
import org.elasticsearch.xpack.esql.core.type.DataType;
import org.elasticsearch.xpack.esql.evaluator.mapper.EvaluatorMapper;
import org.elasticsearch.xpack.esql.optimizer.rules.physical.local.LucenePushdownPredicates;
import org.elasticsearch.xpack.esql.planner.TranslatorHandler;

Expand All @@ -26,7 +30,7 @@
import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.DEFAULT;
import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isBoolean;

public class Not extends UnaryScalarFunction implements Negatable<Expression>, TranslationAware {
public class Not extends UnaryScalarFunction implements EvaluatorMapper, Negatable<Expression>, TranslationAware {
public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(Expression.class, "Not", Not::new);

public Not(Source source, Expression child) {
Expand Down Expand Up @@ -77,6 +81,16 @@ private static Boolean apply(Object input) {
return ((Boolean) input).booleanValue() ? Boolean.FALSE : Boolean.TRUE;
}

@Override
public EvalOperator.ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvaluator) {
return new NotEvaluatorFactory(source(), toEvaluator.apply(field()));
}

@Evaluator
static boolean process(boolean v) {
return false == v;
}

@Override
protected Expression canonicalize() {
if (field() instanceof Negatable) {
Expand Down Expand Up @@ -108,4 +122,18 @@ public Translatable translatable(LucenePushdownPredicates pushdownPredicates) {
public Query asQuery(LucenePushdownPredicates pushdownPredicates, TranslatorHandler handler) {
return handler.asQuery(pushdownPredicates, field()).negate(source());
}

record NotEvaluatorFactory(Source source, EvalOperator.ExpressionEvaluator.Factory field)
implements
EvalOperator.ExpressionEvaluator.Factory {
@Override
public EvalOperator.ExpressionEvaluator get(DriverContext context) {
return new NotEvaluator(source, field.get(context), context);
}

@Override
public String toString() {
return "NotEvaluator[field=" + field + ']';
}
}
}
55 changes: 54 additions & 1 deletion ...esql/src/main/java/org/elasticsearch/xpack/esql/expression/predicate/nulls/IsNotNull.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@

import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.compute.data.Block;
import org.elasticsearch.compute.data.Page;
import org.elasticsearch.compute.operator.DriverContext;
import org.elasticsearch.compute.operator.EvalOperator;
import org.elasticsearch.core.Releasables;
import org.elasticsearch.xpack.esql.capabilities.TranslationAware;
import org.elasticsearch.xpack.esql.core.expression.Expression;
import org.elasticsearch.xpack.esql.core.expression.FoldContext;
Expand All @@ -19,12 +24,13 @@
import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
import org.elasticsearch.xpack.esql.core.tree.Source;
import org.elasticsearch.xpack.esql.core.type.DataType;
import org.elasticsearch.xpack.esql.evaluator.mapper.EvaluatorMapper;
import org.elasticsearch.xpack.esql.optimizer.rules.physical.local.LucenePushdownPredicates;
import org.elasticsearch.xpack.esql.planner.TranslatorHandler;

import java.io.IOException;

public class IsNotNull extends UnaryScalarFunction implements Negatable<UnaryScalarFunction>, TranslationAware {
public class IsNotNull extends UnaryScalarFunction implements EvaluatorMapper, Negatable<UnaryScalarFunction>, TranslationAware {
public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
Expression.class,
"IsNotNull",
Expand Down Expand Up @@ -59,6 +65,12 @@ public Object fold(FoldContext ctx) {
return DataType.isNull(field().dataType()) == false && field().fold(ctx) != null;
}

@Override
public EvalOperator.ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvaluator) {
return new IsNotNullEvaluatorFactory(toEvaluator.apply(field()));

}

@Override
public Nullability nullable() {
return Nullability.FALSE;
Expand All @@ -83,4 +95,45 @@ public Translatable translatable(LucenePushdownPredicates pushdownPredicates) {
public Query asQuery(LucenePushdownPredicates pushdownPredicates, TranslatorHandler handler) {
return new ExistsQuery(source(), handler.nameOf(field()));
}

record IsNotNullEvaluatorFactory(EvalOperator.ExpressionEvaluator.Factory field) implements EvalOperator.ExpressionEvaluator.Factory {
@Override
public EvalOperator.ExpressionEvaluator get(DriverContext context) {
return new IsNotNullEvaluator(context, field.get(context));
}

@Override
public String toString() {
return "IsNotNullEvaluator[field=" + field + ']';
}
}

record IsNotNullEvaluator(DriverContext driverContext, EvalOperator.ExpressionEvaluator field)
implements
EvalOperator.ExpressionEvaluator {
@Override
public Block eval(Page page) {
try (Block fieldBlock = field.eval(page)) {
if (fieldBlock.asVector() != null) {
return driverContext.blockFactory().newConstantBooleanBlockWith(true, page.getPositionCount());
}
try (var builder = driverContext.blockFactory().newBooleanVectorFixedBuilder(page.getPositionCount())) {
for (int p = 0; p < page.getPositionCount(); p++) {
builder.appendBoolean(p, fieldBlock.isNull(p) == false);
}
return builder.build().asBlock();
}
}
}

@Override
public void close() {
Releasables.closeExpectNoException(field);
}

@Override
public String toString() {
return "IsNotNullEvaluator[field=" + field + ']';
}
}
}
Loading