You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ar...@apache.org on 2015/04/02 23:12:02 UTC
svn commit: r1670969 -
/lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/SuggestFieldTest.java
Author: areek
Date: Thu Apr 2 21:12:02 2015
New Revision: 1670969
URL: http://svn.apache.org/r1670969
Log:
LUCENE-6339: fix test bug (ensure opening nrt reader with applyAllDeletes)
Modified:
lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/SuggestFieldTest.java
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/SuggestFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/SuggestFieldTest.java?rev=1670969&r1=1670968&r2=1670969&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/SuggestFieldTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/SuggestFieldTest.java Thu Apr 2 21:12:02 2015
@@ -41,7 +41,6 @@ import org.apache.lucene.document.IntFie
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -56,11 +55,9 @@ import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.BytesRefBuilder;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.LineFileDocs;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.NumericUtils;
import org.apache.lucene.util.TestUtil;
import org.junit.After;
import org.junit.Before;
@@ -157,9 +154,9 @@ public class SuggestFieldTest extends Lu
weights[i] = Math.abs(random().nextLong());
document.add(newSuggestField("suggest_field", "abc", weights[i]));
iw.addDocument(document);
- }
- if (rarely()) {
- iw.commit();
+ if (rarely()) {
+ iw.commit();
+ }
}
DirectoryReader reader = iw.getReader();
@@ -199,11 +196,15 @@ public class SuggestFieldTest extends Lu
}
iw.addDocument(document);
document = new Document();
+
+ if (usually()) {
+ iw.commit();
+ }
}
iw.deleteDocuments(new Term("str_field", "delete"));
- DirectoryReader reader = DirectoryReader.open(iw, false);
+ DirectoryReader reader = DirectoryReader.open(iw, true);
SuggestIndexSearcher indexSearcher = new SuggestIndexSearcher(reader, analyzer);
TopSuggestDocs suggest = indexSearcher.suggest("suggest_field", "abc_", numLive);
assertSuggestions(suggest, expectedEntries.toArray(new Entry[expectedEntries.size()]));
@@ -222,6 +223,11 @@ public class SuggestFieldTest extends Lu
document.add(newSuggestField("suggest_field", "abc_" + i, i));
document.add(newStringField("str_fld", "deleted", Field.Store.NO));
iw.addDocument(document);
+
+ if (usually()) {
+ iw.commit();
+ }
+
}
Filter filter = new QueryWrapperFilter(new TermsQuery("str_fld", new BytesRef("non_existent")));
@@ -246,11 +252,15 @@ public class SuggestFieldTest extends Lu
document.add(newSuggestField("suggest_field", "abc_" + i, i));
document.add(newStringField("delete", "delete", Field.Store.NO));
iw.addDocument(document);
+
+ if (usually()) {
+ iw.commit();
+ }
}
iw.deleteDocuments(new Term("delete", "delete"));
- DirectoryReader reader = DirectoryReader.open(iw, false);
+ DirectoryReader reader = DirectoryReader.open(iw, true);
SuggestIndexSearcher indexSearcher = new SuggestIndexSearcher(reader, analyzer);
TopSuggestDocs suggest = indexSearcher.suggest("suggest_field", "abc_", num);
assertThat(suggest.totalHits, equalTo(0));
@@ -270,6 +280,9 @@ public class SuggestFieldTest extends Lu
document.add(newSuggestField("suggest_field", "abc_" + i, i));
document.add(new IntField("weight_fld", i, Field.Store.YES));
iw.addDocument(document);
+ if (usually()) {
+ iw.commit();
+ }
}
iw.deleteDocuments(NumericRangeQuery.newIntRange("weight_fld", 2, null, true, false));
@@ -293,6 +306,9 @@ public class SuggestFieldTest extends Lu
document.add(newSuggestField("suggest_field", "abc_" + i, i));
document.add(new IntField("filter_int_fld", i, Field.Store.NO));
iw.addDocument(document);
+ if (usually()) {
+ iw.commit();
+ }
}
DirectoryReader reader = iw.getReader();
@@ -534,6 +550,9 @@ public class SuggestFieldTest extends Lu
document.add(newSuggestField("suggest_field", suggest, weight));
mappings.put(suggest, weight);
iw.addDocument(document);
+ if (usually()) {
+ iw.commit();
+ }
}
DirectoryReader reader = iw.getReader();