Fix: visit of inner query for FunctionScoreQueryBuilder (#16776)

* add visitor logic to FunctionScoreQueryBuilder

Signed-off-by: jdnvn <[email protected]>

* update changelog

Signed-off-by: jdnvn <[email protected]>

* add assertion that inner query builder was visited

Signed-off-by: Konrad Gołuchowski <[email protected]>

---------

Signed-off-by: jdnvn <[email protected]>
Signed-off-by: Konrad Gołuchowski <[email protected]>
Signed-off-by: gaobinlong <[email protected]>
Co-authored-by: jdnvn <[email protected]>
Co-authored-by: gaobinlong <[email protected]>
(cherry picked from commit 5a4c510)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: 3 people

CHANGELOG.md

@@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Remove FeatureFlags.PLUGGABLE_CACHE as the feature is no longer experimental ([#17344](https://github.com/opensearch-project/OpenSearch/pull/17344))
 
 ### Fixed
+- Fix visit of inner query for FunctionScoreQueryBuilder ([#16776](https://github.com/opensearch-project/OpenSearch/pull/16776))
 - Fix case insensitive and escaped query on wildcard ([#16827](https://github.com/opensearch-project/OpenSearch/pull/16827))
 - Fix illegal argument exception when creating a PIT ([#16781](https://github.com/opensearch-project/OpenSearch/pull/16781))
 

server/src/main/java/org/opensearch/index/query/functionscore/FunctionScoreQueryBuilder.java

@@ -32,6 +32,7 @@
 
 package org.opensearch.index.query.functionscore;
 
+import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.Query;
 import org.opensearch.common.Nullable;
@@ -52,6 +53,7 @@
 import org.opensearch.index.query.MatchAllQueryBuilder;
 import org.opensearch.index.query.MatchNoneQueryBuilder;
 import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilderVisitor;
 import org.opensearch.index.query.QueryRewriteContext;
 import org.opensearch.index.query.QueryShardContext;
 
@@ -704,4 +706,12 @@ private static String parseFiltersAndFunctions(
         }
         return currentFieldName;
     }
+
+    @Override
+    public void visit(QueryBuilderVisitor visitor) {
+        visitor.accept(this);
+        if (query != null) {
+            visitor.getChildVisitor(BooleanClause.Occur.MUST).accept(query);
+        }
+    }
 }

server/src/test/java/org/opensearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java

@@ -75,6 +75,7 @@
 import org.hamcrest.Matcher;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -938,4 +939,15 @@ public void testMustRewrite() throws IOException {
         e = expectThrows(IllegalStateException.class, () -> functionQueryBuilder2.toQuery(context));
         assertEquals("Rewrite first", e.getMessage());
     }
+
+    public void testVisit() {
+        TermQueryBuilder termQueryBuilder = new TermQueryBuilder("unmapped_field", "foo");
+        FunctionScoreQueryBuilder builder = new FunctionScoreQueryBuilder(termQueryBuilder);
+
+        List<QueryBuilder> visitedQueries = new ArrayList<>();
+        builder.visit(createTestVisitor(visitedQueries));
+
+        assertEquals(2, visitedQueries.size());
+        assertTrue(visitedQueries.contains(termQueryBuilder));
+    }
 }