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

fix ant regenerate 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1642304 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2014-11-28 14:33:21 +00:00
parent d439254a5a
commit 20e0d50186
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py
View File

@ -57,16 +57,16 @@ FOOTER="""
* For every number of bits per value, there is a minimum number of * For every number of bits per value, there is a minimum number of
* blocks (b) / values (v) you need to write in order to reach the next block * blocks (b) / values (v) you need to write in order to reach the next block
* boundary: * boundary:
* - 16 bits per value -> b=2, v=1 * - 16 bits per value -> b=2, v=1
* - 24 bits per value -> b=3, v=1 * - 24 bits per value -> b=3, v=1
* - 50 bits per value -> b=25, v=4 * - 50 bits per value -> b=25, v=4
* - 63 bits per value -> b=63, v=8 * - 63 bits per value -> b=63, v=8
* - ... * - ...
* *
* A bulk read consists in copying <code>iterations*v</code> values that are * A bulk read consists in copying <code>iterations*v</code> values that are
* contained in <code>iterations*b</code> blocks into a <code>long[]</code> * contained in <code>iterations*b</code> blocks into a <code>long[]</code>
* (higher values of <code>iterations</code> are likely to yield a better * (higher values of <code>iterations</code> are likely to yield a better
* throughput) => this requires n * (b + 8v) bytes of memory. * throughput): this requires n * (b + 8v) bytes of memory.
* *
* This method computes <code>iterations</code> as * This method computes <code>iterations</code> as
* <code>ramBudget / (b + 8v)</code> (since a long is 8 bytes). * <code>ramBudget / (b + 8v)</code> (since a long is 8 bytes).

10
lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py
View File

@ -105,16 +105,6 @@ if __name__ == '__main__':
public void clear() { public void clear() {
Arrays.fill(values, %s0L); Arrays.fill(values, %s0L);
} }
@Override
public Object getArray() {
return values;
}
@Override
public boolean hasArray() {
return true;
}
""" %(MASKS[bpv], CASTS[bpv], CASTS[bpv])) """ %(MASKS[bpv], CASTS[bpv], CASTS[bpv]))
if bpv == 64: if bpv == 64:

2
lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py
View File

@ -178,7 +178,7 @@ abstract class Packed64SingleBlock extends PackedInts.MutableImpl {
public void fill(int fromIndex, int toIndex, long val) { public void fill(int fromIndex, int toIndex, long val) {
assert fromIndex >= 0; assert fromIndex >= 0;
assert fromIndex <= toIndex; assert fromIndex <= toIndex;
assert PackedInts.bitsRequired(val) <= bitsPerValue; assert PackedInts.unsignedBitsRequired(val) <= bitsPerValue;
final int valuesPerBlock = 64 / bitsPerValue; final int valuesPerBlock = 64 / bitsPerValue;
if (toIndex - fromIndex <= valuesPerBlock << 1) { if (toIndex - fromIndex <= valuesPerBlock << 1) {