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/25 17:47:46 UTC
svn commit: r1188738 [2/2] - in /lucene/dev/branches/lucene2621:
lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/
lucene/contrib/misc/src/test/org/apache/lucene/index/codecs/appending/
lucene/src/java/org/apache/lucene/index/ luce...
Copied: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexRWPostingsFormat.java (from r1188713, lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexRWPostingsFormat.java?p2=lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexRWPostingsFormat.java&p1=lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java&r1=1188713&r2=1188738&rev=1188738&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexRWPostingsFormat.java Tue Oct 25 15:47:44 2011
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.index.SegmentWriteState;
import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.codecs.preflex.PreFlexCodec;
+import org.apache.lucene.index.codecs.preflex.PreFlexPostingsFormat;
import org.apache.lucene.index.codecs.preflex.PreFlexFields;
import org.apache.lucene.index.codecs.FieldsConsumer;
import org.apache.lucene.index.codecs.FieldsProducer;
@@ -32,9 +32,9 @@ import org.apache.lucene.util.LuceneTest
*
* @lucene.experimental
*/
-public class PreFlexRWCodec extends PreFlexCodec {
+public class PreFlexRWPostingsFormat extends PreFlexPostingsFormat {
- public PreFlexRWCodec() {
+ public PreFlexRWPostingsFormat() {
// NOTE: we impersonate the PreFlex codec so that it can
// read the segments we write!
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java?rev=1188738&r1=1188737&r2=1188738&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java Tue Oct 25 15:47:44 2011
@@ -23,7 +23,7 @@ import java.io.IOException;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.codecs.preflex.PreFlexCodec;
+import org.apache.lucene.index.codecs.preflex.PreFlexPostingsFormat;
import org.apache.lucene.index.codecs.preflex.TermInfo;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
@@ -106,8 +106,8 @@ final class TermInfosWriter implements C
try {
directory.deleteFile(IndexFileNames.segmentFileName(segment, "",
- (isIndex ? PreFlexCodec.TERMS_INDEX_EXTENSION
- : PreFlexCodec.TERMS_EXTENSION)));
+ (isIndex ? PreFlexPostingsFormat.TERMS_INDEX_EXTENSION
+ : PreFlexPostingsFormat.TERMS_EXTENSION)));
} catch (IOException ignored) {
}
}
@@ -125,8 +125,8 @@ final class TermInfosWriter implements C
fieldInfos = fis;
isIndex = isi;
output = directory.createOutput(IndexFileNames.segmentFileName(segment, "",
- (isIndex ? PreFlexCodec.TERMS_INDEX_EXTENSION
- : PreFlexCodec.TERMS_EXTENSION)), IOContext.DEFAULT);
+ (isIndex ? PreFlexPostingsFormat.TERMS_INDEX_EXTENSION
+ : PreFlexPostingsFormat.TERMS_EXTENSION)), IOContext.DEFAULT);
boolean success = false;
try {
output.writeInt(FORMAT_CURRENT); // write format
@@ -147,8 +147,8 @@ final class TermInfosWriter implements C
try {
directory.deleteFile(IndexFileNames.segmentFileName(segment, "",
- (isIndex ? PreFlexCodec.TERMS_INDEX_EXTENSION
- : PreFlexCodec.TERMS_EXTENSION)));
+ (isIndex ? PreFlexPostingsFormat.TERMS_INDEX_EXTENSION
+ : PreFlexPostingsFormat.TERMS_EXTENSION)));
} catch (IOException ignored) {
}
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java?rev=1188738&r1=1188737&r2=1188738&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java Tue Oct 25 15:47:44 2011
@@ -39,15 +39,15 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.*;
-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.mockintblock.MockFixedIntBlockCodec;
-import org.apache.lucene.index.codecs.mockintblock.MockVariableIntBlockCodec;
-import org.apache.lucene.index.codecs.mocksep.MockSepCodec;
-import org.apache.lucene.index.codecs.mockrandom.MockRandomCodec;
-import org.apache.lucene.index.codecs.preflex.PreFlexCodec;
-import org.apache.lucene.index.codecs.preflexrw.PreFlexRWCodec;
-import org.apache.lucene.index.codecs.pulsing.PulsingCodec;
+import org.apache.lucene.index.codecs.mockintblock.MockFixedIntBlockPostingsFormat;
+import org.apache.lucene.index.codecs.mockintblock.MockVariableIntBlockPostingsFormat;
+import org.apache.lucene.index.codecs.mocksep.MockSepPostingsFormat;
+import org.apache.lucene.index.codecs.mockrandom.MockRandomPostingsFormat;
+import org.apache.lucene.index.codecs.preflex.PreFlexPostingsFormat;
+import org.apache.lucene.index.codecs.preflexrw.PreFlexRWPostingsFormat;
+import org.apache.lucene.index.codecs.pulsing.PulsingPostingsFormat;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.FieldCache.CacheEntry;
@@ -211,7 +211,7 @@ public abstract class LuceneTestCase ext
// saves default codec: we do this statically as many build indexes in @beforeClass
private static String savedDefaultCodec;
// default codec: not set when we use a per-field provider.
- private static Codec codec;
+ private static PostingsFormat codec;
// default codec provider
private static CodecProvider savedCodecProvider;
@@ -226,8 +226,8 @@ public abstract class LuceneTestCase ext
private static final String[] TEST_CODECS = new String[] {"MockSep", "MockFixedIntBlock", "MockVariableIntBlock", "MockRandom"};
- private static void swapCodec(Codec c, CodecProvider cp) {
- Codec prior = null;
+ private static void swapCodec(PostingsFormat c, CodecProvider cp) {
+ PostingsFormat prior = null;
try {
prior = cp.lookup(c.name);
} catch (IllegalArgumentException iae) {
@@ -239,7 +239,7 @@ public abstract class LuceneTestCase ext
}
// returns current default codec
- static Codec installTestCodecs(String codec, CodecProvider cp) {
+ static PostingsFormat installTestCodecs(String codec, CodecProvider cp) {
savedDefaultCodec = cp.getDefaultFieldCodec();
final boolean codecHasParam;
@@ -269,37 +269,37 @@ public abstract class LuceneTestCase ext
// If we're running w/ PreFlex codec we must swap in the
// test-only PreFlexRW codec (since core PreFlex can
// only read segments):
- swapCodec(new PreFlexRWCodec(), cp);
+ swapCodec(new PreFlexRWPostingsFormat(), cp);
}
- swapCodec(new MockSepCodec(), cp);
+ swapCodec(new MockSepPostingsFormat(), cp);
// TODO: make it possible to specify min/max iterms per
// block via CL:
int minItemsPerBlock = _TestUtil.nextInt(random, 2, 100);
int maxItemsPerBlock = 2*(Math.max(2, minItemsPerBlock-1)) + random.nextInt(100);
- swapCodec(new PulsingCodec(codecHasParam && "Pulsing".equals(codec) ? codecParam : 1 + random.nextInt(20), minItemsPerBlock, maxItemsPerBlock), cp);
- swapCodec(new MockFixedIntBlockCodec(codecHasParam && "MockFixedIntBlock".equals(codec) ? codecParam : _TestUtil.nextInt(random, 1, 2000)), cp);
+ swapCodec(new PulsingPostingsFormat(codecHasParam && "Pulsing".equals(codec) ? codecParam : 1 + random.nextInt(20), minItemsPerBlock, maxItemsPerBlock), cp);
+ swapCodec(new MockFixedIntBlockPostingsFormat(codecHasParam && "MockFixedIntBlock".equals(codec) ? codecParam : _TestUtil.nextInt(random, 1, 2000)), cp);
// baseBlockSize cannot be over 127:
- swapCodec(new MockVariableIntBlockCodec(codecHasParam && "MockVariableIntBlock".equals(codec) ? codecParam : _TestUtil.nextInt(random, 1, 127)), cp);
- swapCodec(new MockRandomCodec(random), cp);
+ swapCodec(new MockVariableIntBlockPostingsFormat(codecHasParam && "MockVariableIntBlock".equals(codec) ? codecParam : _TestUtil.nextInt(random, 1, 127)), cp);
+ swapCodec(new MockRandomPostingsFormat(random), cp);
return cp.lookup(codec);
}
// returns current PreFlex codec
- static void removeTestCodecs(Codec codec, CodecProvider cp) {
+ static void removeTestCodecs(PostingsFormat codec, CodecProvider cp) {
if (codec.name.equals("PreFlex")) {
- final Codec preFlex = cp.lookup("PreFlex");
+ final PostingsFormat preFlex = cp.lookup("PreFlex");
if (preFlex != null) {
cp.unregister(preFlex);
}
- cp.register(new PreFlexCodec());
+ cp.register(new PreFlexPostingsFormat());
}
cp.unregister(cp.lookup("MockSep"));
cp.unregister(cp.lookup("MockFixedIntBlock"));
cp.unregister(cp.lookup("MockVariableIntBlock"));
cp.unregister(cp.lookup("MockRandom"));
- swapCodec(new PulsingCodec(), cp);
+ swapCodec(new PulsingPostingsFormat(), cp);
cp.setDefaultFieldCodec(savedDefaultCodec);
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java?rev=1188738&r1=1188737&r2=1188738&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java Tue Oct 25 15:47:44 2011
@@ -44,7 +44,7 @@ import org.apache.lucene.index.LogMergeP
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.MergeScheduler;
import org.apache.lucene.index.TieredMergePolicy;
-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.search.FieldDoc;
import org.apache.lucene.search.ScoreDoc;
@@ -351,10 +351,10 @@ public class _TestUtil {
return new String(buffer, 0, i);
}
- public static CodecProvider alwaysCodec(final Codec c) {
+ public static CodecProvider alwaysCodec(final PostingsFormat c) {
CodecProvider p = new CodecProvider() {
@Override
- public Codec lookup(String name) {
+ public PostingsFormat lookup(String name) {
// can't do this until we fix PreFlexRW to not
//impersonate PreFlex:
if (name.equals(c.name)) {
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=1188738&r1=1188737&r2=1188738&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 Tue Oct 25 15:47:44 2011
@@ -70,7 +70,7 @@ public class TestExternalCodecs extends
// TODO
// - good improvement would be to write through to disk,
// and then load into ram from disk
- public static class RAMOnlyCodec extends Codec {
+ public static class RAMOnlyCodec extends PostingsFormat {
public RAMOnlyCodec() {
super("RamOnly");
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=1188738&r1=1188737&r2=1188738&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 Tue Oct 25 15:47:44 2011
@@ -30,10 +30,10 @@ import org.apache.lucene.document.String
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.mocksep.MockSepCodec;
-import org.apache.lucene.index.codecs.pulsing.PulsingCodec;
-import org.apache.lucene.index.codecs.simpletext.SimpleTextCodec;
-import org.apache.lucene.index.codecs.standard.StandardCodec;
+import org.apache.lucene.index.codecs.mocksep.MockSepPostingsFormat;
+import org.apache.lucene.index.codecs.pulsing.PulsingPostingsFormat;
+import org.apache.lucene.index.codecs.simpletext.SimpleTextPostingsFormat;
+import org.apache.lucene.index.codecs.standard.StandardPostingsFormat;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.store.AlreadyClosedException;
@@ -1039,9 +1039,9 @@ public class TestAddIndexes extends Luce
public static class MockCodecProvider extends CodecProvider {
public MockCodecProvider() {
- StandardCodec standardCodec = new StandardCodec();
- SimpleTextCodec simpleTextCodec = new SimpleTextCodec();
- MockSepCodec mockSepCodec = new MockSepCodec();
+ StandardPostingsFormat standardCodec = new StandardPostingsFormat();
+ SimpleTextPostingsFormat simpleTextCodec = new SimpleTextPostingsFormat();
+ MockSepPostingsFormat mockSepCodec = new MockSepPostingsFormat();
register(standardCodec);
register(mockSepCodec);
register(simpleTextCodec);
@@ -1146,7 +1146,7 @@ public class TestAddIndexes extends Luce
IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random));
CodecProvider provider = new CodecProvider();
- provider.register(new StandardCodec());
+ provider.register(new StandardPostingsFormat());
conf.setCodecProvider(provider);
IndexWriter w = new IndexWriter(toAdd, conf);
Document doc = new Document();
@@ -1161,7 +1161,7 @@ public class TestAddIndexes extends Luce
IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random));
CodecProvider provider = new CodecProvider();
- provider.register(new PulsingCodec(1 + random.nextInt(20)));
+ provider.register(new PulsingPostingsFormat(1 + random.nextInt(20)));
conf.setCodecProvider(provider);
IndexWriter w = new IndexWriter(dir, conf);
try {
@@ -1182,7 +1182,7 @@ public class TestAddIndexes extends Luce
IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random));
CodecProvider provider = new CodecProvider();
- provider.register(new PulsingCodec(1 + random.nextInt(20)));
+ provider.register(new PulsingPostingsFormat(1 + random.nextInt(20)));
conf.setCodecProvider(provider);
IndexWriter w = new IndexWriter(dir, conf);
IndexReader indexReader = IndexReader.open(toAdd);
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=1188738&r1=1188737&r2=1188738&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 Tue Oct 25 15:47:44 2011
@@ -32,9 +32,9 @@ import org.apache.lucene.index.codecs.Fi
import org.apache.lucene.index.codecs.PostingsConsumer;
import org.apache.lucene.index.codecs.TermStats;
import org.apache.lucene.index.codecs.TermsConsumer;
-import org.apache.lucene.index.codecs.mocksep.MockSepCodec;
+import org.apache.lucene.index.codecs.mocksep.MockSepPostingsFormat;
import org.apache.lucene.index.codecs.perfield.SegmentCodecs;
-import org.apache.lucene.index.codecs.preflex.PreFlexCodec;
+import org.apache.lucene.index.codecs.preflex.PreFlexPostingsFormat;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
@@ -395,7 +395,7 @@ public class TestCodecs extends LuceneTe
public static class MockSepCodecs extends CodecProvider {
protected MockSepCodecs() {
- this.register(new MockSepCodec());
+ this.register(new MockSepPostingsFormat());
this.setDefaultFieldCodec("MockSep");
}
@@ -460,7 +460,7 @@ public class TestCodecs extends LuceneTe
final FieldData field = fields[TestCodecs.random.nextInt(fields.length)];
final TermsEnum termsEnum = termsDict.terms(field.fieldInfo.name).iterator();
assertTrue(field.fieldInfo.getCodecId() != FieldInfo.UNASSIGNED_CODEC_ID);
- if (si.getSegmentCodecs().codecs[field.fieldInfo.getCodecId()] instanceof PreFlexCodec) {
+ if (si.getSegmentCodecs().codecs[field.fieldInfo.getCodecId()] instanceof PreFlexPostingsFormat) {
// code below expects unicode sort order
continue;
}
@@ -622,7 +622,7 @@ public class TestCodecs extends LuceneTe
Arrays.sort(fields);
for (final FieldData field : fields) {
assertTrue(field.fieldInfo.getCodecId() != FieldInfo.UNASSIGNED_CODEC_ID);
- if (!allowPreFlex && codecInfo.codecs[field.fieldInfo.getCodecId()] instanceof PreFlexCodec) {
+ if (!allowPreFlex && codecInfo.codecs[field.fieldInfo.getCodecId()] instanceof PreFlexPostingsFormat) {
// code below expects unicode sort order
continue;
}
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=1188738&r1=1188737&r2=1188738&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 Tue Oct 25 15:47:44 2011
@@ -33,7 +33,7 @@ import org.apache.lucene.document.TextFi
import org.apache.lucene.index.DocTermOrds.TermOrdsIterator;
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.PostingsFormat;
import org.apache.lucene.index.codecs.CoreCodecProvider;
import org.apache.lucene.index.codecs.DefaultDocValuesProducer;
import org.apache.lucene.index.codecs.FieldsConsumer;
@@ -106,7 +106,7 @@ public class TestDocTermOrds extends Luc
dir.close();
}
- private static class StandardCodecWithOrds extends Codec {
+ private static class StandardCodecWithOrds extends PostingsFormat {
public StandardCodecWithOrds() {
super("StandardOrds");
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestPerFieldCodecSupport.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestPerFieldCodecSupport.java?rev=1188738&r1=1188737&r2=1188738&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestPerFieldCodecSupport.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestPerFieldCodecSupport.java Tue Oct 25 15:47:44 2011
@@ -28,15 +28,15 @@ import org.apache.lucene.document.TextFi
import org.apache.lucene.index.CheckIndex.Status.SegmentInfoStatus;
import org.apache.lucene.index.CheckIndex.Status;
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.mockintblock.MockFixedIntBlockCodec;
-import org.apache.lucene.index.codecs.mockintblock.MockVariableIntBlockCodec;
-import org.apache.lucene.index.codecs.mocksep.MockSepCodec;
+import org.apache.lucene.index.codecs.mockintblock.MockFixedIntBlockPostingsFormat;
+import org.apache.lucene.index.codecs.mockintblock.MockVariableIntBlockPostingsFormat;
+import org.apache.lucene.index.codecs.mocksep.MockSepPostingsFormat;
import org.apache.lucene.index.codecs.perfield.SegmentCodecs;
-import org.apache.lucene.index.codecs.pulsing.PulsingCodec;
-import org.apache.lucene.index.codecs.simpletext.SimpleTextCodec;
-import org.apache.lucene.index.codecs.standard.StandardCodec;
+import org.apache.lucene.index.codecs.pulsing.PulsingPostingsFormat;
+import org.apache.lucene.index.codecs.simpletext.SimpleTextPostingsFormat;
+import org.apache.lucene.index.codecs.standard.StandardPostingsFormat;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
@@ -159,8 +159,8 @@ public class TestPerFieldCodecSupport ex
}
addDocs2(writer, 10);
writer.commit();
- Codec origContentCodec = provider.lookup("MockSep");
- Codec newContentCodec = provider.lookup("Standard");
+ PostingsFormat origContentCodec = provider.lookup("MockSep");
+ PostingsFormat newContentCodec = provider.lookup("Standard");
assertHybridCodecPerField(_TestUtil.checkIndex(dir, provider), "content",
origContentCodec, origContentCodec, newContentCodec);
assertEquals(30, writer.maxDoc());
@@ -194,14 +194,14 @@ public class TestPerFieldCodecSupport ex
}
public void assertCodecPerFieldOptimized(Status checkIndex, String field,
- Codec codec) {
+ PostingsFormat codec) {
assertEquals(1, checkIndex.segmentInfos.size());
final CodecProvider provider = checkIndex.segmentInfos.get(0).codec.provider;
assertEquals(codec, provider.lookup(provider.getFieldCodec(field)));
}
- public void assertCodecPerField(Status checkIndex, String field, Codec codec) {
+ public void assertCodecPerField(Status checkIndex, String field, PostingsFormat codec) {
for (SegmentInfoStatus info : checkIndex.segmentInfos) {
final CodecProvider provider = info.codec.provider;
assertEquals(codec, provider.lookup(provider.getFieldCodec(field)));
@@ -209,7 +209,7 @@ public class TestPerFieldCodecSupport ex
}
public void assertHybridCodecPerField(Status checkIndex, String field,
- Codec... codec) throws IOException {
+ PostingsFormat... codec) throws IOException {
List<SegmentInfoStatus> segmentInfos = checkIndex.segmentInfos;
assertEquals(segmentInfos.size(), codec.length);
for (int i = 0; i < codec.length; i++) {
@@ -241,10 +241,10 @@ public class TestPerFieldCodecSupport ex
public static class MockCodecProvider extends CodecProvider {
public MockCodecProvider() {
- StandardCodec standardCodec = new StandardCodec();
+ StandardPostingsFormat standardCodec = new StandardPostingsFormat();
setDefaultFieldCodec(standardCodec.name);
- SimpleTextCodec simpleTextCodec = new SimpleTextCodec();
- MockSepCodec mockSepCodec = new MockSepCodec();
+ SimpleTextPostingsFormat simpleTextCodec = new SimpleTextPostingsFormat();
+ MockSepPostingsFormat mockSepCodec = new MockSepPostingsFormat();
register(standardCodec);
register(mockSepCodec);
register(simpleTextCodec);
@@ -256,10 +256,10 @@ public class TestPerFieldCodecSupport ex
public static class MockCodecProvider2 extends CodecProvider {
public MockCodecProvider2() {
- StandardCodec standardCodec = new StandardCodec();
+ StandardPostingsFormat standardCodec = new StandardPostingsFormat();
setDefaultFieldCodec(standardCodec.name);
- SimpleTextCodec simpleTextCodec = new SimpleTextCodec();
- MockSepCodec mockSepCodec = new MockSepCodec();
+ SimpleTextPostingsFormat simpleTextCodec = new SimpleTextPostingsFormat();
+ MockSepPostingsFormat mockSepCodec = new MockSepPostingsFormat();
register(standardCodec);
register(mockSepCodec);
register(simpleTextCodec);
@@ -278,12 +278,12 @@ public class TestPerFieldCodecSupport ex
int numRounds = atLeast(1);
for (int i = 0; i < numRounds; i++) {
CodecProvider provider = new CodecProvider();
- Codec[] codecs = new Codec[] { new StandardCodec(),
- new SimpleTextCodec(), new MockSepCodec(),
- new PulsingCodec(1 + random.nextInt(20)),
- new MockVariableIntBlockCodec(1 + random.nextInt(10)),
- new MockFixedIntBlockCodec(1 + random.nextInt(10)) };
- for (Codec codec : codecs) {
+ PostingsFormat[] codecs = new PostingsFormat[] { new StandardPostingsFormat(),
+ new SimpleTextPostingsFormat(), new MockSepPostingsFormat(),
+ new PulsingPostingsFormat(1 + random.nextInt(20)),
+ new MockVariableIntBlockPostingsFormat(1 + random.nextInt(10)),
+ new MockFixedIntBlockPostingsFormat(1 + random.nextInt(10)) };
+ for (PostingsFormat codec : codecs) {
provider.register(codec);
}
int num = _TestUtil.nextInt(random, 30, 60);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/intblock/TestIntBlockCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/intblock/TestIntBlockCodec.java?rev=1188738&r1=1188737&r2=1188738&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/intblock/TestIntBlockCodec.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/intblock/TestIntBlockCodec.java Tue Oct 25 15:47:44 2011
@@ -27,7 +27,7 @@ public class TestIntBlockCodec extends L
public void testSimpleIntBlocks() throws Exception {
Directory dir = newDirectory();
- IntStreamFactory f = new MockFixedIntBlockCodec(128).getIntFactory();
+ IntStreamFactory f = new MockFixedIntBlockPostingsFormat(128).getIntFactory();
IntIndexOutput out = f.createOutput(dir, "test", newIOContext(random));
for(int i=0;i<11777;i++) {
@@ -49,7 +49,7 @@ public class TestIntBlockCodec extends L
public void testEmptySimpleIntBlocks() throws Exception {
Directory dir = newDirectory();
- IntStreamFactory f = new MockFixedIntBlockCodec(128).getIntFactory();
+ IntStreamFactory f = new MockFixedIntBlockPostingsFormat(128).getIntFactory();
IntIndexOutput out = f.createOutput(dir, "test", newIOContext(random));
// write no ints
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=1188738&r1=1188737&r2=1188738&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 Tue Oct 25 15:47:44 2011
@@ -21,7 +21,7 @@ import org.apache.lucene.store.*;
import org.apache.lucene.document.*;
import org.apache.lucene.analysis.*;
import org.apache.lucene.index.*;
-import org.apache.lucene.index.codecs.preflexrw.PreFlexRWCodec;
+import org.apache.lucene.index.codecs.preflexrw.PreFlexRWPostingsFormat;
import org.apache.lucene.util.*;
import java.util.*;
@@ -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)).setCodecProvider(_TestUtil.alwaysCodec(new PreFlexRWPostingsFormat())));
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=1188738&r1=1188737&r2=1188738&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 Tue Oct 25 15:47:44 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.Codec;
+import org.apache.lucene.index.codecs.PostingsFormat;
import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.MockDirectoryWrapper;
@@ -51,7 +51,7 @@ import org.junit.Ignore;
public class Test10KPulsings extends LuceneTestCase {
public void test10kPulsed() throws Exception {
// we always run this test with pulsing codec.
- CodecProvider cp = _TestUtil.alwaysCodec(new PulsingCodec(1));
+ CodecProvider cp = _TestUtil.alwaysCodec(new PulsingPostingsFormat(1));
File f = _TestUtil.getTempDir("10kpulsed");
MockDirectoryWrapper dir = newFSDirectory(f);
@@ -101,7 +101,7 @@ public class Test10KPulsings extends Luc
*/
public void test10kNotPulsed() throws Exception {
// we always run this test with pulsing codec.
- CodecProvider cp = _TestUtil.alwaysCodec(new PulsingCodec(1));
+ CodecProvider cp = _TestUtil.alwaysCodec(new PulsingPostingsFormat(1));
File f = _TestUtil.getTempDir("10knotpulsed");
MockDirectoryWrapper dir = newFSDirectory(f);
@@ -123,9 +123,9 @@ public class Test10KPulsings extends Luc
NumberFormat df = new DecimalFormat("00000", new DecimalFormatSymbols(Locale.ENGLISH));
- Codec codec = cp.lookup(cp.getFieldCodec("field"));
- assertTrue(codec instanceof PulsingCodec);
- PulsingCodec pulsing = (PulsingCodec) codec;
+ PostingsFormat codec = cp.lookup(cp.getFieldCodec("field"));
+ assertTrue(codec instanceof PulsingPostingsFormat);
+ PulsingPostingsFormat pulsing = (PulsingPostingsFormat) codec;
final int freq = pulsing.getFreqCutoff() + 1;
for (int i = 0; i < 10050; i++) {
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=1188738&r1=1188737&r2=1188738&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 Tue Oct 25 15:47:44 2011
@@ -38,7 +38,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.Codec;
+import org.apache.lucene.index.codecs.PostingsFormat;
import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.index.codecs.DefaultDocValuesConsumer;
import org.apache.lucene.index.codecs.DefaultDocValuesProducer;
@@ -48,7 +48,7 @@ import org.apache.lucene.index.codecs.Pe
import org.apache.lucene.index.codecs.PerDocValues;
import org.apache.lucene.index.codecs.PostingsReaderBase;
import org.apache.lucene.index.codecs.PostingsWriterBase;
-import org.apache.lucene.index.codecs.standard.StandardCodec;
+import org.apache.lucene.index.codecs.standard.StandardPostingsFormat;
import org.apache.lucene.index.codecs.standard.StandardPostingsReader;
import org.apache.lucene.index.codecs.standard.StandardPostingsWriter;
import org.apache.lucene.store.Directory;
@@ -63,7 +63,7 @@ public class TestPulsingReuse extends Lu
// 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.alwaysCodec(new PulsingCodec(1));
+ CodecProvider cp = _TestUtil.alwaysCodec(new PulsingPostingsFormat(1));
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random, dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodecProvider(cp));
@@ -142,7 +142,7 @@ public class TestPulsingReuse extends Lu
dir.close();
}
- static class NestedPulsing extends Codec {
+ static class NestedPulsing extends PostingsFormat {
public NestedPulsing() {
super("NestedPulsing");
}
@@ -209,7 +209,7 @@ public class TestPulsingReuse extends Lu
@Override
public void getExtensions(Set<String> extensions) {
- StandardCodec.getStandardExtensions(extensions);
+ StandardPostingsFormat.getStandardExtensions(extensions);
DefaultDocValuesConsumer.getExtensions(extensions);
}
}
Modified: lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/core/SchemaCodecProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/core/SchemaCodecProvider.java?rev=1188738&r1=1188737&r2=1188738&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/core/SchemaCodecProvider.java (original)
+++ lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/core/SchemaCodecProvider.java Tue Oct 25 15:47:44 2011
@@ -19,7 +19,7 @@ package org.apache.solr.core;
import java.util.Collection;
import java.util.Set;
-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.SegmentInfosReader;
import org.apache.lucene.index.codecs.SegmentInfosWriter;
@@ -41,7 +41,7 @@ final class SchemaCodecProvider extends
}
@Override
- public Codec lookup(String name) {
+ public PostingsFormat lookup(String name) {
synchronized (delegate) {
return delegate.lookup(name);
}
@@ -72,12 +72,12 @@ final class SchemaCodecProvider extends
}
@Override
- public void register(Codec codec) {
+ public void register(PostingsFormat codec) {
throw new UnsupportedOperationException();
}
@Override
- public void unregister(Codec codec) {
+ public void unregister(PostingsFormat codec) {
throw new UnsupportedOperationException();
}
Modified: lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/core/SolrConfig.java?rev=1188738&r1=1188737&r2=1188738&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/dev/branches/lucene2621/solr/core/src/java/org/apache/solr/core/SolrConfig.java Tue Oct 25 15:47:44 2011
@@ -35,7 +35,7 @@ import org.apache.solr.update.processor.
import org.apache.solr.spelling.QueryConverter;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.index.IndexDeletionPolicy;
-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.util.Version;
Modified: lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/core/MockCodecProviderFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/core/MockCodecProviderFactory.java?rev=1188738&r1=1188737&r2=1188738&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/core/MockCodecProviderFactory.java (original)
+++ lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/core/MockCodecProviderFactory.java Tue Oct 25 15:47:44 2011
@@ -17,10 +17,10 @@ package org.apache.solr.core;
* limitations under the License.
*/
-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.pulsing.PulsingCodec;
-import org.apache.lucene.index.codecs.standard.StandardCodec;
+import org.apache.lucene.index.codecs.pulsing.PulsingPostingsFormat;
+import org.apache.lucene.index.codecs.standard.StandardPostingsFormat;
import org.apache.solr.common.util.NamedList;
/**
@@ -41,13 +41,13 @@ public class MockCodecProviderFactory ex
@Override
public CodecProvider create() {
CodecProvider cp = new CodecProvider();
- cp.register(new StandardCodec());
- cp.register(new PulsingCodec());
+ cp.register(new StandardPostingsFormat());
+ cp.register(new PulsingPostingsFormat());
if (codecs != null) {
for (Object codec : codecs.getAll("name")) {
if (!cp.isCodecRegistered((String)codec)) {
try {
- Class<? extends Codec> clazz = Class.forName((String)codec).asSubclass(Codec.class);
+ Class<? extends PostingsFormat> clazz = Class.forName((String)codec).asSubclass(PostingsFormat.class);
cp.register(clazz.newInstance());
} catch (Exception e) {
throw new RuntimeException(e);
Modified: lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/core/TestCodecProviderSupport.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/core/TestCodecProviderSupport.java?rev=1188738&r1=1188737&r2=1188738&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/core/TestCodecProviderSupport.java (original)
+++ lucene/dev/branches/lucene2621/solr/core/src/test/org/apache/solr/core/TestCodecProviderSupport.java Tue Oct 25 15:47:44 2011
@@ -20,7 +20,7 @@ package org.apache.solr.core;
import java.util.Map;
import org.apache.lucene.index.codecs.CodecProvider;
-import org.apache.lucene.index.codecs.standard.StandardCodec;
+import org.apache.lucene.index.codecs.standard.StandardPostingsFormat;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.schema.SchemaField;
import org.junit.BeforeClass;
@@ -79,14 +79,14 @@ public class TestCodecProviderSupport ex
}
try {
- codecProvider.register(new StandardCodec());
+ codecProvider.register(new StandardPostingsFormat());
fail("should be unmodifiable");
} catch (UnsupportedOperationException e) {
//
}
try {
- codecProvider.unregister(new StandardCodec());
+ codecProvider.unregister(new StandardPostingsFormat());
fail("should be unmodifiable");
} catch (UnsupportedOperationException e) {
//