You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/04/20 06:13:45 UTC
svn commit: r1674730 - in
/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene:
index/RandomIndexWriter.java search/QueryUtils.java
util/TestRuleSetupAndRestoreClassEnv.java
Author: rmuir
Date: Mon Apr 20 04:13:45 2015
New Revision: 1674730
URL: http://svn.apache.org/r1674730
Log:
make tests.verbose only include relevant output, fix non-reproducibility (!) of QueryUtils
Modified:
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java?rev=1674730&r1=1674729&r2=1674730&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java Mon Apr 20 04:13:45 2015
@@ -100,8 +100,7 @@ public class RandomIndexWriter implement
}
codec = w.getConfig().getCodec();
if (LuceneTestCase.VERBOSE) {
- System.out.println("RIW dir=" + dir + " config=" + w.getConfig());
- System.out.println("codec default=" + codec.getName());
+ System.out.println("RIW dir=" + dir);
}
// Make sure we sometimes test indices that don't get
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java?rev=1674730&r1=1674729&r2=1674730&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java Mon Apr 20 04:13:45 2015
@@ -18,24 +18,27 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
+import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
import java.util.Random;
import junit.framework.Assert;
-import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.index.AllDeletedFilterReader;
-import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.BinaryDocValues;
+import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.FieldInfos;
+import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.MultiReader;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockDirectoryWrapper;
-import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.index.NumericDocValues;
+import org.apache.lucene.index.SortedDocValues;
+import org.apache.lucene.index.SortedNumericDocValues;
+import org.apache.lucene.index.SortedSetDocValues;
+import org.apache.lucene.index.StoredFieldVisitor;
+import org.apache.lucene.index.Terms;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.LuceneTestCase;
@@ -166,16 +169,16 @@ public class QueryUtils {
// we can't put deleted docs before the nested reader, because
// it will throw off the docIds
IndexReader[] readers = new IndexReader[] {
- edge < 0 ? r : emptyReaders[0],
- emptyReaders[0],
- new FCInvisibleMultiReader(edge < 0 ? emptyReaders[4] : emptyReaders[0],
- emptyReaders[0],
- 0 == edge ? r : emptyReaders[0]),
- 0 < edge ? emptyReaders[0] : emptyReaders[7],
- emptyReaders[0],
- new FCInvisibleMultiReader(0 < edge ? emptyReaders[0] : emptyReaders[5],
- emptyReaders[0],
- 0 < edge ? r : emptyReaders[0])
+ edge < 0 ? r : new MultiReader(),
+ new MultiReader(),
+ new FCInvisibleMultiReader(edge < 0 ? emptyReader(4) : new MultiReader(),
+ new MultiReader(),
+ 0 == edge ? r : new MultiReader()),
+ 0 < edge ? new MultiReader() : emptyReader(7),
+ new MultiReader(),
+ new FCInvisibleMultiReader(0 < edge ? new MultiReader() : emptyReader(5),
+ new MultiReader(),
+ 0 < edge ? r : new MultiReader())
};
IndexSearcher out = LuceneTestCase.newSearcher(new FCInvisibleMultiReader(readers));
@@ -183,35 +186,105 @@ public class QueryUtils {
return out;
}
- static final IndexReader[] emptyReaders = new IndexReader[8];
- static {
- try {
- emptyReaders[0] = new MultiReader();
- emptyReaders[4] = makeEmptyIndex(new Random(0), 4);
- emptyReaders[5] = makeEmptyIndex(new Random(0), 5);
- emptyReaders[7] = makeEmptyIndex(new Random(0), 7);
- } catch (IOException ex) {
- throw new RuntimeException(ex);
- }
- }
+ private static IndexReader emptyReader(final int maxDoc) {
+ return new LeafReader() {
- private static IndexReader makeEmptyIndex(Random random, final int numDocs) throws IOException {
- assert numDocs > 0;
- Directory d = new MockDirectoryWrapper(random, new RAMDirectory());
- if (LuceneTestCase.VERBOSE) {
- System.out.println("NOTE: QueryUtils: now create empty index");
- }
- IndexWriter w = new IndexWriter(d, new IndexWriterConfig(new MockAnalyzer(random)));
- for (int i = 0; i < numDocs; i++) {
- w.addDocument(new Document());
- }
- w.forceMerge(1);
- w.close();
- if (LuceneTestCase.VERBOSE) {
- System.out.println("NOTE: QueryUtils: done create empty index");
- }
- DirectoryReader reader = DirectoryReader.open(d);
- return new AllDeletedFilterReader(LuceneTestCase.getOnlySegmentReader(reader));
+ @Override
+ public void addCoreClosedListener(CoreClosedListener listener) {}
+
+ @Override
+ public void removeCoreClosedListener(CoreClosedListener listener) {}
+
+ @Override
+ public Fields fields() throws IOException {
+ return new Fields() {
+ @Override
+ public Iterator<String> iterator() {
+ return Collections.<String>emptyList().iterator();
+ }
+
+ @Override
+ public Terms terms(String field) throws IOException {
+ return null;
+ }
+
+ @Override
+ public int size() {
+ return 0;
+ }
+ };
+ }
+
+ @Override
+ public NumericDocValues getNumericDocValues(String field) throws IOException {
+ return null;
+ }
+
+ @Override
+ public BinaryDocValues getBinaryDocValues(String field) throws IOException {
+ return null;
+ }
+
+ @Override
+ public SortedDocValues getSortedDocValues(String field) throws IOException {
+ return null;
+ }
+
+ @Override
+ public SortedNumericDocValues getSortedNumericDocValues(String field) throws IOException {
+ return null;
+ }
+
+ @Override
+ public SortedSetDocValues getSortedSetDocValues(String field) throws IOException {
+ return null;
+ }
+
+ @Override
+ public Bits getDocsWithField(String field) throws IOException {
+ return null;
+ }
+
+ @Override
+ public NumericDocValues getNormValues(String field) throws IOException {
+ return null;
+ }
+
+ @Override
+ public FieldInfos getFieldInfos() {
+ return new FieldInfos(new FieldInfo[0]);
+ }
+
+ final Bits liveDocs = new Bits.MatchNoBits(maxDoc);
+ @Override
+ public Bits getLiveDocs() {
+ return liveDocs;
+ }
+
+ @Override
+ public void checkIntegrity() throws IOException {}
+
+ @Override
+ public Fields getTermVectors(int docID) throws IOException {
+ return null;
+ }
+
+ @Override
+ public int numDocs() {
+ return 0;
+ }
+
+ @Override
+ public int maxDoc() {
+ return maxDoc;
+ }
+
+ @Override
+ public void document(int docID, StoredFieldVisitor visitor) throws IOException {}
+
+ @Override
+ protected void doClose() throws IOException {}
+ };
}
/** alternate scorer advance(),advance(),next(),next(),advance(),advance(), etc
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java?rev=1674730&r1=1674729&r2=1674730&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java Mon Apr 20 04:13:45 2015
@@ -114,15 +114,9 @@ final class TestRuleSetupAndRestoreClass
// if verbose: print some debugging stuff about which codecs are loaded.
if (VERBOSE) {
- Set<String> codecs = Codec.availableCodecs();
- for (String codec : codecs) {
- System.out.println("Loaded codec: '" + codec + "': " + Codec.forName(codec).getClass().getName());
- }
-
- Set<String> postingsFormats = PostingsFormat.availablePostingsFormats();
- for (String postingsFormat : postingsFormats) {
- System.out.println("Loaded postingsFormat: '" + postingsFormat + "': " + PostingsFormat.forName(postingsFormat).getClass().getName());
- }
+ System.out.println("Loaded codecs: " + Codec.availableCodecs());
+ System.out.println("Loaded postingsFormats: " + PostingsFormat.availablePostingsFormats());
+
}
savedInfoStream = InfoStream.getDefault();