Add unit tests

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
opensearch-project · Nov 28, 2023 · 518cf18 · 518cf18
1 parent cc3bef8
commit 518cf18
Show file tree

Hide file tree

Showing 4 changed files with 321 additions and 13 deletions.
diff --git a/src/main/java/org/opensearch/neuralsearch/query/HybridQuery.java b/src/main/java/org/opensearch/neuralsearch/query/HybridQuery.java
@@ -148,11 +148,6 @@ public Collection<Query> getSubQueries() {
         return Collections.unmodifiableCollection(subQueries);
     }
 
-    public void addSubQuery(final Query query) {
-        Objects.requireNonNull(subQueries, "collection of queries must not be null");
-        subQueries.add(query);
-    }
-
     /**
      * Create the Weight used to score this query
      *

diff --git a/src/main/java/org/opensearch/neuralsearch/search/query/HybridQueryPhaseSearcher.java b/src/main/java/org/opensearch/neuralsearch/search/query/HybridQueryPhaseSearcher.java
@@ -71,7 +71,7 @@ public boolean searchWith(
             query = extractHybridQuery(searchContext, query);
             return searchWithCollector(searchContext, searcher, query, collectors, hasFilterCollector, hasTimeout);
         }
-        validateHybridQuery(query);
+        validateQuery(query);
         return super.searchWith(searchContext, searcher, query, collectors, hasFilterCollector, hasTimeout);
     }
 
@@ -112,7 +112,7 @@ && mightBeWrappedHybridQuery(query)
         return query;
     }
 
-    private void validateHybridQuery(final Query query) {
+    private void validateQuery(final Query query) {
         if (query instanceof BooleanQuery) {
             List<BooleanClause> booleanClauses = ((BooleanQuery) query).clauses();
             for (BooleanClause booleanClause : booleanClauses) {

diff --git a/src/test/java/org/opensearch/neuralsearch/query/HybridQueryIT.java b/src/test/java/org/opensearch/neuralsearch/query/HybridQueryIT.java
@@ -51,6 +51,7 @@ public class HybridQueryIT extends BaseNeuralSearchIT {
     private static final String TEST_KNN_VECTOR_FIELD_NAME_1 = "test-knn-vector-1";
     private static final String TEST_KNN_VECTOR_FIELD_NAME_2 = "test-knn-vector-2";
     private static final String TEST_TEXT_FIELD_NAME_1 = "test-text-field-1";
+    private static final String TEST_NESTED_TYPE_FIELD_NAME_1 = "user";
 
     private static final int TEST_DIMENSION = 768;
     private static final SpaceType TEST_SPACE_TYPE = SpaceType.L2;
@@ -344,7 +345,7 @@ private void initializeIndexIfNotExist(String indexName) throws IOException {
                 indexName,
                 buildIndexConfiguration(
                     Collections.singletonList(new KNNFieldConfig(TEST_KNN_VECTOR_FIELD_NAME_1, TEST_DIMENSION, TEST_SPACE_TYPE)),
-                    List.of("user"),
+                    List.of(TEST_NESTED_TYPE_FIELD_NAME_1),
                     1
                 ),
                 ""