Apache Lucene open-source search software
Fix flaky testToString method for Knn Vector queries (#12500)
Benjamin Trentdf8745e59ee6
diff --git a/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.java b/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.javaindex 35be67fd7ba..d54db77c739 100644--- a/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.java+++ b/lucene/core/src/test/org/apache/lucene/search/BaseKnnVectorQueryTestCase.java@@ -792,6 +792,15 @@ abstract class BaseKnnVectorQueryTestCase extends LuceneTestCase {assertEquals(expectedId, actualId);}+ void assertDocScoreQueryToString(Query query) {+ String queryString = query.toString("ignored");+ // The string should contain matching docIds and their score.+ // Since a forceMerge could occur in this test, we must not assert that a specific doc_id is+ // matched+ // But that instead the string format is expected and that the score is 1.0+ assertTrue(queryString.matches("DocAndScoreQuery\\[\\d+,...]\\[1.0,...]"));+ }+/*** A version of {@link AbstractKnnVectorQuery} that throws an error when an exact search is run.* This allows us to check what search strategy is being used.diff --git a/lucene/core/src/test/org/apache/lucene/search/TestKnnByteVectorQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestKnnByteVectorQuery.javaindex 33c8ebee293..8badf34f2bb 100644--- a/lucene/core/src/test/org/apache/lucene/search/TestKnnByteVectorQuery.java+++ b/lucene/core/src/test/org/apache/lucene/search/TestKnnByteVectorQuery.java@@ -76,8 +76,7 @@ public class TestKnnByteVectorQuery extends BaseKnnVectorQueryTestCase {AbstractKnnVectorQuery query = getKnnVectorQuery("field", new float[] {0, 1}, 10);assertEquals("KnnByteVectorQuery:field[0,...][10]", query.toString("ignored"));- Query rewritten = query.rewrite(newSearcher(reader));- assertEquals("DocAndScoreQuery[0,...][1.0,...]", rewritten.toString("ignored"));+ assertDocScoreQueryToString(query.rewrite(newSearcher(reader)));}}diff --git a/lucene/core/src/test/org/apache/lucene/search/TestKnnFloatVectorQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestKnnFloatVectorQuery.javaindex 15b7f624610..325b65ef9b2 100644--- a/lucene/core/src/test/org/apache/lucene/search/TestKnnFloatVectorQuery.java+++ b/lucene/core/src/test/org/apache/lucene/search/TestKnnFloatVectorQuery.java@@ -75,8 +75,7 @@ public class TestKnnFloatVectorQuery extends BaseKnnVectorQueryTestCase {AbstractKnnVectorQuery query = getKnnVectorQuery("field", new float[] {0.0f, 1.0f}, 10);assertEquals("KnnFloatVectorQuery:field[0.0,...][10]", query.toString("ignored"));- Query rewritten = query.rewrite(newSearcher(reader));- assertEquals("DocAndScoreQuery[0,...][1.0,...]", rewritten.toString("ignored"));+ assertDocScoreQueryToString(query.rewrite(newSearcher(reader)));}}