diff --git a/lucene/src/java/org/apache/lucene/index/codecs/DocValuesConsumer.java b/lucene/src/java/org/apache/lucene/index/codecs/DocValuesConsumer.java index 42dda323996..88a1283ce67 100644 --- a/lucene/src/java/org/apache/lucene/index/codecs/DocValuesConsumer.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/DocValuesConsumer.java @@ -23,7 +23,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MergeState; import org.apache.lucene.index.values.IndexDocValues; import org.apache.lucene.index.values.PerDocFieldValues; -import org.apache.lucene.index.values.Writer; import org.apache.lucene.util.Bits; import org.apache.lucene.util.Counter; @@ -106,7 +105,7 @@ public abstract class DocValuesConsumer { final org.apache.lucene.index.MergeState.IndexReaderAndLiveDocs reader = mergeState.readers.get(readerIDX); if (docValues[readerIDX] != null) { hasMerged = true; - merge(new Writer.SingleSubMergeState(docValues[readerIDX], mergeState.docBase[readerIDX], reader.reader.maxDoc(), + merge(new SingleSubMergeState(docValues[readerIDX], mergeState.docBase[readerIDX], reader.reader.maxDoc(), reader.liveDocs)); } } diff --git a/lucene/src/java/org/apache/lucene/index/codecs/DocValuesReaderBase.java b/lucene/src/java/org/apache/lucene/index/codecs/DocValuesReaderBase.java index 1b3e8661098..5ade60eddb3 100644 --- a/lucene/src/java/org/apache/lucene/index/codecs/DocValuesReaderBase.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/DocValuesReaderBase.java @@ -26,10 +26,10 @@ import java.util.TreeMap; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; -import org.apache.lucene.index.values.Bytes; -import org.apache.lucene.index.values.Floats; +import org.apache.lucene.index.codecs.lucene40.values.Bytes; +import org.apache.lucene.index.codecs.lucene40.values.Floats; +import org.apache.lucene.index.codecs.lucene40.values.Ints; import org.apache.lucene.index.values.IndexDocValues; -import org.apache.lucene.index.values.Ints; import org.apache.lucene.index.values.ValueType; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; diff --git a/lucene/src/java/org/apache/lucene/index/codecs/DocValuesWriterBase.java b/lucene/src/java/org/apache/lucene/index/codecs/DocValuesWriterBase.java index 619b1241857..e238f4cea27 100644 --- a/lucene/src/java/org/apache/lucene/index/codecs/DocValuesWriterBase.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/DocValuesWriterBase.java @@ -22,7 +22,7 @@ import java.util.Comparator; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.PerDocWriteState; -import org.apache.lucene.index.values.Writer; +import org.apache.lucene.index.codecs.lucene40.values.Writer; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.util.BytesRef; diff --git a/lucene/src/java/org/apache/lucene/index/values/Bytes.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/Bytes.java similarity index 98% rename from lucene/src/java/org/apache/lucene/index/values/Bytes.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/Bytes.java index c0b07291e2d..72764cbb2fa 100644 --- a/lucene/src/java/org/apache/lucene/index/values/Bytes.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/Bytes.java @@ -1,4 +1,4 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -24,6 +24,9 @@ import java.util.Comparator; import java.util.concurrent.atomic.AtomicLong; import org.apache.lucene.index.IndexFileNames; +import org.apache.lucene.index.values.IndexDocValues; +import org.apache.lucene.index.values.PerDocFieldValues; +import org.apache.lucene.index.values.ValueType; import org.apache.lucene.index.values.IndexDocValues.SortedSource; import org.apache.lucene.index.values.IndexDocValues.Source; import org.apache.lucene.store.DataOutput; diff --git a/lucene/src/java/org/apache/lucene/index/values/BytesRefUtils.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/BytesRefUtils.java similarity index 97% rename from lucene/src/java/org/apache/lucene/index/values/BytesRefUtils.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/BytesRefUtils.java index f2c5b376d37..d0a2b9021a0 100644 --- a/lucene/src/java/org/apache/lucene/index/values/BytesRefUtils.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/BytesRefUtils.java @@ -1,4 +1,4 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -25,7 +25,7 @@ import org.apache.lucene.util.BytesRef; * * @lucene.internal */ -final class BytesRefUtils { +public final class BytesRefUtils { private BytesRefUtils() { } diff --git a/lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/FixedDerefBytesImpl.java similarity index 91% rename from lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/FixedDerefBytesImpl.java index 3c20fd32c30..31efc70e139 100644 --- a/lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/FixedDerefBytesImpl.java @@ -1,4 +1,4 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,9 +19,11 @@ package org.apache.lucene.index.values; import java.io.IOException; -import org.apache.lucene.index.values.Bytes.BytesReaderBase; -import org.apache.lucene.index.values.Bytes.BytesSourceBase; -import org.apache.lucene.index.values.Bytes.DerefBytesWriterBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesReaderBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesSourceBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.DerefBytesWriterBase; +import org.apache.lucene.index.values.DirectSource; +import org.apache.lucene.index.values.ValueType; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; diff --git a/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/FixedSortedBytesImpl.java similarity index 92% rename from lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/FixedSortedBytesImpl.java index 08fdf94fd9f..b6726d22b4d 100644 --- a/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/FixedSortedBytesImpl.java @@ -1,4 +1,4 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -22,12 +22,14 @@ import java.util.Comparator; import java.util.List; import org.apache.lucene.index.MergeState; -import org.apache.lucene.index.values.Bytes.BytesReaderBase; -import org.apache.lucene.index.values.Bytes.BytesSortedSourceBase; -import org.apache.lucene.index.values.Bytes.DerefBytesWriterBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesReaderBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesSortedSourceBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.DerefBytesWriterBase; +import org.apache.lucene.index.codecs.lucene40.values.SortedBytesMergeUtils.MergeContext; +import org.apache.lucene.index.codecs.lucene40.values.SortedBytesMergeUtils.SortedSourceSlice; +import org.apache.lucene.index.values.IndexDocValues; +import org.apache.lucene.index.values.ValueType; import org.apache.lucene.index.values.IndexDocValues.SortedSource; -import org.apache.lucene.index.values.SortedBytesMergeUtils.MergeContext; -import org.apache.lucene.index.values.SortedBytesMergeUtils.SortedSourceSlice; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; diff --git a/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/FixedStraightBytesImpl.java similarity index 96% rename from lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/FixedStraightBytesImpl.java index b19fab42675..8562923a6ba 100644 --- a/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/FixedStraightBytesImpl.java @@ -1,4 +1,4 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -21,10 +21,12 @@ import static org.apache.lucene.util.ByteBlockPool.BYTE_BLOCK_SIZE; import java.io.IOException; -import org.apache.lucene.index.values.Bytes.BytesSourceBase; -import org.apache.lucene.index.values.Bytes.BytesReaderBase; -import org.apache.lucene.index.values.Bytes.BytesWriterBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesReaderBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesSourceBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesWriterBase; import org.apache.lucene.index.values.DirectSource; +import org.apache.lucene.index.values.IndexDocValues; +import org.apache.lucene.index.values.ValueType; import org.apache.lucene.index.values.IndexDocValues.Source; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; diff --git a/lucene/src/java/org/apache/lucene/index/values/Floats.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/Floats.java similarity index 95% rename from lucene/src/java/org/apache/lucene/index/values/Floats.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/Floats.java index fee1364d443..4f9e1c45aad 100644 --- a/lucene/src/java/org/apache/lucene/index/values/Floats.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/Floats.java @@ -1,4 +1,4 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -18,6 +18,9 @@ package org.apache.lucene.index.values; */ import java.io.IOException; +import org.apache.lucene.index.values.IndexDocValues; +import org.apache.lucene.index.values.PerDocFieldValues; +import org.apache.lucene.index.values.ValueType; import org.apache.lucene.index.values.IndexDocValues.Source; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; diff --git a/lucene/src/java/org/apache/lucene/index/values/IndexDocValuesArray.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/IndexDocValuesArray.java similarity index 98% rename from lucene/src/java/org/apache/lucene/index/values/IndexDocValuesArray.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/IndexDocValuesArray.java index 3c2f4f5d87d..e1180c14089 100644 --- a/lucene/src/java/org/apache/lucene/index/values/IndexDocValuesArray.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/IndexDocValuesArray.java @@ -1,10 +1,11 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; import java.io.IOException; import java.util.Collections; import java.util.EnumMap; import java.util.Map; +import org.apache.lucene.index.values.ValueType; import org.apache.lucene.index.values.IndexDocValues.Source; import org.apache.lucene.store.IndexInput; import org.apache.lucene.util.BytesRef; diff --git a/lucene/src/java/org/apache/lucene/index/values/Ints.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/Ints.java similarity index 95% rename from lucene/src/java/org/apache/lucene/index/values/Ints.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/Ints.java index d8fc6fb1183..b4d7deb3913 100644 --- a/lucene/src/java/org/apache/lucene/index/values/Ints.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/Ints.java @@ -1,4 +1,4 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,6 +19,9 @@ package org.apache.lucene.index.values; import java.io.IOException; +import org.apache.lucene.index.values.IndexDocValues; +import org.apache.lucene.index.values.PerDocFieldValues; +import org.apache.lucene.index.values.ValueType; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; diff --git a/lucene/src/java/org/apache/lucene/index/values/PackedIntValues.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/PackedIntValues.java similarity index 95% rename from lucene/src/java/org/apache/lucene/index/values/PackedIntValues.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/PackedIntValues.java index f147e747f80..54f3f6ce2c3 100644 --- a/lucene/src/java/org/apache/lucene/index/values/PackedIntValues.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/PackedIntValues.java @@ -1,4 +1,4 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,9 +19,12 @@ package org.apache.lucene.index.values; import java.io.IOException; import org.apache.lucene.index.IndexFileNames; -import org.apache.lucene.index.values.FixedStraightBytesImpl.FixedBytesWriterBase; +import org.apache.lucene.index.codecs.lucene40.values.FixedStraightBytesImpl.FixedBytesWriterBase; +import org.apache.lucene.index.codecs.lucene40.values.IndexDocValuesArray.LongValues; +import org.apache.lucene.index.values.IndexDocValues; +import org.apache.lucene.index.values.PerDocFieldValues; +import org.apache.lucene.index.values.ValueType; import org.apache.lucene.index.values.IndexDocValues.Source; -import org.apache.lucene.index.values.IndexDocValuesArray.LongValues; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; diff --git a/lucene/src/java/org/apache/lucene/index/values/SortedBytesMergeUtils.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/SortedBytesMergeUtils.java similarity index 98% rename from lucene/src/java/org/apache/lucene/index/values/SortedBytesMergeUtils.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/SortedBytesMergeUtils.java index e9b2130e2d6..8a32e6aee64 100644 --- a/lucene/src/java/org/apache/lucene/index/values/SortedBytesMergeUtils.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/SortedBytesMergeUtils.java @@ -1,4 +1,4 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -24,6 +24,8 @@ import java.util.List; import org.apache.lucene.index.MergeState; import org.apache.lucene.index.MergeState.IndexReaderAndLiveDocs; +import org.apache.lucene.index.values.IndexDocValues; +import org.apache.lucene.index.values.ValueType; import org.apache.lucene.index.values.IndexDocValues.SortedSource; import org.apache.lucene.index.values.IndexDocValues.Source; import org.apache.lucene.store.IndexOutput; diff --git a/lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/VarDerefBytesImpl.java similarity index 92% rename from lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/VarDerefBytesImpl.java index c7e6a6320e7..63443ea18a9 100644 --- a/lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/VarDerefBytesImpl.java @@ -1,4 +1,4 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,9 +19,11 @@ package org.apache.lucene.index.values; import java.io.IOException; -import org.apache.lucene.index.values.Bytes.BytesReaderBase; -import org.apache.lucene.index.values.Bytes.BytesSourceBase; -import org.apache.lucene.index.values.Bytes.DerefBytesWriterBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesReaderBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesSourceBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.DerefBytesWriterBase; +import org.apache.lucene.index.values.DirectSource; +import org.apache.lucene.index.values.ValueType; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; diff --git a/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/VarSortedBytesImpl.java similarity index 93% rename from lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/VarSortedBytesImpl.java index ac58a08b074..173fa08877e 100644 --- a/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/VarSortedBytesImpl.java @@ -1,4 +1,4 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -22,12 +22,14 @@ import java.util.Comparator; import java.util.List; import org.apache.lucene.index.MergeState; -import org.apache.lucene.index.values.Bytes.BytesSortedSourceBase; -import org.apache.lucene.index.values.Bytes.BytesReaderBase; -import org.apache.lucene.index.values.Bytes.DerefBytesWriterBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesReaderBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesSortedSourceBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.DerefBytesWriterBase; +import org.apache.lucene.index.codecs.lucene40.values.SortedBytesMergeUtils.MergeContext; +import org.apache.lucene.index.codecs.lucene40.values.SortedBytesMergeUtils.SortedSourceSlice; +import org.apache.lucene.index.values.IndexDocValues; +import org.apache.lucene.index.values.ValueType; import org.apache.lucene.index.values.IndexDocValues.SortedSource; -import org.apache.lucene.index.values.SortedBytesMergeUtils.MergeContext; -import org.apache.lucene.index.values.SortedBytesMergeUtils.SortedSourceSlice; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; diff --git a/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/VarStraightBytesImpl.java similarity index 96% rename from lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/VarStraightBytesImpl.java index 88f6c537b81..7ac7a931192 100644 --- a/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/VarStraightBytesImpl.java @@ -1,4 +1,4 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -19,9 +19,11 @@ package org.apache.lucene.index.values; import java.io.IOException; -import org.apache.lucene.index.values.Bytes.BytesReaderBase; -import org.apache.lucene.index.values.Bytes.BytesSourceBase; -import org.apache.lucene.index.values.Bytes.BytesWriterBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesReaderBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesSourceBase; +import org.apache.lucene.index.codecs.lucene40.values.Bytes.BytesWriterBase; +import org.apache.lucene.index.values.DirectSource; +import org.apache.lucene.index.values.ValueType; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; diff --git a/lucene/src/java/org/apache/lucene/index/values/Writer.java b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/Writer.java similarity index 98% rename from lucene/src/java/org/apache/lucene/index/values/Writer.java rename to lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/Writer.java index 000486a6b2b..53173fc3fdc 100644 --- a/lucene/src/java/org/apache/lucene/index/values/Writer.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/lucene40/values/Writer.java @@ -1,4 +1,4 @@ -package org.apache.lucene.index.values; +package org.apache.lucene.index.codecs.lucene40.values; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.Comparator; import org.apache.lucene.index.codecs.DocValuesConsumer; +import org.apache.lucene.index.values.ValueType; import org.apache.lucene.index.values.IndexDocValues.Source; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; diff --git a/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java b/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java index 8a387a24cae..43817ab3de3 100644 --- a/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexFileNames; import org.apache.lucene.index.PerDocWriteState; import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.index.codecs.DocValuesWriterBase; -import org.apache.lucene.index.values.Writer; +import org.apache.lucene.index.codecs.lucene40.values.Writer; import org.apache.lucene.store.Directory; /** diff --git a/lucene/src/java/org/apache/lucene/index/values/DirectSource.java b/lucene/src/java/org/apache/lucene/index/values/DirectSource.java index b7d71ad3a9f..133f64ced14 100644 --- a/lucene/src/java/org/apache/lucene/index/values/DirectSource.java +++ b/lucene/src/java/org/apache/lucene/index/values/DirectSource.java @@ -27,13 +27,13 @@ import org.apache.lucene.util.BytesRef; * Base class for disk resident source implementations * @lucene.internal */ -abstract class DirectSource extends Source { +public abstract class DirectSource extends Source { protected final IndexInput data; private final ToNumeric toNumeric; protected final long baseOffset; - DirectSource(IndexInput input, ValueType type) { + public DirectSource(IndexInput input, ValueType type) { super(type); this.data = input; baseOffset = input.getFilePointer(); diff --git a/lucene/src/test/org/apache/lucene/index/values/TestDocValues.java b/lucene/src/test/org/apache/lucene/index/values/TestDocValues.java index 14cd8c76499..0c326655f7e 100644 --- a/lucene/src/test/org/apache/lucene/index/values/TestDocValues.java +++ b/lucene/src/test/org/apache/lucene/index/values/TestDocValues.java @@ -20,6 +20,10 @@ package org.apache.lucene.index.values; import java.io.IOException; import java.util.Comparator; +import org.apache.lucene.index.codecs.lucene40.values.Bytes; +import org.apache.lucene.index.codecs.lucene40.values.Floats; +import org.apache.lucene.index.codecs.lucene40.values.Ints; +import org.apache.lucene.index.codecs.lucene40.values.Writer; import org.apache.lucene.index.values.IndexDocValues.SortedSource; import org.apache.lucene.index.values.IndexDocValues.Source; import org.apache.lucene.store.Directory; diff --git a/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java b/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java index 0ac16019870..70e615298d2 100644 --- a/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java +++ b/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java @@ -16,6 +16,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.codecs.Codec; +import org.apache.lucene.index.codecs.lucene40.values.BytesRefUtils; import org.apache.lucene.index.values.IndexDocValues.Source; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef;