LUCENE-3752: move preflex-rw to lucene3x package (and make 3.x impl details package-private)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1240750 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-02-05 15:44:49 +00:00
parent 03497e7595
commit 839219831d
37 changed files with 48 additions and 68 deletions

View File

@ -32,7 +32,7 @@ import org.apache.lucene.index.SegmentInfo;
* @lucene.experimental
*/
@Deprecated
public class Lucene3xFieldInfosFormat extends FieldInfosFormat {
class Lucene3xFieldInfosFormat extends FieldInfosFormat {
private final FieldInfosReader reader = new Lucene3xFieldInfosReader();
@Override

View File

@ -37,7 +37,7 @@ import org.apache.lucene.store.IndexInput;
* @deprecated
*/
@Deprecated
public class Lucene3xFieldInfosReader extends FieldInfosReader {
class Lucene3xFieldInfosReader extends FieldInfosReader {
/** Extension of field infos */
static final String FIELD_INFOS_EXTENSION = "fnm";

View File

@ -49,7 +49,7 @@ import org.apache.lucene.util.UnicodeUtil;
* @deprecated (4.0)
*/
@Deprecated
public class Lucene3xFields extends FieldsProducer {
class Lucene3xFields extends FieldsProducer {
private static final boolean DEBUG_SURROGATES = false;

View File

@ -34,7 +34,7 @@ import org.apache.lucene.index.SegmentReadState;
* @lucene.experimental
*/
@Deprecated
public class Lucene3xNormsFormat extends NormsFormat {
class Lucene3xNormsFormat extends NormsFormat {
@Override

View File

@ -36,7 +36,7 @@ import org.apache.lucene.index.SegmentReadState;
* @lucene.experimental
*/
@Deprecated
public class Lucene3xPostingsFormat extends PostingsFormat {
class Lucene3xPostingsFormat extends PostingsFormat {
/** Extension of terms file */
public static final String TERMS_EXTENSION = "tis";

View File

@ -28,7 +28,7 @@ import org.apache.lucene.codecs.SegmentInfosWriter;
* @lucene.experimental
*/
@Deprecated
public class Lucene3xSegmentInfosFormat extends SegmentInfosFormat {
class Lucene3xSegmentInfosFormat extends SegmentInfosFormat {
private final SegmentInfosReader reader = new Lucene3xSegmentInfosReader();
@Override

View File

@ -23,8 +23,6 @@ import java.util.Map;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.SegmentInfosReader;
// TODO we need a 3x version of stored fields reader
import org.apache.lucene.codecs.lucene40.Lucene40StoredFieldsReader;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexFormatTooOldException;
import org.apache.lucene.index.SegmentInfo;
@ -40,7 +38,7 @@ import org.apache.lucene.store.IOContext;
* @deprecated
*/
@Deprecated
public class Lucene3xSegmentInfosReader extends SegmentInfosReader {
class Lucene3xSegmentInfosReader extends SegmentInfosReader {
@Override
public void read(Directory directory, String segmentsFileName, ChecksumIndexInput input, SegmentInfos infos, IOContext context) throws IOException {

View File

@ -30,7 +30,7 @@ import org.apache.lucene.store.IOContext;
/** @deprecated */
@Deprecated
public class Lucene3xStoredFieldsFormat extends StoredFieldsFormat {
class Lucene3xStoredFieldsFormat extends StoredFieldsFormat {
@Override
public StoredFieldsReader fieldsReader(Directory directory, SegmentInfo si,

View File

@ -46,7 +46,7 @@ import java.util.Set;
* @deprecated
*/
@Deprecated
public final class Lucene3xStoredFieldsReader extends StoredFieldsReader implements Cloneable, Closeable {
final class Lucene3xStoredFieldsReader extends StoredFieldsReader implements Cloneable, Closeable {
private final static int FORMAT_SIZE = 4;
/** Extension of stored fields file */

View File

@ -35,7 +35,7 @@ import org.apache.lucene.store.IOContext;
* @lucene.experimental
*/
@Deprecated
public class Lucene3xTermVectorsFormat extends TermVectorsFormat {
class Lucene3xTermVectorsFormat extends TermVectorsFormat {
@Override
public TermVectorsReader vectorsReader(Directory directory,SegmentInfo segmentInfo, FieldInfos fieldInfos, IOContext context) throws IOException {

View File

@ -48,7 +48,7 @@ import org.apache.lucene.util.IOUtils;
/** @deprecated */
@Deprecated
public class Lucene3xTermVectorsReader extends TermVectorsReader {
class Lucene3xTermVectorsReader extends TermVectorsReader {
// NOTE: if you make a new format, it must be larger than
// the current format

View File

@ -30,7 +30,7 @@ import org.apache.lucene.util.Bits;
/** @deprecated (4.0)
* @lucene.experimental */
@Deprecated
public class SegmentTermDocs {
class SegmentTermDocs {
//protected SegmentReader parent;
private final FieldInfos fieldInfos;
private final TermInfosReader tis;

View File

@ -31,7 +31,7 @@ import org.apache.lucene.index.IndexFormatTooNewException;
* @lucene.experimental */
@Deprecated
public final class SegmentTermEnum implements Cloneable {
final class SegmentTermEnum implements Cloneable {
private IndexInput input;
FieldInfos fieldInfos;
long size;

View File

@ -29,7 +29,7 @@ import org.apache.lucene.store.IndexInput;
* @deprecated (4.0)
*/
@Deprecated
public final class SegmentTermPositions
final class SegmentTermPositions
extends SegmentTermDocs {
private IndexInput proxStream;
private IndexInput proxStreamOrig;

View File

@ -23,7 +23,7 @@ package org.apache.lucene.codecs.lucene3x;
* indexing. */
@Deprecated
public class TermInfo {
class TermInfo {
/** The number of documents which contain the term. */
public int docFreq = 0;

View File

@ -38,7 +38,7 @@ import org.apache.lucene.util.DoubleBarrelLRUCache;
* @lucene.experimental
*/
@Deprecated
public final class TermInfosReader {
final class TermInfosReader {
private final Directory directory;
private final String segment;
private final FieldInfos fieldInfos;

View File

@ -1,4 +1,4 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -26,10 +26,7 @@ import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.SegmentInfosFormat;
import org.apache.lucene.codecs.StoredFieldsFormat;
import org.apache.lucene.codecs.TermVectorsFormat;
import org.apache.lucene.codecs.lucene3x.Lucene3xCodec;
import org.apache.lucene.codecs.lucene3x.Lucene3xNormsFormat;
import org.apache.lucene.codecs.lucene40.Lucene40LiveDocsFormat;
import org.apache.lucene.codecs.lucene40.Lucene40StoredFieldsFormat;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.util.LuceneTestCase;

View File

@ -1,4 +1,4 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -20,14 +20,13 @@ import java.io.IOException;
import org.apache.lucene.codecs.FieldInfosReader;
import org.apache.lucene.codecs.FieldInfosWriter;
import org.apache.lucene.codecs.lucene3x.Lucene3xFieldInfosFormat;
/**
*
* @lucene.internal
* @lucene.experimental
*/
public class PreFlexRWFieldInfosFormat extends Lucene3xFieldInfosFormat {
class PreFlexRWFieldInfosFormat extends Lucene3xFieldInfosFormat {
@Override
public FieldInfosReader getFieldInfosReader() throws IOException {

View File

@ -1,4 +1,4 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -36,7 +36,7 @@ import org.apache.lucene.store.IndexInput;
* @lucene.internal
* @lucene.experimental
*/
public class PreFlexRWFieldInfosReader extends FieldInfosReader {
class PreFlexRWFieldInfosReader extends FieldInfosReader {
static final int FORMAT_MINIMUM = PreFlexRWFieldInfosWriter.FORMAT_START;
@Override

View File

@ -1,4 +1,4 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -31,7 +31,7 @@ import org.apache.lucene.store.IndexOutput;
* @lucene.internal
* @lucene.experimental
*/
public class PreFlexRWFieldInfosWriter extends FieldInfosWriter {
class PreFlexRWFieldInfosWriter extends FieldInfosWriter {
// TODO move to test-framework preflex RW?
/** Extension of field infos */

View File

@ -1,4 +1,4 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -24,8 +24,6 @@ import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.PostingsConsumer;
import org.apache.lucene.codecs.TermStats;
import org.apache.lucene.codecs.TermsConsumer;
import org.apache.lucene.codecs.lucene3x.Lucene3xPostingsFormat;
import org.apache.lucene.codecs.lucene3x.TermInfo;
import org.apache.lucene.codecs.lucene40.Lucene40SkipListWriter;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.FieldInfo;

View File

@ -1,4 +1,4 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more

View File

@ -1,4 +1,4 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -18,14 +18,13 @@ package org.apache.lucene.codecs.preflexrw;
import java.io.IOException;
import org.apache.lucene.codecs.PerDocConsumer;
import org.apache.lucene.codecs.lucene3x.Lucene3xNormsFormat;
import org.apache.lucene.index.PerDocWriteState;
/**
* @lucene.internal
* @lucene.experimental
*/
public class PreFlexRWNormsFormat extends Lucene3xNormsFormat {
class PreFlexRWNormsFormat extends Lucene3xNormsFormat {
@Override
public PerDocConsumer docsConsumer(PerDocWriteState state) throws IOException {

View File

@ -1,4 +1,4 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -21,8 +21,6 @@ import java.io.IOException;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.lucene3x.Lucene3xFields;
import org.apache.lucene.codecs.lucene3x.Lucene3xPostingsFormat;
import org.apache.lucene.index.SegmentWriteState;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.util.LuceneTestCase;
@ -32,7 +30,7 @@ import org.apache.lucene.util.LuceneTestCase;
*
* @lucene.experimental
*/
public class PreFlexRWPostingsFormat extends Lucene3xPostingsFormat {
class PreFlexRWPostingsFormat extends Lucene3xPostingsFormat {
public PreFlexRWPostingsFormat() {
// NOTE: we impersonate the PreFlex codec so that it can

View File

@ -1,7 +1,6 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
import org.apache.lucene.codecs.SegmentInfosWriter;
import org.apache.lucene.codecs.lucene3x.Lucene3xSegmentInfosFormat;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -23,7 +22,7 @@ import org.apache.lucene.codecs.lucene3x.Lucene3xSegmentInfosFormat;
/**
* @lucene.experimental
*/
public class PreFlexRWSegmentInfosFormat extends Lucene3xSegmentInfosFormat {
class PreFlexRWSegmentInfosFormat extends Lucene3xSegmentInfosFormat {
private final SegmentInfosWriter writer = new PreFlexRWSegmentInfosWriter();
@Override

View File

@ -1,4 +1,4 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -22,7 +22,6 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.lucene.codecs.SegmentInfosWriter;
import org.apache.lucene.codecs.lucene3x.Lucene3xCodec;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.index.SegmentInfos;
import org.apache.lucene.store.ChecksumIndexOutput;
@ -36,7 +35,7 @@ import org.apache.lucene.util.IOUtils;
* PreFlex implementation of {@link SegmentInfosWriter}.
* @lucene.experimental
*/
public class PreFlexRWSegmentInfosWriter extends SegmentInfosWriter {
class PreFlexRWSegmentInfosWriter extends SegmentInfosWriter {
@Override
public IndexOutput writeInfos(Directory dir, String segmentFileName, String codecID, SegmentInfos infos, IOContext context)

View File

@ -1,13 +1,12 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
import java.io.IOException;
import org.apache.lucene.codecs.StoredFieldsWriter;
import org.apache.lucene.codecs.lucene3x.Lucene3xStoredFieldsFormat;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
public class PreFlexRWStoredFieldsFormat extends Lucene3xStoredFieldsFormat {
class PreFlexRWStoredFieldsFormat extends Lucene3xStoredFieldsFormat {
@Override
public StoredFieldsWriter fieldsWriter(Directory directory, String segment, IOContext context) throws IOException {

View File

@ -1,4 +1,4 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
/**
* Copyright 2004 The Apache Software Foundation
@ -19,7 +19,6 @@ package org.apache.lucene.codecs.preflexrw;
import java.io.IOException;
import org.apache.lucene.codecs.StoredFieldsWriter;
import org.apache.lucene.codecs.lucene3x.Lucene3xStoredFieldsReader;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexableField;
@ -30,7 +29,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
/** @lucene.experimental */
public final class PreFlexRWStoredFieldsWriter extends StoredFieldsWriter {
final class PreFlexRWStoredFieldsWriter extends StoredFieldsWriter {
private final Directory directory;
private final String segment;
private IndexOutput fieldsStream;

View File

@ -1,4 +1,4 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -21,15 +21,13 @@ import java.io.IOException;
import org.apache.lucene.codecs.TermVectorsReader;
import org.apache.lucene.codecs.TermVectorsWriter;
import org.apache.lucene.codecs.lucene3x.Lucene3xTermVectorsFormat;
import org.apache.lucene.codecs.lucene3x.Lucene3xTermVectorsReader;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.util.LuceneTestCase;
public class PreFlexRWTermVectorsFormat extends Lucene3xTermVectorsFormat {
class PreFlexRWTermVectorsFormat extends Lucene3xTermVectorsFormat {
@Override
public TermVectorsWriter vectorsWriter(Directory directory, String segment, IOContext context) throws IOException {

View File

@ -1,4 +1,4 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.Comparator;
import org.apache.lucene.codecs.TermVectorsWriter;
import org.apache.lucene.codecs.lucene3x.Lucene3xTermVectorsReader;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.store.DataInput;
@ -33,7 +32,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.StringHelper;
public final class PreFlexRWTermVectorsWriter extends TermVectorsWriter {
final class PreFlexRWTermVectorsWriter extends TermVectorsWriter {
private final Directory directory;
private final String segment;
private IndexOutput tvx = null, tvd = null, tvf = null;

View File

@ -1,4 +1,4 @@
package org.apache.lucene.codecs.preflexrw;
package org.apache.lucene.codecs.lucene3x;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -21,8 +21,6 @@ package org.apache.lucene.codecs.preflexrw;
import java.io.Closeable;
import java.io.IOException;
import org.apache.lucene.codecs.lucene3x.Lucene3xPostingsFormat;
import org.apache.lucene.codecs.lucene3x.TermInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.store.Directory;

View File

@ -36,8 +36,8 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.appending.AppendingCodec;
import org.apache.lucene.codecs.lucene3x.PreFlexRWCodec;
import org.apache.lucene.codecs.lucene40.Lucene40Codec;
import org.apache.lucene.codecs.preflexrw.PreFlexRWCodec;
import org.apache.lucene.codecs.simpletext.SimpleTextCodec;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;

View File

@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
org.apache.lucene.codecs.preflexrw.PreFlexRWCodec
org.apache.lucene.codecs.lucene3x.PreFlexRWCodec

View File

@ -18,7 +18,7 @@ package org.apache.lucene.codecs.lucene3x;
*/
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.preflexrw.PreFlexRWCodec;
import org.apache.lucene.codecs.lucene3x.PreFlexRWCodec;
import org.apache.lucene.util.LuceneTestCase;
/**

View File

@ -18,7 +18,7 @@ package org.apache.lucene.codecs.lucene3x;
*/
import org.apache.lucene.store.*;
import org.apache.lucene.codecs.preflexrw.PreFlexRWCodec;
import org.apache.lucene.codecs.lucene3x.PreFlexRWCodec;
import org.apache.lucene.document.*;
import org.apache.lucene.analysis.*;
import org.apache.lucene.index.*;

View File

@ -28,9 +28,9 @@ import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.FieldInfosReader;
import org.apache.lucene.codecs.lucene3x.Lucene3xPostingsFormat;
import org.apache.lucene.codecs.lucene3x.PreFlexRWCodec;
import org.apache.lucene.codecs.lucene3x.SegmentTermEnum;
import org.apache.lucene.codecs.lucene3x.TermInfosReaderIndex;
import org.apache.lucene.codecs.preflexrw.PreFlexRWCodec;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.CorruptIndexException;

View File

@ -22,7 +22,7 @@ import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.preflexrw.PreFlexRWCodec;
import org.apache.lucene.codecs.lucene3x.PreFlexRWCodec;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
import org.apache.lucene.store.Directory;