Added missing tests

Author: carlosdelest

x-pack/plugin/esql/qa/testFixtures/src/main/resources/scoring.csv-spec

@@ -361,7 +361,6 @@ _id:keyword
 scoresNonPushableFunctions
 
 required_capability: metadata_score
-required_capability: full_text_functions_disjunctions_score
 
 from books metadata _score 
 | where length(title) > 100
@@ -370,8 +369,8 @@ from books metadata _score
 ;
 
 book_no:keyword |  _score:double
-2924            | 0.0
-8678            | 0.0
+2924            | 1.0
+8678            | 1.0
 ;
 
 scoresPushableFunctions
@@ -423,6 +422,7 @@ book_no:keyword |  _score:double
 
 disjunctionScoresPushableNonPushableFunctions
 
+required_capability: metadata_score
 required_capability: full_text_functions_disjunctions_score
 
 from books metadata _score 
@@ -443,6 +443,7 @@ book_no:keyword |  _score:double
 
 disjunctionScoresMultipleClauses
 
+required_capability: metadata_score
 required_capability: full_text_functions_disjunctions_score
 
 from books metadata _score 

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/ScoringIT.java

@@ -98,6 +98,48 @@ public void testDisjunctionScoring() {
         }
     }
 
+    public void testConjunctionPushableScoring() {
+        var query = """
+            FROM test METADATA _score
+            | WHERE match(content, "fox") AND id > 4
+            | KEEP id, _score
+            | SORT _score DESC, id ASC
+            """;
+
+        try (var resp = run(query)) {
+            assertColumnNames(resp.columns(), List.of("id", "_score"));
+            assertColumnTypes(resp.columns(), List.of("integer", "double"));
+            List<List<Object>> values = getValuesList(resp);
+            assertThat(values.size(), equalTo(1));
+
+            assertThat(values.get(0).get(0), equalTo(6));
+
+            // Matches full text query and pushable query
+            assertThat((Double) values.get(0).get(1), greaterThan(1.0));
+        }
+    }
+
+    public void testConjunctionNonPushableScoring() {
+        var query = """
+            FROM test METADATA _score
+            | WHERE match(content, "fox") AND length(content) < 20
+            | KEEP id, _score
+            | SORT _score DESC, id ASC
+            """;
+
+        try (var resp = run(query)) {
+            assertColumnNames(resp.columns(), List.of("id", "_score"));
+            assertColumnTypes(resp.columns(), List.of("integer", "double"));
+            List<List<Object>> values = getValuesList(resp);
+            assertThat(values.size(), equalTo(1));
+
+            assertThat(values.get(0).get(0), equalTo(1));
+
+            // Matches full text query and pushable query
+            assertThat((Double) values.get(0).get(1), greaterThan(1.0));
+        }
+    }
+
     public void testDisjunctionScoringPushableFunctions() {
         var query = """
             FROM test METADATA _score

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

@@ -284,6 +284,11 @@ public final void test() throws Throwable {
                 "CSV tests cannot currently handle the _source field mapping directives",
                 testCase.requiredCapabilities.contains(EsqlCapabilities.Cap.SOURCE_FIELD_MAPPING.capabilityName())
             );
+            assumeFalse(
+                "CSV tests cannot currently handle scoring that depends on Lucene",
+                testCase.requiredCapabilities.contains(EsqlCapabilities.Cap.METADATA_SCORE.capabilityName())
+            );
+
             if (Build.current().isSnapshot()) {
                 assertThat(
                     "Capability is not included in the enabled list capabilities on a snapshot build. Spelling mistake?",

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

@@ -1666,7 +1666,7 @@ public void testMatchWithFieldCasting() {
         assertThat(queryBuilder.value(), is(123456));
     }
 
-    public void testMatchFunctionWithPushableConjunction() {
+    public void testMatchFunctionWithNonPushableConjunction() {
         String query = """
             from test
             | where match(last_name, "Smith") and length(first_name) > 10
@@ -1685,6 +1685,24 @@ public void testMatchFunctionWithPushableConjunction() {
         assertThat(esQuery.query(), instanceOf(MatchQueryBuilder.class));
     }
 
+    public void testMatchFunctionWithPushableConjunction() {
+        String query = """
+            from test metadata _score
+            | where match(last_name, "Smith") and salary > 10000
+            """;
+        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);
+        Source source = new Source(2, 38, "salary > 10000");
+        BoolQueryBuilder expected = new BoolQueryBuilder().must(new MatchQueryBuilder("last_name", "Smith").lenient(true))
+            .must(wrapWithSingleQuery(query, QueryBuilders.rangeQuery("salary").gt(10000), "salary", source));
+        assertThat(esQuery.query().toString(), equalTo(expected.toString()));
+    }
+
     public void testMatchFunctionWithNonPushableDisjunction() {
         String query = """
             from test
@@ -1716,7 +1734,6 @@ public void testMatchFunctionWithPushableDisjunction() {
         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));