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 2011/10/26 22:32:22 UTC
svn commit: r1189430 - in /lucene/dev/branches/lucene2621/lucene/src:
java/org/apache/lucene/index/codecs/perfield/ test/org/apache/lucene/index/
Author: rmuir
Date: Wed Oct 26 20:32:21 2011
New Revision: 1189430
URL: http://svn.apache.org/viewvc?rev=1189430&view=rev
Log:
LUCENE-3490: fix up a few more tests
Modified:
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/SegmentFormats.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BTerms.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocCount.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/SegmentFormats.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/SegmentFormats.java?rev=1189430&r1=1189429&r2=1189430&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/SegmentFormats.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/SegmentFormats.java Wed Oct 26 20:32:21 2011
@@ -45,7 +45,7 @@ import org.apache.lucene.store.IndexOutp
* During indexing {@link FieldInfos} uses {@link SegmentFormatsBuilder} to incrementally
* build the {@link SegmentFormats} mapping. Once a segment is flushed
* DocumentsWriter creates a {@link SegmentFormats} instance from
- * {@link FieldInfos#buildSegmentCodecs(boolean)} The {@link FieldInfo#formatId}
+ * {@link FieldInfos#buildSegmentFormats(boolean)} The {@link FieldInfo#formatId}
* assigned by {@link SegmentFormatsBuilder} refers to the formats ordinal
* maintained inside {@link SegmentFormats}. This ord is later used to get the
* right format when the segment is opened in a reader.The {@link PostingsFormat} returned
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BTerms.java?rev=1189430&r1=1189429&r2=1189430&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BTerms.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/Test2BTerms.java Wed Oct 26 20:32:21 2011
@@ -142,7 +142,7 @@ public class Test2BTerms extends LuceneT
@Ignore("Takes ~4 hours to run on a fast machine!! And requires that you don't use PreFlex codec.")
public void test2BTerms() throws IOException {
- if ("PreFlex".equals(CodecProvider.getDefault().getDefaultCodec().getName())) {
+ if ("Lucene3x".equals(CodecProvider.getDefault().getDefaultCodec().getName())) {
throw new RuntimeException("thist test cannot run with PreFlex codec");
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocCount.java?rev=1189430&r1=1189429&r2=1189430&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocCount.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocCount.java Wed Oct 26 20:32:21 2011
@@ -32,7 +32,7 @@ import org.apache.lucene.util._TestUtil;
public class TestDocCount extends LuceneTestCase {
public void testSimple() throws Exception {
assumeFalse("PreFlex codec does not support docCount statistic!",
- "PreFlex".equals(CodecProvider.getDefault().getDefaultCodec().getName()));
+ "Lucene3x".equals(CodecProvider.getDefault().getDefaultCodec().getName()));
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random, dir);
int numDocs = atLeast(100);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1189430&r1=1189429&r2=1189430&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java Wed Oct 26 20:32:21 2011
@@ -30,6 +30,9 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.codecs.Codec;
+import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.perfield.PerFieldCodec;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
@@ -988,15 +991,24 @@ public class TestIndexWriterReader exten
public void testNoTermsIndex() throws Exception {
// Some Codecs don't honor the ReaderTermsIndexDivisor, so skip the test if
// they're picked.
- HashSet<String> illegalCodecs = new HashSet<String>();
- illegalCodecs.add("PreFlex");
- illegalCodecs.add("SimpleText");
- illegalCodecs.add("Memory");
+ assumeFalse("PreFlex codec does not support ReaderTermsIndexDivisor!",
+ "Lucene3x".equals(CodecProvider.getDefault().getDefaultCodec().getName()));
IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random)).setReaderTermsIndexDivisor(-1);
+
+ // nocommit: make some kind of idiom for this?
+ // or can we just use the annotation?
+ Codec codec = CodecProvider.getDefault().getDefaultCodec();
+
// Don't proceed if picked Codec is in the list of illegal ones.
- if (illegalCodecs.contains(conf.getCodecProvider().getFieldCodec("f"))) return;
+ if (codec instanceof PerFieldCodec) {
+ PerFieldCodec perField = (PerFieldCodec) codec;
+ final String format = perField.getPostingsFormat("f");
+ assumeFalse("Format: " + format + " does not support ReaderTermsIndexDivisor!",
+ (format.equals("SimpleText") || format.equals("Memory")));
+ }
+
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, conf);
@@ -1006,7 +1018,7 @@ public class TestIndexWriterReader exten
IndexReader r = IndexReader.open(w, true).getSequentialSubReaders()[0];
try {
r.termDocsEnum(null, "f", new BytesRef("val"));
- fail("should have failed to seek since terms index was not loaded. Codec used " + conf.getCodecProvider().getFieldCodec("f"));
+ fail("should have failed to seek since terms index was not loaded.");
} catch (IllegalStateException e) {
// expected - we didn't load the term index
} finally {