index. */
+ public abstract long get(long index);
+
+ @Override
+ public long get(int idx) {
+ return get((long) idx);
+ }
+
+}
Property changes on: lucene/core/src/java/org/apache/lucene/util/LongValues.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lucene/core/src/java/org/apache/lucene/util/packed/AbstractAppendingLongBuffer.java
===================================================================
--- lucene/core/src/java/org/apache/lucene/util/packed/AbstractAppendingLongBuffer.java (revision 1536438)
+++ lucene/core/src/java/org/apache/lucene/util/packed/AbstractAppendingLongBuffer.java (working copy)
@@ -18,6 +18,7 @@
*/
import org.apache.lucene.util.ArrayUtil;
+import org.apache.lucene.util.LongValues;
import org.apache.lucene.util.RamUsageEstimator;
import java.util.Arrays;
@@ -25,7 +26,7 @@
import static org.apache.lucene.util.packed.PackedInts.checkBlockSize;
/** Common functionality shared by {@link AppendingDeltaPackedLongBuffer} and {@link MonotonicAppendingLongBuffer}. */
-abstract class AbstractAppendingLongBuffer {
+abstract class AbstractAppendingLongBuffer extends LongValues {
static final int MIN_PAGE_SIZE = 64;
// More than 1M doesn't really makes sense with these appending buffers
@@ -92,7 +93,7 @@
abstract void packPendingValues();
- /** Get a value from this buffer. */
+ @Override
public final long get(long index) {
assert index >= 0 && index < size();
final int block = (int) (index >> pageShift);
Index: lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java
===================================================================
--- lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java (revision 1536438)
+++ lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java (working copy)
@@ -21,13 +21,14 @@
import static org.apache.lucene.util.packed.PackedInts.numBlocks;
import org.apache.lucene.util.ArrayUtil;
+import org.apache.lucene.util.LongValues;
import org.apache.lucene.util.RamUsageEstimator;
/**
* Base implementation for {@link PagedMutable} and {@link PagedGrowableWriter}.
* @lucene.internal
*/
-abstract class AbstractPagedMutableindex. */
+ @Override
public final long get(long index) {
assert index >= 0 && index < size;
final int pageIndex = pageIndex(index);
Index: lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java
===================================================================
--- lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java (revision 1536438)
+++ lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java (working copy)
@@ -29,12 +29,13 @@
import java.io.IOException;
import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.util.LongValues;
/**
* Provides random access to a stream written with {@link BlockPackedWriter}.
* @lucene.internal
*/
-public final class BlockPackedReader {
+public final class BlockPackedReader extends LongValues {
private final int blockShift, blockMask;
private final long valueCount;
@@ -77,7 +78,7 @@
this.minValues = minValues;
}
- /** Get value at index. */
+ @Override
public long get(long index) {
assert index >= 0 && index < valueCount;
final int block = (int) (index >>> blockShift);
Index: lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReaderIterator.java
===================================================================
--- lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReaderIterator.java (revision 1536438)
+++ lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReaderIterator.java (working copy)
@@ -21,8 +21,6 @@
import static org.apache.lucene.util.packed.AbstractBlockPackedWriter.MAX_BLOCK_SIZE;
import static org.apache.lucene.util.packed.AbstractBlockPackedWriter.MIN_BLOCK_SIZE;
import static org.apache.lucene.util.packed.AbstractBlockPackedWriter.MIN_VALUE_EQUALS_0;
-import static org.apache.lucene.util.packed.BlockPackedReaderIterator.readVLong;
-import static org.apache.lucene.util.packed.BlockPackedReaderIterator.zigZagDecode;
import static org.apache.lucene.util.packed.PackedInts.checkBlockSize;
import java.io.EOFException;
Index: lucene/core/src/java/org/apache/lucene/util/packed/GrowableWriter.java
===================================================================
--- lucene/core/src/java/org/apache/lucene/util/packed/GrowableWriter.java (revision 1536438)
+++ lucene/core/src/java/org/apache/lucene/util/packed/GrowableWriter.java (working copy)
@@ -30,7 +30,7 @@
*
* @lucene.internal
*/ -public class GrowableWriter implements PackedInts.Mutable { +public class GrowableWriter extends PackedInts.Mutable { private long currentMask; private PackedInts.Mutable current; Index: lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java (revision 1536438) +++ lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java (working copy) @@ -26,6 +26,7 @@ import java.io.IOException; import org.apache.lucene.store.IndexInput; +import org.apache.lucene.util.LongValues; import org.apache.lucene.util.RamUsageEstimator; /** @@ -33,7 +34,7 @@ * {@link MonotonicBlockPackedWriter}. * @lucene.internal */ -public final class MonotonicBlockPackedReader { +public final class MonotonicBlockPackedReader extends LongValues { private final int blockShift, blockMask; private final long valueCount; @@ -72,14 +73,14 @@ } } - /** Get value atindex. */
+ @Override
public long get(long index) {
assert index >= 0 && index < valueCount;
final int block = (int) (index >>> blockShift);
final int idx = (int) (index & blockMask);
return minValues[block] + (long) (idx * averages[block]) + zigZagDecode(subReaders[block].get(idx));
}
-
+
/** Returns the number of values */
public long size() {
return valueCount;
Index: lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
===================================================================
--- lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java (revision 1536438)
+++ lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java (working copy)
@@ -21,6 +21,7 @@
import java.util.Arrays;
import org.apache.lucene.codecs.CodecUtil;
+import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.store.DataInput;
import org.apache.lucene.store.DataOutput;
import org.apache.lucene.store.IndexInput;
@@ -451,37 +452,42 @@
* A read-only random access array of positive integers.
* @lucene.internal
*/
- public static interface Reader {
- /**
- * @param index the position of the wanted value.
- * @return the value at the stated index.
- */
- long get(int index);
+ public static abstract class Reader extends NumericDocValues {
/**
* Bulk get: read at least one and at most len longs starting
* from index into arr[off:off+len] and return
* the actual number of values that have been read.
*/
- int get(int index, long[] arr, int off, int len);
+ public int get(int index, long[] arr, int off, int len) {
+ assert len > 0 : "len must be > 0 (got " + len + ")";
+ assert index >= 0 && index < size();
+ assert off + len <= arr.length;
+ final int gets = Math.min(size() - index, len);
+ for (int i = index, o = off, end = index + gets; i < end; ++i, ++o) {
+ arr[o] = get(i);
+ }
+ return gets;
+ }
+
/**
* @return the number of bits used to store any given value.
* Note: This does not imply that memory usage is
* {@code bitsPerValue * #values} as implementations are free to
* use non-space-optimal packing of bits.
*/
- int getBitsPerValue();
+ public abstract int getBitsPerValue();
/**
* @return the number of values.
*/
- int size();
+ public abstract int size();
/**
* Return the in-memory size in bytes.
*/
- long ramBytesUsed();
+ public abstract long ramBytesUsed();
/**
* Expert: if the bit-width of this reader matches one of
@@ -492,7 +498,10 @@
* interpret the full value as unsigned. Ie,
* bytes[idx]&0xFF, shorts[idx]&0xFFFF, etc.
*/
- Object getArray();
+ public Object getArray() {
+ assert !hasArray();
+ return null;
+ }
/**
* Returns true if this implementation is backed by a
@@ -500,7 +509,9 @@
*
* @see #getArray
*/
- boolean hasArray();
+ public boolean hasArray() {
+ return false;
+ }
}
@@ -558,14 +569,14 @@
* A packed integer array that can be modified.
* @lucene.internal
*/
- public static interface Mutable extends Reader {
+ public static abstract class Mutable extends Reader {
/**
* Set the value at the given index in the array.
* @param index where the value should be positioned.
* @param value a value conforming to the constraints set by the array.
*/
- void set(int index, long value);
+ public abstract void set(int index, long value);
/**
* Bulk set: set at least one and at most len longs starting
@@ -573,33 +584,63 @@
* index. Returns the actual number of values that have been
* set.
*/
- int set(int index, long[] arr, int off, int len);
+ public int set(int index, long[] arr, int off, int len) {
+ assert len > 0 : "len must be > 0 (got " + len + ")";
+ assert index >= 0 && index < size();
+ len = Math.min(len, size() - index);
+ assert off + len <= arr.length;
+ for (int i = index, o = off, end = index + len; i < end; ++i, ++o) {
+ set(i, arr[o]);
+ }
+ return len;
+ }
+
/**
* Fill the mutable from fromIndex (inclusive) to
* toIndex (exclusive) with val.
*/
- void fill(int fromIndex, int toIndex, long val);
+ public void fill(int fromIndex, int toIndex, long val) {
+ assert val <= maxValue(getBitsPerValue());
+ assert fromIndex <= toIndex;
+ for (int i = fromIndex; i < toIndex; ++i) {
+ set(i, val);
+ }
+ }
/**
* Sets all values to 0.
*/
- void clear();
+ public void clear() {
+ fill(0, size(), 0);
+ }
/**
* Save this mutable into out. Instantiating a reader from
* the generated data will return a reader with the same number of bits
* per value.
*/
- void save(DataOutput out) throws IOException;
+ public void save(DataOutput out) throws IOException {
+ Writer writer = getWriterNoHeader(out, getFormat(), size(), getBitsPerValue(), DEFAULT_BUFFER_SIZE);
+ writer.writeHeader();
+ for (int i = 0; i < size(); ++i) {
+ writer.add(get(i));
+ }
+ writer.finish();
+ }
+ /** The underlying format. */
+ Format getFormat() {
+ return Format.PACKED;
+ }
+
}
/**
* A simple base for Readers that keeps track of valueCount and bitsPerValue.
* @lucene.internal
*/
- static abstract class ReaderImpl implements Reader {
+ static abstract class ReaderImpl extends Reader {
protected final int bitsPerValue;
protected final int valueCount;
@@ -610,86 +651,45 @@
}
@Override
- public int getBitsPerValue() {
+ public abstract long get(int index);
+
+ @Override
+ public final int getBitsPerValue() {
return bitsPerValue;
}
@Override
- public int size() {
+ public final int size() {
return valueCount;
}
- @Override
- public Object getArray() {
- return null;
- }
+ }
- @Override
- public boolean hasArray() {
- return false;
- }
+ static abstract class MutableImpl extends Mutable {
- @Override
- public int get(int index, long[] arr, int off, int len) {
- assert len > 0 : "len must be > 0 (got " + len + ")";
- assert index >= 0 && index < valueCount;
- assert off + len <= arr.length;
+ protected final int valueCount;
+ protected final int bitsPerValue;
- final int gets = Math.min(valueCount - index, len);
- for (int i = index, o = off, end = index + gets; i < end; ++i, ++o) {
- arr[o] = get(i);
- }
- return gets;
- }
-
- }
-
- static abstract class MutableImpl extends ReaderImpl implements Mutable {
-
protected MutableImpl(int valueCount, int bitsPerValue) {
- super(valueCount, bitsPerValue);
+ this.valueCount = valueCount;
+ assert bitsPerValue > 0 && bitsPerValue <= 64 : "bitsPerValue=" + bitsPerValue;
+ this.bitsPerValue = bitsPerValue;
}
@Override
- public int set(int index, long[] arr, int off, int len) {
- assert len > 0 : "len must be > 0 (got " + len + ")";
- assert index >= 0 && index < valueCount;
- len = Math.min(len, valueCount - index);
- assert off + len <= arr.length;
-
- for (int i = index, o = off, end = index + len; i < end; ++i, ++o) {
- set(i, arr[o]);
- }
- return len;
+ public final int getBitsPerValue() {
+ return bitsPerValue;
}
@Override
- public void fill(int fromIndex, int toIndex, long val) {
- assert val <= maxValue(bitsPerValue);
- assert fromIndex <= toIndex;
- for (int i = fromIndex; i < toIndex; ++i) {
- set(i, val);
- }
+ public final int size() {
+ return valueCount;
}
- protected Format getFormat() {
- return Format.PACKED;
- }
-
- @Override
- public void save(DataOutput out) throws IOException {
- Writer writer = getWriterNoHeader(out, getFormat(),
- valueCount, bitsPerValue, DEFAULT_BUFFER_SIZE);
- writer.writeHeader();
- for (int i = 0; i < valueCount; ++i) {
- writer.add(get(i));
- }
- writer.finish();
- }
}
/** A {@link Reader} which has all its values equal to 0 (bitsPerValue = 0). */
- public static final class NullReader implements Reader {
+ public static final class NullReader extends Reader {
private final int valueCount;
@@ -727,16 +727,6 @@
return RamUsageEstimator.alignObjectSize(RamUsageEstimator.NUM_BYTES_OBJECT_HEADER + RamUsageEstimator.NUM_BYTES_INT);
}
- @Override
- public Object getArray() {
- return null;
- }
-
- @Override
- public boolean hasArray() {
- return false;
- }
-
}
/** A write-once Writer.