simplify the code given toInt in NumberUtils

Signed-off-by: yuye-aws <yuyezhu@amazon.com>
opensearch-project · Apr 28, 2024 · aa08ffb · aa08ffb
1 parent d155a1b
commit aa08ffb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 22 deletions.
diff --git a/src/main/java/org/opensearch/neuralsearch/processor/TextChunkingProcessor.java b/src/main/java/org/opensearch/neuralsearch/processor/TextChunkingProcessor.java
@@ -153,10 +153,6 @@ private int getMaxTokenCount(final Map<String, Object> sourceAndMetadataMap) {
         }
         // if the index is specified in the metadata, read maxTokenCount from the index setting
         String maxTokenCountString = indexMetadata.getSettings().get("index.analyze.max_token_count");
-        // if maxTokenCount is not specified in the index, return the default setting
-        if (Objects.isNull(maxTokenCountString)) {
-            return defaultMaxTokenCount;
-        }
         return NumberUtils.toInt(maxTokenCountString, defaultMaxTokenCount);
     }
 

diff --git a/src/main/java/org/opensearch/neuralsearch/query/NeuralQueryBuilder.java b/src/main/java/org/opensearch/neuralsearch/query/NeuralQueryBuilder.java
@@ -33,7 +33,6 @@
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryRewriteContext;
 import org.opensearch.index.query.QueryShardContext;
-import org.opensearch.knn.index.query.KNNQueryBuilder;
 import org.opensearch.neuralsearch.ml.MLCommonsClientAccessor;
 import org.opensearch.neuralsearch.util.NeuralSearchClusterUtil;
 
@@ -289,18 +288,7 @@ protected QueryBuilder doRewrite(QueryRewriteContext queryRewriteContext) {
         // create a new builder. Once the supplier's value gets set, we return a KNNQueryBuilder. Otherwise, we just
         // return the current unmodified query builder.
         if (vectorSupplier() != null) {
-            if (vectorSupplier().get() == null) {
-                return this;
-            }
-            KNNQueryBuilder knnQueryBuilder = new KNNQueryBuilder(fieldName(), vectorSupplier.get()).filter(filter());
-            if (maxDistance != null) {
-                knnQueryBuilder.maxDistance(maxDistance);
-            } else if (minScore != null) {
-                knnQueryBuilder.minScore(minScore);
-            } else {
-                knnQueryBuilder.k(k);
-            }
-            return knnQueryBuilder;
+            return this;
         }
 
         SetOnce<float[]> vectorSetOnce = new SetOnce<>();

diff --git a/src/test/java/org/opensearch/neuralsearch/query/HybridQueryBuilderTests.java b/src/test/java/org/opensearch/neuralsearch/query/HybridQueryBuilderTests.java
@@ -47,7 +47,6 @@
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.index.query.TermQueryBuilder;
-import org.opensearch.knn.index.SpaceType;
 import org.opensearch.knn.index.VectorDataType;
 import org.opensearch.knn.index.mapper.KNNVectorFieldMapper;
 import org.opensearch.knn.index.query.KNNQuery;
@@ -90,7 +89,7 @@ public void testDoToQuery_whenOneSubquery_thenBuildSuccessfully() {
         when(mockKNNVectorField.getDimension()).thenReturn(4);
         when(mockKNNVectorField.getVectorDataType()).thenReturn(VectorDataType.FLOAT);
         when(mockQueryShardContext.fieldMapper(eq(VECTOR_FIELD_NAME))).thenReturn(mockKNNVectorField);
-        when(mockKNNVectorField.getSpaceType()).thenReturn(SpaceType.L2);
+        // when(mockKNNVectorField.getSpaceType()).thenReturn(SpaceType.L2);
 
         NeuralQueryBuilder neuralQueryBuilder = new NeuralQueryBuilder().fieldName(VECTOR_FIELD_NAME)
             .queryText(QUERY_TEXT)
@@ -119,7 +118,7 @@ public void testDoToQuery_whenMultipleSubqueries_thenBuildSuccessfully() {
         when(mockQueryShardContext.index()).thenReturn(dummyIndex);
         when(mockKNNVectorField.getDimension()).thenReturn(4);
         when(mockKNNVectorField.getVectorDataType()).thenReturn(VectorDataType.FLOAT);
-        when(mockKNNVectorField.getSpaceType()).thenReturn(SpaceType.L2);
+        // when(mockKNNVectorField.getSpaceType()).thenReturn(SpaceType.L2);
         when(mockQueryShardContext.fieldMapper(eq(VECTOR_FIELD_NAME))).thenReturn(mockKNNVectorField);
 
         NeuralQueryBuilder neuralQueryBuilder = new NeuralQueryBuilder().fieldName(VECTOR_FIELD_NAME)

diff --git a/src/test/java/org/opensearch/neuralsearch/query/HybridQueryTests.java b/src/test/java/org/opensearch/neuralsearch/query/HybridQueryTests.java
@@ -38,7 +38,6 @@
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.index.query.QueryShardContext;
-import org.opensearch.knn.index.SpaceType;
 import org.opensearch.knn.index.mapper.KNNVectorFieldMapper;
 import org.opensearch.knn.index.query.KNNQueryBuilder;
 
@@ -118,7 +117,7 @@ public void testRewrite_whenRewriteQuery_thenSuccessful() {
         when(mockQueryShardContext.index()).thenReturn(dummyIndex);
         when(mockKNNVectorField.getDimension()).thenReturn(4);
         when(mockQueryShardContext.fieldMapper(eq(VECTOR_FIELD_NAME))).thenReturn(mockKNNVectorField);
-        when(mockKNNVectorField.getSpaceType()).thenReturn(SpaceType.L2);
+        // when(mockKNNVectorField.getSpaceType()).thenReturn(SpaceType.L2);
         KNNQueryBuilder knnQueryBuilder = new KNNQueryBuilder(VECTOR_FIELD_NAME, VECTOR_QUERY, K);
         Query knnQuery = knnQueryBuilder.toQuery(mockQueryShardContext);