OR doesn't need to check for pushable full text functions

Author: carlosdelest

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/FullTextFunction.java

@@ -276,7 +276,7 @@ private static void checkFullTextSearchDisjunctions(Expression condition, Failur
      * @param or disjunction to check
      * @return true if the disjunction is pushable, false otherwise
      */
-    public static boolean checkDisjunctionPushable(Or or) {
+    private static boolean checkDisjunctionPushable(Or or) {
         boolean hasFullText = or.anyMatch(FullTextFunction.class::isInstance);
         return hasFullText == false || onlyFullTextFunctionsInExpression(or);
     }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/predicate/logical/Or.java

@@ -12,9 +12,7 @@
 import org.elasticsearch.xpack.esql.core.expression.predicate.Negatable;
 import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
 import org.elasticsearch.xpack.esql.core.tree.Source;
-import org.elasticsearch.xpack.esql.expression.function.fulltext.FullTextFunction;
 import org.elasticsearch.xpack.esql.expression.predicate.Predicates;
-import org.elasticsearch.xpack.esql.optimizer.rules.physical.local.LucenePushdownPredicates;
 
 import java.io.IOException;
 
@@ -59,9 +57,4 @@ protected Expression canonicalize() {
         // NB: this add a circular dependency between Predicates / Logical package
         return Predicates.combineOr(Predicates.splitOr(super.canonicalize()));
     }
-
-    @Override
-    public boolean translatable(LucenePushdownPredicates pushdownPredicates) {
-        return super.translatable(pushdownPredicates) && FullTextFunction.checkDisjunctionPushable(this);
-    }
 }

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalPhysicalPlanOptimizerTests.java

@@ -1673,6 +1673,24 @@ public void testMatchFunctionWithNonPushableDisjunction() {
         assertThat(fieldExtract.child(), instanceOf(EsQueryExec.class));
     }
 
+    public void testMatchFunctionWithPushableDisjunction() {
+        String query = """
+            from test
+            | where match(last_name, "Smith") or emp_no > 10""";
+        var plan = plannerOptimizer.plan(query);
+
+        var limit = as(plan, LimitExec.class);
+        var exchange = as(limit.child(), ExchangeExec.class);
+        var project = as(exchange.child(), ProjectExec.class);
+        var fieldExtract = as(project.child(), FieldExtractExec.class);
+        var esQuery = as(fieldExtract.child(), EsQueryExec.class);
+        var boolQuery = as(esQuery.query(), BoolQueryBuilder.class);
+        Source source = new Source(2, 37, "emp_no > 10");
+        BoolQueryBuilder expected = new BoolQueryBuilder().should(new MatchQueryBuilder("last_name", "Smith").lenient(true))
+            .should(wrapWithSingleQuery(query, QueryBuilders.rangeQuery("emp_no").gt(10), "emp_no", source));
+        assertThat(esQuery.query().toString(), equalTo(expected.toString()));
+    }
+
     private QueryBuilder wrapWithSingleQuery(String query, QueryBuilder inner, String fieldName, Source source) {
         return FilterTests.singleValueQuery(query, inner, fieldName, source);
     }