Apache Lucene open-source search software
Revert TestManyKnnDocs changes from #14084 (#14158)
Benjamin Trent2240adbf7a48
diff --git a/lucene/core/src/test/org/apache/lucene/document/TestManyKnnDocs.java b/lucene/core/src/test/org/apache/lucene/document/TestManyKnnDocs.javaindex 1e485515a62..2023ee73391 100644--- a/lucene/core/src/test/org/apache/lucene/document/TestManyKnnDocs.java+++ b/lucene/core/src/test/org/apache/lucene/document/TestManyKnnDocs.java@@ -17,7 +17,6 @@package org.apache.lucene.document;import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;-import java.nio.file.Path;import org.apache.lucene.index.DirectoryReader;import org.apache.lucene.index.IndexWriter;import org.apache.lucene.index.IndexWriterConfig;@@ -25,27 +24,19 @@ import org.apache.lucene.index.TieredMergePolicy;import org.apache.lucene.index.VectorSimilarityFunction;import org.apache.lucene.search.IndexSearcher;import org.apache.lucene.search.KnnFloatVectorQuery;-import org.apache.lucene.search.MatchAllDocsQuery;-import org.apache.lucene.search.MatchNoDocsQuery;-import org.apache.lucene.search.Query;-import org.apache.lucene.search.SeededKnnFloatVectorQuery;import org.apache.lucene.search.TopDocs;import org.apache.lucene.store.Directory;import org.apache.lucene.store.FSDirectory;import org.apache.lucene.tests.codecs.vector.ConfigurableMCodec;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.lucene.tests.util.LuceneTestCase.Monster;-import org.junit.BeforeClass;@TimeoutSuite(millis = 86_400_000) // 24 hour timeout@Monster("takes ~10 minutes and needs extra heap, disk space, file handles")public class TestManyKnnDocs extends LuceneTestCase {// gradlew -p lucene/core test --tests TestManyKnnDocs -Ptests.heapsize=16g -Dtests.monster=true- private static Path testDir;-- @BeforeClass- public static void init_index() throws Exception {+ public void testLargeSegment() throws Exception {IndexWriterConfig iwc = new IndexWriterConfig();iwc.setCodec(new ConfigurableMCodec(@@ -55,138 +46,27 @@ public class TestManyKnnDocs extends LuceneTestCase {mp.setMaxMergeAtOnce(256); // avoid intermediate merges (waste of time with HNSW?)mp.setSegmentsPerTier(256); // only merge once at the end when we askiwc.setMergePolicy(mp);+ String fieldName = "field";VectorSimilarityFunction similarityFunction = VectorSimilarityFunction.DOT_PRODUCT;- try (Directory dir = FSDirectory.open(testDir = createTempDir("ManyKnnVectorDocs"));+ try (Directory dir = FSDirectory.open(createTempDir("ManyKnnVectorDocs"));IndexWriter iw = new IndexWriter(dir, iwc)) {int numVectors = 2088992;+ float[] vector = new float[1];+ Document doc = new Document();+ doc.add(new KnnFloatVectorField(fieldName, vector, similarityFunction));for (int i = 0; i < numVectors; i++) {- float[] vector = new float[1];- Document doc = new Document();vector[0] = (i % 256);- doc.add(new KnnFloatVectorField("field", vector, similarityFunction));- doc.add(new KeywordField("int", "" + i, org.apache.lucene.document.Field.Store.YES));- doc.add(new StoredField("intValue", i));iw.addDocument(doc);}// merge to single segment and then verifyiw.forceMerge(1);iw.commit();- }- }-- public void testLargeSegmentKnn() throws Exception {- try (Directory dir = FSDirectory.open(testDir)) {IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));- for (int i = 0; i < 256; i++) {- Query filterQuery = new MatchAllDocsQuery();- float[] vector = new float[128];- vector[0] = i;- vector[1] = 1;- TopDocs docs =- searcher.search(new KnnFloatVectorQuery("field", vector, 10, filterQuery), 5);- assertEquals(5, docs.scoreDocs.length);- Document d = searcher.storedFields().document(docs.scoreDocs[0].doc);- String s = "";- for (int j = 0; j < docs.scoreDocs.length - 1; j++) {- s += docs.scoreDocs[j].doc + " " + docs.scoreDocs[j].score + "\n";- }- assertEquals(s, i + 256, d.getField("intValue").numericValue());- }- }- }-- public void testLargeSegmentSeededExact() throws Exception {- try (Directory dir = FSDirectory.open(testDir)) {- IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));- for (int i = 0; i < 256; i++) {- Query seedQuery = KeywordField.newExactQuery("int", "" + (i + 256));- Query filterQuery = new MatchAllDocsQuery();- float[] vector = new float[128];- vector[0] = i;- vector[1] = 1;- TopDocs docs =- searcher.search(- new SeededKnnFloatVectorQuery("field", vector, 10, filterQuery, seedQuery), 5);- assertEquals(5, docs.scoreDocs.length);- String s = "";- for (int j = 0; j < docs.scoreDocs.length - 1; j++) {- s += docs.scoreDocs[j].doc + " " + docs.scoreDocs[j].score + "\n";- }- Document d = searcher.storedFields().document(docs.scoreDocs[0].doc);- assertEquals(s, i + 256, d.getField("intValue").numericValue());- }- }- }-- public void testLargeSegmentSeededNearby() throws Exception {- try (Directory dir = FSDirectory.open(testDir)) {- IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));- for (int i = 0; i < 256; i++) {- Query seedQuery = KeywordField.newExactQuery("int", "" + i);- Query filterQuery = new MatchAllDocsQuery();- float[] vector = new float[128];- vector[0] = i;- vector[1] = 1;- TopDocs docs =- searcher.search(- new SeededKnnFloatVectorQuery("field", vector, 10, filterQuery, seedQuery), 5);- assertEquals(5, docs.scoreDocs.length);- String s = "";- for (int j = 0; j < docs.scoreDocs.length - 1; j++) {- s += docs.scoreDocs[j].doc + " " + docs.scoreDocs[j].score + "\n";- }- Document d = searcher.storedFields().document(docs.scoreDocs[0].doc);- assertEquals(s, i + 256, d.getField("intValue").numericValue());- }- }- }-- public void testLargeSegmentSeededDistant() throws Exception {- try (Directory dir = FSDirectory.open(testDir)) {- IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));- for (int i = 0; i < 256; i++) {- Query seedQuery = KeywordField.newExactQuery("int", "" + (i + 128));- Query filterQuery = new MatchAllDocsQuery();- float[] vector = new float[128];- vector[0] = i;- vector[1] = 1;- TopDocs docs =- searcher.search(- new SeededKnnFloatVectorQuery("field", vector, 10, filterQuery, seedQuery), 5);- assertEquals(5, docs.scoreDocs.length);- Document d = searcher.storedFields().document(docs.scoreDocs[0].doc);- String s = "";- for (int j = 0; j < docs.scoreDocs.length - 1; j++) {- s += docs.scoreDocs[j].doc + " " + docs.scoreDocs[j].score + "\n";- }- assertEquals(s, i + 256, d.getField("intValue").numericValue());- }- }- }-- public void testLargeSegmentSeededNone() throws Exception {- try (Directory dir = FSDirectory.open(testDir)) {- IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(dir));- for (int i = 0; i < 256; i++) {- Query seedQuery = new MatchNoDocsQuery();- Query filterQuery = new MatchAllDocsQuery();- float[] vector = new float[128];- vector[0] = i;- vector[1] = 1;- TopDocs docs =- searcher.search(- new SeededKnnFloatVectorQuery("field", vector, 10, filterQuery, seedQuery), 5);- assertEquals(5, docs.scoreDocs.length);- Document d = searcher.storedFields().document(docs.scoreDocs[0].doc);- String s = "";- for (int j = 0; j < docs.scoreDocs.length - 1; j++) {- s += docs.scoreDocs[j].doc + " " + docs.scoreDocs[j].score + "\n";- }- assertEquals(s, i + 256, d.getField("intValue").numericValue());- }+ TopDocs docs = searcher.search(new KnnFloatVectorQuery("field", new float[] {120}, 10), 5);+ assertEquals(5, docs.scoreDocs.length);}}}