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/31 21:31:40 UTC
svn commit: r1195655 [1/2] - in
/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene: ./
index/ index/codecs/perfield/ index/codecs/preflex/ index/codecs/pulsing/
index/values/ search/ search/similarities/ util/fst/
Author: rmuir
Date: Mon Oct 31 20:31:38 2011
New Revision: 1195655
URL: http://svn.apache.org/viewvc?rev=1195655&view=rev
Log:
LUCENE-3490: get core tests compiling again (without codecprovider)
Modified:
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestExternalCodecs.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/TestAddIndexes.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDoc.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/TestDocTermOrds.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFlex.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLongPostings.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestReaderClosed.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestTermsEnum2.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/perfield/TestPerFieldPostingsFormat.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/Test10KPulsings.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestExternalCodecs.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestExternalCodecs.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestExternalCodecs.java Mon Oct 31 20:31:38 2011
@@ -36,6 +36,8 @@ import org.apache.lucene.util.Bits;
/* Intentionally outside of oal.index to verify fully
external codecs work fine */
+// nocommit: add any custom codecs here to test-framework so they can be 'loaded'
+// automagically
public class TestExternalCodecs extends LuceneTestCase {
// For fun, test that we can override how terms are
@@ -548,7 +550,7 @@ public class TestExternalCodecs extends
IndexWriter w = new IndexWriter(
dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
- setCodecProvider(_TestUtil.onlyFormat(new CustomPerFieldPostingsFormat())).
+ setCodec(_TestUtil.alwaysFormat(new CustomPerFieldPostingsFormat())).
setMergePolicy(newLogMergePolicy(3))
);
w.setInfoStream(VERBOSE ? System.out : null);
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=1195655&r1=1195654&r2=1195655&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 Mon Oct 31 20:31:38 2011
@@ -24,7 +24,8 @@ import org.apache.lucene.analysis.*;
import org.apache.lucene.analysis.tokenattributes.*;
import org.apache.lucene.document.*;
import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.Codec;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -142,7 +143,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 ("Lucene3x".equals(CodecProvider.getDefault().getDefaultCodec().getName())) {
+ if ("Lucene3x".equals(Codec.getDefault().getName())) {
throw new RuntimeException("thist test cannot run with PreFlex codec");
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java Mon Oct 31 20:31:38 2011
@@ -29,7 +29,7 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.PostingsFormat;
import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsBaseFormat;
import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsFormat;
@@ -46,6 +46,8 @@ import org.apache.lucene.store.RAMDirect
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
+//nocommit: add any custom codecs here to test-framework so they can be 'loaded'
+//automagically
public class TestAddIndexes extends LuceneTestCase {
public void testSimpleCase() throws IOException {
@@ -984,24 +986,23 @@ public class TestAddIndexes extends Luce
// two auxiliary directories
Directory aux = newDirectory();
Directory aux2 = newDirectory();
- CodecProvider provider = _TestUtil.alwaysFormat(new CustomPerFieldPostingsFormat());
+ Codec codec = _TestUtil.alwaysFormat(new CustomPerFieldPostingsFormat());
IndexWriter writer = null;
writer = newWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE).setCodecProvider(
- provider));
+ new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE).setCodec(codec));
// add 100 documents
addDocs3(writer, 100);
assertEquals(100, writer.maxDoc());
writer.commit();
writer.close();
- _TestUtil.checkIndex(dir, provider);
+ _TestUtil.checkIndex(dir);
writer = newWriter(
aux,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
setOpenMode(OpenMode.CREATE).
- setCodecProvider(provider).
+ setCodec(codec).
setMaxBufferedDocs(10).
setMergePolicy(newLogMergePolicy(false))
);
@@ -1015,7 +1016,7 @@ public class TestAddIndexes extends Luce
aux2,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
setOpenMode(OpenMode.CREATE).
- setCodecProvider(provider)
+ setCodec(codec)
);
// add 40 documents in compound files
addDocs2(writer, 50);
@@ -1028,7 +1029,7 @@ public class TestAddIndexes extends Luce
dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
setOpenMode(OpenMode.APPEND).
- setCodecProvider(provider)
+ setCodec(codec)
);
assertEquals(100, writer.maxDoc());
writer.addIndexes(aux, aux2);
@@ -1165,7 +1166,7 @@ public class TestAddIndexes extends Luce
{
IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random));
- conf.setCodecProvider(_TestUtil.alwaysFormat(new Lucene40PostingsFormat()));
+ conf.setCodec(_TestUtil.alwaysFormat(new Lucene40PostingsFormat()));
IndexWriter w = new IndexWriter(toAdd, conf);
Document doc = new Document();
FieldType customType = new FieldType();
@@ -1179,7 +1180,7 @@ public class TestAddIndexes extends Luce
Directory dir = newDirectory();
IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random));
- conf.setCodecProvider(_TestUtil.alwaysFormat(new PulsingPostingsFormat(new Lucene40PostingsBaseFormat(), 1 + random.nextInt(20))));
+ conf.setCodec(_TestUtil.alwaysFormat(new PulsingPostingsFormat(new Lucene40PostingsBaseFormat(), 1 + random.nextInt(20))));
IndexWriter w = new IndexWriter(dir, conf);
try {
w.addIndexes(toAdd);
@@ -1198,7 +1199,7 @@ public class TestAddIndexes extends Luce
Directory dir = newDirectory();
IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random));
- conf.setCodecProvider(_TestUtil.alwaysFormat(new PulsingPostingsFormat(new Lucene40PostingsBaseFormat(), 1 + random.nextInt(20))));
+ conf.setCodec(_TestUtil.alwaysFormat(new PulsingPostingsFormat(new Lucene40PostingsBaseFormat(), 1 + random.nextInt(20))));
IndexWriter w = new IndexWriter(dir, conf);
IndexReader indexReader = IndexReader.open(toAdd);
try {
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Mon Oct 31 20:31:38 2011
@@ -35,7 +35,6 @@ import org.apache.lucene.document.String
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.IndexSearcher;
@@ -726,7 +725,7 @@ public class TestBackwardsCompatibility
}
private int checkAllSegmentsUpgraded(Directory dir) throws IOException {
- final SegmentInfos infos = new SegmentInfos(CodecProvider.getDefault());
+ final SegmentInfos infos = new SegmentInfos();
infos.read(dir);
if (VERBOSE) {
System.out.println("checkAllSegmentsUpgraded: " + infos);
@@ -738,7 +737,7 @@ public class TestBackwardsCompatibility
}
private int getNumberOfSegments(Directory dir) throws IOException {
- final SegmentInfos infos = new SegmentInfos(CodecProvider.getDefault());
+ final SegmentInfos infos = new SegmentInfos();
infos.read(dir);
return infos.size();
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBinaryTerms.java Mon Oct 31 20:31:38 2011
@@ -23,7 +23,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
@@ -37,7 +37,7 @@ import org.apache.lucene.util.LuceneTest
public class TestBinaryTerms extends LuceneTestCase {
public void testBinary() throws IOException {
assumeFalse("PreFlex codec cannot work with binary terms!",
- CodecProvider.getDefault().getDefaultCodec().getName().equals("Lucene3x"));
+ Codec.getDefault().getName().equals("Lucene3x"));
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random, dir);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestCodecs.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestCodecs.java Mon Oct 31 20:31:38 2011
@@ -27,7 +27,6 @@ import org.apache.lucene.index.FieldInfo
import org.apache.lucene.document.FieldType;
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.FieldsConsumer;
import org.apache.lucene.index.codecs.FieldsProducer;
import org.apache.lucene.index.codecs.PostingsConsumer;
@@ -66,6 +65,9 @@ import org.junit.BeforeClass;
// goes to 1 before next one known to exist
// - skipTo(term)
// - skipTo(doc)
+
+//nocommit: add any custom codecs here to test-framework so they can be 'loaded'
+//automagically
public class TestCodecs extends LuceneTestCase {
private static String[] fieldNames = new String[] {"one", "two", "three", "four"};
@@ -257,7 +259,7 @@ public class TestCodecs extends LuceneTe
final Directory dir = newDirectory();
FieldInfos clonedFieldInfos = (FieldInfos) fieldInfos.clone();
this.write(fieldInfos, dir, fields, true);
- Codec codec = CodecProvider.getDefault().getDefaultCodec();
+ Codec codec = Codec.getDefault();
final SegmentInfo si = new SegmentInfo(SEGMENT, 10000, dir, false, codec, clonedFieldInfos);
final FieldsProducer reader = codec.postingsFormat().fieldsProducer(new SegmentReadState(dir, si, fieldInfos, newIOContext(random), IndexReader.DEFAULT_TERMS_INDEX_DIVISOR));
@@ -310,7 +312,7 @@ public class TestCodecs extends LuceneTe
FieldInfos clonedFieldInfos = (FieldInfos) fieldInfos.clone();
this.write(fieldInfos, dir, fields, false);
- Codec codec = CodecProvider.getDefault().getDefaultCodec();
+ Codec codec = Codec.getDefault();
final SegmentInfo si = new SegmentInfo(SEGMENT, 10000, dir, false, codec, clonedFieldInfos);
if (VERBOSE) {
@@ -340,7 +342,7 @@ public class TestCodecs extends LuceneTe
final Directory dir = newDirectory();
final IndexWriterConfig config = newIndexWriterConfig(Version.LUCENE_31,
new MockAnalyzer(random));
- config.setCodecProvider(_TestUtil.alwaysFormat(new MockSepPostingsFormat()));
+ config.setCodec(_TestUtil.alwaysFormat(new MockSepPostingsFormat()));
final IndexWriter writer = new IndexWriter(dir, config);
try {
@@ -608,7 +610,7 @@ public class TestCodecs extends LuceneTe
private void write(final FieldInfos fieldInfos, final Directory dir, final FieldData[] fields, boolean allowPreFlex) throws Throwable {
final int termIndexInterval = _TestUtil.nextInt(random, 13, 27);
- final Codec codec = CodecProvider.getDefault().getDefaultCodec();
+ final Codec codec = Codec.getDefault();
final SegmentWriteState state = new SegmentWriteState(null, dir, SEGMENT, fieldInfos, 10000, termIndexInterval, codec, null, newIOContext(random));
final FieldsConsumer consumer = codec.postingsFormat().fieldsConsumer(state);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java Mon Oct 31 20:31:38 2011
@@ -26,7 +26,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
@@ -62,7 +61,7 @@ public class TestConsistentFieldNumbers
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(2, sis.size());
@@ -80,7 +79,7 @@ public class TestConsistentFieldNumbers
writer.optimize();
writer.close();
- sis = new SegmentInfos(CodecProvider.getDefault());
+ sis = new SegmentInfos();
sis.read(dir);
assertEquals(1, sis.size());
@@ -125,7 +124,7 @@ public class TestConsistentFieldNumbers
writer.addIndexes(dir2);
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir1);
assertEquals(2, sis.size());
@@ -144,7 +143,7 @@ public class TestConsistentFieldNumbers
writer.optimize();
writer.close();
- sis = new SegmentInfos(CodecProvider.getDefault());
+ sis = new SegmentInfos();
sis.read(dir1);
assertEquals(1, sis.size());
@@ -173,7 +172,7 @@ public class TestConsistentFieldNumbers
d.add(new Field("f2", "d1 second field", TextField.TYPE_STORED));
writer.addDocument(d);
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(1, sis.size());
FieldInfos fis1 = sis.info(0).getFieldInfos();
@@ -193,7 +192,7 @@ public class TestConsistentFieldNumbers
d.add(new BinaryField("f3", new byte[] { 1, 2, 3 }));
writer.addDocument(d);
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(2, sis.size());
FieldInfos fis1 = sis.info(0).getFieldInfos();
@@ -218,7 +217,7 @@ public class TestConsistentFieldNumbers
d.add(new BinaryField("f3", new byte[] { 1, 2, 3, 4, 5 }));
writer.addDocument(d);
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(3, sis.size());
FieldInfos fis1 = sis.info(0).getFieldInfos();
@@ -256,7 +255,7 @@ public class TestConsistentFieldNumbers
assertFalse(" field numbers got mixed up", writer.anyNonBulkMerges);
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(1, sis.size());
FieldInfos fis1 = sis.info(0).getFieldInfos();
@@ -297,7 +296,7 @@ public class TestConsistentFieldNumbers
writer.optimize();
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
for (SegmentInfo si : sis) {
FieldInfos fis = si.getFieldInfos();
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java Mon Oct 31 20:31:38 2011
@@ -23,7 +23,6 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -47,7 +46,7 @@ public class TestDirectoryReader extends
DocHelper.setupDoc(doc2);
DocHelper.writeDoc(random, dir, doc1);
DocHelper.writeDoc(random, dir, doc2);
- sis = new SegmentInfos(CodecProvider.getDefault());
+ sis = new SegmentInfos();
sis.read(dir);
}
@@ -109,7 +108,7 @@ public class TestDirectoryReader extends
if (reader instanceof MultiReader)
// MultiReader does not "own" the directory so it does
// not write the changes to sis on commit:
- sis.commit(dir);
+ sis.commit(dir, sis.codecFormat());
sis.read(dir);
reader = openReader();
@@ -122,7 +121,7 @@ public class TestDirectoryReader extends
if (reader instanceof MultiReader)
// MultiReader does not "own" the directory so it does
// not write the changes to sis on commit:
- sis.commit(dir);
+ sis.commit(dir, sis.codecFormat());
sis.read(dir);
reader = openReader();
assertEquals( 1, reader.numDocs() );
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDoc.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDoc.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDoc.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDoc.java Mon Oct 31 20:31:38 2011
@@ -33,7 +33,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
@@ -198,7 +198,7 @@ public class TestDoc extends LuceneTestC
SegmentReader r1 = SegmentReader.get(true, si1, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, context);
SegmentReader r2 = SegmentReader.get(true, si2, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, context);
- SegmentMerger merger = new SegmentMerger(si1.dir, IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL, merged, null, null, new FieldInfos(), CodecProvider.getDefault().getDefaultCodec(), context);
+ SegmentMerger merger = new SegmentMerger(si1.dir, IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL, merged, null, null, new FieldInfos(), Codec.getDefault(), context);
merger.add(r1);
merger.add(r2);
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=1195655&r1=1195654&r2=1195655&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 Mon Oct 31 20:31:38 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.index;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.FixedBitSet;
@@ -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!",
- "Lucene3x".equals(CodecProvider.getDefault().getDefaultCodec().getName()));
+ "Lucene3x".equals(Codec.getDefault().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/TestDocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java Mon Oct 31 20:31:38 2011
@@ -34,13 +34,7 @@ import org.apache.lucene.index.DocTermOr
import org.apache.lucene.index.codecs.BlockTermsReader;
import org.apache.lucene.index.codecs.BlockTermsWriter;
import org.apache.lucene.index.codecs.Codec;
-import org.apache.lucene.index.codecs.CodecProvider;
-import org.apache.lucene.index.codecs.DefaultDocValuesFormat;
-import org.apache.lucene.index.codecs.DefaultFieldsFormat;
-import org.apache.lucene.index.codecs.DocValuesFormat;
-import org.apache.lucene.index.codecs.FieldsFormat;
import org.apache.lucene.index.codecs.PostingsFormat;
-import org.apache.lucene.index.codecs.CoreCodecProvider;
import org.apache.lucene.index.codecs.FieldsConsumer;
import org.apache.lucene.index.codecs.FieldsProducer;
import org.apache.lucene.index.codecs.FixedGapTermsIndexReader;
@@ -64,6 +58,8 @@ import org.apache.lucene.util._TestUtil;
// - test w/ cutoff
// - crank docs way up so we get some merging sometimes
+//nocommit: add any custom codecs here to test-framework so they can be 'loaded'
+//automagically
public class TestDocTermOrds extends LuceneTestCase {
public void testSimple() throws Exception {
@@ -230,10 +226,8 @@ public class TestDocTermOrds extends Luc
// Sometimes swap in codec that impls ord():
if (random.nextInt(10) == 7) {
// Make sure terms index has ords:
- CodecProvider cp = _TestUtil.alwaysFormat(new StandardPostingsFormatWithOrds());
- // So checkIndex on close works
- dir.setCodecProvider(cp);
- conf.setCodecProvider(cp);
+ Codec codec = _TestUtil.alwaysFormat(new StandardPostingsFormatWithOrds());
+ conf.setCodec(codec);
}
final RandomIndexWriter w = new RandomIndexWriter(random, dir, conf);
@@ -329,10 +323,8 @@ public class TestDocTermOrds extends Luc
// Sometimes swap in codec that impls ord():
if (random.nextInt(10) == 7) {
- CodecProvider cp = _TestUtil.alwaysFormat(new StandardPostingsFormatWithOrds());
- // So checkIndex on close works
- dir.setCodecProvider(cp);
- conf.setCodecProvider(cp);
+ Codec codec = _TestUtil.alwaysFormat(new StandardPostingsFormatWithOrds());
+ conf.setCodec(codec);
}
final RandomIndexWriter w = new RandomIndexWriter(random, dir, conf);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFlex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFlex.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFlex.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFlex.java Mon Oct 31 20:31:38 2011
@@ -65,7 +65,7 @@ public class TestFlex extends LuceneTest
public void testTermOrd() throws Exception {
Directory d = newDirectory();
IndexWriter w = new IndexWriter(d, newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random)).setCodecProvider(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())));
+ new MockAnalyzer(random)).setCodec(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())));
Document doc = new Document();
doc.add(newField("f", "a b c", TextField.TYPE_UNSTORED));
w.addDocument(doc);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestForTooMuchCloning.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestForTooMuchCloning.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestForTooMuchCloning.java Mon Oct 31 20:31:38 2011
@@ -22,7 +22,6 @@ import java.util.*;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.search.TopDocs;
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java Mon Oct 31 20:31:38 2011
@@ -33,7 +33,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInfos.FieldNumberBiMap;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.index.codecs.DefaultSegmentInfosWriter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
@@ -357,7 +356,7 @@ public class TestGlobalFieldNumbers exte
new LogByteSizeMergePolicy()));
w.optimize();
w.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(base);
SegmentInfo segmentInfo = sis.info(sis.size() - 1);// last segment must
// have all fields with
@@ -383,7 +382,7 @@ public class TestGlobalFieldNumbers exte
_TestUtil
.unzip(getDataFile("index." + oldNames[i] + ".zip"), oldIndxeDir);
dir = newFSDirectory(oldIndxeDir);
- SegmentInfos infos = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos infos = new SegmentInfos();
infos.read(dir);
SortedMap<Integer, String> sortedMap = new TreeMap<Integer, String>();
@@ -433,7 +432,7 @@ public class TestGlobalFieldNumbers exte
writer.close();
// we don't merge here since we use NoMergePolicy
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(base);
// check that the latest global field numbers are consistent and carried
// over from the 4.0 index
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java Mon Oct 31 20:31:38 2011
@@ -39,7 +39,6 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader.FieldOption;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsFormat;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
@@ -78,7 +77,7 @@ public class TestIndexReader extends Luc
IndexCommit c = r.getIndexCommit();
r.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(d);
IndexReader r2 = IndexReader.open(d, false);
assertEquals(c.getUserData(), commitUserData);
@@ -947,7 +946,7 @@ public class TestIndexReader extends Luc
addDocumentWithFields(writer);
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(d);
IndexReader r = IndexReader.open(d, false);
IndexCommit c = r.getIndexCommit();
@@ -1232,7 +1231,7 @@ public class TestIndexReader extends Luc
// LUCENE-1609: don't load terms index
public void testNoTermsIndex() throws Throwable {
Directory dir = newDirectory();
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodecProvider(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodec(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())));
Document doc = new Document();
doc.add(newField("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", TextField.TYPE_UNSTORED));
doc.add(newField("number", "0 1 2 3 4 5 6 7 8 9", TextField.TYPE_UNSTORED));
@@ -1252,7 +1251,7 @@ public class TestIndexReader extends Luc
writer = new IndexWriter(
dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
- setCodecProvider(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())).
+ setCodec(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())).
setMergePolicy(newLogMergePolicy(10))
);
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java Mon Oct 31 20:31:38 2011
@@ -41,7 +41,6 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.IndexSearcher;
@@ -144,7 +143,7 @@ public class TestIndexWriter extends Luc
public static void assertNoUnreferencedFiles(Directory dir, String message) throws IOException {
String[] startFiles = dir.listAll();
- SegmentInfos infos = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos infos = new SegmentInfos();
infos.read(dir);
new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))).rollback();
String[] endFiles = dir.listAll();
@@ -606,7 +605,7 @@ public class TestIndexWriter extends Luc
writer.addDocument(doc);
writer.flush(false, true);
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
// Since we flushed w/o allowing merging we should now
// have 10 segments
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java Mon Oct 31 20:31:38 2011
@@ -31,8 +31,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.FieldType;
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.search.IndexSearcher;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Mon Oct 31 20:31:38 2011
@@ -34,7 +34,6 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
@@ -1291,7 +1290,7 @@ public class TestIndexWriterExceptions e
IndexReader reader = IndexReader.open(dir);
assertTrue(reader.numDocs() > 0);
reader.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
for (SegmentInfo segmentInfo : sis) {
assertFalse(segmentInfo.getHasVectors());
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java Mon Oct 31 20:31:38 2011
@@ -25,7 +25,6 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.codecs.Codec;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java Mon Oct 31 20:31:38 2011
@@ -23,7 +23,6 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase;
@@ -49,7 +48,7 @@ public class TestIndexWriterOptimize ext
writer.addDocument(doc);
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
final int segCount = sis.size();
@@ -60,7 +59,7 @@ public class TestIndexWriterOptimize ext
writer.optimize(3);
writer.close();
- sis = new SegmentInfos(CodecProvider.getDefault());
+ sis = new SegmentInfos();
sis.read(dir);
final int optSegCount = sis.size();
@@ -93,7 +92,7 @@ public class TestIndexWriterOptimize ext
writer.waitForMerges();
writer.commit();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
final int segCount = sis.size();
@@ -102,7 +101,7 @@ public class TestIndexWriterOptimize ext
writer.commit();
writer.waitForMerges();
- sis = new SegmentInfos(CodecProvider.getDefault());
+ sis = new SegmentInfos();
sis.read(dir);
final int optSegCount = sis.size();
@@ -202,7 +201,7 @@ public class TestIndexWriterOptimize ext
assertTrue(!reader.isOptimized());
reader.close();
- SegmentInfos infos = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos infos = new SegmentInfos();
infos.read(dir);
assertEquals(2, infos.size());
}
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=1195655&r1=1195654&r2=1195655&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 Mon Oct 31 20:31:38 2011
@@ -31,7 +31,6 @@ 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.search.TermQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
@@ -991,7 +990,7 @@ public class TestIndexWriterReader exten
// Some Codecs don't honor the ReaderTermsIndexDivisor, so skip the test if
// they're picked.
assumeFalse("PreFlex codec does not support ReaderTermsIndexDivisor!",
- "Lucene3x".equals(CodecProvider.getDefault().getDefaultCodec().getName()));
+ "Lucene3x".equals(Codec.getDefault().getName()));
IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random)).setReaderTermsIndexDivisor(-1);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLongPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLongPostings.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLongPostings.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestLongPostings.java Mon Oct 31 20:31:38 2011
@@ -29,7 +29,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java Mon Oct 31 20:31:38 2011
@@ -69,7 +69,7 @@ public class TestMultiLevelSkipList exte
public void testSimpleSkip() throws IOException {
Directory dir = new CountingRAMDirectory(new RAMDirectory());
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new PayloadAnalyzer()).setCodecProvider(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())).setMergePolicy(newLogMergePolicy()));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new PayloadAnalyzer()).setCodec(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())).setMergePolicy(newLogMergePolicy()));
Term term = new Term("test", "a");
for (int i = 0; i < 5000; i++) {
Document d1 = new Document();
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestReaderClosed.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestReaderClosed.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestReaderClosed.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestReaderClosed.java Mon Oct 31 20:31:38 2011
@@ -22,7 +22,6 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.store.AlreadyClosedException;
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestRollingUpdates.java Mon Oct 31 20:31:38 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.index;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.*;
-import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.memory.MemoryPostingsFormat;
import org.apache.lucene.store.*;
import org.apache.lucene.util.*;
@@ -36,13 +36,12 @@ public class TestRollingUpdates extends
dir.setCheckIndexOnClose(false); // we use a custom codec provider
final LineFileDocs docs = new LineFileDocs(random);
- CodecProvider provider = CodecProvider.getDefault();
//provider.register(new MemoryCodec());
- if ( (!"Lucene3x".equals(provider.getDefaultCodec().getName())) && random.nextBoolean()) {
- CodecProvider.setDefault(_TestUtil.alwaysFormat(new MemoryPostingsFormat()));
+ if ( (!"Lucene3x".equals(Codec.getDefault().getName())) && random.nextBoolean()) {
+ Codec.setDefault(_TestUtil.alwaysFormat(new MemoryPostingsFormat()));
}
- final IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodecProvider(provider));
+ final IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
w.setInfoStream(VERBOSE ? System.out : null);
final int SIZE = atLeast(TEST_NIGHTLY ? 100 : 20);
int id = 0;
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java Mon Oct 31 20:31:38 2011
@@ -4,7 +4,6 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -37,7 +36,7 @@ public class TestSegmentInfo extends Luc
writer.addDocument(doc);
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
SegmentInfo si = sis.info(0);
long sizeInBytesNoStore = si.sizeInBytes(false);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java Mon Oct 31 20:31:38 2011
@@ -23,7 +23,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.util.BytesRef;
import java.io.IOException;
@@ -75,7 +75,7 @@ public class TestSegmentMerger extends L
}
public void testMerge() throws IOException {
- SegmentMerger merger = new SegmentMerger(mergedDir, IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL, mergedSegment, null, null, new FieldInfos(), CodecProvider.getDefault().getDefaultCodec(), newIOContext(random));
+ SegmentMerger merger = new SegmentMerger(mergedDir, IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL, mergedSegment, null, null, new FieldInfos(), Codec.getDefault(), newIOContext(random));
merger.add(reader1);
merger.add(reader2);
int docsMerged = merger.merge();
@@ -146,7 +146,7 @@ public class TestSegmentMerger extends L
w.close();
// Assert that SM fails if .del exists
- SegmentMerger sm = new SegmentMerger(dir, 1, "a", null, null, null, CodecProvider.getDefault().getDefaultCodec(), newIOContext(random));
+ SegmentMerger sm = new SegmentMerger(dir, 1, "a", null, null, null, Codec.getDefault(), newIOContext(random));
try {
sm.createCompoundFile("b1", w.segmentInfos.info(0), newIOContext(random));
fail("should not have been able to create a .cfs with .del and .s* files");
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java Mon Oct 31 20:31:38 2011
@@ -75,7 +75,7 @@ public class TestSegmentTermEnum extends
public void testPrevTermAtEnd() throws IOException
{
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodecProvider(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodec(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())));
addDoc(writer, "aaa bbb");
writer.close();
SegmentReader reader = getOnlySegmentReader(IndexReader.open(dir, false));
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java Mon Oct 31 20:31:38 2011
@@ -20,7 +20,6 @@ package org.apache.lucene.index;
import java.io.IOException;
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
@@ -58,7 +57,7 @@ public class TestSizeBoundedOptimize ext
}
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
double min = sis.info(0).sizeInBytes(true);
@@ -72,7 +71,7 @@ public class TestSizeBoundedOptimize ext
writer.close();
// Should only be 3 segments in the index, because one of them exceeds the size limit
- sis = new SegmentInfos(CodecProvider.getDefault());
+ sis = new SegmentInfos();
sis.read(dir);
assertEquals(3, sis.size());
}
@@ -105,7 +104,7 @@ public class TestSizeBoundedOptimize ext
writer.close();
// Should only be 3 segments in the index, because one of them exceeds the size limit
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(3, sis.size());
}
@@ -132,7 +131,7 @@ public class TestSizeBoundedOptimize ext
writer.optimize();
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(2, sis.size());
}
@@ -159,7 +158,7 @@ public class TestSizeBoundedOptimize ext
writer.optimize();
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(2, sis.size());
}
@@ -186,7 +185,7 @@ public class TestSizeBoundedOptimize ext
writer.optimize();
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(1, sis.size());
}
@@ -212,7 +211,7 @@ public class TestSizeBoundedOptimize ext
writer.optimize();
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(3, sis.size());
}
@@ -239,7 +238,7 @@ public class TestSizeBoundedOptimize ext
writer.optimize();
writer.close();
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(4, sis.size());
}
@@ -272,7 +271,7 @@ public class TestSizeBoundedOptimize ext
// Should only be 4 segments in the index, because of the merge factor and
// max merge docs settings.
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(4, sis.size());
}
@@ -304,7 +303,7 @@ public class TestSizeBoundedOptimize ext
writer.close();
// Verify that the last segment does not have deletions.
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(3, sis.size());
assertFalse(sis.info(2).hasDeletions());
@@ -330,7 +329,7 @@ public class TestSizeBoundedOptimize ext
writer.close();
// Verify that the last segment does not have deletions.
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(1, sis.size());
}
@@ -360,7 +359,7 @@ public class TestSizeBoundedOptimize ext
writer.close();
// Verify that the last segment does not have deletions.
- SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos();
sis.read(dir);
assertEquals(1, sis.size());
assertTrue(sis.info(0).hasDeletions());
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestTermsEnum2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestTermsEnum2.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestTermsEnum2.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestTermsEnum2.java Mon Oct 31 20:31:38 2011
@@ -29,7 +29,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.TermsEnum.SeekStatus;
-import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.search.AutomatonQuery;
import org.apache.lucene.search.CheckHits;
import org.apache.lucene.search.IndexSearcher;
@@ -57,7 +57,7 @@ public class TestTermsEnum2 extends Luce
super.setUp();
// we generate aweful regexps: good for testing.
// but for preflex codec, the test can be very slow, so use less iterations.
- numIterations = CodecProvider.getDefault().getDefaultCodec().getName().equals("Lucene3x") ? 10 * RANDOM_MULTIPLIER : atLeast(50);
+ numIterations = Codec.getDefault().getName().equals("Lucene3x") ? 10 * RANDOM_MULTIPLIER : atLeast(50);
dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir,
newIndexWriterConfig(TEST_VERSION_CURRENT,
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/perfield/TestPerFieldPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/perfield/TestPerFieldPostingsFormat.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/perfield/TestPerFieldPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/perfield/TestPerFieldPostingsFormat.java Mon Oct 31 20:31:38 2011
@@ -36,7 +36,6 @@ import org.apache.lucene.index.CheckInde
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.PostingsFormat;
-import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.index.codecs.lucene40.Lucene40Codec;
import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsFormat;
import org.apache.lucene.index.codecs.mocksep.MockSepPostingsFormat;
@@ -53,6 +52,8 @@ import org.junit.Test;
*
*
*/
+//nocommit: add any custom codecs here to test-framework so they can be 'loaded'
+//automagically
public class TestPerFieldPostingsFormat extends LuceneTestCase {
private IndexWriter newWriter(Directory dir, IndexWriterConfig conf)
@@ -98,10 +99,8 @@ public class TestPerFieldPostingsFormat
@Test
public void testMergeUnusedPerFieldCodec() throws IOException {
Directory dir = newDirectory();
- CodecProvider provider = new MockCodecProvider();
IndexWriterConfig iwconf = newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE).setCodecProvider(
- provider);
+ new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE).setCodec(new MockCodec());
IndexWriter writer = newWriter(dir, iwconf);
addDocs(writer, 10);
writer.commit();
@@ -110,7 +109,7 @@ public class TestPerFieldPostingsFormat
addDocs2(writer, 10);
writer.commit();
assertEquals(30, writer.maxDoc());
- _TestUtil.checkIndex(dir, provider);
+ _TestUtil.checkIndex(dir);
writer.optimize();
assertEquals(30, writer.maxDoc());
writer.close();
@@ -124,19 +123,18 @@ public class TestPerFieldPostingsFormat
@Test
public void testChangeCodecAndMerge() throws IOException {
Directory dir = newDirectory();
- CodecProvider provider = new MockCodecProvider();
if (VERBOSE) {
System.out.println("TEST: make new index");
}
IndexWriterConfig iwconf = newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE).setCodecProvider(provider);
+ new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE).setCodec(new MockCodec());
iwconf.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH);
//((LogMergePolicy) iwconf.getMergePolicy()).setMergeFactor(10);
IndexWriter writer = newWriter(dir, iwconf);
addDocs(writer, 10);
writer.commit();
- assertQuery(new Term("content", "aaa"), dir, 10, provider);
+ assertQuery(new Term("content", "aaa"), dir, 10);
if (VERBOSE) {
System.out.println("TEST: addDocs3");
}
@@ -144,20 +142,19 @@ public class TestPerFieldPostingsFormat
writer.commit();
writer.close();
- assertQuery(new Term("content", "ccc"), dir, 10, provider);
- assertQuery(new Term("content", "aaa"), dir, 10, provider);
- Lucene40Codec codec = (Lucene40Codec)provider.getDefaultCodec();
- assertCodecPerField(_TestUtil.checkIndex(dir, provider), "content",
+ assertQuery(new Term("content", "ccc"), dir, 10);
+ assertQuery(new Term("content", "aaa"), dir, 10);
+ Lucene40Codec codec = (Lucene40Codec)iwconf.getCodec();
+ assertCodecPerField(_TestUtil.checkIndex(dir), "content",
codec.getPostingsFormat("MockSep"));
iwconf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
- .setOpenMode(OpenMode.APPEND).setCodecProvider(provider);
+ .setOpenMode(OpenMode.APPEND).setCodec(codec);
//((LogMergePolicy) iwconf.getMergePolicy()).setUseCompoundFile(false);
//((LogMergePolicy) iwconf.getMergePolicy()).setMergeFactor(10);
iwconf.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH);
- provider = new MockCodecProvider2(); // uses standard for field content
- iwconf.setCodecProvider(provider);
+ iwconf.setCodec(new MockCodec2()); // uses standard for field content
writer = newWriter(dir, iwconf);
// swap in new codec for currently written segments
if (VERBOSE) {
@@ -165,24 +162,24 @@ public class TestPerFieldPostingsFormat
}
addDocs2(writer, 10);
writer.commit();
- codec = (Lucene40Codec)provider.getDefaultCodec();
+ codec = (Lucene40Codec)iwconf.getCodec();
PostingsFormat origContentCodec = codec.getPostingsFormat("MockSep");
PostingsFormat newContentCodec = codec.getPostingsFormat("Lucene40");
- assertHybridCodecPerField(_TestUtil.checkIndex(dir, provider), "content",
+ assertHybridCodecPerField(_TestUtil.checkIndex(dir), "content",
origContentCodec, origContentCodec, newContentCodec);
assertEquals(30, writer.maxDoc());
- assertQuery(new Term("content", "bbb"), dir, 10, provider);
- assertQuery(new Term("content", "ccc"), dir, 10, provider); ////
- assertQuery(new Term("content", "aaa"), dir, 10, provider);
+ assertQuery(new Term("content", "bbb"), dir, 10);
+ assertQuery(new Term("content", "ccc"), dir, 10); ////
+ assertQuery(new Term("content", "aaa"), dir, 10);
if (VERBOSE) {
System.out.println("TEST: add more docs w/ new codec");
}
addDocs2(writer, 10);
writer.commit();
- assertQuery(new Term("content", "ccc"), dir, 10, provider);
- assertQuery(new Term("content", "bbb"), dir, 20, provider);
- assertQuery(new Term("content", "aaa"), dir, 10, provider);
+ assertQuery(new Term("content", "ccc"), dir, 10);
+ assertQuery(new Term("content", "bbb"), dir, 20);
+ assertQuery(new Term("content", "aaa"), dir, 10);
assertEquals(40, writer.maxDoc());
if (VERBOSE) {
@@ -191,11 +188,11 @@ public class TestPerFieldPostingsFormat
writer.optimize();
assertEquals(40, writer.maxDoc());
writer.close();
- assertCodecPerFieldOptimized(_TestUtil.checkIndex(dir, provider),
+ assertCodecPerFieldOptimized(_TestUtil.checkIndex(dir),
"content", newContentCodec);
- assertQuery(new Term("content", "ccc"), dir, 10, provider);
- assertQuery(new Term("content", "bbb"), dir, 20, provider);
- assertQuery(new Term("content", "aaa"), dir, 10, provider);
+ assertQuery(new Term("content", "ccc"), dir, 10);
+ assertQuery(new Term("content", "bbb"), dir, 20);
+ assertQuery(new Term("content", "aaa"), dir, 10);
dir.close();
}
@@ -226,12 +223,12 @@ public class TestPerFieldPostingsFormat
}
}
- public void assertQuery(Term t, Directory dir, int num, CodecProvider codecs)
+ public void assertQuery(Term t, Directory dir, int num)
throws CorruptIndexException, IOException {
if (VERBOSE) {
System.out.println("\nTEST: assertQuery " + t);
}
- IndexReader reader = IndexReader.open(dir, null, true, 1, codecs);
+ IndexReader reader = IndexReader.open(dir, null, true, 1);
IndexSearcher searcher = newSearcher(reader);
TopDocs search = searcher.search(new TermQuery(t), num + 10);
assertEquals(num, search.totalHits);
@@ -240,82 +237,58 @@ public class TestPerFieldPostingsFormat
}
- public static class MockCodecProvider extends CodecProvider {
+ public static class MockCodec extends Lucene40Codec {
final PostingsFormat lucene40 = new Lucene40PostingsFormat();
final PostingsFormat simpleText = new SimpleTextPostingsFormat();
final PostingsFormat mockSep = new MockSepPostingsFormat();
- final Codec codec = new Lucene40Codec() {
- @Override
- public PostingsFormat getPostingsFormat(String formatName) {
- if (formatName.equals(lucene40.name)) {
- return lucene40;
- } else if (formatName.equals(simpleText.name)) {
- return simpleText;
- } else if (formatName.equals(mockSep.name)) {
- return mockSep;
- } else {
- throw new IllegalArgumentException("unknown postings format: " + formatName);
- }
- }
-
- @Override
- public String getPostingsFormatForField(String field) {
- if (field.equals("id")) {
- return simpleText.name;
- } else if (field.equals("content")) {
- return mockSep.name;
- } else {
- return lucene40.name;
- }
- }
- };
-
@Override
- public Codec lookup(String name) {
- return codec;
+ public PostingsFormat getPostingsFormat(String formatName) {
+ if (formatName.equals(lucene40.name)) {
+ return lucene40;
+ } else if (formatName.equals(simpleText.name)) {
+ return simpleText;
+ } else if (formatName.equals(mockSep.name)) {
+ return mockSep;
+ } else {
+ throw new IllegalArgumentException("unknown postings format: " + formatName);
+ }
}
@Override
- public Codec getDefaultCodec() {
- return codec;
+ public String getPostingsFormatForField(String field) {
+ if (field.equals("id")) {
+ return simpleText.name;
+ } else if (field.equals("content")) {
+ return mockSep.name;
+ } else {
+ return lucene40.name;
+ }
}
}
- public static class MockCodecProvider2 extends CodecProvider {
+ public static class MockCodec2 extends Lucene40Codec {
final PostingsFormat lucene40 = new Lucene40PostingsFormat();
final PostingsFormat simpleText = new SimpleTextPostingsFormat();
- final Codec codec = new Lucene40Codec() {
- @Override
- public PostingsFormat getPostingsFormat(String formatName) {
- if (formatName.equals(lucene40.name)) {
- return lucene40;
- } else if (formatName.equals(simpleText.name)) {
- return simpleText;
- } else {
- throw new IllegalArgumentException("unknown postings format: " + formatName);
- }
- }
-
- @Override
- public String getPostingsFormatForField(String field) {
- if (field.equals("id")) {
- return simpleText.name;
- } else {
- return lucene40.name;
- }
- }
- };
-
@Override
- public Codec lookup(String name) {
- return codec;
+ public PostingsFormat getPostingsFormat(String formatName) {
+ if (formatName.equals(lucene40.name)) {
+ return lucene40;
+ } else if (formatName.equals(simpleText.name)) {
+ return simpleText;
+ } else {
+ throw new IllegalArgumentException("unknown postings format: " + formatName);
+ }
}
@Override
- public Codec getDefaultCodec() {
- return codec;
+ public String getPostingsFormatForField(String field) {
+ if (field.equals("id")) {
+ return simpleText.name;
+ } else {
+ return lucene40.name;
+ }
}
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java Mon Oct 31 20:31:38 2011
@@ -282,7 +282,7 @@ public class TestSurrogates extends Luce
RandomIndexWriter w = new RandomIndexWriter(random,
dir,
newIndexWriterConfig( TEST_VERSION_CURRENT,
- new MockAnalyzer(random)).setCodecProvider(_TestUtil.alwaysCodec(new PreFlexRWCodec())));
+ new MockAnalyzer(random)).setCodec(new PreFlexRWCodec()));
final int numField = _TestUtil.nextInt(random, 2, 5);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/Test10KPulsings.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/Test10KPulsings.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/Test10KPulsings.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/Test10KPulsings.java Mon Oct 31 20:31:38 2011
@@ -34,7 +34,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.PostingsFormat;
import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsBaseFormat;
import org.apache.lucene.search.DocIdSetIterator;
@@ -49,16 +49,18 @@ import org.junit.Ignore;
*
* @lucene.experimental
*/
+//nocommit: add any custom codecs here to test-framework so they can be 'loaded'
+//automagically
public class Test10KPulsings extends LuceneTestCase {
public void test10kPulsed() throws Exception {
// we always run this test with pulsing codec.
- CodecProvider cp = _TestUtil.alwaysFormat(new PulsingPostingsFormat(new Lucene40PostingsBaseFormat(), 1));
+ Codec cp = _TestUtil.alwaysFormat(new PulsingPostingsFormat(new Lucene40PostingsBaseFormat(), 1));
File f = _TestUtil.getTempDir("10kpulsed");
MockDirectoryWrapper dir = newFSDirectory(f);
dir.setCheckIndexOnClose(false); // we do this ourselves explicitly
RandomIndexWriter iw = new RandomIndexWriter(random, dir,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodecProvider(cp));
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodec(cp));
Document document = new Document();
FieldType ft = new FieldType(TextField.TYPE_STORED);
@@ -103,13 +105,13 @@ public class Test10KPulsings extends Luc
public void test10kNotPulsed() throws Exception {
// we always run this test with pulsing codec.
int freqCutoff = _TestUtil.nextInt(random, 1, 10);
- CodecProvider cp = _TestUtil.alwaysFormat(new PulsingPostingsFormat(new Lucene40PostingsBaseFormat(), freqCutoff));
+ Codec cp = _TestUtil.alwaysFormat(new PulsingPostingsFormat(new Lucene40PostingsBaseFormat(), freqCutoff));
File f = _TestUtil.getTempDir("10knotpulsed");
MockDirectoryWrapper dir = newFSDirectory(f);
dir.setCheckIndexOnClose(false); // we do this ourselves explicitly
RandomIndexWriter iw = new RandomIndexWriter(random, dir,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodecProvider(cp));
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodec(cp));
Document document = new Document();
FieldType ft = new FieldType(TextField.TYPE_STORED);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java Mon Oct 31 20:31:38 2011
@@ -37,7 +37,7 @@ import org.apache.lucene.index.SegmentWr
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.index.codecs.BlockTreeTermsReader;
import org.apache.lucene.index.codecs.BlockTreeTermsWriter;
-import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.FieldsConsumer;
import org.apache.lucene.index.codecs.FieldsProducer;
import org.apache.lucene.index.codecs.PostingsFormat;
@@ -54,14 +54,16 @@ import org.apache.lucene.util._TestUtil;
/**
* Tests that pulsing codec reuses its enums and wrapped enums
*/
+//nocommit: add any custom codecs here to test-framework so they can be 'loaded'
+//automagically
public class TestPulsingReuse extends LuceneTestCase {
// TODO: this is a basic test. this thing is complicated, add more
public void testSophisticatedReuse() throws Exception {
// we always run this test with pulsing codec.
- CodecProvider cp = _TestUtil.alwaysFormat(new PulsingPostingsFormat(new Lucene40PostingsBaseFormat(), 1));
+ Codec cp = _TestUtil.alwaysFormat(new PulsingPostingsFormat(new Lucene40PostingsBaseFormat(), 1));
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random, dir,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodecProvider(cp));
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodec(cp));
Document doc = new Document();
doc.add(new Field("foo", "a b b c c c d e f g g h i i j j k", TextField.TYPE_UNSTORED));
iw.addDocument(doc);
@@ -96,11 +98,11 @@ public class TestPulsingReuse extends Lu
/** tests reuse with Pulsing1(Pulsing2(Standard)) */
public void testNestedPulsing() throws Exception {
// we always run this test with pulsing codec.
- CodecProvider cp = _TestUtil.alwaysFormat(new NestedPulsing());
+ Codec cp = _TestUtil.alwaysFormat(new NestedPulsing());
MockDirectoryWrapper dir = newDirectory();
dir.setCheckIndexOnClose(false); // will do this ourselves, custom codec
RandomIndexWriter iw = new RandomIndexWriter(random, dir,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodecProvider(cp));
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodec(cp));
Document doc = new Document();
doc.add(new Field("foo", "a b b c c c d e f g g g h i i j j k l l m m m", TextField.TYPE_UNSTORED));
// note: the reuse is imperfect, here we would have 4 enums (lost reuse when we get an enum for 'm')
@@ -133,7 +135,7 @@ public class TestPulsingReuse extends Lu
ir.close();
CheckIndex ci = new CheckIndex(dir);
- ci.checkIndex(null, cp);
+ ci.checkIndex(null);
dir.close();
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java Mon Oct 31 20:31:38 2011
@@ -39,7 +39,7 @@ import org.apache.lucene.index.LogMergeP
import org.apache.lucene.index.MultiPerDocValues;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.PerDocValues;
import org.apache.lucene.index.values.IndexDocValues.Source;
import org.apache.lucene.search.*;
@@ -65,7 +65,7 @@ public class TestDocValuesIndexing exten
@Before
public void setUp() throws Exception {
super.setUp();
- assumeFalse("cannot work with preflex codec", CodecProvider.getDefault().getDefaultCodec().getName().equals("Lucene3x"));
+ assumeFalse("cannot work with preflex codec", Codec.getDefault().getName().equals("Lucene3x"));
}
/*
@@ -140,7 +140,7 @@ public class TestDocValuesIndexing exten
indexValues(w_1, valuesPerIndex, first, values, false, 7);
w_1.commit();
assertEquals(valuesPerIndex, w_1.maxDoc());
- _TestUtil.checkIndex(d_1, w_1.getConfig().getCodecProvider());
+ _TestUtil.checkIndex(d_1);
// index second index
Directory d_2 = newDirectory();
@@ -148,7 +148,7 @@ public class TestDocValuesIndexing exten
indexValues(w_2, valuesPerIndex, second, values, false, 7);
w_2.commit();
assertEquals(valuesPerIndex, w_2.maxDoc());
- _TestUtil.checkIndex(d_2, w_2.getConfig().getCodecProvider());
+ _TestUtil.checkIndex(d_2);
Directory target = newDirectory();
IndexWriter w = new IndexWriter(target, writerConfig(random.nextBoolean()));
@@ -162,7 +162,7 @@ public class TestDocValuesIndexing exten
w.optimize(true);
w.commit();
- _TestUtil.checkIndex(target, w.getConfig().getCodecProvider());
+ _TestUtil.checkIndex(target);
assertEquals(valuesPerIndex * 2, w.maxDoc());
// check values
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java Mon Oct 31 20:31:38 2011
@@ -15,7 +15,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.NoMergePolicy;
-import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.values.IndexDocValues.Source;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -42,7 +42,7 @@ public class TestTypePromotion extends L
@Before
public void setUp() throws Exception {
super.setUp();
- assumeFalse("cannot work with preflex codec", CodecProvider.getDefault().getDefaultCodec().getName().equals("Lucene3x"));
+ assumeFalse("cannot work with preflex codec", Codec.getDefault().getName().equals("Lucene3x"));
}
private static EnumSet<ValueType> INTEGERS = EnumSet.of(ValueType.VAR_INTS,
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java?rev=1195655&r1=1195654&r2=1195655&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java Mon Oct 31 20:31:38 2011
@@ -28,7 +28,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
-import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.values.IndexDocValues.Source;
import org.apache.lucene.search.similarities.DefaultSimilarityProvider;
import org.apache.lucene.search.similarities.Similarity;
@@ -49,7 +49,7 @@ public class TestDocValuesScoring extend
public void testSimple() throws Exception {
assumeFalse("PreFlex codec cannot work with IndexDocValues!",
- "Lucene3x".equals(CodecProvider.getDefault().getDefaultCodec().getName()));
+ "Lucene3x".equals(Codec.getDefault().getName()));
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random, dir);