You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/11/28 15:34:39 UTC
svn commit: r1642305 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/util/packed/
Author: rmuir
Date: Fri Nov 28 14:34:38 2014
New Revision: 1642305
URL: http://svn.apache.org/r1642305
Log:
fix ant regenerate
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py?rev=1642305&r1=1642304&r2=1642305&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py Fri Nov 28 14:34:38 2014
@@ -57,16 +57,16 @@ FOOTER="""
* 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
* boundary:
- * - 16 bits per value -> b=2, v=1
- * - 24 bits per value -> b=3, v=1
- * - 50 bits per value -> b=25, v=4
- * - 63 bits per value -> b=63, v=8
+ * - 16 bits per value -> b=2, v=1
+ * - 24 bits per value -> b=3, v=1
+ * - 50 bits per value -> b=25, v=4
+ * - 63 bits per value -> b=63, v=8
* - ...
*
* 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>
* (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
* <code>ramBudget / (b + 8v)</code> (since a long is 8 bytes).
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py?rev=1642305&r1=1642304&r2=1642305&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py Fri Nov 28 14:34:38 2014
@@ -105,16 +105,6 @@ if __name__ == '__main__':
public void clear() {
Arrays.fill(values, %s0L);
}
-
- @Override
- public Object getArray() {
- return values;
- }
-
- @Override
- public boolean hasArray() {
- return true;
- }
""" %(MASKS[bpv], CASTS[bpv], CASTS[bpv]))
if bpv == 64:
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py?rev=1642305&r1=1642304&r2=1642305&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py Fri Nov 28 14:34:38 2014
@@ -178,7 +178,7 @@ abstract class Packed64SingleBlock exten
public void fill(int fromIndex, int toIndex, long val) {
assert fromIndex >= 0;
assert fromIndex <= toIndex;
- assert PackedInts.bitsRequired(val) <= bitsPerValue;
+ assert PackedInts.unsignedBitsRequired(val) <= bitsPerValue;
final int valuesPerBlock = 64 / bitsPerValue;
if (toIndex - fromIndex <= valuesPerBlock << 1) {