From aa08ffbd3d4b12a2519b11bd100e1ffedb60c821 Mon Sep 17 00:00:00 2001 From: yuye-aws Date: Sun, 28 Apr 2024 09:18:46 +0800 Subject: [PATCH] simplify the code given toInt in NumberUtils Signed-off-by: yuye-aws --- .../processor/TextChunkingProcessor.java | 4 ---- .../neuralsearch/query/NeuralQueryBuilder.java | 14 +------------- .../query/HybridQueryBuilderTests.java | 5 ++--- .../neuralsearch/query/HybridQueryTests.java | 3 +-- 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/opensearch/neuralsearch/processor/TextChunkingProcessor.java b/src/main/java/org/opensearch/neuralsearch/processor/TextChunkingProcessor.java index c722745ef..8e85df268 100644 --- 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 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 index 986d6d96c..e669a5710 100644 --- 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 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 index debc3b7d6..67fa1b498 100644 --- 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 index b74bd010c..c1b64551f 100644 --- 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);