Remove redundant tests

Signed-off-by: Atri Sharma <atri.jiit@gmail.com>

Author: atris

server/src/main/java/org/opensearch/index/query/BoolQueryBuilder.java

@@ -554,57 +554,4 @@ private boolean checkAllDocsHaveOneValue(List<LeafReaderContext> contexts, Strin
         }
         return true;
     }
-
-    // Note: The must-to-filter optimization logic has been moved to MustToFilterRewriter in the query rewriting infrastructure
-    // The following methods are kept for reference but are no longer used:
-    /*
-    private boolean rewriteMustClausesToFilter(BoolQueryBuilder newBuilder, QueryRewriteContext queryRewriteContext) {
-        // If we have must clauses which return the same score for all matching documents, like numeric term queries or ranges,
-        // moving them from must clauses to filter clauses improves performance in some cases.
-        // This works because it can let Lucene use MaxScoreCache to skip non-competitive docs.
-        boolean changed = false;
-        Set<QueryBuilder> mustClausesToMove = new HashSet<>();
-
-        QueryShardContext shardContext;
-        if (queryRewriteContext == null) {
-            shardContext = null;
-        } else {
-            shardContext = queryRewriteContext.convertToShardContext(); // can still be null
-        }
-
-        for (QueryBuilder clause : mustClauses) {
-            if (isClauseIrrelevantToScoring(clause, shardContext)) {
-                mustClausesToMove.add(clause);
-                changed = true;
-            }
-        }
-
-        newBuilder.mustClauses.removeAll(mustClausesToMove);
-        newBuilder.filterClauses.addAll(mustClausesToMove);
-        return changed;
-    }
-
-    private boolean isClauseIrrelevantToScoring(QueryBuilder clause, QueryShardContext context) {
-        // This is an incomplete list of clauses this might apply for; it can be expanded in future.
-
-        // If a clause is purely numeric, for example a date range, its score is unimportant as
-        // it'll be the same for all returned docs
-        if (clause instanceof RangeQueryBuilder) return true;
-        if (clause instanceof GeoBoundingBoxQueryBuilder) return true;
-
-        // Further optimizations depend on knowing whether the field is numeric.
-        // QueryBuilder.doRewrite() is called several times in the search flow, and the shard context telling us this
-        // is only available the last time, when it's called from SearchService.executeQueryPhase().
-        // Skip moving these clauses if we don't have the shard context.
-        if (context == null) return false;
-        if (!(clause instanceof WithFieldName wfn)) return false;
-        MappedFieldType fieldType = context.fieldMapper(wfn.fieldName());
-        if (!(fieldType instanceof NumberFieldMapper.NumberFieldType)) return false;
-
-        if (clause instanceof MatchQueryBuilder) return true;
-        if (clause instanceof TermQueryBuilder) return true;
-        if (clause instanceof TermsQueryBuilder) return true;
-        return false;
-    }
-    */
 }

server/src/test/java/org/opensearch/index/query/BoolQueryBuilderTests.java

@@ -73,7 +73,6 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public class BoolQueryBuilderTests extends AbstractQueryTestCase<BoolQueryBuilder> {
     @Override
@@ -584,74 +583,6 @@ public void testMustNotRewriteDisabledWithoutExactlyOneValuePerDoc() throws Exce
         IOUtils.close(w, reader, dir);
     }
 
-    // Note: The must-to-filter optimization has been moved to MustToFilterRewriter in the query rewriting infrastructure
-    // This test is kept but modified to verify that the optimization no longer happens at this level
-    public void testMustClausesRewritten() throws Exception {
-        BoolQueryBuilder qb = new BoolQueryBuilder();
-
-        // Previously these would be moved, but now they stay in must
-        QueryBuilder intTermQuery = new TermQueryBuilder(INT_FIELD_NAME, 200);
-        QueryBuilder rangeQuery = new RangeQueryBuilder(INT_FIELD_NAME).gt(10).lt(20);
-        QueryBuilder rangeQueryWithBoost = new RangeQueryBuilder(DATE_FIELD_NAME).gt(10).lt(20).boost(2);
-        QueryBuilder intTermsQuery = new TermsQueryBuilder(INT_FIELD_NAME, new int[] { 1, 4, 100 });
-        QueryBuilder boundingBoxQuery = new GeoBoundingBoxQueryBuilder(GEO_POINT_FIELD_NAME);
-        QueryBuilder doubleMatchQuery = new MatchQueryBuilder(DOUBLE_FIELD_NAME, 5.5);
-
-        // Text queries
-        QueryBuilder textTermQuery = new TermQueryBuilder(TEXT_FIELD_NAME, "bar");
-        QueryBuilder textTermsQuery = new TermsQueryBuilder(TEXT_FIELD_NAME, "foo", "bar");
-        QueryBuilder textMatchQuery = new MatchQueryBuilder(TEXT_FIELD_NAME, "baz");
-
-        qb.must(intTermQuery);
-        qb.must(rangeQuery);
-        qb.must(rangeQueryWithBoost);
-        qb.must(intTermsQuery);
-        qb.must(boundingBoxQuery);
-        qb.must(doubleMatchQuery);
-
-        qb.must(textTermQuery);
-        qb.must(textTermsQuery);
-        qb.must(textMatchQuery);
-
-        BoolQueryBuilder rewritten = (BoolQueryBuilder) Rewriteable.rewrite(qb, createShardContext());
-
-        // Verify that the must-to-filter optimization no longer happens at this level
-        // All clauses should remain in must
-        for (QueryBuilder clause : List.of(
-            intTermQuery,
-            rangeQuery,
-            rangeQueryWithBoost,
-            intTermsQuery,
-            boundingBoxQuery,
-            doubleMatchQuery,
-            textTermQuery,
-            textTermsQuery,
-            textMatchQuery
-        )) {
-            assertTrue(rewritten.must().contains(clause));
-            assertFalse(rewritten.filter().contains(clause));
-        }
-
-        // Same behavior with null context - all clauses remain in must
-        QueryRewriteContext nullContext = mock(QueryRewriteContext.class);
-        when(nullContext.convertToShardContext()).thenReturn(null);
-        rewritten = (BoolQueryBuilder) Rewriteable.rewrite(qb, nullContext);
-        for (QueryBuilder clause : List.of(
-            rangeQuery,
-            rangeQueryWithBoost,
-            boundingBoxQuery,
-            textTermQuery,
-            textTermsQuery,
-            textMatchQuery,
-            intTermQuery,
-            intTermsQuery,
-            doubleMatchQuery
-        )) {
-            assertTrue(rewritten.must().contains(clause));
-            assertFalse(rewritten.filter().contains(clause));
-        }
-    }
-
     private QueryBuilder getRangeQueryBuilder(String fieldName, Integer lower, Integer upper, boolean includeLower, boolean includeUpper) {
         RangeQueryBuilder rq = new RangeQueryBuilder(fieldName);
         if (lower != null) {