This is an automated email from the ASF dual-hosted git repository. ishan pushed a commit to branch jira/solr-17927 in repository https://gitbox.apache.org/repos/asf/solr.git
commit c847eaa48f16e188ac9b0d4e646b6c40669cac42 Author: Elia <[email protected]> AuthorDate: Wed Dec 10 18:05:58 2025 +0100 Minor fixes --- .../solr/search/vector/SolrKnnByteVectorQuery.java | 2 +- .../search/vector/SolrKnnFloatVectorQuery.java | 2 +- .../apache/solr/search/vector/KnnQParserTest.java | 34 +++++++++++++++++----- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/search/vector/SolrKnnByteVectorQuery.java b/solr/core/src/java/org/apache/solr/search/vector/SolrKnnByteVectorQuery.java index 6fd721cb414..bd4e5bcd207 100644 --- a/solr/core/src/java/org/apache/solr/search/vector/SolrKnnByteVectorQuery.java +++ b/solr/core/src/java/org/apache/solr/search/vector/SolrKnnByteVectorQuery.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.search.neural; +package org.apache.solr.search.vector; import org.apache.lucene.search.KnnByteVectorQuery; import org.apache.lucene.search.Query; diff --git a/solr/core/src/java/org/apache/solr/search/vector/SolrKnnFloatVectorQuery.java b/solr/core/src/java/org/apache/solr/search/vector/SolrKnnFloatVectorQuery.java index 68089d66014..937b97ff7ec 100644 --- a/solr/core/src/java/org/apache/solr/search/vector/SolrKnnFloatVectorQuery.java +++ b/solr/core/src/java/org/apache/solr/search/vector/SolrKnnFloatVectorQuery.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.search.neural; +package org.apache.solr.search.vector; import org.apache.lucene.search.KnnFloatVectorQuery; import org.apache.lucene.search.Query; diff --git a/solr/core/src/test/org/apache/solr/search/vector/KnnQParserTest.java b/solr/core/src/test/org/apache/solr/search/vector/KnnQParserTest.java index 35a12b56a95..2d06c3027b4 100644 --- a/solr/core/src/test/org/apache/solr/search/vector/KnnQParserTest.java +++ b/solr/core/src/test/org/apache/solr/search/vector/KnnQParserTest.java @@ -145,13 +145,21 @@ public class KnnQParserTest extends SolrTestCaseJ4 { assertQEx( "efSearchScaleFactor < 1.0 should throw Exception", "efSearchScaleFactor (0.5) must be >= 1.0", - req(CommonParams.Q, "{!knn f=vector topK=5 efSearchScaleFactor=0.5}" + vectorToSearch, "fl", "id"), + req( + CommonParams.Q, + "{!knn f=vector topK=5 efSearchScaleFactor=0.5}" + vectorToSearch, + "fl", + "id"), SolrException.ErrorCode.BAD_REQUEST); assertQEx( "efSearchScaleFactor = 0.0 should throw Exception", "efSearchScaleFactor (0.0) must be >= 1.0", - req(CommonParams.Q, "{!knn f=vector topK=5 efSearchScaleFactor=0.0}" + vectorToSearch, "fl", "id"), + req( + CommonParams.Q, + "{!knn f=vector topK=5 efSearchScaleFactor=0.0}" + vectorToSearch, + "fl", + "id"), SolrException.ErrorCode.BAD_REQUEST); } @@ -162,7 +170,11 @@ public class KnnQParserTest extends SolrTestCaseJ4 { assertQEx( "efSearchScaleFactor = NaN should throw Exception", "efSearchScaleFactor (NaN) must be >= 1.0", - req(CommonParams.Q, "{!knn f=vector topK=5 efSearchScaleFactor=NaN}" + vectorToSearch, "fl", "id"), + req( + CommonParams.Q, + "{!knn f=vector topK=5 efSearchScaleFactor=NaN}" + vectorToSearch, + "fl", + "id"), SolrException.ErrorCode.BAD_REQUEST); } @@ -172,7 +184,11 @@ public class KnnQParserTest extends SolrTestCaseJ4 { // Test functional behavior with efSearchScaleFactor = 2.0 assertQ( - req(CommonParams.Q, "{!knn f=vector topK=5 efSearchScaleFactor=2.0}" + vectorToSearch, "fl", "id"), + req( + CommonParams.Q, + "{!knn f=vector topK=5 efSearchScaleFactor=2.0}" + vectorToSearch, + "fl", + "id"), "//result[@numFound='5']", "//result/doc[1]/str[@name='id'][.='1']", "//result/doc[2]/str[@name='id'][.='4']", @@ -485,7 +501,6 @@ public class KnnQParserTest extends SolrTestCaseJ4 { "//result/doc[10]/str[@name='id'][.='8']"); } - @Test public void efSearchScaleFactorWithEarlyTermination_shouldWorkCorrectly() { String vectorToSearch = "[1.0, 2.0, 3.0, 4.0]"; @@ -511,7 +526,8 @@ public class KnnQParserTest extends SolrTestCaseJ4 { assertQ( req( CommonParams.Q, - "{!knn f=vector topK=4 efSearchScaleFactor=1.5 seedQuery='id:(1 4 7 8 9)'}" + vectorToSearch, + "{!knn f=vector topK=4 efSearchScaleFactor=1.5 seedQuery='id:(1 4 7 8 9)'}" + + vectorToSearch, "fl", "id"), "//result[@numFound='4']"); @@ -523,7 +539,11 @@ public class KnnQParserTest extends SolrTestCaseJ4 { // Test functional behavior with byte vectors and efSearchScaleFactor assertQ( - req(CommonParams.Q, "{!knn f=vector_byte_encoding topK=3 efSearchScaleFactor=1.5}" + vectorToSearch, "fl", "id"), + req( + CommonParams.Q, + "{!knn f=vector_byte_encoding topK=3 efSearchScaleFactor=1.5}" + vectorToSearch, + "fl", + "id"), "//result[@numFound='3']", "//result/doc[1]/str[@name='id'][.='2']", "//result/doc[2]/str[@name='id'][.='3']",
