You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/10/26 20:33:51 UTC
svn commit: r1189367 [3/3] - in /lucene/dev/branches/lucene2621:
lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/
lucene/src/java/org/apache/lucene/index/
lucene/src/java/org/apache/lucene/index/codecs/
lucene/src/java/org/apache/...
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=1189367&r1=1189366&r2=1189367&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 Wed Oct 26 18:33:48 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.lucene3x.Lucene3xPostingsFormat;
import org.apache.lucene.index.codecs.mocksep.MockSepPostingsFormat;
-import org.apache.lucene.index.codecs.perfield.SegmentCodecs;
-import org.apache.lucene.index.codecs.preflex.PreFlexPostingsFormat;
+import org.apache.lucene.index.codecs.perfield.SegmentFormats;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
@@ -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 PreFlexPostingsFormat) {
+ if (si.getSegmentCodecs().codecs[field.fieldInfo.getCodecId()] instanceof Lucene3xPostingsFormat) {
// code below expects unicode sort order
continue;
}
@@ -615,14 +615,14 @@ 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 SegmentCodecs codecInfo = fieldInfos.buildSegmentCodecs(false);
+ final SegmentFormats codecInfo = fieldInfos.buildSegmentCodecs(false);
final SegmentWriteState state = new SegmentWriteState(null, dir, SEGMENT, fieldInfos, 10000, termIndexInterval, codecInfo, null, newIOContext(random));
final FieldsConsumer consumer = state.segmentCodecs.codec().fieldsConsumer(state);
Arrays.sort(fields);
for (final FieldData field : fields) {
assertTrue(field.fieldInfo.getCodecId() != FieldInfo.UNASSIGNED_CODEC_ID);
- if (!allowPreFlex && codecInfo.codecs[field.fieldInfo.getCodecId()] instanceof PreFlexPostingsFormat) {
+ if (!allowPreFlex && codecInfo.codecs[field.fieldInfo.getCodecId()] instanceof Lucene3xPostingsFormat) {
// 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=1189367&r1=1189366&r2=1189367&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 Wed Oct 26 18:33:48 2011
@@ -47,8 +47,8 @@ import org.apache.lucene.index.codecs.Po
import org.apache.lucene.index.codecs.PostingsWriterBase;
import org.apache.lucene.index.codecs.TermsIndexReaderBase;
import org.apache.lucene.index.codecs.TermsIndexWriterBase;
-import org.apache.lucene.index.codecs.standard.StandardPostingsReader;
-import org.apache.lucene.index.codecs.standard.StandardPostingsWriter;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsReader;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsWriter;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
@@ -114,7 +114,7 @@ public class TestDocTermOrds extends Luc
@Override
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
- PostingsWriterBase docs = new StandardPostingsWriter(state);
+ PostingsWriterBase docs = new Lucene40PostingsWriter(state);
// TODO: should we make the terms index more easily
// pluggable? Ie so that this codec would record which
@@ -151,7 +151,7 @@ public class TestDocTermOrds extends Luc
@Override
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
- PostingsReaderBase postings = new StandardPostingsReader(state.dir, state.segmentInfo, state.context, state.codecId);
+ PostingsReaderBase postings = new Lucene40PostingsReader(state.dir, state.segmentInfo, state.context, state.codecId);
TermsIndexReaderBase indexReader;
boolean success = false;
@@ -200,7 +200,7 @@ public class TestDocTermOrds extends Luc
@Override
public void files(Directory dir, SegmentInfo segmentInfo, int id, Set<String> files) throws IOException {
- StandardPostingsReader.files(dir, segmentInfo, id, files);
+ Lucene40PostingsReader.files(dir, segmentInfo, id, files);
BlockTermsReader.files(dir, segmentInfo, id, files);
FixedGapTermsIndexReader.files(dir, segmentInfo, id, files);
DefaultDocValuesConsumer.files(dir, segmentInfo, id, files);
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=1189367&r1=1189366&r2=1189367&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 Wed Oct 26 18:33:48 2011
@@ -30,13 +30,13 @@ import org.apache.lucene.index.CheckInde
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.codecs.PostingsFormat;
import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsFormat;
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.perfield.SegmentFormats;
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;
@@ -213,7 +213,7 @@ public class TestPerFieldCodecSupport ex
List<SegmentInfoStatus> segmentInfos = checkIndex.segmentInfos;
assertEquals(segmentInfos.size(), codec.length);
for (int i = 0; i < codec.length; i++) {
- SegmentCodecs codecInfo = segmentInfos.get(i).codec;
+ SegmentFormats codecInfo = segmentInfos.get(i).codec;
FieldInfos fieldInfos = new FieldInfos(checkIndex.dir, IndexFileNames
.segmentFileName(segmentInfos.get(i).name, "",
IndexFileNames.FIELD_INFOS_EXTENSION));
@@ -241,7 +241,7 @@ public class TestPerFieldCodecSupport ex
public static class MockCodecProvider extends CodecProvider {
public MockCodecProvider() {
- StandardPostingsFormat standardCodec = new StandardPostingsFormat();
+ Lucene40PostingsFormat standardCodec = new Lucene40PostingsFormat();
setDefaultFieldCodec(standardCodec.name);
SimpleTextPostingsFormat simpleTextCodec = new SimpleTextPostingsFormat();
MockSepPostingsFormat mockSepCodec = new MockSepPostingsFormat();
@@ -256,7 +256,7 @@ public class TestPerFieldCodecSupport ex
public static class MockCodecProvider2 extends CodecProvider {
public MockCodecProvider2() {
- StandardPostingsFormat standardCodec = new StandardPostingsFormat();
+ Lucene40PostingsFormat standardCodec = new Lucene40PostingsFormat();
setDefaultFieldCodec(standardCodec.name);
SimpleTextPostingsFormat simpleTextCodec = new SimpleTextPostingsFormat();
MockSepPostingsFormat mockSepCodec = new MockSepPostingsFormat();
@@ -278,7 +278,7 @@ public class TestPerFieldCodecSupport ex
int numRounds = atLeast(1);
for (int i = 0; i < numRounds; i++) {
CodecProvider provider = new CodecProvider();
- PostingsFormat[] codecs = new PostingsFormat[] { new StandardPostingsFormat(),
+ PostingsFormat[] codecs = new PostingsFormat[] { new Lucene40PostingsFormat(),
new SimpleTextPostingsFormat(), new MockSepPostingsFormat(),
new PulsingPostingsFormat(1 + random.nextInt(20)),
new MockVariableIntBlockPostingsFormat(1 + random.nextInt(10)),
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=1189367&r1=1189366&r2=1189367&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 Wed Oct 26 18:33:48 2011
@@ -48,9 +48,9 @@ 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.StandardPostingsFormat;
-import org.apache.lucene.index.codecs.standard.StandardPostingsReader;
-import org.apache.lucene.index.codecs.standard.StandardPostingsWriter;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsFormat;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsReader;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsWriter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase;
@@ -149,7 +149,7 @@ public class TestPulsingReuse extends Lu
@Override
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
- PostingsWriterBase docsWriter = new StandardPostingsWriter(state);
+ PostingsWriterBase docsWriter = new Lucene40PostingsWriter(state);
PostingsWriterBase pulsingWriterInner = new PulsingPostingsWriter(2, docsWriter);
PostingsWriterBase pulsingWriter = new PulsingPostingsWriter(1, pulsingWriterInner);
@@ -170,7 +170,7 @@ public class TestPulsingReuse extends Lu
@Override
public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
- PostingsReaderBase docsReader = new StandardPostingsReader(state.dir, state.segmentInfo, state.context, state.codecId);
+ PostingsReaderBase docsReader = new Lucene40PostingsReader(state.dir, state.segmentInfo, state.context, state.codecId);
PostingsReaderBase pulsingReaderInner = new PulsingPostingsReader(docsReader);
PostingsReaderBase pulsingReader = new PulsingPostingsReader(pulsingReaderInner);
boolean success = false;
@@ -202,14 +202,14 @@ public class TestPulsingReuse extends Lu
@Override
public void files(Directory dir, SegmentInfo segmentInfo, int id, Set<String> files) throws IOException {
- StandardPostingsReader.files(dir, segmentInfo, id, files);
+ Lucene40PostingsReader.files(dir, segmentInfo, id, files);
BlockTreeTermsReader.files(dir, segmentInfo, id, files);
DefaultDocValuesConsumer.files(dir, segmentInfo, id, files);
}
@Override
public void getExtensions(Set<String> extensions) {
- StandardPostingsFormat.getStandardExtensions(extensions);
+ Lucene40PostingsFormat.getStandardExtensions(extensions);
DefaultDocValuesConsumer.getExtensions(extensions);
}
}
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=1189367&r1=1189366&r2=1189367&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 Wed Oct 26 18:33:48 2011
@@ -19,8 +19,8 @@ package org.apache.solr.core;
import org.apache.lucene.index.codecs.PostingsFormat;
import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsFormat;
import org.apache.lucene.index.codecs.pulsing.PulsingPostingsFormat;
-import org.apache.lucene.index.codecs.standard.StandardPostingsFormat;
import org.apache.solr.common.util.NamedList;
/**
@@ -41,7 +41,7 @@ public class MockCodecProviderFactory ex
@Override
public CodecProvider create() {
CodecProvider cp = new CodecProvider();
- cp.register(new StandardPostingsFormat());
+ cp.register(new Lucene40PostingsFormat());
cp.register(new PulsingPostingsFormat());
if (codecs != null) {
for (Object codec : codecs.getAll("name")) {
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=1189367&r1=1189366&r2=1189367&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 Wed Oct 26 18:33:48 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.StandardPostingsFormat;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsFormat;
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 StandardPostingsFormat());
+ codecProvider.register(new Lucene40PostingsFormat());
fail("should be unmodifiable");
} catch (UnsupportedOperationException e) {
//
}
try {
- codecProvider.unregister(new StandardPostingsFormat());
+ codecProvider.unregister(new Lucene40PostingsFormat());
fail("should be unmodifiable");
} catch (UnsupportedOperationException e) {
//