Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosFormat.java
View File

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

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFieldInfosReader.java
View File

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

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java
View File

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

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xNormsFormat.java
View File

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

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xPostingsFormat.java
View File

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

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosFormat.java
View File

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

4
lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java
View File

@ -23,8 +23,6 @@ import java.util.Map;
import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.SegmentInfosReader; 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.IndexFileNames;
import org.apache.lucene.index.IndexFormatTooOldException; import org.apache.lucene.index.IndexFormatTooOldException;
import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.index.SegmentInfo;
@ -40,7 +38,7 @@ import org.apache.lucene.store.IOContext;
* @deprecated * @deprecated
*/ */
@Deprecated @Deprecated
public class Lucene3xSegmentInfosReader extends SegmentInfosReader { class Lucene3xSegmentInfosReader extends SegmentInfosReader {
@Override @Override
public void read(Directory directory, String segmentsFileName, ChecksumIndexInput input, SegmentInfos infos, IOContext context) throws IOException { public void read(Directory directory, String segmentsFileName, ChecksumIndexInput input, SegmentInfos infos, IOContext context) throws IOException {

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsFormat.java
View File

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

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xStoredFieldsReader.java
View File

@ -46,7 +46,7 @@ import java.util.Set;
* @deprecated * @deprecated
*/ */
@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; private final static int FORMAT_SIZE = 4;
/** Extension of stored fields file */ /** Extension of stored fields file */

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsFormat.java
View File

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

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
View File

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

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermDocs.java
View File

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

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java
View File

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

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermPositions.java
View File

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

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfo.java
View File

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

2
lucene/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java
View File

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

5
lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/PreFlexRWCodec.java → lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWCodec.java
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 * 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.SegmentInfosFormat;
import org.apache.lucene.codecs.StoredFieldsFormat; import org.apache.lucene.codecs.StoredFieldsFormat;
import org.apache.lucene.codecs.TermVectorsFormat; 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.Lucene40LiveDocsFormat;
import org.apache.lucene.codecs.lucene40.Lucene40StoredFieldsFormat;
import org.apache.lucene.index.IndexFileNames; import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;

5
lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/PreFlexRWFieldInfosFormat.java → lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldInfosFormat.java
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 * 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.FieldInfosReader;
import org.apache.lucene.codecs.FieldInfosWriter; import org.apache.lucene.codecs.FieldInfosWriter;
import org.apache.lucene.codecs.lucene3x.Lucene3xFieldInfosFormat;
/** /**
* *
* @lucene.internal * @lucene.internal
* @lucene.experimental * @lucene.experimental
*/ */
public class PreFlexRWFieldInfosFormat extends Lucene3xFieldInfosFormat { class PreFlexRWFieldInfosFormat extends Lucene3xFieldInfosFormat {
@Override @Override
public FieldInfosReader getFieldInfosReader() throws IOException { public FieldInfosReader getFieldInfosReader() throws IOException {

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

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

4
lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/PreFlexRWFieldsWriter.java → lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWFieldsWriter.java
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 * 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.PostingsConsumer;
import org.apache.lucene.codecs.TermStats; import org.apache.lucene.codecs.TermStats;
import org.apache.lucene.codecs.TermsConsumer; 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.codecs.lucene40.Lucene40SkipListWriter;
import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfo;

2
lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/PreFlexRWNormsConsumer.java → lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWNormsConsumer.java
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 * Licensed to the Apache Software Foundation (ASF) under one or more

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

6
lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/PreFlexRWPostingsFormat.java → lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWPostingsFormat.java
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 * 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.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer; 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.SegmentWriteState;
import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;
@ -32,7 +30,7 @@ import org.apache.lucene.util.LuceneTestCase;
* *
* @lucene.experimental * @lucene.experimental
*/ */
public class PreFlexRWPostingsFormat extends Lucene3xPostingsFormat { class PreFlexRWPostingsFormat extends Lucene3xPostingsFormat {
public PreFlexRWPostingsFormat() { public PreFlexRWPostingsFormat() {
// NOTE: we impersonate the PreFlex codec so that it can // NOTE: we impersonate the PreFlex codec so that it can

5
lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/PreFlexRWSegmentInfosFormat.java → lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosFormat.java
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.SegmentInfosWriter;
import org.apache.lucene.codecs.lucene3x.Lucene3xSegmentInfosFormat;
/** /**
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
@ -23,7 +22,7 @@ import org.apache.lucene.codecs.lucene3x.Lucene3xSegmentInfosFormat;
/** /**
* @lucene.experimental * @lucene.experimental
*/ */
public class PreFlexRWSegmentInfosFormat extends Lucene3xSegmentInfosFormat { class PreFlexRWSegmentInfosFormat extends Lucene3xSegmentInfosFormat {
private final SegmentInfosWriter writer = new PreFlexRWSegmentInfosWriter(); private final SegmentInfosWriter writer = new PreFlexRWSegmentInfosWriter();
@Override @Override

5
lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/PreFlexRWSegmentInfosWriter.java → lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWSegmentInfosWriter.java
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 * 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 java.util.Map.Entry;
import org.apache.lucene.codecs.SegmentInfosWriter; import org.apache.lucene.codecs.SegmentInfosWriter;
import org.apache.lucene.codecs.lucene3x.Lucene3xCodec;
import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.index.SegmentInfos; import org.apache.lucene.index.SegmentInfos;
import org.apache.lucene.store.ChecksumIndexOutput; import org.apache.lucene.store.ChecksumIndexOutput;
@ -36,7 +35,7 @@ import org.apache.lucene.util.IOUtils;
* PreFlex implementation of {@link SegmentInfosWriter}. * PreFlex implementation of {@link SegmentInfosWriter}.
* @lucene.experimental * @lucene.experimental
*/ */
public class PreFlexRWSegmentInfosWriter extends SegmentInfosWriter { class PreFlexRWSegmentInfosWriter extends SegmentInfosWriter {
@Override @Override
public IndexOutput writeInfos(Directory dir, String segmentFileName, String codecID, SegmentInfos infos, IOContext context) public IndexOutput writeInfos(Directory dir, String segmentFileName, String codecID, SegmentInfos infos, IOContext context)

5
lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/PreFlexRWStoredFieldsFormat.java → lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsFormat.java
View File

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

5
lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/PreFlexRWStoredFieldsWriter.java → lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWStoredFieldsWriter.java
View File

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

6
lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/PreFlexRWTermVectorsFormat.java → lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsFormat.java
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 * 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.TermVectorsReader;
import org.apache.lucene.codecs.TermVectorsWriter; 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.FieldInfos;
import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IOContext;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;
public class PreFlexRWTermVectorsFormat extends Lucene3xTermVectorsFormat { class PreFlexRWTermVectorsFormat extends Lucene3xTermVectorsFormat {
@Override @Override
public TermVectorsWriter vectorsWriter(Directory directory, String segment, IOContext context) throws IOException { public TermVectorsWriter vectorsWriter(Directory directory, String segment, IOContext context) throws IOException {

5
lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/PreFlexRWTermVectorsWriter.java → lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/PreFlexRWTermVectorsWriter.java
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 * Licensed to the Apache Software Foundation (ASF) under one or more
@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.Comparator; import java.util.Comparator;
import org.apache.lucene.codecs.TermVectorsWriter; import org.apache.lucene.codecs.TermVectorsWriter;
import org.apache.lucene.codecs.lucene3x.Lucene3xTermVectorsReader;
import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.IndexFileNames; import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.store.DataInput; 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.IOUtils;
import org.apache.lucene.util.StringHelper; import org.apache.lucene.util.StringHelper;
public final class PreFlexRWTermVectorsWriter extends TermVectorsWriter { final class PreFlexRWTermVectorsWriter extends TermVectorsWriter {
private final Directory directory; private final Directory directory;
private final String segment; private final String segment;
private IndexOutput tvx = null, tvd = null, tvf = null; private IndexOutput tvx = null, tvd = null, tvf = null;

4
lucene/src/test-framework/java/org/apache/lucene/codecs/preflexrw/TermInfosWriter.java → lucene/src/test-framework/java/org/apache/lucene/codecs/lucene3x/TermInfosWriter.java
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 * 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.Closeable;
import java.io.IOException; 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.FieldInfos;
import org.apache.lucene.index.IndexFileNames; import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;

2
lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
View File

@ -36,8 +36,8 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.appending.AppendingCodec; 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.lucene40.Lucene40Codec;
import org.apache.lucene.codecs.preflexrw.PreFlexRWCodec;
import org.apache.lucene.codecs.simpletext.SimpleTextCodec; import org.apache.lucene.codecs.simpletext.SimpleTextCodec;
import org.apache.lucene.document.Field; import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType; import org.apache.lucene.document.FieldType;

2
lucene/src/test-framework/resources/META-INF/services/org.apache.lucene.codecs.Codec
View File

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

2
lucene/src/test/org/apache/lucene/codecs/lucene3x/TestImpersonation.java
View File

@ -18,7 +18,7 @@ package org.apache.lucene.codecs.lucene3x;
*/ */
import org.apache.lucene.codecs.Codec; 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; import org.apache.lucene.util.LuceneTestCase;
/** /**

2
lucene/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java
View File

@ -18,7 +18,7 @@ package org.apache.lucene.codecs.lucene3x;
*/ */
import org.apache.lucene.store.*; 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.document.*;
import org.apache.lucene.analysis.*; import org.apache.lucene.analysis.*;
import org.apache.lucene.index.*; import org.apache.lucene.index.*;

2
lucene/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java
View File

@ -28,9 +28,9 @@ import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.FieldInfosReader; import org.apache.lucene.codecs.FieldInfosReader;
import org.apache.lucene.codecs.lucene3x.Lucene3xPostingsFormat; 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.SegmentTermEnum;
import org.apache.lucene.codecs.lucene3x.TermInfosReaderIndex; 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.Document;
import org.apache.lucene.document.StringField; import org.apache.lucene.document.StringField;
import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.CorruptIndexException;

2
lucene/src/test/org/apache/lucene/index/TestMixedCodecs.java
View File

@ -22,7 +22,7 @@ import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec; 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.Document;
import org.apache.lucene.document.StringField; import org.apache.lucene.document.StringField;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;