From 426db4d180626eb63370c362c262f44506fff903 Mon Sep 17 00:00:00 2001 From: Mayya Sharipova Date: Wed, 2 Oct 2024 10:35:13 -0400 Subject: [PATCH] Spotless --- .../vectors/KnnScoreDocQueryBuilder.java | 21 +++++++++++-------- .../search/vectors/KnnVectorQueryBuilder.java | 6 +++--- .../ToChildBlockJoinQueryBuilderTests.java | 6 +++--- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java b/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java index f9aad2d774719..66e9c58888d9f 100644 --- a/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/vectors/KnnScoreDocQueryBuilder.java @@ -50,8 +50,13 @@ public class KnnScoreDocQueryBuilder extends AbstractQueryBuilder filterQueries) { + public KnnScoreDocQueryBuilder( + ScoreDoc[] scoreDocs, + String fieldName, + VectorData queryVector, + Float vectorSimilarity, + List filterQueries + ) { this.scoreDocs = scoreDocs; this.fieldName = fieldName; this.queryVector = queryVector; @@ -83,7 +88,7 @@ public KnnScoreDocQueryBuilder(StreamInput in) throws IOException { } else { this.vectorSimilarity = null; } - if (in.getTransportVersion().onOrAfter(TransportVersions.TO_CHILD_BLOCK_JOIN_QUERY)){ + if (in.getTransportVersion().onOrAfter(TransportVersions.TO_CHILD_BLOCK_JOIN_QUERY)) { this.filterQueries = readQueries(in); } else { this.filterQueries = List.of(); @@ -111,8 +116,6 @@ Float vectorSimilarity() { return vectorSimilarity; } - - @Override protected void doWriteTo(StreamOutput out) throws IOException { out.writeArray(Lucene::writeScoreDoc, scoreDocs); @@ -133,7 +136,7 @@ protected void doWriteTo(StreamOutput out) throws IOException { || out.getTransportVersion().isPatchFrom(TransportVersions.FIX_VECTOR_SIMILARITY_INNER_HITS_BACKPORT_8_15)) { out.writeOptionalFloat(vectorSimilarity); } - if (out.getTransportVersion().onOrAfter(TransportVersions.TO_CHILD_BLOCK_JOIN_QUERY)){ + if (out.getTransportVersion().onOrAfter(TransportVersions.TO_CHILD_BLOCK_JOIN_QUERY)) { writeQueries(out, filterQueries); } } @@ -199,9 +202,9 @@ protected QueryBuilder doRewrite(QueryRewriteContext queryRewriteContext) throws // so add them as should clauses to a filter BoolQueryBuilder boolQuery = new BoolQueryBuilder(); boolQuery.must(exactKnnQuery); - boolQuery.filter(new BoolQueryBuilder() - .should(filterQueryChildren) - .should(new ToChildBlockJoinQueryBuilder(filterQueryChildren))); + boolQuery.filter( + new BoolQueryBuilder().should(filterQueryChildren).should(new ToChildBlockJoinQueryBuilder(filterQueryChildren)) + ); return boolQuery; } } diff --git a/server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java b/server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java index 9196e223f2e96..2adb6629944f7 100644 --- a/server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/vectors/KnnVectorQueryBuilder.java @@ -434,9 +434,9 @@ protected QueryBuilder doRewrite(QueryRewriteContext ctx) throws IOException { // so add them as should clauses to a filter BoolQueryBuilder boolQuery = new BoolQueryBuilder(); boolQuery.must(exactKnnQuery); - boolQuery.filter(new BoolQueryBuilder() - .should(filterQueryChildren) - .should(new ToChildBlockJoinQueryBuilder(filterQueryChildren))); + boolQuery.filter( + new BoolQueryBuilder().should(filterQueryChildren).should(new ToChildBlockJoinQueryBuilder(filterQueryChildren)) + ); return boolQuery; } } diff --git a/server/src/test/java/org/elasticsearch/index/query/ToChildBlockJoinQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ToChildBlockJoinQueryBuilderTests.java index add16a9ebf70b..89d0474461ace 100644 --- a/server/src/test/java/org/elasticsearch/index/query/ToChildBlockJoinQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/ToChildBlockJoinQueryBuilderTests.java @@ -17,7 +17,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; -public class ToChildBlockJoinQueryBuilderTests extends AbstractQueryTestCase< ToChildBlockJoinQueryBuilder> { +public class ToChildBlockJoinQueryBuilderTests extends AbstractQueryTestCase { @Override protected ToChildBlockJoinQueryBuilder doCreateTestQueryBuilder() { String filterFieldName = randomBoolean() ? KEYWORD_FIELD_NAME : TEXT_FIELD_NAME; @@ -25,8 +25,8 @@ protected ToChildBlockJoinQueryBuilder doCreateTestQueryBuilder() { } @Override - protected void doAssertLuceneQuery(ToChildBlockJoinQueryBuilder queryBuilder, Query query, - SearchExecutionContext context) throws IOException { + protected void doAssertLuceneQuery(ToChildBlockJoinQueryBuilder queryBuilder, Query query, SearchExecutionContext context) + throws IOException { assertThat(query, instanceOf(ToChildBlockJoinQuery.class)); }