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:32:11 UTC
svn commit: r1188714 - in /lucene/dev/branches/lucene2621/lucene/src:
java/org/apache/lucene/index/ java/org/apache/lucene/index/codecs/perfield/
test/org/apache/lucene/index/
Author: rmuir
Date: Tue Oct 25 15:32:10 2011
New Revision: 1188714
URL: http://svn.apache.org/viewvc?rev=1188714&view=rev
Log:
LUCENE-3535: move perfieldcodecwrapper into codecs package
Added:
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldCodecWrapper.java
- copied, changed from r1188635, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/SegmentCodecs.java
- copied, changed from r1188635, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCodecs.java
Removed:
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentCodecs.java
Modified:
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfo.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfos.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/PerDocWriteState.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentWriteState.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/TestPerFieldCodecSupport.java
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/CheckIndex.java?rev=1188714&r1=1188713&r2=1188714&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/CheckIndex.java Tue Oct 25 15:32:10 2011
@@ -40,6 +40,7 @@ import java.util.Map;
import org.apache.lucene.index.codecs.BlockTreeTermsReader;
import org.apache.lucene.index.codecs.PerDocValues;
+import org.apache.lucene.index.codecs.perfield.SegmentCodecs;
import org.apache.lucene.index.values.IndexDocValues;
import org.apache.lucene.index.values.IndexDocValues.Source;
import org.apache.lucene.store.FSDirectory;
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java?rev=1188714&r1=1188713&r2=1188714&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java Tue Oct 25 15:32:10 2011
@@ -28,6 +28,7 @@ import org.apache.lucene.index.Documents
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.DocValuesConsumer;
import org.apache.lucene.index.codecs.PerDocConsumer;
+import org.apache.lucene.index.codecs.perfield.SegmentCodecs;
import org.apache.lucene.index.values.PerDocFieldValues;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.IOUtils;
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java?rev=1188714&r1=1188713&r2=1188714&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java Tue Oct 25 15:32:10 2011
@@ -27,6 +27,7 @@ import java.text.NumberFormat;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.DocumentsWriterDeleteQueue.DeleteSlice;
import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.perfield.SegmentCodecs;
import org.apache.lucene.search.similarities.SimilarityProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FlushInfo;
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java?rev=1188714&r1=1188713&r2=1188714&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java Tue Oct 25 15:32:10 2011
@@ -20,8 +20,8 @@ import java.util.Iterator;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.lucene.index.FieldInfos.FieldNumberBiMap;
-import org.apache.lucene.index.SegmentCodecs.SegmentCodecsBuilder;
import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.perfield.SegmentCodecs.SegmentCodecsBuilder;
import org.apache.lucene.util.SetOnce;
/**
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfo.java?rev=1188714&r1=1188713&r2=1188714&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfo.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfo.java Tue Oct 25 15:32:10 2011
@@ -78,7 +78,7 @@ public final class FieldInfo {
assert indexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS || !storePayloads;
}
- void setCodecId(int codecId) {
+ public void setCodecId(int codecId) {
assert this.codecId == UNASSIGNED_CODEC_ID : "CodecId can only be set once.";
this.codecId = codecId;
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfos.java?rev=1188714&r1=1188713&r2=1188714&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfos.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/FieldInfos.java Tue Oct 25 15:32:10 2011
@@ -29,9 +29,9 @@ import java.util.TreeMap;
import java.util.Map.Entry;
import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.SegmentCodecs; // Required for Java 1.5 javadocs
-import org.apache.lucene.index.SegmentCodecs.SegmentCodecsBuilder;
import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.perfield.SegmentCodecs;
+import org.apache.lucene.index.codecs.perfield.SegmentCodecs.SegmentCodecsBuilder;
import org.apache.lucene.index.values.ValueType;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
@@ -235,7 +235,7 @@ public final class FieldInfos implements
* <p>
* Note: this ctor should not be used during indexing use
* {@link FieldInfos#FieldInfos(FieldInfos)} or
- * {@link FieldInfos#FieldInfos(FieldNumberBiMap,org.apache.lucene.index.SegmentCodecs.SegmentCodecsBuilder)}
+ * {@link FieldInfos#FieldInfos(FieldNumberBiMap,org.apache.lucene.index.codecs.perfield.SegmentCodecs.SegmentCodecsBuilder)}
* instead.
*/
public FieldInfos() {
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1188714&r1=1188713&r2=1188714&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java Tue Oct 25 15:32:10 2011
@@ -39,8 +39,8 @@ import org.apache.lucene.index.Documents
import org.apache.lucene.index.FieldInfos.FieldNumberBiMap;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.PayloadProcessorProvider.DirPayloadProcessor;
-import org.apache.lucene.index.SegmentCodecs.SegmentCodecsBuilder;
import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.perfield.SegmentCodecs.SegmentCodecsBuilder;
import org.apache.lucene.search.Query;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.CompoundFileDirectory;
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/PerDocWriteState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/PerDocWriteState.java?rev=1188714&r1=1188713&r2=1188714&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/PerDocWriteState.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/PerDocWriteState.java Tue Oct 25 15:32:10 2011
@@ -18,6 +18,7 @@ package org.apache.lucene.index;
import java.io.PrintStream;
import org.apache.lucene.index.codecs.PerDocConsumer;
+import org.apache.lucene.index.codecs.perfield.SegmentCodecs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.util.Counter;
@@ -38,7 +39,7 @@ public class PerDocWriteState {
public final int codecId;
public final IOContext context;
- PerDocWriteState(PrintStream infoStream, Directory directory,
+ public PerDocWriteState(PrintStream infoStream, Directory directory,
String segmentName, FieldInfos fieldInfos, Counter bytesUsed,
int codecId, IOContext context) {
this.infoStream = infoStream;
@@ -51,7 +52,7 @@ public class PerDocWriteState {
this.context = context;
}
- PerDocWriteState(SegmentWriteState state) {
+ public PerDocWriteState(SegmentWriteState state) {
infoStream = state.infoStream;
directory = state.directory;
segmentCodecs = state.segmentCodecs;
@@ -62,7 +63,7 @@ public class PerDocWriteState {
context = state.context;
}
- PerDocWriteState(PerDocWriteState state, int codecId) {
+ public PerDocWriteState(PerDocWriteState state, int codecId) {
this.infoStream = state.infoStream;
this.directory = state.directory;
this.segmentName = state.segmentName;
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java?rev=1188714&r1=1188713&r2=1188714&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java Tue Oct 25 15:32:10 2011
@@ -24,6 +24,7 @@ import org.apache.lucene.index.codecs.Co
import org.apache.lucene.index.codecs.FieldsProducer;
import org.apache.lucene.index.codecs.FieldsReader;
import org.apache.lucene.index.codecs.PerDocValues;
+import org.apache.lucene.index.codecs.perfield.SegmentCodecs;
import org.apache.lucene.store.CompoundFileDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1188714&r1=1188713&r2=1188714&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfo.java Tue Oct 25 15:32:10 2011
@@ -30,6 +30,7 @@ import java.util.Set;
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.index.codecs.DefaultSegmentInfosWriter;
+import org.apache.lucene.index.codecs.perfield.SegmentCodecs;
import org.apache.lucene.store.CompoundFileDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1188714&r1=1188713&r2=1188714&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java Tue Oct 25 15:32:10 2011
@@ -33,6 +33,7 @@ import org.apache.lucene.index.codecs.Fi
import org.apache.lucene.index.codecs.FieldsWriter;
import org.apache.lucene.index.codecs.MergeState;
import org.apache.lucene.index.codecs.PerDocConsumer;
+import org.apache.lucene.index.codecs.perfield.SegmentCodecs;
import org.apache.lucene.store.CompoundFileDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentWriteState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentWriteState.java?rev=1188714&r1=1188713&r2=1188714&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentWriteState.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentWriteState.java Tue Oct 25 15:32:10 2011
@@ -19,6 +19,7 @@ package org.apache.lucene.index;
import java.io.PrintStream;
+import org.apache.lucene.index.codecs.perfield.SegmentCodecs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.util.BitVector;
@@ -43,7 +44,7 @@ public class SegmentWriteState {
// Lazily created:
public BitVector liveDocs;
- final SegmentCodecs segmentCodecs;
+ public final SegmentCodecs segmentCodecs;
public final int codecId;
/** Expert: The fraction of terms in the "dictionary" which should be stored
@@ -72,7 +73,7 @@ public class SegmentWriteState {
/**
* Create a shallow {@link SegmentWriteState} copy final a codec ID
*/
- SegmentWriteState(SegmentWriteState state, int codecId) {
+ public SegmentWriteState(SegmentWriteState state, int codecId) {
infoStream = state.infoStream;
directory = state.directory;
segmentName = state.segmentName;
Copied: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldCodecWrapper.java (from r1188635, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldCodecWrapper.java?p2=lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldCodecWrapper.java&p1=lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java&r1=1188635&r2=1188714&rev=1188714&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldCodecWrapper.java Tue Oct 25 15:32:10 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.index;
+package org.apache.lucene.index.codecs.perfield;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +27,15 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
+import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.FieldInfos;
+import org.apache.lucene.index.FieldsEnum;
+import org.apache.lucene.index.PerDocWriteState;
+import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.index.SegmentReadState;
+import org.apache.lucene.index.SegmentWriteState;
+import org.apache.lucene.index.Terms;
+import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.FieldsConsumer;
import org.apache.lucene.index.codecs.FieldsProducer;
Copied: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/SegmentCodecs.java (from r1188635, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCodecs.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/SegmentCodecs.java?p2=lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/SegmentCodecs.java&p1=lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCodecs.java&r1=1188635&r2=1188714&rev=1188714&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCodecs.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/SegmentCodecs.java Tue Oct 25 15:32:10 2011
@@ -1,4 +1,4 @@
-package org.apache.lucene.index;
+package org.apache.lucene.index.codecs.perfield;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,6 +23,10 @@ import java.util.IdentityHashMap;
import java.util.Map;
import java.util.Set;
+import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.FieldInfos;
+import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.index.SegmentWriteState;
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.index.codecs.preflex.PreFlexCodec;
@@ -59,20 +63,20 @@ import org.apache.lucene.store.IndexOutp
*
* @lucene.internal
*/
-final class SegmentCodecs implements Cloneable {
+public final class SegmentCodecs implements Cloneable {
/**
* internal structure to map codecs to fields - don't modify this from outside
* of this class!
*/
- final Codec[] codecs;
- final CodecProvider provider;
+ public final Codec[] codecs;
+ public final CodecProvider provider;
private final Codec codec;
- SegmentCodecs(CodecProvider provider, IndexInput input) throws IOException {
+ public SegmentCodecs(CodecProvider provider, IndexInput input) throws IOException {
this(provider, read(input, provider));
}
- SegmentCodecs(CodecProvider provider, Codec... codecs) {
+ public SegmentCodecs(CodecProvider provider, Codec... codecs) {
this.provider = provider;
this.codecs = codecs;
if (codecs.length == 1 && codecs[0] instanceof PreFlexCodec) {
@@ -82,11 +86,11 @@ final class SegmentCodecs implements Clo
}
}
- Codec codec() {
+ public Codec codec() {
return codec;
}
- void write(IndexOutput out) throws IOException {
+ public void write(IndexOutput out) throws IOException {
out.writeVInt(codecs.length);
for (Codec codec : codecs) {
out.writeString(codec.name);
@@ -104,7 +108,7 @@ final class SegmentCodecs implements Clo
return list.toArray(Codec.EMPTY);
}
- void files(Directory dir, SegmentInfo info, Set<String> files)
+ public void files(Directory dir, SegmentInfo info, Set<String> files)
throws IOException {
final Codec[] codecArray = codecs;
for (int i = 0; i < codecArray.length; i++) {
@@ -126,7 +130,7 @@ final class SegmentCodecs implements Clo
* </p>
* @see FieldInfo#getCodecId()
*/
- final static class SegmentCodecsBuilder {
+ public final static class SegmentCodecsBuilder {
private final Map<Codec, Integer> codecRegistry = new IdentityHashMap<Codec, Integer>();
private final ArrayList<Codec> codecs = new ArrayList<Codec>();
private final CodecProvider provider;
@@ -135,11 +139,11 @@ final class SegmentCodecs implements Clo
this.provider = provider;
}
- static SegmentCodecsBuilder create(CodecProvider provider) {
+ public static SegmentCodecsBuilder create(CodecProvider provider) {
return new SegmentCodecsBuilder(provider);
}
- SegmentCodecsBuilder tryAddAndSet(FieldInfo fi) {
+ public SegmentCodecsBuilder tryAddAndSet(FieldInfo fi) {
if (fi.getCodecId() == FieldInfo.UNASSIGNED_CODEC_ID) {
final Codec fieldCodec = provider.lookup(provider
.getFieldCodec(fi.name));
@@ -154,11 +158,11 @@ final class SegmentCodecs implements Clo
return this;
}
- SegmentCodecs build() {
+ public SegmentCodecs build() {
return new SegmentCodecs(provider, codecs.toArray(Codec.EMPTY));
}
- SegmentCodecsBuilder clear() {
+ public SegmentCodecsBuilder clear() {
codecRegistry.clear();
codecs.clear();
return this;
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=1188714&r1=1188713&r2=1188714&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:32:10 2011
@@ -33,6 +33,7 @@ import org.apache.lucene.index.codecs.Po
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.perfield.SegmentCodecs;
import org.apache.lucene.index.codecs.preflex.PreFlexCodec;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
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=1188714&r1=1188713&r2=1188714&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:32:10 2011
@@ -33,6 +33,7 @@ import org.apache.lucene.index.codecs.Co
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.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;