You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2012/08/29 12:22:06 UTC
svn commit: r1378492 [1/3] - in /lucene/dev/trunk/lucene: ./
core/src/java/org/apache/lucene/util/packed/
Author: jpountz
Date: Wed Aug 29 10:22:03 2012
New Revision: 1378492
URL: http://svn.apache.org/viewvc?rev=1378492&view=rev
Log:
LUCENE-4322: Start reducing the JAR size by only specializing decode for bitsPerValue in [1-24].
Added:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked.java (with props)
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock.java (with props)
Removed:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked25.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked26.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked27.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked28.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked29.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked30.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked31.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked32.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked33.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked34.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked35.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked36.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked37.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked38.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked39.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked40.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked41.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked42.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked43.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked44.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked45.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked46.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked47.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked48.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked49.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked50.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked51.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked52.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked53.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked54.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked55.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked56.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked57.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked58.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked59.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked60.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked61.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked62.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked63.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked64.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock32.java
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked19.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked2.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked20.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked21.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked22.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked23.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked24.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked3.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked4.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked5.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked6.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked7.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked8.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked9.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock1.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock10.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock12.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock16.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock2.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock21.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock3.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock4.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock5.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock6.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock7.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock8.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock9.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1378492&r1=1378491&r2=1378492&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Wed Aug 29 10:22:03 2012
@@ -118,6 +118,10 @@ Bug Fixes
Optimizations
+* LUCENE-4322: Decrease lucene-core JAR size. The core JAR size had increased a
+ lot because of generated code introduced in LUCENE-4161 and LUCENE-3892.
+ (Adrien Grand)
+
* LUCENE-4317: Improve reuse of internal TokenStreams and StringReader
in oal.document.Field. (Uwe Schindler, Chris Male, Robert Muir)
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java?rev=1378492&r1=1378491&r2=1378492&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java Wed Aug 29 10:22:03 2012
@@ -19,7 +19,6 @@ package org.apache.lucene.util.packed;
* limitations under the License.
*/
-import java.nio.ByteBuffer;
/**
* Efficient sequential read/write of packed integers.
@@ -50,46 +49,46 @@ abstract class BulkOperation implements
new BulkOperationPacked22(),
new BulkOperationPacked23(),
new BulkOperationPacked24(),
- new BulkOperationPacked25(),
- new BulkOperationPacked26(),
- new BulkOperationPacked27(),
- new BulkOperationPacked28(),
- new BulkOperationPacked29(),
- new BulkOperationPacked30(),
- new BulkOperationPacked31(),
- new BulkOperationPacked32(),
- new BulkOperationPacked33(),
- new BulkOperationPacked34(),
- new BulkOperationPacked35(),
- new BulkOperationPacked36(),
- new BulkOperationPacked37(),
- new BulkOperationPacked38(),
- new BulkOperationPacked39(),
- new BulkOperationPacked40(),
- new BulkOperationPacked41(),
- new BulkOperationPacked42(),
- new BulkOperationPacked43(),
- new BulkOperationPacked44(),
- new BulkOperationPacked45(),
- new BulkOperationPacked46(),
- new BulkOperationPacked47(),
- new BulkOperationPacked48(),
- new BulkOperationPacked49(),
- new BulkOperationPacked50(),
- new BulkOperationPacked51(),
- new BulkOperationPacked52(),
- new BulkOperationPacked53(),
- new BulkOperationPacked54(),
- new BulkOperationPacked55(),
- new BulkOperationPacked56(),
- new BulkOperationPacked57(),
- new BulkOperationPacked58(),
- new BulkOperationPacked59(),
- new BulkOperationPacked60(),
- new BulkOperationPacked61(),
- new BulkOperationPacked62(),
- new BulkOperationPacked63(),
- new BulkOperationPacked64(),
+ new BulkOperationPacked(25),
+ new BulkOperationPacked(26),
+ new BulkOperationPacked(27),
+ new BulkOperationPacked(28),
+ new BulkOperationPacked(29),
+ new BulkOperationPacked(30),
+ new BulkOperationPacked(31),
+ new BulkOperationPacked(32),
+ new BulkOperationPacked(33),
+ new BulkOperationPacked(34),
+ new BulkOperationPacked(35),
+ new BulkOperationPacked(36),
+ new BulkOperationPacked(37),
+ new BulkOperationPacked(38),
+ new BulkOperationPacked(39),
+ new BulkOperationPacked(40),
+ new BulkOperationPacked(41),
+ new BulkOperationPacked(42),
+ new BulkOperationPacked(43),
+ new BulkOperationPacked(44),
+ new BulkOperationPacked(45),
+ new BulkOperationPacked(46),
+ new BulkOperationPacked(47),
+ new BulkOperationPacked(48),
+ new BulkOperationPacked(49),
+ new BulkOperationPacked(50),
+ new BulkOperationPacked(51),
+ new BulkOperationPacked(52),
+ new BulkOperationPacked(53),
+ new BulkOperationPacked(54),
+ new BulkOperationPacked(55),
+ new BulkOperationPacked(56),
+ new BulkOperationPacked(57),
+ new BulkOperationPacked(58),
+ new BulkOperationPacked(59),
+ new BulkOperationPacked(60),
+ new BulkOperationPacked(61),
+ new BulkOperationPacked(62),
+ new BulkOperationPacked(63),
+ new BulkOperationPacked(64),
};
// NOTE: this is sparse (some entries are null):
@@ -125,7 +124,7 @@ abstract class BulkOperation implements
null,
null,
null,
- new BulkOperationPackedSingleBlock32(),
+ new BulkOperationPackedSingleBlock(32),
};
@@ -142,32 +141,11 @@ abstract class BulkOperation implements
}
}
-
- private static long[] toLongArray(int[] ints, int offset, int length) {
- long[] arr = new long[length];
- for (int i = 0; i < length; ++i) {
- arr[i] = ints[offset + i];
+ protected int writeLong(long block, byte[] blocks, int blocksOffset) {
+ for (int j = 1; j <= 8; ++j) {
+ blocks[blocksOffset++] = (byte) (block >>> (64 - (j << 3)));
}
- return arr;
- }
-
- @Override
- public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- encode(toLongArray(values, valuesOffset, iterations * valueCount()), 0, blocks, blocksOffset, iterations);
- }
-
- @Override
- public void encode(long[] values, int valuesOffset, byte[] blocks, int blocksOffset, int iterations) {
- final long[] longBLocks = new long[blockCount() * iterations];
- encode(values, valuesOffset, longBLocks, 0, iterations);
- ByteBuffer.wrap(blocks, blocksOffset, 8 * iterations * blockCount()).asLongBuffer().put(longBLocks);
- }
-
- @Override
- public void encode(int[] values, int valuesOffset, byte[] blocks, int blocksOffset, int iterations) {
- final long[] longBLocks = new long[blockCount() * iterations];
- encode(values, valuesOffset, longBLocks, 0, iterations);
- ByteBuffer.wrap(blocks, blocksOffset, 8 * iterations * blockCount()).asLongBuffer().put(longBLocks);
+ return blocksOffset;
}
/**
Added: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked.java?rev=1378492&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked.java (added)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked.java Wed Aug 29 10:22:03 2012
@@ -0,0 +1,231 @@
+package org.apache.lucene.util.packed;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Non-specialized {@link BulkOperation} for {@link PackedInts.Format#PACKED}.
+ */
+class BulkOperationPacked extends BulkOperation {
+
+ private final int bitsPerValue;
+ private final int blockCount;
+ private final int valueCount;
+ private final long mask;
+
+ public BulkOperationPacked(int bitsPerValue) {
+ this.bitsPerValue = bitsPerValue;
+ assert bitsPerValue > 0 && bitsPerValue <= 64;
+ int blocks = bitsPerValue;
+ while ((blocks & 1) == 0) {
+ blocks >>>= 1;
+ }
+ this.blockCount = blocks;
+ this.valueCount = 64 * blockCount / bitsPerValue;
+ if (bitsPerValue == 64) {
+ this.mask = ~0L;
+ } else {
+ this.mask = (1L << bitsPerValue) - 1;
+ }
+ assert valueCount * bitsPerValue == 64 * blockCount;
+ }
+
+ @Override
+ public int blockCount() {
+ return blockCount;
+ }
+
+ @Override
+ public int valueCount() {
+ return valueCount;
+ }
+
+ @Override
+ public void decode(long[] blocks, int blocksOffset, long[] values,
+ int valuesOffset, int iterations) {
+ int bitsLeft = 64;
+ for (int i = 0; i < valueCount * iterations; ++i) {
+ bitsLeft -= bitsPerValue;
+ if (bitsLeft < 0) {
+ values[valuesOffset++] =
+ ((blocks[blocksOffset++] & ((1L << (bitsPerValue + bitsLeft)) - 1)) << -bitsLeft)
+ | (blocks[blocksOffset] >>> (64 + bitsLeft));
+ bitsLeft += 64;
+ } else {
+ values[valuesOffset++] = (blocks[blocksOffset] >>> bitsLeft) & mask;
+ }
+ }
+ }
+
+ @Override
+ public void decode(byte[] blocks, int blocksOffset, long[] values,
+ int valuesOffset, int iterations) {
+ int blockBitsLeft = 8;
+ int valueBitsLeft = bitsPerValue;
+ long nextValue = 0;
+ for (int end = valuesOffset + iterations * valueCount; valuesOffset < end; ) {
+ if (valueBitsLeft > blockBitsLeft) {
+ nextValue |= (blocks[blocksOffset++] & ((1L << blockBitsLeft) - 1)) << (valueBitsLeft - blockBitsLeft);
+ valueBitsLeft -= blockBitsLeft;
+ blockBitsLeft = 8;
+ } else {
+ nextValue |= ((blocks[blocksOffset] & 0xFFL) >>> (blockBitsLeft - valueBitsLeft)) & ((1L << valueBitsLeft) - 1);
+ values[valuesOffset++] = nextValue;
+ nextValue = 0;
+ blockBitsLeft -= valueBitsLeft;
+ valueBitsLeft = bitsPerValue;
+ }
+ }
+ }
+
+ @Override
+ public void decode(long[] blocks, int blocksOffset, int[] values,
+ int valuesOffset, int iterations) {
+ if (bitsPerValue > 32) {
+ throw new UnsupportedOperationException("Cannot decode " + bitsPerValue + "-bits values into an int[]");
+ }
+ int bitsLeft = 64;
+ for (int i = 0; i < valueCount * iterations; ++i) {
+ bitsLeft -= bitsPerValue;
+ if (bitsLeft < 0) {
+ values[valuesOffset++] = (int)
+ (((blocks[blocksOffset++] & ((1L << (bitsPerValue + bitsLeft)) - 1)) << -bitsLeft)
+ | (blocks[blocksOffset] >>> (64 + bitsLeft)));
+ bitsLeft += 64;
+ } else {
+ values[valuesOffset++] = (int) ((blocks[blocksOffset] >>> bitsLeft) & mask);
+ }
+ }
+ }
+
+ @Override
+ public void decode(byte[] blocks, int blocksOffset, int[] values,
+ int valuesOffset, int iterations) {
+ if (bitsPerValue > 32) {
+ throw new UnsupportedOperationException("Cannot decode " + bitsPerValue + "-bits values into an int[]");
+ }
+ int blockBitsLeft = 8;
+ int valueBitsLeft = bitsPerValue;
+ int nextValue = 0;
+ for (int end = valuesOffset + iterations * valueCount; valuesOffset < end; ) {
+ if (valueBitsLeft > blockBitsLeft) {
+ nextValue |= (blocks[blocksOffset++] & ((1L << blockBitsLeft) - 1)) << (valueBitsLeft - blockBitsLeft);
+ valueBitsLeft -= blockBitsLeft;
+ blockBitsLeft = 8;
+ } else {
+ nextValue |= ((blocks[blocksOffset] & 0xFFL) >>> (blockBitsLeft - valueBitsLeft)) & ((1L << valueBitsLeft) - 1);
+ values[valuesOffset++] = nextValue;
+ nextValue = 0;
+ blockBitsLeft -= valueBitsLeft;
+ valueBitsLeft = bitsPerValue;
+ }
+ }
+ }
+
+ @Override
+ public void encode(long[] values, int valuesOffset, long[] blocks,
+ int blocksOffset, int iterations) {
+ long nextBlock = 0;
+ int bitsLeft = 64;
+ for (int i = 0; i < valueCount * iterations; ++i) {
+ bitsLeft -= bitsPerValue;
+ if (bitsLeft > 0) {
+ nextBlock |= values[valuesOffset++] << bitsLeft;
+ } else if (bitsLeft == 0) {
+ nextBlock |= values[valuesOffset++];
+ blocks[blocksOffset++] = nextBlock;
+ nextBlock = 0;
+ bitsLeft = 64;
+ } else { // bitsLeft < 0
+ nextBlock |= values[valuesOffset] >>> -bitsLeft;
+ blocks[blocksOffset++] = nextBlock;
+ nextBlock = (values[valuesOffset++] & ((1L << -bitsLeft) - 1)) << (64 + bitsLeft);
+ bitsLeft += 64;
+ }
+ }
+ }
+
+ @Override
+ public void encode(int[] values, int valuesOffset, long[] blocks,
+ int blocksOffset, int iterations) {
+ long nextBlock = 0;
+ int bitsLeft = 64;
+ for (int i = 0; i < valueCount * iterations; ++i) {
+ bitsLeft -= bitsPerValue;
+ if (bitsLeft > 0) {
+ nextBlock |= (values[valuesOffset++] & 0xFFFFFFFFL) << bitsLeft;
+ } else if (bitsLeft == 0) {
+ nextBlock |= (values[valuesOffset++] & 0xFFFFFFFFL);
+ blocks[blocksOffset++] = nextBlock;
+ nextBlock = 0;
+ bitsLeft = 64;
+ } else { // bitsLeft < 0
+ nextBlock |= (values[valuesOffset] & 0xFFFFFFFFL) >>> -bitsLeft;
+ blocks[blocksOffset++] = nextBlock;
+ nextBlock = (values[valuesOffset++] & ((1L << -bitsLeft) - 1)) << (64 + bitsLeft);
+ bitsLeft += 64;
+ }
+ }
+ }
+
+ @Override
+ public void encode(long[] values, int valuesOffset, byte[] blocks,
+ int blocksOffset, int iterations) {
+ long nextBlock = 0;
+ int bitsLeft = 64;
+ for (int i = 0; i < valueCount * iterations; ++i) {
+ bitsLeft -= bitsPerValue;
+ if (bitsLeft > 0) {
+ nextBlock |= values[valuesOffset++] << bitsLeft;
+ } else if (bitsLeft == 0) {
+ nextBlock |= values[valuesOffset++];
+ blocksOffset = writeLong(nextBlock, blocks, blocksOffset);
+ nextBlock = 0;
+ bitsLeft = 64;
+ } else { // bitsLeft < 0
+ nextBlock |= values[valuesOffset] >>> -bitsLeft;
+ blocksOffset = writeLong(nextBlock, blocks, blocksOffset);
+ nextBlock = (values[valuesOffset++] & ((1L << -bitsLeft) - 1)) << (64 + bitsLeft);
+ bitsLeft += 64;
+ }
+ }
+ }
+
+ @Override
+ public void encode(int[] values, int valuesOffset, byte[] blocks,
+ int blocksOffset, int iterations) {
+ long nextBlock = 0;
+ int bitsLeft = 64;
+ for (int i = 0; i < valueCount * iterations; ++i) {
+ bitsLeft -= bitsPerValue;
+ if (bitsLeft > 0) {
+ nextBlock |= (values[valuesOffset++] & 0xFFFFFFFFL) << bitsLeft;
+ } else if (bitsLeft == 0) {
+ nextBlock |= (values[valuesOffset++] & 0xFFFFFFFFL);
+ blocksOffset = writeLong(nextBlock, blocks, blocksOffset);
+ nextBlock = 0;
+ bitsLeft = 64;
+ } else { // bitsLeft < 0
+ nextBlock |= (values[valuesOffset] & 0xFFFFFFFFL) >>> -bitsLeft;
+ blocksOffset = writeLong(nextBlock, blocks, blocksOffset);
+ nextBlock = (values[valuesOffset++] & ((1L << -bitsLeft) - 1)) << (64 + bitsLeft);
+ bitsLeft += 64;
+ }
+ }
+ }
+
+}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java?rev=1378492&r1=1378491&r2=1378492&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java Wed Aug 29 10:22:03 2012
@@ -22,15 +22,12 @@ package org.apache.lucene.util.packed;
/**
* Efficient sequential read/write of packed integers.
*/
-final class BulkOperationPacked1 extends BulkOperation {
- @Override
- public int blockCount() {
- return 1;
- }
+final class BulkOperationPacked1 extends BulkOperationPacked {
- @Override
- public int valueCount() {
- return 64;
+ public BulkOperationPacked1() {
+ super(1);
+ assert blockCount() == 1;
+ assert valueCount() == 64;
}
@Override
@@ -339,22 +336,4 @@ final class BulkOperationPacked1 extends
}
}
- @Override
- public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 63) | ((values[valuesOffset++] & 0xffffffffL) << 62) | ((values[valuesOffset++] & 0xffffffffL) << 61) | ((values[valuesOffset++] & 0xffffffffL) << 60) | ((values[valuesOffset++] & 0xffffffffL) << 59) | ((values[valuesOffset++] & 0xffffffffL) << 58) | ((values[valuesOffset++] & 0xffffffffL) << 57) | ((values[valuesOffset++] & 0xffffffffL) << 56) | ((values[valuesOffset++] & 0xffffffffL) << 55) | ((values[valuesOffset++] & 0xffffffffL) << 54) | ((values[valuesOffset++] & 0xffffffffL) << 53) | ((values[valuesOffset++] & 0xffffffffL) << 52) | ((values[valuesOffset++] & 0xffffffffL) << 51) | ((values[valuesOffset++] & 0xffffffffL) << 50) | ((values[valuesOffset++] & 0xffffffffL) << 49) | ((values[valuesOffset++] & 0xffffffffL) << 48) | ((values[valuesOffset++] & 0xffffffffL) << 47) | ((values[valuesOffset++] & 0xffffffffL) << 46) | ((values[valuesOffset++] & 0xffffffffL) << 45) | ((values[valuesOffset++]
& 0xffffffffL) << 44) | ((values[valuesOffset++] & 0xffffffffL) << 43) | ((values[valuesOffset++] & 0xffffffffL) << 42) | ((values[valuesOffset++] & 0xffffffffL) << 41) | ((values[valuesOffset++] & 0xffffffffL) << 40) | ((values[valuesOffset++] & 0xffffffffL) << 39) | ((values[valuesOffset++] & 0xffffffffL) << 38) | ((values[valuesOffset++] & 0xffffffffL) << 37) | ((values[valuesOffset++] & 0xffffffffL) << 36) | ((values[valuesOffset++] & 0xffffffffL) << 35) | ((values[valuesOffset++] & 0xffffffffL) << 34) | ((values[valuesOffset++] & 0xffffffffL) << 33) | ((values[valuesOffset++] & 0xffffffffL) << 32) | ((values[valuesOffset++] & 0xffffffffL) << 31) | ((values[valuesOffset++] & 0xffffffffL) << 30) | ((values[valuesOffset++] & 0xffffffffL) << 29) | ((values[valuesOffset++] & 0xffffffffL) << 28) | ((values[valuesOffset++] & 0xffffffffL) << 27) | ((values[valuesOffset++] & 0xffffffffL) << 26) | ((values[valuesOffset++] & 0xffffffffL) << 25) | ((values[valuesOffset++] & 0xfffff
fffL) << 24) | ((values[valuesOffset++] & 0xffffffffL) << 23) | ((values[valuesOffset++] & 0xffffffffL) << 22) | ((values[valuesOffset++] & 0xffffffffL) << 21) | ((values[valuesOffset++] & 0xffffffffL) << 20) | ((values[valuesOffset++] & 0xffffffffL) << 19) | ((values[valuesOffset++] & 0xffffffffL) << 18) | ((values[valuesOffset++] & 0xffffffffL) << 17) | ((values[valuesOffset++] & 0xffffffffL) << 16) | ((values[valuesOffset++] & 0xffffffffL) << 15) | ((values[valuesOffset++] & 0xffffffffL) << 14) | ((values[valuesOffset++] & 0xffffffffL) << 13) | ((values[valuesOffset++] & 0xffffffffL) << 12) | ((values[valuesOffset++] & 0xffffffffL) << 11) | ((values[valuesOffset++] & 0xffffffffL) << 10) | ((values[valuesOffset++] & 0xffffffffL) << 9) | ((values[valuesOffset++] & 0xffffffffL) << 8) | ((values[valuesOffset++] & 0xffffffffL) << 7) | ((values[valuesOffset++] & 0xffffffffL) << 6) | ((values[valuesOffset++] & 0xffffffffL) << 5) | ((values[valuesOffset++] & 0xffffffffL) << 4) |
((values[valuesOffset++] & 0xffffffffL) << 3) | ((values[valuesOffset++] & 0xffffffffL) << 2) | ((values[valuesOffset++] & 0xffffffffL) << 1) | (values[valuesOffset++] & 0xffffffffL);
- }
- }
-
- @Override
- public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = (values[valuesOffset++] << 63) | (values[valuesOffset++] << 62) | (values[valuesOffset++] << 61) | (values[valuesOffset++] << 60) | (values[valuesOffset++] << 59) | (values[valuesOffset++] << 58) | (values[valuesOffset++] << 57) | (values[valuesOffset++] << 56) | (values[valuesOffset++] << 55) | (values[valuesOffset++] << 54) | (values[valuesOffset++] << 53) | (values[valuesOffset++] << 52) | (values[valuesOffset++] << 51) | (values[valuesOffset++] << 50) | (values[valuesOffset++] << 49) | (values[valuesOffset++] << 48) | (values[valuesOffset++] << 47) | (values[valuesOffset++] << 46) | (values[valuesOffset++] << 45) | (values[valuesOffset++] << 44) | (values[valuesOffset++] << 43) | (values[valuesOffset++] << 42) | (values[valuesOffset++] << 41) | (values[valuesOffset++] << 40) | (values[valuesOffset++] << 39) | (values[valuesOffset++] << 38) | (values[valuesOffset++] << 37) | (values[valuesOffset++] << 36) | (values[valuesOffset++] << 35) |
(values[valuesOffset++] << 34) | (values[valuesOffset++] << 33) | (values[valuesOffset++] << 32) | (values[valuesOffset++] << 31) | (values[valuesOffset++] << 30) | (values[valuesOffset++] << 29) | (values[valuesOffset++] << 28) | (values[valuesOffset++] << 27) | (values[valuesOffset++] << 26) | (values[valuesOffset++] << 25) | (values[valuesOffset++] << 24) | (values[valuesOffset++] << 23) | (values[valuesOffset++] << 22) | (values[valuesOffset++] << 21) | (values[valuesOffset++] << 20) | (values[valuesOffset++] << 19) | (values[valuesOffset++] << 18) | (values[valuesOffset++] << 17) | (values[valuesOffset++] << 16) | (values[valuesOffset++] << 15) | (values[valuesOffset++] << 14) | (values[valuesOffset++] << 13) | (values[valuesOffset++] << 12) | (values[valuesOffset++] << 11) | (values[valuesOffset++] << 10) | (values[valuesOffset++] << 9) | (values[valuesOffset++] << 8) | (values[valuesOffset++] << 7) | (values[valuesOffset++] << 6) | (values[valuesOffset++] << 5) | (va
lues[valuesOffset++] << 4) | (values[valuesOffset++] << 3) | (values[valuesOffset++] << 2) | (values[valuesOffset++] << 1) | values[valuesOffset++];
- }
- }
-
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java?rev=1378492&r1=1378491&r2=1378492&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java Wed Aug 29 10:22:03 2012
@@ -22,15 +22,12 @@ package org.apache.lucene.util.packed;
/**
* Efficient sequential read/write of packed integers.
*/
-final class BulkOperationPacked10 extends BulkOperation {
- @Override
- public int blockCount() {
- return 5;
- }
+final class BulkOperationPacked10 extends BulkOperationPacked {
- @Override
- public int valueCount() {
- return 32;
+ public BulkOperationPacked10() {
+ super(10);
+ assert blockCount() == 5;
+ assert valueCount() == 32;
}
@Override
@@ -283,30 +280,4 @@ final class BulkOperationPacked10 extend
}
}
- @Override
- public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 54) | ((values[valuesOffset++] & 0xffffffffL) << 44) | ((values[valuesOffset++] & 0xffffffffL) << 34) | ((values[valuesOffset++] & 0xffffffffL) << 24) | ((values[valuesOffset++] & 0xffffffffL) << 14) | ((values[valuesOffset++] & 0xffffffffL) << 4) | ((values[valuesOffset] & 0xffffffffL) >>> 6);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 58) | ((values[valuesOffset++] & 0xffffffffL) << 48) | ((values[valuesOffset++] & 0xffffffffL) << 38) | ((values[valuesOffset++] & 0xffffffffL) << 28) | ((values[valuesOffset++] & 0xffffffffL) << 18) | ((values[valuesOffset++] & 0xffffffffL) << 8) | ((values[valuesOffset] & 0xffffffffL) >>> 2);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 62) | ((values[valuesOffset++] & 0xffffffffL) << 52) | ((values[valuesOffset++] & 0xffffffffL) << 42) | ((values[valuesOffset++] & 0xffffffffL) << 32) | ((values[valuesOffset++] & 0xffffffffL) << 22) | ((values[valuesOffset++] & 0xffffffffL) << 12) | ((values[valuesOffset++] & 0xffffffffL) << 2) | ((values[valuesOffset] & 0xffffffffL) >>> 8);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 56) | ((values[valuesOffset++] & 0xffffffffL) << 46) | ((values[valuesOffset++] & 0xffffffffL) << 36) | ((values[valuesOffset++] & 0xffffffffL) << 26) | ((values[valuesOffset++] & 0xffffffffL) << 16) | ((values[valuesOffset++] & 0xffffffffL) << 6) | ((values[valuesOffset] & 0xffffffffL) >>> 4);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 60) | ((values[valuesOffset++] & 0xffffffffL) << 50) | ((values[valuesOffset++] & 0xffffffffL) << 40) | ((values[valuesOffset++] & 0xffffffffL) << 30) | ((values[valuesOffset++] & 0xffffffffL) << 20) | ((values[valuesOffset++] & 0xffffffffL) << 10) | (values[valuesOffset++] & 0xffffffffL);
- }
- }
-
- @Override
- public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = (values[valuesOffset++] << 54) | (values[valuesOffset++] << 44) | (values[valuesOffset++] << 34) | (values[valuesOffset++] << 24) | (values[valuesOffset++] << 14) | (values[valuesOffset++] << 4) | (values[valuesOffset] >>> 6);
- blocks[blocksOffset++] = (values[valuesOffset++] << 58) | (values[valuesOffset++] << 48) | (values[valuesOffset++] << 38) | (values[valuesOffset++] << 28) | (values[valuesOffset++] << 18) | (values[valuesOffset++] << 8) | (values[valuesOffset] >>> 2);
- blocks[blocksOffset++] = (values[valuesOffset++] << 62) | (values[valuesOffset++] << 52) | (values[valuesOffset++] << 42) | (values[valuesOffset++] << 32) | (values[valuesOffset++] << 22) | (values[valuesOffset++] << 12) | (values[valuesOffset++] << 2) | (values[valuesOffset] >>> 8);
- blocks[blocksOffset++] = (values[valuesOffset++] << 56) | (values[valuesOffset++] << 46) | (values[valuesOffset++] << 36) | (values[valuesOffset++] << 26) | (values[valuesOffset++] << 16) | (values[valuesOffset++] << 6) | (values[valuesOffset] >>> 4);
- blocks[blocksOffset++] = (values[valuesOffset++] << 60) | (values[valuesOffset++] << 50) | (values[valuesOffset++] << 40) | (values[valuesOffset++] << 30) | (values[valuesOffset++] << 20) | (values[valuesOffset++] << 10) | values[valuesOffset++];
- }
- }
-
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java?rev=1378492&r1=1378491&r2=1378492&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java Wed Aug 29 10:22:03 2012
@@ -22,15 +22,12 @@ package org.apache.lucene.util.packed;
/**
* Efficient sequential read/write of packed integers.
*/
-final class BulkOperationPacked11 extends BulkOperation {
- @Override
- public int blockCount() {
- return 11;
- }
+final class BulkOperationPacked11 extends BulkOperationPacked {
- @Override
- public int valueCount() {
- return 64;
+ public BulkOperationPacked11() {
+ super(11);
+ assert blockCount() == 11;
+ assert valueCount() == 64;
}
@Override
@@ -519,42 +516,4 @@ final class BulkOperationPacked11 extend
}
}
- @Override
- public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 53) | ((values[valuesOffset++] & 0xffffffffL) << 42) | ((values[valuesOffset++] & 0xffffffffL) << 31) | ((values[valuesOffset++] & 0xffffffffL) << 20) | ((values[valuesOffset++] & 0xffffffffL) << 9) | ((values[valuesOffset] & 0xffffffffL) >>> 2);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 62) | ((values[valuesOffset++] & 0xffffffffL) << 51) | ((values[valuesOffset++] & 0xffffffffL) << 40) | ((values[valuesOffset++] & 0xffffffffL) << 29) | ((values[valuesOffset++] & 0xffffffffL) << 18) | ((values[valuesOffset++] & 0xffffffffL) << 7) | ((values[valuesOffset] & 0xffffffffL) >>> 4);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 60) | ((values[valuesOffset++] & 0xffffffffL) << 49) | ((values[valuesOffset++] & 0xffffffffL) << 38) | ((values[valuesOffset++] & 0xffffffffL) << 27) | ((values[valuesOffset++] & 0xffffffffL) << 16) | ((values[valuesOffset++] & 0xffffffffL) << 5) | ((values[valuesOffset] & 0xffffffffL) >>> 6);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 58) | ((values[valuesOffset++] & 0xffffffffL) << 47) | ((values[valuesOffset++] & 0xffffffffL) << 36) | ((values[valuesOffset++] & 0xffffffffL) << 25) | ((values[valuesOffset++] & 0xffffffffL) << 14) | ((values[valuesOffset++] & 0xffffffffL) << 3) | ((values[valuesOffset] & 0xffffffffL) >>> 8);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 56) | ((values[valuesOffset++] & 0xffffffffL) << 45) | ((values[valuesOffset++] & 0xffffffffL) << 34) | ((values[valuesOffset++] & 0xffffffffL) << 23) | ((values[valuesOffset++] & 0xffffffffL) << 12) | ((values[valuesOffset++] & 0xffffffffL) << 1) | ((values[valuesOffset] & 0xffffffffL) >>> 10);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 54) | ((values[valuesOffset++] & 0xffffffffL) << 43) | ((values[valuesOffset++] & 0xffffffffL) << 32) | ((values[valuesOffset++] & 0xffffffffL) << 21) | ((values[valuesOffset++] & 0xffffffffL) << 10) | ((values[valuesOffset] & 0xffffffffL) >>> 1);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 63) | ((values[valuesOffset++] & 0xffffffffL) << 52) | ((values[valuesOffset++] & 0xffffffffL) << 41) | ((values[valuesOffset++] & 0xffffffffL) << 30) | ((values[valuesOffset++] & 0xffffffffL) << 19) | ((values[valuesOffset++] & 0xffffffffL) << 8) | ((values[valuesOffset] & 0xffffffffL) >>> 3);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 61) | ((values[valuesOffset++] & 0xffffffffL) << 50) | ((values[valuesOffset++] & 0xffffffffL) << 39) | ((values[valuesOffset++] & 0xffffffffL) << 28) | ((values[valuesOffset++] & 0xffffffffL) << 17) | ((values[valuesOffset++] & 0xffffffffL) << 6) | ((values[valuesOffset] & 0xffffffffL) >>> 5);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 59) | ((values[valuesOffset++] & 0xffffffffL) << 48) | ((values[valuesOffset++] & 0xffffffffL) << 37) | ((values[valuesOffset++] & 0xffffffffL) << 26) | ((values[valuesOffset++] & 0xffffffffL) << 15) | ((values[valuesOffset++] & 0xffffffffL) << 4) | ((values[valuesOffset] & 0xffffffffL) >>> 7);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 57) | ((values[valuesOffset++] & 0xffffffffL) << 46) | ((values[valuesOffset++] & 0xffffffffL) << 35) | ((values[valuesOffset++] & 0xffffffffL) << 24) | ((values[valuesOffset++] & 0xffffffffL) << 13) | ((values[valuesOffset++] & 0xffffffffL) << 2) | ((values[valuesOffset] & 0xffffffffL) >>> 9);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 55) | ((values[valuesOffset++] & 0xffffffffL) << 44) | ((values[valuesOffset++] & 0xffffffffL) << 33) | ((values[valuesOffset++] & 0xffffffffL) << 22) | ((values[valuesOffset++] & 0xffffffffL) << 11) | (values[valuesOffset++] & 0xffffffffL);
- }
- }
-
- @Override
- public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = (values[valuesOffset++] << 53) | (values[valuesOffset++] << 42) | (values[valuesOffset++] << 31) | (values[valuesOffset++] << 20) | (values[valuesOffset++] << 9) | (values[valuesOffset] >>> 2);
- blocks[blocksOffset++] = (values[valuesOffset++] << 62) | (values[valuesOffset++] << 51) | (values[valuesOffset++] << 40) | (values[valuesOffset++] << 29) | (values[valuesOffset++] << 18) | (values[valuesOffset++] << 7) | (values[valuesOffset] >>> 4);
- blocks[blocksOffset++] = (values[valuesOffset++] << 60) | (values[valuesOffset++] << 49) | (values[valuesOffset++] << 38) | (values[valuesOffset++] << 27) | (values[valuesOffset++] << 16) | (values[valuesOffset++] << 5) | (values[valuesOffset] >>> 6);
- blocks[blocksOffset++] = (values[valuesOffset++] << 58) | (values[valuesOffset++] << 47) | (values[valuesOffset++] << 36) | (values[valuesOffset++] << 25) | (values[valuesOffset++] << 14) | (values[valuesOffset++] << 3) | (values[valuesOffset] >>> 8);
- blocks[blocksOffset++] = (values[valuesOffset++] << 56) | (values[valuesOffset++] << 45) | (values[valuesOffset++] << 34) | (values[valuesOffset++] << 23) | (values[valuesOffset++] << 12) | (values[valuesOffset++] << 1) | (values[valuesOffset] >>> 10);
- blocks[blocksOffset++] = (values[valuesOffset++] << 54) | (values[valuesOffset++] << 43) | (values[valuesOffset++] << 32) | (values[valuesOffset++] << 21) | (values[valuesOffset++] << 10) | (values[valuesOffset] >>> 1);
- blocks[blocksOffset++] = (values[valuesOffset++] << 63) | (values[valuesOffset++] << 52) | (values[valuesOffset++] << 41) | (values[valuesOffset++] << 30) | (values[valuesOffset++] << 19) | (values[valuesOffset++] << 8) | (values[valuesOffset] >>> 3);
- blocks[blocksOffset++] = (values[valuesOffset++] << 61) | (values[valuesOffset++] << 50) | (values[valuesOffset++] << 39) | (values[valuesOffset++] << 28) | (values[valuesOffset++] << 17) | (values[valuesOffset++] << 6) | (values[valuesOffset] >>> 5);
- blocks[blocksOffset++] = (values[valuesOffset++] << 59) | (values[valuesOffset++] << 48) | (values[valuesOffset++] << 37) | (values[valuesOffset++] << 26) | (values[valuesOffset++] << 15) | (values[valuesOffset++] << 4) | (values[valuesOffset] >>> 7);
- blocks[blocksOffset++] = (values[valuesOffset++] << 57) | (values[valuesOffset++] << 46) | (values[valuesOffset++] << 35) | (values[valuesOffset++] << 24) | (values[valuesOffset++] << 13) | (values[valuesOffset++] << 2) | (values[valuesOffset] >>> 9);
- blocks[blocksOffset++] = (values[valuesOffset++] << 55) | (values[valuesOffset++] << 44) | (values[valuesOffset++] << 33) | (values[valuesOffset++] << 22) | (values[valuesOffset++] << 11) | values[valuesOffset++];
- }
- }
-
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java?rev=1378492&r1=1378491&r2=1378492&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java Wed Aug 29 10:22:03 2012
@@ -22,15 +22,12 @@ package org.apache.lucene.util.packed;
/**
* Efficient sequential read/write of packed integers.
*/
-final class BulkOperationPacked12 extends BulkOperation {
- @Override
- public int blockCount() {
- return 3;
- }
+final class BulkOperationPacked12 extends BulkOperationPacked {
- @Override
- public int valueCount() {
- return 16;
+ public BulkOperationPacked12() {
+ super(12);
+ assert blockCount() == 3;
+ assert valueCount() == 16;
}
@Override
@@ -183,26 +180,4 @@ final class BulkOperationPacked12 extend
}
}
- @Override
- public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 52) | ((values[valuesOffset++] & 0xffffffffL) << 40) | ((values[valuesOffset++] & 0xffffffffL) << 28) | ((values[valuesOffset++] & 0xffffffffL) << 16) | ((values[valuesOffset++] & 0xffffffffL) << 4) | ((values[valuesOffset] & 0xffffffffL) >>> 8);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 56) | ((values[valuesOffset++] & 0xffffffffL) << 44) | ((values[valuesOffset++] & 0xffffffffL) << 32) | ((values[valuesOffset++] & 0xffffffffL) << 20) | ((values[valuesOffset++] & 0xffffffffL) << 8) | ((values[valuesOffset] & 0xffffffffL) >>> 4);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 60) | ((values[valuesOffset++] & 0xffffffffL) << 48) | ((values[valuesOffset++] & 0xffffffffL) << 36) | ((values[valuesOffset++] & 0xffffffffL) << 24) | ((values[valuesOffset++] & 0xffffffffL) << 12) | (values[valuesOffset++] & 0xffffffffL);
- }
- }
-
- @Override
- public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = (values[valuesOffset++] << 52) | (values[valuesOffset++] << 40) | (values[valuesOffset++] << 28) | (values[valuesOffset++] << 16) | (values[valuesOffset++] << 4) | (values[valuesOffset] >>> 8);
- blocks[blocksOffset++] = (values[valuesOffset++] << 56) | (values[valuesOffset++] << 44) | (values[valuesOffset++] << 32) | (values[valuesOffset++] << 20) | (values[valuesOffset++] << 8) | (values[valuesOffset] >>> 4);
- blocks[blocksOffset++] = (values[valuesOffset++] << 60) | (values[valuesOffset++] << 48) | (values[valuesOffset++] << 36) | (values[valuesOffset++] << 24) | (values[valuesOffset++] << 12) | values[valuesOffset++];
- }
- }
-
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java?rev=1378492&r1=1378491&r2=1378492&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java Wed Aug 29 10:22:03 2012
@@ -22,15 +22,12 @@ package org.apache.lucene.util.packed;
/**
* Efficient sequential read/write of packed integers.
*/
-final class BulkOperationPacked13 extends BulkOperation {
- @Override
- public int blockCount() {
- return 13;
- }
+final class BulkOperationPacked13 extends BulkOperationPacked {
- @Override
- public int valueCount() {
- return 64;
+ public BulkOperationPacked13() {
+ super(13);
+ assert blockCount() == 13;
+ assert valueCount() == 64;
}
@Override
@@ -555,46 +552,4 @@ final class BulkOperationPacked13 extend
}
}
- @Override
- public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 51) | ((values[valuesOffset++] & 0xffffffffL) << 38) | ((values[valuesOffset++] & 0xffffffffL) << 25) | ((values[valuesOffset++] & 0xffffffffL) << 12) | ((values[valuesOffset] & 0xffffffffL) >>> 1);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 63) | ((values[valuesOffset++] & 0xffffffffL) << 50) | ((values[valuesOffset++] & 0xffffffffL) << 37) | ((values[valuesOffset++] & 0xffffffffL) << 24) | ((values[valuesOffset++] & 0xffffffffL) << 11) | ((values[valuesOffset] & 0xffffffffL) >>> 2);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 62) | ((values[valuesOffset++] & 0xffffffffL) << 49) | ((values[valuesOffset++] & 0xffffffffL) << 36) | ((values[valuesOffset++] & 0xffffffffL) << 23) | ((values[valuesOffset++] & 0xffffffffL) << 10) | ((values[valuesOffset] & 0xffffffffL) >>> 3);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 61) | ((values[valuesOffset++] & 0xffffffffL) << 48) | ((values[valuesOffset++] & 0xffffffffL) << 35) | ((values[valuesOffset++] & 0xffffffffL) << 22) | ((values[valuesOffset++] & 0xffffffffL) << 9) | ((values[valuesOffset] & 0xffffffffL) >>> 4);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 60) | ((values[valuesOffset++] & 0xffffffffL) << 47) | ((values[valuesOffset++] & 0xffffffffL) << 34) | ((values[valuesOffset++] & 0xffffffffL) << 21) | ((values[valuesOffset++] & 0xffffffffL) << 8) | ((values[valuesOffset] & 0xffffffffL) >>> 5);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 59) | ((values[valuesOffset++] & 0xffffffffL) << 46) | ((values[valuesOffset++] & 0xffffffffL) << 33) | ((values[valuesOffset++] & 0xffffffffL) << 20) | ((values[valuesOffset++] & 0xffffffffL) << 7) | ((values[valuesOffset] & 0xffffffffL) >>> 6);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 58) | ((values[valuesOffset++] & 0xffffffffL) << 45) | ((values[valuesOffset++] & 0xffffffffL) << 32) | ((values[valuesOffset++] & 0xffffffffL) << 19) | ((values[valuesOffset++] & 0xffffffffL) << 6) | ((values[valuesOffset] & 0xffffffffL) >>> 7);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 57) | ((values[valuesOffset++] & 0xffffffffL) << 44) | ((values[valuesOffset++] & 0xffffffffL) << 31) | ((values[valuesOffset++] & 0xffffffffL) << 18) | ((values[valuesOffset++] & 0xffffffffL) << 5) | ((values[valuesOffset] & 0xffffffffL) >>> 8);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 56) | ((values[valuesOffset++] & 0xffffffffL) << 43) | ((values[valuesOffset++] & 0xffffffffL) << 30) | ((values[valuesOffset++] & 0xffffffffL) << 17) | ((values[valuesOffset++] & 0xffffffffL) << 4) | ((values[valuesOffset] & 0xffffffffL) >>> 9);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 55) | ((values[valuesOffset++] & 0xffffffffL) << 42) | ((values[valuesOffset++] & 0xffffffffL) << 29) | ((values[valuesOffset++] & 0xffffffffL) << 16) | ((values[valuesOffset++] & 0xffffffffL) << 3) | ((values[valuesOffset] & 0xffffffffL) >>> 10);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 54) | ((values[valuesOffset++] & 0xffffffffL) << 41) | ((values[valuesOffset++] & 0xffffffffL) << 28) | ((values[valuesOffset++] & 0xffffffffL) << 15) | ((values[valuesOffset++] & 0xffffffffL) << 2) | ((values[valuesOffset] & 0xffffffffL) >>> 11);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 53) | ((values[valuesOffset++] & 0xffffffffL) << 40) | ((values[valuesOffset++] & 0xffffffffL) << 27) | ((values[valuesOffset++] & 0xffffffffL) << 14) | ((values[valuesOffset++] & 0xffffffffL) << 1) | ((values[valuesOffset] & 0xffffffffL) >>> 12);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 52) | ((values[valuesOffset++] & 0xffffffffL) << 39) | ((values[valuesOffset++] & 0xffffffffL) << 26) | ((values[valuesOffset++] & 0xffffffffL) << 13) | (values[valuesOffset++] & 0xffffffffL);
- }
- }
-
- @Override
- public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = (values[valuesOffset++] << 51) | (values[valuesOffset++] << 38) | (values[valuesOffset++] << 25) | (values[valuesOffset++] << 12) | (values[valuesOffset] >>> 1);
- blocks[blocksOffset++] = (values[valuesOffset++] << 63) | (values[valuesOffset++] << 50) | (values[valuesOffset++] << 37) | (values[valuesOffset++] << 24) | (values[valuesOffset++] << 11) | (values[valuesOffset] >>> 2);
- blocks[blocksOffset++] = (values[valuesOffset++] << 62) | (values[valuesOffset++] << 49) | (values[valuesOffset++] << 36) | (values[valuesOffset++] << 23) | (values[valuesOffset++] << 10) | (values[valuesOffset] >>> 3);
- blocks[blocksOffset++] = (values[valuesOffset++] << 61) | (values[valuesOffset++] << 48) | (values[valuesOffset++] << 35) | (values[valuesOffset++] << 22) | (values[valuesOffset++] << 9) | (values[valuesOffset] >>> 4);
- blocks[blocksOffset++] = (values[valuesOffset++] << 60) | (values[valuesOffset++] << 47) | (values[valuesOffset++] << 34) | (values[valuesOffset++] << 21) | (values[valuesOffset++] << 8) | (values[valuesOffset] >>> 5);
- blocks[blocksOffset++] = (values[valuesOffset++] << 59) | (values[valuesOffset++] << 46) | (values[valuesOffset++] << 33) | (values[valuesOffset++] << 20) | (values[valuesOffset++] << 7) | (values[valuesOffset] >>> 6);
- blocks[blocksOffset++] = (values[valuesOffset++] << 58) | (values[valuesOffset++] << 45) | (values[valuesOffset++] << 32) | (values[valuesOffset++] << 19) | (values[valuesOffset++] << 6) | (values[valuesOffset] >>> 7);
- blocks[blocksOffset++] = (values[valuesOffset++] << 57) | (values[valuesOffset++] << 44) | (values[valuesOffset++] << 31) | (values[valuesOffset++] << 18) | (values[valuesOffset++] << 5) | (values[valuesOffset] >>> 8);
- blocks[blocksOffset++] = (values[valuesOffset++] << 56) | (values[valuesOffset++] << 43) | (values[valuesOffset++] << 30) | (values[valuesOffset++] << 17) | (values[valuesOffset++] << 4) | (values[valuesOffset] >>> 9);
- blocks[blocksOffset++] = (values[valuesOffset++] << 55) | (values[valuesOffset++] << 42) | (values[valuesOffset++] << 29) | (values[valuesOffset++] << 16) | (values[valuesOffset++] << 3) | (values[valuesOffset] >>> 10);
- blocks[blocksOffset++] = (values[valuesOffset++] << 54) | (values[valuesOffset++] << 41) | (values[valuesOffset++] << 28) | (values[valuesOffset++] << 15) | (values[valuesOffset++] << 2) | (values[valuesOffset] >>> 11);
- blocks[blocksOffset++] = (values[valuesOffset++] << 53) | (values[valuesOffset++] << 40) | (values[valuesOffset++] << 27) | (values[valuesOffset++] << 14) | (values[valuesOffset++] << 1) | (values[valuesOffset] >>> 12);
- blocks[blocksOffset++] = (values[valuesOffset++] << 52) | (values[valuesOffset++] << 39) | (values[valuesOffset++] << 26) | (values[valuesOffset++] << 13) | values[valuesOffset++];
- }
- }
-
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java?rev=1378492&r1=1378491&r2=1378492&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java Wed Aug 29 10:22:03 2012
@@ -22,15 +22,12 @@ package org.apache.lucene.util.packed;
/**
* Efficient sequential read/write of packed integers.
*/
-final class BulkOperationPacked14 extends BulkOperation {
- @Override
- public int blockCount() {
- return 7;
- }
+final class BulkOperationPacked14 extends BulkOperationPacked {
- @Override
- public int valueCount() {
- return 32;
+ public BulkOperationPacked14() {
+ super(14);
+ assert blockCount() == 7;
+ assert valueCount() == 32;
}
@Override
@@ -319,34 +316,4 @@ final class BulkOperationPacked14 extend
}
}
- @Override
- public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 50) | ((values[valuesOffset++] & 0xffffffffL) << 36) | ((values[valuesOffset++] & 0xffffffffL) << 22) | ((values[valuesOffset++] & 0xffffffffL) << 8) | ((values[valuesOffset] & 0xffffffffL) >>> 6);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 58) | ((values[valuesOffset++] & 0xffffffffL) << 44) | ((values[valuesOffset++] & 0xffffffffL) << 30) | ((values[valuesOffset++] & 0xffffffffL) << 16) | ((values[valuesOffset++] & 0xffffffffL) << 2) | ((values[valuesOffset] & 0xffffffffL) >>> 12);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 52) | ((values[valuesOffset++] & 0xffffffffL) << 38) | ((values[valuesOffset++] & 0xffffffffL) << 24) | ((values[valuesOffset++] & 0xffffffffL) << 10) | ((values[valuesOffset] & 0xffffffffL) >>> 4);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 60) | ((values[valuesOffset++] & 0xffffffffL) << 46) | ((values[valuesOffset++] & 0xffffffffL) << 32) | ((values[valuesOffset++] & 0xffffffffL) << 18) | ((values[valuesOffset++] & 0xffffffffL) << 4) | ((values[valuesOffset] & 0xffffffffL) >>> 10);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 54) | ((values[valuesOffset++] & 0xffffffffL) << 40) | ((values[valuesOffset++] & 0xffffffffL) << 26) | ((values[valuesOffset++] & 0xffffffffL) << 12) | ((values[valuesOffset] & 0xffffffffL) >>> 2);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 62) | ((values[valuesOffset++] & 0xffffffffL) << 48) | ((values[valuesOffset++] & 0xffffffffL) << 34) | ((values[valuesOffset++] & 0xffffffffL) << 20) | ((values[valuesOffset++] & 0xffffffffL) << 6) | ((values[valuesOffset] & 0xffffffffL) >>> 8);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 56) | ((values[valuesOffset++] & 0xffffffffL) << 42) | ((values[valuesOffset++] & 0xffffffffL) << 28) | ((values[valuesOffset++] & 0xffffffffL) << 14) | (values[valuesOffset++] & 0xffffffffL);
- }
- }
-
- @Override
- public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = (values[valuesOffset++] << 50) | (values[valuesOffset++] << 36) | (values[valuesOffset++] << 22) | (values[valuesOffset++] << 8) | (values[valuesOffset] >>> 6);
- blocks[blocksOffset++] = (values[valuesOffset++] << 58) | (values[valuesOffset++] << 44) | (values[valuesOffset++] << 30) | (values[valuesOffset++] << 16) | (values[valuesOffset++] << 2) | (values[valuesOffset] >>> 12);
- blocks[blocksOffset++] = (values[valuesOffset++] << 52) | (values[valuesOffset++] << 38) | (values[valuesOffset++] << 24) | (values[valuesOffset++] << 10) | (values[valuesOffset] >>> 4);
- blocks[blocksOffset++] = (values[valuesOffset++] << 60) | (values[valuesOffset++] << 46) | (values[valuesOffset++] << 32) | (values[valuesOffset++] << 18) | (values[valuesOffset++] << 4) | (values[valuesOffset] >>> 10);
- blocks[blocksOffset++] = (values[valuesOffset++] << 54) | (values[valuesOffset++] << 40) | (values[valuesOffset++] << 26) | (values[valuesOffset++] << 12) | (values[valuesOffset] >>> 2);
- blocks[blocksOffset++] = (values[valuesOffset++] << 62) | (values[valuesOffset++] << 48) | (values[valuesOffset++] << 34) | (values[valuesOffset++] << 20) | (values[valuesOffset++] << 6) | (values[valuesOffset] >>> 8);
- blocks[blocksOffset++] = (values[valuesOffset++] << 56) | (values[valuesOffset++] << 42) | (values[valuesOffset++] << 28) | (values[valuesOffset++] << 14) | values[valuesOffset++];
- }
- }
-
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java?rev=1378492&r1=1378491&r2=1378492&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java Wed Aug 29 10:22:03 2012
@@ -22,15 +22,12 @@ package org.apache.lucene.util.packed;
/**
* Efficient sequential read/write of packed integers.
*/
-final class BulkOperationPacked15 extends BulkOperation {
- @Override
- public int blockCount() {
- return 15;
- }
+final class BulkOperationPacked15 extends BulkOperationPacked {
- @Override
- public int valueCount() {
- return 64;
+ public BulkOperationPacked15() {
+ super(15);
+ assert blockCount() == 15;
+ assert valueCount() == 64;
}
@Override
@@ -591,50 +588,4 @@ final class BulkOperationPacked15 extend
}
}
- @Override
- public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 49) | ((values[valuesOffset++] & 0xffffffffL) << 34) | ((values[valuesOffset++] & 0xffffffffL) << 19) | ((values[valuesOffset++] & 0xffffffffL) << 4) | ((values[valuesOffset] & 0xffffffffL) >>> 11);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 53) | ((values[valuesOffset++] & 0xffffffffL) << 38) | ((values[valuesOffset++] & 0xffffffffL) << 23) | ((values[valuesOffset++] & 0xffffffffL) << 8) | ((values[valuesOffset] & 0xffffffffL) >>> 7);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 57) | ((values[valuesOffset++] & 0xffffffffL) << 42) | ((values[valuesOffset++] & 0xffffffffL) << 27) | ((values[valuesOffset++] & 0xffffffffL) << 12) | ((values[valuesOffset] & 0xffffffffL) >>> 3);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 61) | ((values[valuesOffset++] & 0xffffffffL) << 46) | ((values[valuesOffset++] & 0xffffffffL) << 31) | ((values[valuesOffset++] & 0xffffffffL) << 16) | ((values[valuesOffset++] & 0xffffffffL) << 1) | ((values[valuesOffset] & 0xffffffffL) >>> 14);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 50) | ((values[valuesOffset++] & 0xffffffffL) << 35) | ((values[valuesOffset++] & 0xffffffffL) << 20) | ((values[valuesOffset++] & 0xffffffffL) << 5) | ((values[valuesOffset] & 0xffffffffL) >>> 10);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 54) | ((values[valuesOffset++] & 0xffffffffL) << 39) | ((values[valuesOffset++] & 0xffffffffL) << 24) | ((values[valuesOffset++] & 0xffffffffL) << 9) | ((values[valuesOffset] & 0xffffffffL) >>> 6);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 58) | ((values[valuesOffset++] & 0xffffffffL) << 43) | ((values[valuesOffset++] & 0xffffffffL) << 28) | ((values[valuesOffset++] & 0xffffffffL) << 13) | ((values[valuesOffset] & 0xffffffffL) >>> 2);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 62) | ((values[valuesOffset++] & 0xffffffffL) << 47) | ((values[valuesOffset++] & 0xffffffffL) << 32) | ((values[valuesOffset++] & 0xffffffffL) << 17) | ((values[valuesOffset++] & 0xffffffffL) << 2) | ((values[valuesOffset] & 0xffffffffL) >>> 13);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 51) | ((values[valuesOffset++] & 0xffffffffL) << 36) | ((values[valuesOffset++] & 0xffffffffL) << 21) | ((values[valuesOffset++] & 0xffffffffL) << 6) | ((values[valuesOffset] & 0xffffffffL) >>> 9);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 55) | ((values[valuesOffset++] & 0xffffffffL) << 40) | ((values[valuesOffset++] & 0xffffffffL) << 25) | ((values[valuesOffset++] & 0xffffffffL) << 10) | ((values[valuesOffset] & 0xffffffffL) >>> 5);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 59) | ((values[valuesOffset++] & 0xffffffffL) << 44) | ((values[valuesOffset++] & 0xffffffffL) << 29) | ((values[valuesOffset++] & 0xffffffffL) << 14) | ((values[valuesOffset] & 0xffffffffL) >>> 1);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 63) | ((values[valuesOffset++] & 0xffffffffL) << 48) | ((values[valuesOffset++] & 0xffffffffL) << 33) | ((values[valuesOffset++] & 0xffffffffL) << 18) | ((values[valuesOffset++] & 0xffffffffL) << 3) | ((values[valuesOffset] & 0xffffffffL) >>> 12);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 52) | ((values[valuesOffset++] & 0xffffffffL) << 37) | ((values[valuesOffset++] & 0xffffffffL) << 22) | ((values[valuesOffset++] & 0xffffffffL) << 7) | ((values[valuesOffset] & 0xffffffffL) >>> 8);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 56) | ((values[valuesOffset++] & 0xffffffffL) << 41) | ((values[valuesOffset++] & 0xffffffffL) << 26) | ((values[valuesOffset++] & 0xffffffffL) << 11) | ((values[valuesOffset] & 0xffffffffL) >>> 4);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 60) | ((values[valuesOffset++] & 0xffffffffL) << 45) | ((values[valuesOffset++] & 0xffffffffL) << 30) | ((values[valuesOffset++] & 0xffffffffL) << 15) | (values[valuesOffset++] & 0xffffffffL);
- }
- }
-
- @Override
- public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = (values[valuesOffset++] << 49) | (values[valuesOffset++] << 34) | (values[valuesOffset++] << 19) | (values[valuesOffset++] << 4) | (values[valuesOffset] >>> 11);
- blocks[blocksOffset++] = (values[valuesOffset++] << 53) | (values[valuesOffset++] << 38) | (values[valuesOffset++] << 23) | (values[valuesOffset++] << 8) | (values[valuesOffset] >>> 7);
- blocks[blocksOffset++] = (values[valuesOffset++] << 57) | (values[valuesOffset++] << 42) | (values[valuesOffset++] << 27) | (values[valuesOffset++] << 12) | (values[valuesOffset] >>> 3);
- blocks[blocksOffset++] = (values[valuesOffset++] << 61) | (values[valuesOffset++] << 46) | (values[valuesOffset++] << 31) | (values[valuesOffset++] << 16) | (values[valuesOffset++] << 1) | (values[valuesOffset] >>> 14);
- blocks[blocksOffset++] = (values[valuesOffset++] << 50) | (values[valuesOffset++] << 35) | (values[valuesOffset++] << 20) | (values[valuesOffset++] << 5) | (values[valuesOffset] >>> 10);
- blocks[blocksOffset++] = (values[valuesOffset++] << 54) | (values[valuesOffset++] << 39) | (values[valuesOffset++] << 24) | (values[valuesOffset++] << 9) | (values[valuesOffset] >>> 6);
- blocks[blocksOffset++] = (values[valuesOffset++] << 58) | (values[valuesOffset++] << 43) | (values[valuesOffset++] << 28) | (values[valuesOffset++] << 13) | (values[valuesOffset] >>> 2);
- blocks[blocksOffset++] = (values[valuesOffset++] << 62) | (values[valuesOffset++] << 47) | (values[valuesOffset++] << 32) | (values[valuesOffset++] << 17) | (values[valuesOffset++] << 2) | (values[valuesOffset] >>> 13);
- blocks[blocksOffset++] = (values[valuesOffset++] << 51) | (values[valuesOffset++] << 36) | (values[valuesOffset++] << 21) | (values[valuesOffset++] << 6) | (values[valuesOffset] >>> 9);
- blocks[blocksOffset++] = (values[valuesOffset++] << 55) | (values[valuesOffset++] << 40) | (values[valuesOffset++] << 25) | (values[valuesOffset++] << 10) | (values[valuesOffset] >>> 5);
- blocks[blocksOffset++] = (values[valuesOffset++] << 59) | (values[valuesOffset++] << 44) | (values[valuesOffset++] << 29) | (values[valuesOffset++] << 14) | (values[valuesOffset] >>> 1);
- blocks[blocksOffset++] = (values[valuesOffset++] << 63) | (values[valuesOffset++] << 48) | (values[valuesOffset++] << 33) | (values[valuesOffset++] << 18) | (values[valuesOffset++] << 3) | (values[valuesOffset] >>> 12);
- blocks[blocksOffset++] = (values[valuesOffset++] << 52) | (values[valuesOffset++] << 37) | (values[valuesOffset++] << 22) | (values[valuesOffset++] << 7) | (values[valuesOffset] >>> 8);
- blocks[blocksOffset++] = (values[valuesOffset++] << 56) | (values[valuesOffset++] << 41) | (values[valuesOffset++] << 26) | (values[valuesOffset++] << 11) | (values[valuesOffset] >>> 4);
- blocks[blocksOffset++] = (values[valuesOffset++] << 60) | (values[valuesOffset++] << 45) | (values[valuesOffset++] << 30) | (values[valuesOffset++] << 15) | values[valuesOffset++];
- }
- }
-
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java?rev=1378492&r1=1378491&r2=1378492&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java Wed Aug 29 10:22:03 2012
@@ -22,15 +22,12 @@ package org.apache.lucene.util.packed;
/**
* Efficient sequential read/write of packed integers.
*/
-final class BulkOperationPacked16 extends BulkOperation {
- @Override
- public int blockCount() {
- return 1;
- }
+final class BulkOperationPacked16 extends BulkOperationPacked {
- @Override
- public int valueCount() {
- return 4;
+ public BulkOperationPacked16() {
+ super(16);
+ assert blockCount() == 1;
+ assert valueCount() == 4;
}
@Override
@@ -99,22 +96,4 @@ final class BulkOperationPacked16 extend
}
}
- @Override
- public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 48) | ((values[valuesOffset++] & 0xffffffffL) << 32) | ((values[valuesOffset++] & 0xffffffffL) << 16) | (values[valuesOffset++] & 0xffffffffL);
- }
- }
-
- @Override
- public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = (values[valuesOffset++] << 48) | (values[valuesOffset++] << 32) | (values[valuesOffset++] << 16) | values[valuesOffset++];
- }
- }
-
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java?rev=1378492&r1=1378491&r2=1378492&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java Wed Aug 29 10:22:03 2012
@@ -22,15 +22,12 @@ package org.apache.lucene.util.packed;
/**
* Efficient sequential read/write of packed integers.
*/
-final class BulkOperationPacked17 extends BulkOperation {
- @Override
- public int blockCount() {
- return 17;
- }
+final class BulkOperationPacked17 extends BulkOperationPacked {
- @Override
- public int valueCount() {
- return 64;
+ public BulkOperationPacked17() {
+ super(17);
+ assert blockCount() == 17;
+ assert valueCount() == 64;
}
@Override
@@ -627,54 +624,4 @@ final class BulkOperationPacked17 extend
}
}
- @Override
- public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 47) | ((values[valuesOffset++] & 0xffffffffL) << 30) | ((values[valuesOffset++] & 0xffffffffL) << 13) | ((values[valuesOffset] & 0xffffffffL) >>> 4);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 60) | ((values[valuesOffset++] & 0xffffffffL) << 43) | ((values[valuesOffset++] & 0xffffffffL) << 26) | ((values[valuesOffset++] & 0xffffffffL) << 9) | ((values[valuesOffset] & 0xffffffffL) >>> 8);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 56) | ((values[valuesOffset++] & 0xffffffffL) << 39) | ((values[valuesOffset++] & 0xffffffffL) << 22) | ((values[valuesOffset++] & 0xffffffffL) << 5) | ((values[valuesOffset] & 0xffffffffL) >>> 12);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 52) | ((values[valuesOffset++] & 0xffffffffL) << 35) | ((values[valuesOffset++] & 0xffffffffL) << 18) | ((values[valuesOffset++] & 0xffffffffL) << 1) | ((values[valuesOffset] & 0xffffffffL) >>> 16);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 48) | ((values[valuesOffset++] & 0xffffffffL) << 31) | ((values[valuesOffset++] & 0xffffffffL) << 14) | ((values[valuesOffset] & 0xffffffffL) >>> 3);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 61) | ((values[valuesOffset++] & 0xffffffffL) << 44) | ((values[valuesOffset++] & 0xffffffffL) << 27) | ((values[valuesOffset++] & 0xffffffffL) << 10) | ((values[valuesOffset] & 0xffffffffL) >>> 7);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 57) | ((values[valuesOffset++] & 0xffffffffL) << 40) | ((values[valuesOffset++] & 0xffffffffL) << 23) | ((values[valuesOffset++] & 0xffffffffL) << 6) | ((values[valuesOffset] & 0xffffffffL) >>> 11);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 53) | ((values[valuesOffset++] & 0xffffffffL) << 36) | ((values[valuesOffset++] & 0xffffffffL) << 19) | ((values[valuesOffset++] & 0xffffffffL) << 2) | ((values[valuesOffset] & 0xffffffffL) >>> 15);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 49) | ((values[valuesOffset++] & 0xffffffffL) << 32) | ((values[valuesOffset++] & 0xffffffffL) << 15) | ((values[valuesOffset] & 0xffffffffL) >>> 2);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 62) | ((values[valuesOffset++] & 0xffffffffL) << 45) | ((values[valuesOffset++] & 0xffffffffL) << 28) | ((values[valuesOffset++] & 0xffffffffL) << 11) | ((values[valuesOffset] & 0xffffffffL) >>> 6);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 58) | ((values[valuesOffset++] & 0xffffffffL) << 41) | ((values[valuesOffset++] & 0xffffffffL) << 24) | ((values[valuesOffset++] & 0xffffffffL) << 7) | ((values[valuesOffset] & 0xffffffffL) >>> 10);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 54) | ((values[valuesOffset++] & 0xffffffffL) << 37) | ((values[valuesOffset++] & 0xffffffffL) << 20) | ((values[valuesOffset++] & 0xffffffffL) << 3) | ((values[valuesOffset] & 0xffffffffL) >>> 14);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 50) | ((values[valuesOffset++] & 0xffffffffL) << 33) | ((values[valuesOffset++] & 0xffffffffL) << 16) | ((values[valuesOffset] & 0xffffffffL) >>> 1);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 63) | ((values[valuesOffset++] & 0xffffffffL) << 46) | ((values[valuesOffset++] & 0xffffffffL) << 29) | ((values[valuesOffset++] & 0xffffffffL) << 12) | ((values[valuesOffset] & 0xffffffffL) >>> 5);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 59) | ((values[valuesOffset++] & 0xffffffffL) << 42) | ((values[valuesOffset++] & 0xffffffffL) << 25) | ((values[valuesOffset++] & 0xffffffffL) << 8) | ((values[valuesOffset] & 0xffffffffL) >>> 9);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 55) | ((values[valuesOffset++] & 0xffffffffL) << 38) | ((values[valuesOffset++] & 0xffffffffL) << 21) | ((values[valuesOffset++] & 0xffffffffL) << 4) | ((values[valuesOffset] & 0xffffffffL) >>> 13);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 51) | ((values[valuesOffset++] & 0xffffffffL) << 34) | ((values[valuesOffset++] & 0xffffffffL) << 17) | (values[valuesOffset++] & 0xffffffffL);
- }
- }
-
- @Override
- public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = (values[valuesOffset++] << 47) | (values[valuesOffset++] << 30) | (values[valuesOffset++] << 13) | (values[valuesOffset] >>> 4);
- blocks[blocksOffset++] = (values[valuesOffset++] << 60) | (values[valuesOffset++] << 43) | (values[valuesOffset++] << 26) | (values[valuesOffset++] << 9) | (values[valuesOffset] >>> 8);
- blocks[blocksOffset++] = (values[valuesOffset++] << 56) | (values[valuesOffset++] << 39) | (values[valuesOffset++] << 22) | (values[valuesOffset++] << 5) | (values[valuesOffset] >>> 12);
- blocks[blocksOffset++] = (values[valuesOffset++] << 52) | (values[valuesOffset++] << 35) | (values[valuesOffset++] << 18) | (values[valuesOffset++] << 1) | (values[valuesOffset] >>> 16);
- blocks[blocksOffset++] = (values[valuesOffset++] << 48) | (values[valuesOffset++] << 31) | (values[valuesOffset++] << 14) | (values[valuesOffset] >>> 3);
- blocks[blocksOffset++] = (values[valuesOffset++] << 61) | (values[valuesOffset++] << 44) | (values[valuesOffset++] << 27) | (values[valuesOffset++] << 10) | (values[valuesOffset] >>> 7);
- blocks[blocksOffset++] = (values[valuesOffset++] << 57) | (values[valuesOffset++] << 40) | (values[valuesOffset++] << 23) | (values[valuesOffset++] << 6) | (values[valuesOffset] >>> 11);
- blocks[blocksOffset++] = (values[valuesOffset++] << 53) | (values[valuesOffset++] << 36) | (values[valuesOffset++] << 19) | (values[valuesOffset++] << 2) | (values[valuesOffset] >>> 15);
- blocks[blocksOffset++] = (values[valuesOffset++] << 49) | (values[valuesOffset++] << 32) | (values[valuesOffset++] << 15) | (values[valuesOffset] >>> 2);
- blocks[blocksOffset++] = (values[valuesOffset++] << 62) | (values[valuesOffset++] << 45) | (values[valuesOffset++] << 28) | (values[valuesOffset++] << 11) | (values[valuesOffset] >>> 6);
- blocks[blocksOffset++] = (values[valuesOffset++] << 58) | (values[valuesOffset++] << 41) | (values[valuesOffset++] << 24) | (values[valuesOffset++] << 7) | (values[valuesOffset] >>> 10);
- blocks[blocksOffset++] = (values[valuesOffset++] << 54) | (values[valuesOffset++] << 37) | (values[valuesOffset++] << 20) | (values[valuesOffset++] << 3) | (values[valuesOffset] >>> 14);
- blocks[blocksOffset++] = (values[valuesOffset++] << 50) | (values[valuesOffset++] << 33) | (values[valuesOffset++] << 16) | (values[valuesOffset] >>> 1);
- blocks[blocksOffset++] = (values[valuesOffset++] << 63) | (values[valuesOffset++] << 46) | (values[valuesOffset++] << 29) | (values[valuesOffset++] << 12) | (values[valuesOffset] >>> 5);
- blocks[blocksOffset++] = (values[valuesOffset++] << 59) | (values[valuesOffset++] << 42) | (values[valuesOffset++] << 25) | (values[valuesOffset++] << 8) | (values[valuesOffset] >>> 9);
- blocks[blocksOffset++] = (values[valuesOffset++] << 55) | (values[valuesOffset++] << 38) | (values[valuesOffset++] << 21) | (values[valuesOffset++] << 4) | (values[valuesOffset] >>> 13);
- blocks[blocksOffset++] = (values[valuesOffset++] << 51) | (values[valuesOffset++] << 34) | (values[valuesOffset++] << 17) | values[valuesOffset++];
- }
- }
-
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java?rev=1378492&r1=1378491&r2=1378492&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java Wed Aug 29 10:22:03 2012
@@ -22,15 +22,12 @@ package org.apache.lucene.util.packed;
/**
* Efficient sequential read/write of packed integers.
*/
-final class BulkOperationPacked18 extends BulkOperation {
- @Override
- public int blockCount() {
- return 9;
- }
+final class BulkOperationPacked18 extends BulkOperationPacked {
- @Override
- public int valueCount() {
- return 32;
+ public BulkOperationPacked18() {
+ super(18);
+ assert blockCount() == 9;
+ assert valueCount() == 32;
}
@Override
@@ -355,38 +352,4 @@ final class BulkOperationPacked18 extend
}
}
- @Override
- public void encode(int[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 46) | ((values[valuesOffset++] & 0xffffffffL) << 28) | ((values[valuesOffset++] & 0xffffffffL) << 10) | ((values[valuesOffset] & 0xffffffffL) >>> 8);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 56) | ((values[valuesOffset++] & 0xffffffffL) << 38) | ((values[valuesOffset++] & 0xffffffffL) << 20) | ((values[valuesOffset++] & 0xffffffffL) << 2) | ((values[valuesOffset] & 0xffffffffL) >>> 16);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 48) | ((values[valuesOffset++] & 0xffffffffL) << 30) | ((values[valuesOffset++] & 0xffffffffL) << 12) | ((values[valuesOffset] & 0xffffffffL) >>> 6);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 58) | ((values[valuesOffset++] & 0xffffffffL) << 40) | ((values[valuesOffset++] & 0xffffffffL) << 22) | ((values[valuesOffset++] & 0xffffffffL) << 4) | ((values[valuesOffset] & 0xffffffffL) >>> 14);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 50) | ((values[valuesOffset++] & 0xffffffffL) << 32) | ((values[valuesOffset++] & 0xffffffffL) << 14) | ((values[valuesOffset] & 0xffffffffL) >>> 4);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 60) | ((values[valuesOffset++] & 0xffffffffL) << 42) | ((values[valuesOffset++] & 0xffffffffL) << 24) | ((values[valuesOffset++] & 0xffffffffL) << 6) | ((values[valuesOffset] & 0xffffffffL) >>> 12);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 52) | ((values[valuesOffset++] & 0xffffffffL) << 34) | ((values[valuesOffset++] & 0xffffffffL) << 16) | ((values[valuesOffset] & 0xffffffffL) >>> 2);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 62) | ((values[valuesOffset++] & 0xffffffffL) << 44) | ((values[valuesOffset++] & 0xffffffffL) << 26) | ((values[valuesOffset++] & 0xffffffffL) << 8) | ((values[valuesOffset] & 0xffffffffL) >>> 10);
- blocks[blocksOffset++] = ((values[valuesOffset++] & 0xffffffffL) << 54) | ((values[valuesOffset++] & 0xffffffffL) << 36) | ((values[valuesOffset++] & 0xffffffffL) << 18) | (values[valuesOffset++] & 0xffffffffL);
- }
- }
-
- @Override
- public void encode(long[] values, int valuesOffset, long[] blocks, int blocksOffset, int iterations) {
- assert blocksOffset + iterations * blockCount() <= blocks.length;
- assert valuesOffset + iterations * valueCount() <= values.length;
- for (int i = 0; i < iterations; ++i) {
- blocks[blocksOffset++] = (values[valuesOffset++] << 46) | (values[valuesOffset++] << 28) | (values[valuesOffset++] << 10) | (values[valuesOffset] >>> 8);
- blocks[blocksOffset++] = (values[valuesOffset++] << 56) | (values[valuesOffset++] << 38) | (values[valuesOffset++] << 20) | (values[valuesOffset++] << 2) | (values[valuesOffset] >>> 16);
- blocks[blocksOffset++] = (values[valuesOffset++] << 48) | (values[valuesOffset++] << 30) | (values[valuesOffset++] << 12) | (values[valuesOffset] >>> 6);
- blocks[blocksOffset++] = (values[valuesOffset++] << 58) | (values[valuesOffset++] << 40) | (values[valuesOffset++] << 22) | (values[valuesOffset++] << 4) | (values[valuesOffset] >>> 14);
- blocks[blocksOffset++] = (values[valuesOffset++] << 50) | (values[valuesOffset++] << 32) | (values[valuesOffset++] << 14) | (values[valuesOffset] >>> 4);
- blocks[blocksOffset++] = (values[valuesOffset++] << 60) | (values[valuesOffset++] << 42) | (values[valuesOffset++] << 24) | (values[valuesOffset++] << 6) | (values[valuesOffset] >>> 12);
- blocks[blocksOffset++] = (values[valuesOffset++] << 52) | (values[valuesOffset++] << 34) | (values[valuesOffset++] << 16) | (values[valuesOffset] >>> 2);
- blocks[blocksOffset++] = (values[valuesOffset++] << 62) | (values[valuesOffset++] << 44) | (values[valuesOffset++] << 26) | (values[valuesOffset++] << 8) | (values[valuesOffset] >>> 10);
- blocks[blocksOffset++] = (values[valuesOffset++] << 54) | (values[valuesOffset++] << 36) | (values[valuesOffset++] << 18) | values[valuesOffset++];
- }
- }
-
}