Fixup

Author: nik9000

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/Equals.java

@@ -152,7 +152,7 @@ public Query asQuery(LucenePushdownPredicates pushdownPredicates, TranslatorHand
         if (right() instanceof Literal rhs && left().dataType() == DataType.TEXT && left() instanceof FieldAttribute lhs) {
             return asQueryText(pushdownPredicates, handler, lhs, ((BytesRef) rhs.value()).utf8ToString());
         }
-        return super.asQuery(pushdownPredicates, handler);
+        return handler.forceToSingleValueQuery(left(), super.asQuery(pushdownPredicates, handler));
     }
 
     private Query asQueryText(LucenePushdownPredicates pushdownPredicates, TranslatorHandler handler, FieldAttribute lhs, String rhs) {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/GreaterThan.java

@@ -10,6 +10,7 @@
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.time.DateUtils;
 import org.elasticsearch.compute.ann.Evaluator;
+import org.elasticsearch.xpack.esql.capabilities.TranslationAware;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.expression.predicate.Negatable;
 import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
@@ -22,7 +23,10 @@
 import java.time.ZoneId;
 import java.util.Map;
 
-public class GreaterThan extends EsqlBinaryComparison implements Negatable<EsqlBinaryComparison> {
+public class GreaterThan extends EsqlBinaryComparison
+    implements
+        Negatable<EsqlBinaryComparison>,
+        TranslationAware.SingleValueTranslationAware {
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
         Expression.class,
         "GreaterThan",
@@ -117,6 +121,11 @@ public EsqlBinaryComparison reverse() {
         return new LessThan(source(), left(), right(), zoneId());
     }
 
+    @Override
+    public Expression singleValueField() {
+        return left();
+    }
+
     @Evaluator(extraName = "Ints")
     static boolean processInts(int lhs, int rhs) {
         return lhs > rhs;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/GreaterThanOrEqual.java

@@ -10,6 +10,7 @@
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.time.DateUtils;
 import org.elasticsearch.compute.ann.Evaluator;
+import org.elasticsearch.xpack.esql.capabilities.TranslationAware;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.expression.predicate.Negatable;
 import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
@@ -22,7 +23,8 @@
 import java.time.ZoneId;
 import java.util.Map;
 
-public class GreaterThanOrEqual extends EsqlBinaryComparison implements Negatable<EsqlBinaryComparison> {
+public class GreaterThanOrEqual extends EsqlBinaryComparison implements Negatable<EsqlBinaryComparison>,
+    TranslationAware.SingleValueTranslationAware {
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
         Expression.class,
         "GreaterThanOrEqual",
@@ -112,6 +114,11 @@ public LessThan negate() {
         return new LessThan(source(), left(), right(), zoneId());
     }
 
+    @Override
+    public Expression singleValueField() {
+        return left();
+    }
+
     @Override
     public EsqlBinaryComparison reverse() {
         return new LessThanOrEqual(source(), left(), right(), zoneId());

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/LessThan.java

@@ -10,6 +10,7 @@
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.time.DateUtils;
 import org.elasticsearch.compute.ann.Evaluator;
+import org.elasticsearch.xpack.esql.capabilities.TranslationAware;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.expression.predicate.Negatable;
 import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
@@ -22,7 +23,8 @@
 import java.time.ZoneId;
 import java.util.Map;
 
-public class LessThan extends EsqlBinaryComparison implements Negatable<EsqlBinaryComparison> {
+public class LessThan extends EsqlBinaryComparison implements Negatable<EsqlBinaryComparison>,
+    TranslationAware.SingleValueTranslationAware {
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
         Expression.class,
         "LessThan",
@@ -109,6 +111,11 @@ public EsqlBinaryComparison reverse() {
         return new GreaterThan(source(), left(), right(), zoneId());
     }
 
+    @Override
+    public Expression singleValueField() {
+        return left();
+    }
+
     @Evaluator(extraName = "Ints")
     static boolean processInts(int lhs, int rhs) {
         return lhs < rhs;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/LessThanOrEqual.java

@@ -10,6 +10,7 @@
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.time.DateUtils;
 import org.elasticsearch.compute.ann.Evaluator;
+import org.elasticsearch.xpack.esql.capabilities.TranslationAware;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.expression.predicate.Negatable;
 import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
@@ -22,7 +23,8 @@
 import java.time.ZoneId;
 import java.util.Map;
 
-public class LessThanOrEqual extends EsqlBinaryComparison implements Negatable<EsqlBinaryComparison> {
+public class LessThanOrEqual extends EsqlBinaryComparison implements Negatable<EsqlBinaryComparison>,
+    TranslationAware.SingleValueTranslationAware {
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
         Expression.class,
         "LessThanOrEqual",
@@ -109,6 +111,11 @@ public EsqlBinaryComparison reverse() {
         return new GreaterThanOrEqual(source(), left(), right(), zoneId());
     }
 
+    @Override
+    public Expression singleValueField() {
+        return left();
+    }
+
     @Evaluator(extraName = "Ints")
     static boolean processInts(int lhs, int rhs) {
         return lhs <= rhs;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/NotEquals.java

@@ -10,6 +10,7 @@
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.time.DateUtils;
 import org.elasticsearch.compute.ann.Evaluator;
+import org.elasticsearch.xpack.esql.capabilities.TranslationAware;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.expression.predicate.Negatable;
 import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
@@ -22,7 +23,8 @@
 import java.time.ZoneId;
 import java.util.Map;
 
-public class NotEquals extends EsqlBinaryComparison implements Negatable<EsqlBinaryComparison> {
+public class NotEquals extends EsqlBinaryComparison implements Negatable<EsqlBinaryComparison>,
+    TranslationAware.SingleValueTranslationAware {
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
         Expression.class,
         "NotEquals",
@@ -189,4 +191,9 @@ public NotEquals swapLeftAndRight() {
     public EsqlBinaryComparison negate() {
         return new Equals(source(), left(), right(), zoneId());
     }
+
+    @Override
+    public Expression singleValueField() {
+        return left();
+    }
 }