You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org> on 2016/06/14 03:14:37 UTC
Change in asterixdb[master]: Eliminate Hard Tabs From Java Files
Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/921
Change subject: Eliminate Hard Tabs From Java Files
......................................................................
Eliminate Hard Tabs From Java Files
tabs->spaces
Change-Id: I0dfbeaa9b9b24d3da106ead85afd9df02b14ddaa
---
M asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Deleter.java
M hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java
M hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java
M hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/ArrayTupleReference.java
M hyracks-fullstack/hyracks/hyracks-dataflow-hadoop/src/main/java/org/apache/hyracks/dataflow/hadoop/util/MRContextUtil.java
M hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProvider.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProviderFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISplitKey.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexMetaDataFrameFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexTupleWriterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleFilter.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdater.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdaterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/TreeIndexException.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/UnsortedInputException.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/ITreeIndexOperatorDescriptor.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/exceptions/TreeIndexNonExistentKeyException.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrameFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/IndexOp.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/LongArrayList.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/SlotOffTupleOff.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/TypeAwareTupleWriterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexBufferCacheWarmup.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStatsGatherer.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyDiskComponentFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMemoryComponent.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMergeOperation.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeRefrencingTupleWriterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleReference.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleWriterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8TokenFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8NGramTokenFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8WordTokenFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/IBinaryTokenizerFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/INGramToken.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8NGramTokenFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8WordTokenFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/tuples/LSMTypeAwareTupleWriterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntry.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntryArrayList.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparatorFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparatorFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveIntComparatorFactory.java
M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java
M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexMultiThreadTestDriver.java
M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java
M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java
M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestStorageManagerInterface.java
M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java
M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java
67 files changed, 1,208 insertions(+), 1,209 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/21/921/1
diff --git a/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Deleter.java b/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Deleter.java
index 8c92cd1..05ba774 100644
--- a/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Deleter.java
+++ b/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Deleter.java
@@ -33,7 +33,7 @@
public static void main(String[] args) throws IOException {
- LogManager.getRootLogger().setLevel(Level.DEBUG);
+ LogManager.getRootLogger().setLevel(Level.DEBUG);
LOG.info("Obliterator args: " + Arrays.toString(args));
for (int i = 0; i < args.length; i++) {
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java
index a8af9a0..8318176 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java
@@ -30,45 +30,45 @@
public class LogicalExpressionPrettyPrintVisitor implements ILogicalExpressionVisitor<String, Integer> {
- @Override
- public String visitConstantExpression(ConstantExpression expr, Integer indent)
- throws AlgebricksException {
- return expr.toString();
- }
+ @Override
+ public String visitConstantExpression(ConstantExpression expr, Integer indent)
+ throws AlgebricksException {
+ return expr.toString();
+ }
- @Override
- public String visitVariableReferenceExpression(
- VariableReferenceExpression expr, Integer indent)
- throws AlgebricksException {
- return expr.toString();
- }
+ @Override
+ public String visitVariableReferenceExpression(
+ VariableReferenceExpression expr, Integer indent)
+ throws AlgebricksException {
+ return expr.toString();
+ }
- @Override
- public String visitAggregateFunctionCallExpression(
- AggregateFunctionCallExpression expr, Integer indent)
- throws AlgebricksException {
- return expr.toString();
- }
+ @Override
+ public String visitAggregateFunctionCallExpression(
+ AggregateFunctionCallExpression expr, Integer indent)
+ throws AlgebricksException {
+ return expr.toString();
+ }
- @Override
- public String visitScalarFunctionCallExpression(
- ScalarFunctionCallExpression expr, Integer indent)
- throws AlgebricksException {
- return expr.toString();
- }
+ @Override
+ public String visitScalarFunctionCallExpression(
+ ScalarFunctionCallExpression expr, Integer indent)
+ throws AlgebricksException {
+ return expr.toString();
+ }
- @Override
- public String visitStatefulFunctionCallExpression(
- StatefulFunctionCallExpression expr, Integer indent)
- throws AlgebricksException {
- return expr.toString();
- }
+ @Override
+ public String visitStatefulFunctionCallExpression(
+ StatefulFunctionCallExpression expr, Integer indent)
+ throws AlgebricksException {
+ return expr.toString();
+ }
- @Override
- public String visitUnnestingFunctionCallExpression(
- UnnestingFunctionCallExpression expr, Integer indent)
- throws AlgebricksException {
- return expr.toString();
- }
+ @Override
+ public String visitUnnestingFunctionCallExpression(
+ UnnestingFunctionCallExpression expr, Integer indent)
+ throws AlgebricksException {
+ return expr.toString();
+ }
}
diff --git a/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java b/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java
index c6b2e6b..0992489 100644
--- a/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java
+++ b/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java
@@ -24,6 +24,6 @@
public interface IBinaryHashFunctionFamilyProvider {
- public IBinaryHashFunctionFamily getBinaryHashFunctionFamily(Object type)
- throws AlgebricksException;
+ public IBinaryHashFunctionFamily getBinaryHashFunctionFamily(Object type)
+ throws AlgebricksException;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/ArrayTupleReference.java b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/ArrayTupleReference.java
index 8cb473d..9da28fb 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/ArrayTupleReference.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/ArrayTupleReference.java
@@ -29,31 +29,31 @@
* @author alexander.behm
*/
public class ArrayTupleReference implements ITupleReference {
- private int[] fEndOffsets;
- private byte[] tupleData;
+ private int[] fEndOffsets;
+ private byte[] tupleData;
- public void reset(int[] fEndOffsets, byte[] tupleData) {
- this.fEndOffsets = fEndOffsets;
- this.tupleData = tupleData;
- }
+ public void reset(int[] fEndOffsets, byte[] tupleData) {
+ this.fEndOffsets = fEndOffsets;
+ this.tupleData = tupleData;
+ }
- @Override
- public int getFieldCount() {
- return fEndOffsets.length;
- }
+ @Override
+ public int getFieldCount() {
+ return fEndOffsets.length;
+ }
- @Override
- public byte[] getFieldData(int fIdx) {
- return tupleData;
- }
+ @Override
+ public byte[] getFieldData(int fIdx) {
+ return tupleData;
+ }
- @Override
- public int getFieldStart(int fIdx) {
- return (fIdx == 0) ? 0 : fEndOffsets[fIdx - 1];
- }
+ @Override
+ public int getFieldStart(int fIdx) {
+ return (fIdx == 0) ? 0 : fEndOffsets[fIdx - 1];
+ }
- @Override
- public int getFieldLength(int fIdx) {
- return (fIdx == 0) ? fEndOffsets[0] : fEndOffsets[fIdx] - fEndOffsets[fIdx - 1];
- }
+ @Override
+ public int getFieldLength(int fIdx) {
+ return (fIdx == 0) ? fEndOffsets[0] : fEndOffsets[fIdx] - fEndOffsets[fIdx - 1];
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-hadoop/src/main/java/org/apache/hyracks/dataflow/hadoop/util/MRContextUtil.java b/hyracks-fullstack/hyracks/hyracks-dataflow-hadoop/src/main/java/org/apache/hyracks/dataflow/hadoop/util/MRContextUtil.java
index 17c5ec5..047a6fc 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-hadoop/src/main/java/org/apache/hyracks/dataflow/hadoop/util/MRContextUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-hadoop/src/main/java/org/apache/hyracks/dataflow/hadoop/util/MRContextUtil.java
@@ -41,7 +41,7 @@
* The wrapper to generate TaskTattemptContext
*/
public class MRContextUtil {
- // public static Reducer.Context = create
+ //public static Reducer.Context = create
@SuppressWarnings({ "rawtypes", "unchecked" })
public Mapper.Context createMapContext(Configuration conf, TaskAttemptID taskid, RecordReader reader,
diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java
index 5f40b28..52f3417 100644
--- a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java
+++ b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java
@@ -62,7 +62,7 @@
ChannelControlBlock allocateChannel() throws NetException {
synchronized (mConn) {
- cleanupClosedChannels();
+ cleanupClosedChannels();
int idx = allocationBitmap.nextClearBit(0);
if (idx < 0 || idx >= ccbArray.length) {
cleanupClosedChannels();
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProvider.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProvider.java
index fd9a0bc..d9ab69f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProvider.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProvider.java
@@ -20,5 +20,5 @@
package org.apache.hyracks.storage.am.common.api;
public interface IPrimitiveValueProvider {
- public double getValue(byte[] bytes, int offset);
+ public double getValue(byte[] bytes, int offset);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProviderFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProviderFactory.java
index 198f27a..ceb5f71 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProviderFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProviderFactory.java
@@ -22,5 +22,5 @@
import java.io.Serializable;
public interface IPrimitiveValueProviderFactory extends Serializable {
- public IPrimitiveValueProvider createPrimitiveValueProvider();
+ public IPrimitiveValueProvider createPrimitiveValueProvider();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISplitKey.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISplitKey.java
index 3f0f8bc..311fef4 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISplitKey.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISplitKey.java
@@ -21,23 +21,23 @@
import java.nio.ByteBuffer;
public interface ISplitKey {
- public void initData(int keySize);
+ public void initData(int keySize);
- public void reset();
+ public void reset();
- public ByteBuffer getBuffer();
+ public ByteBuffer getBuffer();
- public ITreeIndexTupleReference getTuple();
+ public ITreeIndexTupleReference getTuple();
- public int getLeftPage();
+ public int getLeftPage();
- public int getRightPage();
+ public int getRightPage();
- public void setLeftPage(int leftPage);
+ public void setLeftPage(int leftPage);
- public void setRightPage(int rightPage);
+ public void setRightPage(int rightPage);
- public void setPages(int leftPage, int rightPage);
+ public void setPages(int leftPage, int rightPage);
- public ISplitKey duplicate(ITreeIndexTupleReference copyTuple);
+ public ISplitKey duplicate(ITreeIndexTupleReference copyTuple);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java
index ac3fc3b..0dd327f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java
@@ -29,21 +29,21 @@
* concurrent operations).
*/
public interface ITreeIndexAccessor extends IIndexAccessor {
- /**
- * Creates a cursor appropriate for passing into diskOrderScan().
- *
- */
- public ITreeIndexCursor createDiskOrderScanCursor();
+ /**
+ * Creates a cursor appropriate for passing into diskOrderScan().
+ *
+ */
+ public ITreeIndexCursor createDiskOrderScanCursor();
- /**
- * Open the given cursor for a disk-order scan, positioning the cursor to
- * the first leaf tuple.
- *
- * @param icursor
- * Cursor to be opened for disk-order scanning.
- * @throws HyracksDataException
- * If the BufferCache throws while un/pinning or un/latching.
- */
- public void diskOrderScan(ITreeIndexCursor cursor)
- throws HyracksDataException;
+ /**
+ * Open the given cursor for a disk-order scan, positioning the cursor to
+ * the first leaf tuple.
+ *
+ * @param icursor
+ * Cursor to be opened for disk-order scanning.
+ * @throws HyracksDataException
+ * If the BufferCache throws while un/pinning or un/latching.
+ */
+ public void diskOrderScan(ITreeIndexCursor cursor)
+ throws HyracksDataException;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexMetaDataFrameFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexMetaDataFrameFactory.java
index 7405833..ff7deaf 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexMetaDataFrameFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexMetaDataFrameFactory.java
@@ -20,5 +20,5 @@
package org.apache.hyracks.storage.am.common.api;
public interface ITreeIndexMetaDataFrameFactory {
- public ITreeIndexMetaDataFrame createFrame();
+ public ITreeIndexMetaDataFrame createFrame();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexTupleWriterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexTupleWriterFactory.java
index 8fb8924..22bff98 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexTupleWriterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexTupleWriterFactory.java
@@ -22,5 +22,5 @@
import java.io.Serializable;
public interface ITreeIndexTupleWriterFactory extends Serializable {
- public ITreeIndexTupleWriter createTupleWriter();
+ public ITreeIndexTupleWriter createTupleWriter();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleFilter.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleFilter.java
index ac74021..50673cf 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleFilter.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleFilter.java
@@ -22,5 +22,5 @@
import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
public interface ITupleFilter {
- public boolean accept(IFrameTupleReference tuple) throws Exception;
+ public boolean accept(IFrameTupleReference tuple) throws Exception;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdater.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdater.java
index b0debc9..2cbb746 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdater.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdater.java
@@ -29,5 +29,5 @@
*
*/
public interface ITupleUpdater {
- public void updateTuple(ITupleReference tuple);
+ public void updateTuple(ITupleReference tuple);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdaterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdaterFactory.java
index 941d738..80d1d20 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdaterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdaterFactory.java
@@ -22,5 +22,5 @@
import java.io.Serializable;
public interface ITupleUpdaterFactory extends Serializable {
- public ITupleUpdater createTupleUpdater();
+ public ITupleUpdater createTupleUpdater();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/TreeIndexException.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/TreeIndexException.java
index 988a304..080752f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/TreeIndexException.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/TreeIndexException.java
@@ -21,22 +21,22 @@
public class TreeIndexException extends IndexException {
- private static final long serialVersionUID = 1L;
- private boolean handled = false;
+ private static final long serialVersionUID = 1L;
+ private boolean handled = false;
- public TreeIndexException(Exception e) {
- super(e);
- }
+ public TreeIndexException(Exception e) {
+ super(e);
+ }
- public TreeIndexException(String message) {
- super(message);
- }
+ public TreeIndexException(String message) {
+ super(message);
+ }
- public void setHandled(boolean handled) {
- this.handled = handled;
- }
+ public void setHandled(boolean handled) {
+ this.handled = handled;
+ }
- public boolean getHandled() {
- return handled;
- }
+ public boolean getHandled() {
+ return handled;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/UnsortedInputException.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/UnsortedInputException.java
index dd69cb1..52a8488 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/UnsortedInputException.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/UnsortedInputException.java
@@ -23,13 +23,13 @@
* Thrown when trying to bulk load an index with an unsorted input stream.
*/
public class UnsortedInputException extends IndexException {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public UnsortedInputException(Exception e) {
- super(e);
- }
+ public UnsortedInputException(Exception e) {
+ super(e);
+ }
- public UnsortedInputException(String message) {
+ public UnsortedInputException(String message) {
super(message);
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/ITreeIndexOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/ITreeIndexOperatorDescriptor.java
index 4ae6995..0a41e47 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/ITreeIndexOperatorDescriptor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/ITreeIndexOperatorDescriptor.java
@@ -24,9 +24,9 @@
import org.apache.hyracks.storage.am.common.api.ITupleFilterFactory;
public interface ITreeIndexOperatorDescriptor extends IIndexOperatorDescriptor {
- public IBinaryComparatorFactory[] getTreeIndexComparatorFactories();
+ public IBinaryComparatorFactory[] getTreeIndexComparatorFactories();
- public ITypeTraits[] getTreeIndexTypeTraits();
+ public ITypeTraits[] getTreeIndexTypeTraits();
- public ITupleFilterFactory getTupleFilterFactory();
+ public ITupleFilterFactory getTupleFilterFactory();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/exceptions/TreeIndexNonExistentKeyException.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/exceptions/TreeIndexNonExistentKeyException.java
index 7aba4c8..bd5e5c4 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/exceptions/TreeIndexNonExistentKeyException.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/exceptions/TreeIndexNonExistentKeyException.java
@@ -23,13 +23,13 @@
public class TreeIndexNonExistentKeyException extends TreeIndexException {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public TreeIndexNonExistentKeyException(Exception e) {
- super(e);
- }
+ public TreeIndexNonExistentKeyException(Exception e) {
+ super(e);
+ }
- public TreeIndexNonExistentKeyException(String message) {
- super(message);
- }
+ public TreeIndexNonExistentKeyException(String message) {
+ super(message);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java
index d9e119f..92ba631 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java
@@ -27,46 +27,46 @@
public static final int GREATEST_KEY_INDICATOR = -1;
public static final int ERROR_INDICATOR = -2;
- protected static final int slotSize = 4;
- protected ITreeIndexFrame frame;
+ protected static final int slotSize = 4;
+ protected ITreeIndexFrame frame;
- @Override
- public int getTupleOff(int offset) {
- return frame.getBuffer().getInt(offset);
- }
+ @Override
+ public int getTupleOff(int offset) {
+ return frame.getBuffer().getInt(offset);
+ }
- @Override
- public void setSlot(int offset, int value) {
- frame.getBuffer().putInt(offset, value);
- }
+ @Override
+ public void setSlot(int offset, int value) {
+ frame.getBuffer().putInt(offset, value);
+ }
- @Override
- public int getSlotEndOff() {
- return frame.getBuffer().capacity()
- - (frame.getTupleCount() * slotSize);
- }
+ @Override
+ public int getSlotEndOff() {
+ return frame.getBuffer().capacity()
+ - (frame.getTupleCount() * slotSize);
+ }
- @Override
- public int getSlotStartOff() {
- return frame.getBuffer().capacity() - slotSize;
- }
+ @Override
+ public int getSlotStartOff() {
+ return frame.getBuffer().capacity() - slotSize;
+ }
- @Override
- public int getSlotSize() {
- return slotSize;
- }
+ @Override
+ public int getSlotSize() {
+ return slotSize;
+ }
- @Override
- public void setFrame(ITreeIndexFrame frame) {
- this.frame = frame;
- }
+ @Override
+ public void setFrame(ITreeIndexFrame frame) {
+ this.frame = frame;
+ }
- @Override
- public int getSlotOff(int tupleIndex) {
- return getSlotStartOff() - tupleIndex * slotSize;
- }
+ @Override
+ public int getSlotOff(int tupleIndex) {
+ return getSlotStartOff() - tupleIndex * slotSize;
+ }
- @Override
+ @Override
public int getGreatestKeyIndicator() {
return GREATEST_KEY_INDICATOR;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrameFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrameFactory.java
index a130f3c..d2cec23 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrameFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrameFactory.java
@@ -23,8 +23,8 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexMetaDataFrameFactory;
public class LIFOMetaDataFrameFactory implements ITreeIndexMetaDataFrameFactory {
- @Override
- public ITreeIndexMetaDataFrame createFrame() {
- return new LIFOMetaDataFrame();
- }
+ @Override
+ public ITreeIndexMetaDataFrame createFrame() {
+ return new LIFOMetaDataFrame();
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java
index 781437f..ce2aa38 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java
@@ -20,5 +20,5 @@
package org.apache.hyracks.storage.am.common.ophelpers;
public enum FindTupleMode {
- INCLUSIVE, EXCLUSIVE, EXCLUSIVE_ERROR_IF_EXISTS, EXACT
+ INCLUSIVE, EXCLUSIVE, EXCLUSIVE_ERROR_IF_EXISTS, EXACT
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java
index d59dc11..e9dfaff 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java
@@ -20,5 +20,5 @@
package org.apache.hyracks.storage.am.common.ophelpers;
public enum FindTupleNoExactMatchPolicy {
- LOWER_KEY, HIGHER_KEY, NONE
+ LOWER_KEY, HIGHER_KEY, NONE
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/IndexOp.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/IndexOp.java
index 5d04dc8..7a0d4e8 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/IndexOp.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/IndexOp.java
@@ -20,5 +20,5 @@
package org.apache.hyracks.storage.am.common.ophelpers;
public enum IndexOp {
- INSERT, DELETE, UPDATE, UPSERT, SEARCH, DISKORDERSCAN, PHYSICALDELETE
+ INSERT, DELETE, UPDATE, UPSERT, SEARCH, DISKORDERSCAN, PHYSICALDELETE
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/LongArrayList.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/LongArrayList.java
index c15fe38..1da4f46 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/LongArrayList.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/LongArrayList.java
@@ -20,28 +20,28 @@
package org.apache.hyracks.storage.am.common.ophelpers;
public class LongArrayList {
- private long[] data;
- private int size;
- private int first;
- private final int growth;
+ private long[] data;
+ private int size;
+ private int first;
+ private final int growth;
- public LongArrayList(int initialCapacity, int growth) {
- data = new long[initialCapacity];
- size = 0;
- first = 0;
- this.growth = growth;
- }
+ public LongArrayList(int initialCapacity, int growth) {
+ data = new long[initialCapacity];
+ size = 0;
+ first = 0;
+ this.growth = growth;
+ }
- public int size() {
- return size;
- }
+ public int size() {
+ return size;
+ }
- public int first() {
- return first;
- }
+ public int first() {
+ return first;
+ }
- public void addFirst(long i) {
- long[] newData = new long[data.length + 1];
+ public void addFirst(long i) {
+ long[] newData = new long[data.length + 1];
System.arraycopy(data, 0, newData, 0, first);
System.arraycopy(data, first, newData, first + 1, size - first);
data = newData;
@@ -50,54 +50,54 @@
}
- public void add(long i) {
- if (size == data.length) {
- long[] newData = new long[data.length + growth];
- System.arraycopy(data, 0, newData, 0, data.length);
- data = newData;
- }
+ public void add(long i) {
+ if (size == data.length) {
+ long[] newData = new long[data.length + growth];
+ System.arraycopy(data, 0, newData, 0, data.length);
+ data = newData;
+ }
- data[size++] = i;
- }
+ data[size++] = i;
+ }
- public void removeLast() {
- if (size > 0)
- size--;
- }
+ public void removeLast() {
+ if (size > 0)
+ size--;
+ }
- // WARNING: caller is responsible for checking size > 0
- public long getLast() {
- return data[size - 1];
- }
+ // WARNING: caller is responsible for checking size > 0
+ public long getLast() {
+ return data[size - 1];
+ }
- public long get(int i) {
- return data[i];
- }
+ public long get(int i) {
+ return data[i];
+ }
- // WARNING: caller is responsible for checking i < size
- public void set(int i, long value) {
- data[i] = value;
+ // WARNING: caller is responsible for checking i < size
+ public void set(int i, long value) {
+ data[i] = value;
- }
+ }
- public long getFirst() {
- return data[first];
- }
+ public long getFirst() {
+ return data[first];
+ }
- public void moveFirst() {
- first++;
- }
+ public void moveFirst() {
+ first++;
+ }
- public void clear() {
- size = 0;
- first = 0;
- }
+ public void clear() {
+ size = 0;
+ first = 0;
+ }
- public boolean isLast() {
- return size == first;
- }
+ public boolean isLast() {
+ return size == first;
+ }
- public boolean isEmpty() {
- return size == 0;
- }
+ public boolean isEmpty() {
+ return size == 0;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/SlotOffTupleOff.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/SlotOffTupleOff.java
index 0944f13..f7845c7 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/SlotOffTupleOff.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/SlotOffTupleOff.java
@@ -20,23 +20,23 @@
package org.apache.hyracks.storage.am.common.ophelpers;
public class SlotOffTupleOff implements Comparable<SlotOffTupleOff> {
- public int tupleIndex;
- public int slotOff;
- public int tupleOff;
+ public int tupleIndex;
+ public int slotOff;
+ public int tupleOff;
- public SlotOffTupleOff(int tupleIndex, int slotOff, int recOff) {
- this.tupleIndex = tupleIndex;
- this.slotOff = slotOff;
- this.tupleOff = recOff;
- }
+ public SlotOffTupleOff(int tupleIndex, int slotOff, int recOff) {
+ this.tupleIndex = tupleIndex;
+ this.slotOff = slotOff;
+ this.tupleOff = recOff;
+ }
- @Override
- public int compareTo(SlotOffTupleOff o) {
- return tupleOff - o.tupleOff;
- }
+ @Override
+ public int compareTo(SlotOffTupleOff o) {
+ return tupleOff - o.tupleOff;
+ }
- @Override
- public String toString() {
- return tupleIndex + " " + slotOff + " " + tupleOff;
- }
+ @Override
+ public String toString() {
+ return tupleIndex + " " + slotOff + " " + tupleOff;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java
index 4d37049..9b16514 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java
@@ -96,8 +96,8 @@
return fieldCount * 2;
}
- @Override
- public int getTupleSize() {
- return nullFlagsBytes + fieldSlotsBytes + buf.getShort(tupleStartOff + nullFlagsBytes + (fieldCount-1) * 2);
- }
+ @Override
+ public int getTupleSize() {
+ return nullFlagsBytes + fieldSlotsBytes + buf.getShort(tupleStartOff + nullFlagsBytes + (fieldCount-1) * 2);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/TypeAwareTupleWriterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/TypeAwareTupleWriterFactory.java
index c367152..741a53a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/TypeAwareTupleWriterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/TypeAwareTupleWriterFactory.java
@@ -24,18 +24,18 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexTupleWriterFactory;
public class TypeAwareTupleWriterFactory implements
- ITreeIndexTupleWriterFactory {
+ ITreeIndexTupleWriterFactory {
- private static final long serialVersionUID = 1L;
- protected ITypeTraits[] typeTraits;
+ private static final long serialVersionUID = 1L;
+ protected ITypeTraits[] typeTraits;
- public TypeAwareTupleWriterFactory(ITypeTraits[] typeTraits) {
- this.typeTraits = typeTraits;
- }
+ public TypeAwareTupleWriterFactory(ITypeTraits[] typeTraits) {
+ this.typeTraits = typeTraits;
+ }
- @Override
- public ITreeIndexTupleWriter createTupleWriter() {
- return new TypeAwareTupleWriter(typeTraits);
- }
+ @Override
+ public ITreeIndexTupleWriter createTupleWriter() {
+ return new TypeAwareTupleWriter(typeTraits);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexBufferCacheWarmup.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexBufferCacheWarmup.java
index 5668992..ff76c5a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexBufferCacheWarmup.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexBufferCacheWarmup.java
@@ -32,74 +32,74 @@
import org.apache.hyracks.storage.common.file.BufferedFileHandle;
public class TreeIndexBufferCacheWarmup {
- private final IBufferCache bufferCache;
- private final IMetaDataPageManager freePageManager;
- private final int fileId;
- private final ArrayList<IntArrayList> pagesByLevel = new ArrayList<IntArrayList>();
- private final Random rnd = new Random();
+ private final IBufferCache bufferCache;
+ private final IMetaDataPageManager freePageManager;
+ private final int fileId;
+ private final ArrayList<IntArrayList> pagesByLevel = new ArrayList<IntArrayList>();
+ private final Random rnd = new Random();
- public TreeIndexBufferCacheWarmup(IBufferCache bufferCache,
- IMetaDataPageManager freePageManager, int fileId) {
- this.bufferCache = bufferCache;
- this.freePageManager = freePageManager;
- this.fileId = fileId;
- }
+ public TreeIndexBufferCacheWarmup(IBufferCache bufferCache,
+ IMetaDataPageManager freePageManager, int fileId) {
+ this.bufferCache = bufferCache;
+ this.freePageManager = freePageManager;
+ this.fileId = fileId;
+ }
- public void warmup(ITreeIndexFrame frame,
- ITreeIndexMetaDataFrame metaFrame, int[] warmupTreeLevels,
- int[] warmupRepeats) throws HyracksDataException {
- bufferCache.openFile(fileId);
+ public void warmup(ITreeIndexFrame frame,
+ ITreeIndexMetaDataFrame metaFrame, int[] warmupTreeLevels,
+ int[] warmupRepeats) throws HyracksDataException {
+ bufferCache.openFile(fileId);
- // scan entire file to determine pages in each level
- int maxPageId = freePageManager.getMaxPage(metaFrame);
- for (int pageId = 0; pageId <= maxPageId; pageId++) {
- ICachedPage page = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, pageId), false);
- page.acquireReadLatch();
- try {
- frame.setPage(page);
- byte level = frame.getLevel();
- while (level >= pagesByLevel.size()) {
- pagesByLevel.add(new IntArrayList(100, 100));
- }
- if (level >= 0) {
- // System.out.println("ADDING: " + level + " " + pageId);
- pagesByLevel.get(level).add(pageId);
- }
- } finally {
- page.releaseReadLatch();
- bufferCache.unpin(page);
- }
- }
+ // scan entire file to determine pages in each level
+ int maxPageId = freePageManager.getMaxPage(metaFrame);
+ for (int pageId = 0; pageId <= maxPageId; pageId++) {
+ ICachedPage page = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, pageId), false);
+ page.acquireReadLatch();
+ try {
+ frame.setPage(page);
+ byte level = frame.getLevel();
+ while (level >= pagesByLevel.size()) {
+ pagesByLevel.add(new IntArrayList(100, 100));
+ }
+ if (level >= 0) {
+ // System.out.println("ADDING: " + level + " " + pageId);
+ pagesByLevel.get(level).add(pageId);
+ }
+ } finally {
+ page.releaseReadLatch();
+ bufferCache.unpin(page);
+ }
+ }
- // pin certain pages again to simulate frequent access
- for (int i = 0; i < warmupTreeLevels.length; i++) {
- if (warmupTreeLevels[i] < pagesByLevel.size()) {
- int repeats = warmupRepeats[i];
- IntArrayList pageIds = pagesByLevel.get(warmupTreeLevels[i]);
- int[] remainingPageIds = new int[pageIds.size()];
- for (int r = 0; r < repeats; r++) {
- for (int j = 0; j < pageIds.size(); j++) {
- remainingPageIds[j] = pageIds.get(j);
- }
+ // pin certain pages again to simulate frequent access
+ for (int i = 0; i < warmupTreeLevels.length; i++) {
+ if (warmupTreeLevels[i] < pagesByLevel.size()) {
+ int repeats = warmupRepeats[i];
+ IntArrayList pageIds = pagesByLevel.get(warmupTreeLevels[i]);
+ int[] remainingPageIds = new int[pageIds.size()];
+ for (int r = 0; r < repeats; r++) {
+ for (int j = 0; j < pageIds.size(); j++) {
+ remainingPageIds[j] = pageIds.get(j);
+ }
- int remainingLength = pageIds.size();
- for (int j = 0; j < pageIds.size(); j++) {
- int index = MathUtil.stripSignBit(rnd.nextInt()) % remainingLength;
- int pageId = remainingPageIds[index];
+ int remainingLength = pageIds.size();
+ for (int j = 0; j < pageIds.size(); j++) {
+ int index = MathUtil.stripSignBit(rnd.nextInt()) % remainingLength;
+ int pageId = remainingPageIds[index];
- // pin & latch then immediately unlatch & unpin
- ICachedPage page = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, pageId), false);
- page.acquireReadLatch();
- page.releaseReadLatch();
- bufferCache.unpin(page);
+ // pin & latch then immediately unlatch & unpin
+ ICachedPage page = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, pageId), false);
+ page.acquireReadLatch();
+ page.releaseReadLatch();
+ bufferCache.unpin(page);
- remainingPageIds[index] = remainingPageIds[remainingLength - 1];
- remainingLength--;
- }
- }
- }
- }
+ remainingPageIds[index] = remainingPageIds[remainingLength - 1];
+ remainingLength--;
+ }
+ }
+ }
+ }
- bufferCache.closeFile(fileId);
- }
+ bufferCache.closeFile(fileId);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java
index 8251c6f..8a28f41 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java
@@ -26,140 +26,140 @@
public class TreeIndexStats {
- private TreeIndexNodeTypeStats rootStats = new TreeIndexNodeTypeStats();
- private TreeIndexNodeTypeStats interiorStats = new TreeIndexNodeTypeStats();
- private TreeIndexNodeTypeStats leafStats = new TreeIndexNodeTypeStats();
+ private TreeIndexNodeTypeStats rootStats = new TreeIndexNodeTypeStats();
+ private TreeIndexNodeTypeStats interiorStats = new TreeIndexNodeTypeStats();
+ private TreeIndexNodeTypeStats leafStats = new TreeIndexNodeTypeStats();
- private int freePages = 0;
- private int metaPages = 0;
- private int treeLevels = 0;
+ private int freePages = 0;
+ private int metaPages = 0;
+ private int treeLevels = 0;
- public void begin() {
- rootStats.clear();
- interiorStats.clear();
- leafStats.clear();
- freePages = 0;
- metaPages = 0;
- treeLevels = 0;
- }
+ public void begin() {
+ rootStats.clear();
+ interiorStats.clear();
+ leafStats.clear();
+ freePages = 0;
+ metaPages = 0;
+ treeLevels = 0;
+ }
- public void addRoot(ITreeIndexFrame frame) {
- treeLevels = frame.getLevel() + 1;
- rootStats.add(frame);
- }
+ public void addRoot(ITreeIndexFrame frame) {
+ treeLevels = frame.getLevel() + 1;
+ rootStats.add(frame);
+ }
- public void add(ITreeIndexFrame frame) {
- if (frame.isLeaf()) {
- leafStats.add(frame);
- } else if (frame.isInterior()) {
- interiorStats.add(frame);
- }
- }
+ public void add(ITreeIndexFrame frame) {
+ if (frame.isLeaf()) {
+ leafStats.add(frame);
+ } else if (frame.isInterior()) {
+ interiorStats.add(frame);
+ }
+ }
- public void add(ITreeIndexMetaDataFrame metaFrame,
- IMetaDataPageManager freePageManager) {
- if (freePageManager.isFreePage(metaFrame)) {
- freePages++;
- } else if (freePageManager.isMetaPage(metaFrame)) {
- metaPages++;
- }
- }
+ public void add(ITreeIndexMetaDataFrame metaFrame,
+ IMetaDataPageManager freePageManager) {
+ if (freePageManager.isFreePage(metaFrame)) {
+ freePages++;
+ } else if (freePageManager.isMetaPage(metaFrame)) {
+ metaPages++;
+ }
+ }
- public void end() {
- // nothing here currently
- }
+ public void end() {
+ // nothing here currently
+ }
- @Override
- public String toString() {
- StringBuilder strBuilder = new StringBuilder();
- DecimalFormat df = new DecimalFormat("#####.##");
+ @Override
+ public String toString() {
+ StringBuilder strBuilder = new StringBuilder();
+ DecimalFormat df = new DecimalFormat("#####.##");
- strBuilder.append("TREE LEVELS: " + treeLevels + "\n");
- strBuilder.append("FREE PAGES : " + freePages + "\n");
- strBuilder.append("META PAGES : " + metaPages + "\n");
- long totalPages = interiorStats.getNumPages() + leafStats.getNumPages()
- + freePages + metaPages;
- strBuilder.append("TOTAL PAGES : " + totalPages + "\n");
+ strBuilder.append("TREE LEVELS: " + treeLevels + "\n");
+ strBuilder.append("FREE PAGES : " + freePages + "\n");
+ strBuilder.append("META PAGES : " + metaPages + "\n");
+ long totalPages = interiorStats.getNumPages() + leafStats.getNumPages()
+ + freePages + metaPages;
+ strBuilder.append("TOTAL PAGES : " + totalPages + "\n");
- strBuilder.append("\n");
- strBuilder.append("ROOT STATS" + "\n");
- strBuilder
- .append("NUM TUPLES: " + rootStats.getNumTuples() + "\n");
- strBuilder.append("FILL FACTOR : "
- + df.format(rootStats.getAvgFillFactor()) + "\n");
+ strBuilder.append("\n");
+ strBuilder.append("ROOT STATS" + "\n");
+ strBuilder
+ .append("NUM TUPLES: " + rootStats.getNumTuples() + "\n");
+ strBuilder.append("FILL FACTOR : "
+ + df.format(rootStats.getAvgFillFactor()) + "\n");
- if (interiorStats.getNumPages() > 0) {
- strBuilder.append("\n");
- strBuilder.append("INTERIOR STATS" + "\n");
- strBuilder.append("NUM PAGES: " + interiorStats.getNumPages()
- + "\n");
- strBuilder.append("NUM TUPLES: "
- + interiorStats.getNumTuples() + "\n");
- strBuilder.append("AVG TUPLES/PAGE: "
- + df.format(interiorStats.getAvgNumTuples()) + "\n");
- strBuilder.append("AVG FILL FACTOR: "
- + df.format(interiorStats.getAvgFillFactor()) + "\n");
- }
+ if (interiorStats.getNumPages() > 0) {
+ strBuilder.append("\n");
+ strBuilder.append("INTERIOR STATS" + "\n");
+ strBuilder.append("NUM PAGES: " + interiorStats.getNumPages()
+ + "\n");
+ strBuilder.append("NUM TUPLES: "
+ + interiorStats.getNumTuples() + "\n");
+ strBuilder.append("AVG TUPLES/PAGE: "
+ + df.format(interiorStats.getAvgNumTuples()) + "\n");
+ strBuilder.append("AVG FILL FACTOR: "
+ + df.format(interiorStats.getAvgFillFactor()) + "\n");
+ }
- if (leafStats.getNumPages() > 0) {
- strBuilder.append("\n");
- strBuilder.append("LEAF STATS" + "\n");
- strBuilder.append("NUM PAGES: "
- + df.format(leafStats.getNumPages()) + "\n");
- strBuilder.append("NUM TUPLES: "
- + df.format(leafStats.getNumTuples()) + "\n");
- strBuilder.append("AVG TUPLES/PAGE: "
- + df.format(leafStats.getAvgNumTuples()) + "\n");
- strBuilder.append("AVG FILL FACTOR: "
- + df.format(leafStats.getAvgFillFactor()) + "\n");
- }
+ if (leafStats.getNumPages() > 0) {
+ strBuilder.append("\n");
+ strBuilder.append("LEAF STATS" + "\n");
+ strBuilder.append("NUM PAGES: "
+ + df.format(leafStats.getNumPages()) + "\n");
+ strBuilder.append("NUM TUPLES: "
+ + df.format(leafStats.getNumTuples()) + "\n");
+ strBuilder.append("AVG TUPLES/PAGE: "
+ + df.format(leafStats.getAvgNumTuples()) + "\n");
+ strBuilder.append("AVG FILL FACTOR: "
+ + df.format(leafStats.getAvgFillFactor()) + "\n");
+ }
- return strBuilder.toString();
- }
+ return strBuilder.toString();
+ }
- public class TreeIndexNodeTypeStats {
- private long numTuples;
- private long sumTuplesSizes;
- private long numPages;
- private double sumFillFactors;
+ public class TreeIndexNodeTypeStats {
+ private long numTuples;
+ private long sumTuplesSizes;
+ private long numPages;
+ private double sumFillFactors;
- public void clear() {
- numTuples = 0;
- sumTuplesSizes = 0;
- numPages = 0;
- }
+ public void clear() {
+ numTuples = 0;
+ sumTuplesSizes = 0;
+ numPages = 0;
+ }
- public void add(ITreeIndexFrame frame) {
- numPages++;
- numTuples += frame.getTupleCount();
- sumFillFactors += (double) (frame.getBuffer().capacity() - frame
- .getTotalFreeSpace())
- / (double) frame.getBuffer().capacity();
- }
+ public void add(ITreeIndexFrame frame) {
+ numPages++;
+ numTuples += frame.getTupleCount();
+ sumFillFactors += (double) (frame.getBuffer().capacity() - frame
+ .getTotalFreeSpace())
+ / (double) frame.getBuffer().capacity();
+ }
- public long getNumTuples() {
- return numTuples;
- }
+ public long getNumTuples() {
+ return numTuples;
+ }
- public long getSumTupleSizes() {
- return sumTuplesSizes;
- }
+ public long getSumTupleSizes() {
+ return sumTuplesSizes;
+ }
- public long getNumPages() {
- return numPages;
- }
+ public long getNumPages() {
+ return numPages;
+ }
- public double getAvgNumTuples() {
- return (double) numTuples / (double) numPages;
- }
+ public double getAvgNumTuples() {
+ return (double) numTuples / (double) numPages;
+ }
- public double getAvgTupleSize() {
- return (double) sumTuplesSizes / (double) numTuples;
- }
+ public double getAvgTupleSize() {
+ return (double) sumTuplesSizes / (double) numTuples;
+ }
- public double getAvgFillFactor() {
- return sumFillFactors / numPages;
- }
- }
+ public double getAvgFillFactor() {
+ return sumFillFactors / numPages;
+ }
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStatsGatherer.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStatsGatherer.java
index 712acb8..c24a90b 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStatsGatherer.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStatsGatherer.java
@@ -28,63 +28,63 @@
public class TreeIndexStatsGatherer {
- private final TreeIndexStats treeIndexStats = new TreeIndexStats();
- private final IBufferCache bufferCache;
- private final IMetaDataPageManager freePageManager;
- private final int fileId;
- private final int rootPage;
+ private final TreeIndexStats treeIndexStats = new TreeIndexStats();
+ private final IBufferCache bufferCache;
+ private final IMetaDataPageManager freePageManager;
+ private final int fileId;
+ private final int rootPage;
- public TreeIndexStatsGatherer(IBufferCache bufferCache,
- IMetaDataPageManager freePageManager, int fileId, int rootPage) {
- this.bufferCache = bufferCache;
- this.freePageManager = freePageManager;
- this.fileId = fileId;
- this.rootPage = rootPage;
- }
+ public TreeIndexStatsGatherer(IBufferCache bufferCache,
+ IMetaDataPageManager freePageManager, int fileId, int rootPage) {
+ this.bufferCache = bufferCache;
+ this.freePageManager = freePageManager;
+ this.fileId = fileId;
+ this.rootPage = rootPage;
+ }
- public TreeIndexStats gatherStats(ITreeIndexFrame leafFrame,
- ITreeIndexFrame interiorFrame, ITreeIndexMetaDataFrame metaFrame)
- throws HyracksDataException {
+ public TreeIndexStats gatherStats(ITreeIndexFrame leafFrame,
+ ITreeIndexFrame interiorFrame, ITreeIndexMetaDataFrame metaFrame)
+ throws HyracksDataException {
- bufferCache.openFile(fileId);
+ bufferCache.openFile(fileId);
- treeIndexStats.begin();
+ treeIndexStats.begin();
- int maxPageId = freePageManager.getMaxPage(metaFrame);
- for (int pageId = 0; pageId <= maxPageId; pageId++) {
- ICachedPage page = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, pageId), false);
- page.acquireReadLatch();
- try {
- metaFrame.setPage(page);
- leafFrame.setPage(page);
- interiorFrame.setPage(page);
+ int maxPageId = freePageManager.getMaxPage(metaFrame);
+ for (int pageId = 0; pageId <= maxPageId; pageId++) {
+ ICachedPage page = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, pageId), false);
+ page.acquireReadLatch();
+ try {
+ metaFrame.setPage(page);
+ leafFrame.setPage(page);
+ interiorFrame.setPage(page);
- if (leafFrame.isLeaf()) {
- if (pageId == rootPage) {
- treeIndexStats.addRoot(leafFrame);
- } else {
- treeIndexStats.add(leafFrame);
- }
- } else if (interiorFrame.isInterior()) {
- if (pageId == rootPage) {
- treeIndexStats.addRoot(interiorFrame);
- } else {
- treeIndexStats.add(interiorFrame);
- }
- } else {
- treeIndexStats.add(metaFrame, freePageManager);
- }
+ if (leafFrame.isLeaf()) {
+ if (pageId == rootPage) {
+ treeIndexStats.addRoot(leafFrame);
+ } else {
+ treeIndexStats.add(leafFrame);
+ }
+ } else if (interiorFrame.isInterior()) {
+ if (pageId == rootPage) {
+ treeIndexStats.addRoot(interiorFrame);
+ } else {
+ treeIndexStats.add(interiorFrame);
+ }
+ } else {
+ treeIndexStats.add(metaFrame, freePageManager);
+ }
- } finally {
- page.releaseReadLatch();
- bufferCache.unpin(page);
- }
- }
+ } finally {
+ page.releaseReadLatch();
+ bufferCache.unpin(page);
+ }
+ }
- treeIndexStats.end();
+ treeIndexStats.end();
- bufferCache.closeFile(fileId);
+ bufferCache.closeFile(fileId);
- return treeIndexStats;
- }
+ return treeIndexStats;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java
index 7784d42..a4afe80 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java
@@ -27,17 +27,17 @@
@SuppressWarnings("rawtypes")
public class TreeIndexUtils {
- public static String printFrameTuples(ITreeIndexFrame frame, ISerializerDeserializer[] fieldSerdes) throws HyracksDataException {
- StringBuilder strBuilder = new StringBuilder();
- ITreeIndexTupleReference tuple = frame.createTupleReference();
- for (int i = 0; i < frame.getTupleCount(); i++) {
- tuple.resetByTupleIndex(frame, i);
- String tupleString = TupleUtils.printTuple(tuple, fieldSerdes);
- strBuilder.append(tupleString);
- if (i != frame.getTupleCount() - 1) {
- strBuilder.append(" | ");
- }
- }
- return strBuilder.toString();
+ public static String printFrameTuples(ITreeIndexFrame frame, ISerializerDeserializer[] fieldSerdes) throws HyracksDataException {
+ StringBuilder strBuilder = new StringBuilder();
+ ITreeIndexTupleReference tuple = frame.createTupleReference();
+ for (int i = 0; i < frame.getTupleCount(); i++) {
+ tuple.resetByTupleIndex(frame, i);
+ String tupleString = TupleUtils.printTuple(tuple, fieldSerdes);
+ strBuilder.append(tupleString);
+ if (i != frame.getTupleCount() - 1) {
+ strBuilder.append(" | ");
+ }
+ }
+ return strBuilder.toString();
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyDiskComponentFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyDiskComponentFactory.java
index b82e9ec..bddea2a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyDiskComponentFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyDiskComponentFactory.java
@@ -29,37 +29,37 @@
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
public class LSMBTreeWithBuddyDiskComponentFactory implements
- ILSMComponentFactory {
+ ILSMComponentFactory {
- private final TreeIndexFactory<BTree> btreeFactory;
- private final TreeIndexFactory<BTree> buddyBtreeFactory;
- private final BloomFilterFactory bloomFilterFactory;
+ private final TreeIndexFactory<BTree> btreeFactory;
+ private final TreeIndexFactory<BTree> buddyBtreeFactory;
+ private final BloomFilterFactory bloomFilterFactory;
- public LSMBTreeWithBuddyDiskComponentFactory(
- TreeIndexFactory<BTree> btreeFactory,
- TreeIndexFactory<BTree> buddyBtreeFactory,
- BloomFilterFactory bloomFilterFactory) {
- this.btreeFactory = btreeFactory;
- this.buddyBtreeFactory = buddyBtreeFactory;
- this.bloomFilterFactory = bloomFilterFactory;
- }
+ public LSMBTreeWithBuddyDiskComponentFactory(
+ TreeIndexFactory<BTree> btreeFactory,
+ TreeIndexFactory<BTree> buddyBtreeFactory,
+ BloomFilterFactory bloomFilterFactory) {
+ this.btreeFactory = btreeFactory;
+ this.buddyBtreeFactory = buddyBtreeFactory;
+ this.bloomFilterFactory = bloomFilterFactory;
+ }
- @Override
- public ILSMComponent createLSMComponentInstance(
- LSMComponentFileReferences cfr) throws IndexException,
- HyracksDataException {
- return new LSMBTreeWithBuddyDiskComponent(
- btreeFactory.createIndexInstance(cfr
- .getInsertIndexFileReference()),
- buddyBtreeFactory.createIndexInstance(cfr
- .getDeleteIndexFileReference()),
- bloomFilterFactory.createBloomFiltertInstance(cfr
- .getBloomFilterFileReference()));
- }
+ @Override
+ public ILSMComponent createLSMComponentInstance(
+ LSMComponentFileReferences cfr) throws IndexException,
+ HyracksDataException {
+ return new LSMBTreeWithBuddyDiskComponent(
+ btreeFactory.createIndexInstance(cfr
+ .getInsertIndexFileReference()),
+ buddyBtreeFactory.createIndexInstance(cfr
+ .getDeleteIndexFileReference()),
+ bloomFilterFactory.createBloomFiltertInstance(cfr
+ .getBloomFilterFileReference()));
+ }
- @Override
- public IBufferCache getBufferCache() {
- return btreeFactory.getBufferCache();
- }
+ @Override
+ public IBufferCache getBufferCache() {
+ return btreeFactory.getBufferCache();
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMemoryComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMemoryComponent.java
index b56aaff..a45cbf1 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMemoryComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMemoryComponent.java
@@ -27,37 +27,37 @@
* This class is also not needed at the moment but is implemented anyway
*/
public class LSMBTreeWithBuddyMemoryComponent extends
- AbstractMemoryLSMComponent {
+ AbstractMemoryLSMComponent {
- private final BTree btree;
- private final BTree buddyBtree;
+ private final BTree btree;
+ private final BTree buddyBtree;
- public LSMBTreeWithBuddyMemoryComponent(BTree btree, BTree buddyBtree,
- IVirtualBufferCache vbc, boolean isActive) {
- super(vbc, isActive);
- this.btree = btree;
- this.buddyBtree = buddyBtree;
- }
+ public LSMBTreeWithBuddyMemoryComponent(BTree btree, BTree buddyBtree,
+ IVirtualBufferCache vbc, boolean isActive) {
+ super(vbc, isActive);
+ this.btree = btree;
+ this.buddyBtree = buddyBtree;
+ }
- public BTree getBTree() {
- return btree;
- }
+ public BTree getBTree() {
+ return btree;
+ }
- public BTree getBuddyBTree() {
- return buddyBtree;
- }
+ public BTree getBuddyBTree() {
+ return buddyBtree;
+ }
- @Override
- protected void reset() throws HyracksDataException {
- super.reset();
- btree.deactivate();
- btree.destroy();
- btree.create();
- btree.activate();
- buddyBtree.deactivate();
- buddyBtree.destroy();
- buddyBtree.create();
- buddyBtree.activate();
- }
+ @Override
+ protected void reset() throws HyracksDataException {
+ super.reset();
+ btree.deactivate();
+ btree.destroy();
+ btree.create();
+ btree.activate();
+ buddyBtree.deactivate();
+ buddyBtree.destroy();
+ buddyBtree.create();
+ buddyBtree.activate();
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMergeOperation.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMergeOperation.java
index 61f68fb..d70bdd5 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMergeOperation.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMergeOperation.java
@@ -34,103 +34,103 @@
public class LSMBTreeWithBuddyMergeOperation implements ILSMIOOperation {
- private final ILSMIndexAccessorInternal accessor;
- private final List<ILSMComponent> mergingComponents;
- private final ITreeIndexCursor cursor;
- private final FileReference btreeMergeTarget;
- private final FileReference buddyBtreeMergeTarget;
- private final FileReference bloomFilterMergeTarget;
- private final ILSMIOOperationCallback callback;
- private final String indexIdentifier;
- private final boolean keepDeletedTuples;
+ private final ILSMIndexAccessorInternal accessor;
+ private final List<ILSMComponent> mergingComponents;
+ private final ITreeIndexCursor cursor;
+ private final FileReference btreeMergeTarget;
+ private final FileReference buddyBtreeMergeTarget;
+ private final FileReference bloomFilterMergeTarget;
+ private final ILSMIOOperationCallback callback;
+ private final String indexIdentifier;
+ private final boolean keepDeletedTuples;
- public LSMBTreeWithBuddyMergeOperation(ILSMIndexAccessorInternal accessor,
- List<ILSMComponent> mergingComponents, ITreeIndexCursor cursor,
- FileReference btreeMergeTarget,
- FileReference buddyBtreeMergeTarget,
- FileReference bloomFilterMergeTarget,
- ILSMIOOperationCallback callback, String indexIdentifier, boolean keepDeletedTuples) {
- this.accessor = accessor;
- this.mergingComponents = mergingComponents;
- this.cursor = cursor;
- this.btreeMergeTarget = btreeMergeTarget;
- this.buddyBtreeMergeTarget = buddyBtreeMergeTarget;
- this.bloomFilterMergeTarget = bloomFilterMergeTarget;
- this.callback = callback;
- this.indexIdentifier = indexIdentifier;
- this.keepDeletedTuples = keepDeletedTuples;
- }
+ public LSMBTreeWithBuddyMergeOperation(ILSMIndexAccessorInternal accessor,
+ List<ILSMComponent> mergingComponents, ITreeIndexCursor cursor,
+ FileReference btreeMergeTarget,
+ FileReference buddyBtreeMergeTarget,
+ FileReference bloomFilterMergeTarget,
+ ILSMIOOperationCallback callback, String indexIdentifier, boolean keepDeletedTuples) {
+ this.accessor = accessor;
+ this.mergingComponents = mergingComponents;
+ this.cursor = cursor;
+ this.btreeMergeTarget = btreeMergeTarget;
+ this.buddyBtreeMergeTarget = buddyBtreeMergeTarget;
+ this.bloomFilterMergeTarget = bloomFilterMergeTarget;
+ this.callback = callback;
+ this.indexIdentifier = indexIdentifier;
+ this.keepDeletedTuples = keepDeletedTuples;
+ }
- @Override
- public Set<IODeviceHandle> getReadDevices() {
- Set<IODeviceHandle> devs = new HashSet<IODeviceHandle>();
- for (ILSMComponent o : mergingComponents) {
- LSMBTreeWithBuddyDiskComponent component = (LSMBTreeWithBuddyDiskComponent) o;
- devs.add(component.getBTree().getFileReference().getDeviceHandle());
+ @Override
+ public Set<IODeviceHandle> getReadDevices() {
+ Set<IODeviceHandle> devs = new HashSet<IODeviceHandle>();
+ for (ILSMComponent o : mergingComponents) {
+ LSMBTreeWithBuddyDiskComponent component = (LSMBTreeWithBuddyDiskComponent) o;
+ devs.add(component.getBTree().getFileReference().getDeviceHandle());
- devs.add(component.getBuddyBTree().getFileReference()
- .getDeviceHandle());
- devs.add(component.getBloomFilter().getFileReference()
- .getDeviceHandle());
+ devs.add(component.getBuddyBTree().getFileReference()
+ .getDeviceHandle());
+ devs.add(component.getBloomFilter().getFileReference()
+ .getDeviceHandle());
- }
- return devs;
- }
+ }
+ return devs;
+ }
- @Override
- public Set<IODeviceHandle> getWriteDevices() {
- Set<IODeviceHandle> devs = new HashSet<IODeviceHandle>();
- devs.add(btreeMergeTarget.getDeviceHandle());
+ @Override
+ public Set<IODeviceHandle> getWriteDevices() {
+ Set<IODeviceHandle> devs = new HashSet<IODeviceHandle>();
+ devs.add(btreeMergeTarget.getDeviceHandle());
- devs.add(buddyBtreeMergeTarget.getDeviceHandle());
- devs.add(bloomFilterMergeTarget.getDeviceHandle());
+ devs.add(buddyBtreeMergeTarget.getDeviceHandle());
+ devs.add(bloomFilterMergeTarget.getDeviceHandle());
- return devs;
- }
+ return devs;
+ }
- @Override
- public Boolean call() throws HyracksDataException, IndexException {
- accessor.merge(this);
- return true;
- }
+ @Override
+ public Boolean call() throws HyracksDataException, IndexException {
+ accessor.merge(this);
+ return true;
+ }
- @Override
- public ILSMIOOperationCallback getCallback() {
- return callback;
- }
+ @Override
+ public ILSMIOOperationCallback getCallback() {
+ return callback;
+ }
- @Override
- public String getIndexUniqueIdentifier() {
- return indexIdentifier;
- }
+ @Override
+ public String getIndexUniqueIdentifier() {
+ return indexIdentifier;
+ }
- @Override
- public LSMIOOpertionType getIOOpertionType() {
- return LSMIOOpertionType.MERGE;
- }
+ @Override
+ public LSMIOOpertionType getIOOpertionType() {
+ return LSMIOOpertionType.MERGE;
+ }
- public FileReference getBTreeMergeTarget() {
- return btreeMergeTarget;
- }
+ public FileReference getBTreeMergeTarget() {
+ return btreeMergeTarget;
+ }
- public FileReference getBuddyBTreeMergeTarget() {
- return buddyBtreeMergeTarget;
- }
+ public FileReference getBuddyBTreeMergeTarget() {
+ return buddyBtreeMergeTarget;
+ }
- public FileReference getBloomFilterMergeTarget() {
- return bloomFilterMergeTarget;
- }
+ public FileReference getBloomFilterMergeTarget() {
+ return bloomFilterMergeTarget;
+ }
- public ITreeIndexCursor getCursor() {
- return cursor;
- }
+ public ITreeIndexCursor getCursor() {
+ return cursor;
+ }
- public List<ILSMComponent> getMergingComponents() {
- return mergingComponents;
- }
+ public List<ILSMComponent> getMergingComponents() {
+ return mergingComponents;
+ }
- public boolean isKeepDeletedTuples() {
- return keepDeletedTuples;
- }
+ public boolean isKeepDeletedTuples() {
+ return keepDeletedTuples;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java
index 6e04dd6..a109f3f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java
@@ -27,7 +27,7 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexOperationContext;
public class LSMBTreeWithBuddySearchCursor extends LSMBTreeWithBuddyAbstractCursor{
- private int currentCursor;
+ private int currentCursor;
private PermutingTupleReference buddyBTreeTuple;
public LSMBTreeWithBuddySearchCursor(ILSMIndexOperationContext opCtx, int[] buddyBTreeFields) {
@@ -65,7 +65,7 @@
private void searchNextCursor() throws HyracksDataException {
if (currentCursor < numberOfTrees) {
try {
- btreeCursors[currentCursor].reset();
+ btreeCursors[currentCursor].reset();
btreeAccessors[currentCursor].search(btreeCursors[currentCursor], btreeRangePredicate);
} catch (IndexException e) {
throw new HyracksDataException(e);
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java
index 11828a2..d045059 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java
@@ -26,145 +26,145 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexOperationContext;
public class LSMBTreeWithBuddySortedCursor extends
- LSMBTreeWithBuddyAbstractCursor {
- // TODO: This class can be removed and instead use a search cursor that uses
- // a logic similar
- // to the one in LSMRTreeWithAntiMatterTuplesSearchCursor
+ LSMBTreeWithBuddyAbstractCursor {
+ // TODO: This class can be removed and instead use a search cursor that uses
+ // a logic similar
+ // to the one in LSMRTreeWithAntiMatterTuplesSearchCursor
// currently, this cursor is only used when doing merge operations.
- private boolean[] depletedBtreeCursors;
- private int foundIn = -1;
- private PermutingTupleReference buddyBtreeTuple;
+ private boolean[] depletedBtreeCursors;
+ private int foundIn = -1;
+ private PermutingTupleReference buddyBtreeTuple;
- public LSMBTreeWithBuddySortedCursor(ILSMIndexOperationContext opCtx,
- int[] buddyBTreeFields) throws HyracksDataException {
- super(opCtx);
- this.buddyBtreeTuple = new PermutingTupleReference(buddyBTreeFields);
- reset();
- }
+ public LSMBTreeWithBuddySortedCursor(ILSMIndexOperationContext opCtx,
+ int[] buddyBTreeFields) throws HyracksDataException {
+ super(opCtx);
+ this.buddyBtreeTuple = new PermutingTupleReference(buddyBTreeFields);
+ reset();
+ }
- public ILSMIndexOperationContext getOpCtx() {
- return opCtx;
- }
+ public ILSMIndexOperationContext getOpCtx() {
+ return opCtx;
+ }
- @Override
- public void reset() throws HyracksDataException {
- depletedBtreeCursors = new boolean[numberOfTrees];
- foundNext = false;
- try {
- for (int i = 0; i < numberOfTrees; i++) {
- btreeCursors[i].reset();
- try {
- btreeAccessors[i].search(btreeCursors[i],
- btreeRangePredicate);
- } catch (IndexException e) {
- throw new HyracksDataException(e);
- }
- if (btreeCursors[i].hasNext()) {
- btreeCursors[i].next();
- } else {
- depletedBtreeCursors[i] = true;
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- throw new HyracksDataException(
- "error while reseting the btrees of the lsm btree with buddy btree",
- e);
- } finally {
- if (open) {
- lsmHarness.endSearch(opCtx);
- }
- }
- }
+ @Override
+ public void reset() throws HyracksDataException {
+ depletedBtreeCursors = new boolean[numberOfTrees];
+ foundNext = false;
+ try {
+ for (int i = 0; i < numberOfTrees; i++) {
+ btreeCursors[i].reset();
+ try {
+ btreeAccessors[i].search(btreeCursors[i],
+ btreeRangePredicate);
+ } catch (IndexException e) {
+ throw new HyracksDataException(e);
+ }
+ if (btreeCursors[i].hasNext()) {
+ btreeCursors[i].next();
+ } else {
+ depletedBtreeCursors[i] = true;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new HyracksDataException(
+ "error while reseting the btrees of the lsm btree with buddy btree",
+ e);
+ } finally {
+ if (open) {
+ lsmHarness.endSearch(opCtx);
+ }
+ }
+ }
- @Override
- public boolean hasNext() throws HyracksDataException, IndexException {
- while (!foundNext) {
- frameTuple = null;
+ @Override
+ public boolean hasNext() throws HyracksDataException, IndexException {
+ while (!foundNext) {
+ frameTuple = null;
- if (foundIn != -1) {
- if (btreeCursors[foundIn].hasNext()) {
- btreeCursors[foundIn].next();
- } else {
- depletedBtreeCursors[foundIn] = true;
- }
- }
+ if (foundIn != -1) {
+ if (btreeCursors[foundIn].hasNext()) {
+ btreeCursors[foundIn].next();
+ } else {
+ depletedBtreeCursors[foundIn] = true;
+ }
+ }
- foundIn = -1;
- for (int i = 0; i < numberOfTrees; i++) {
- if (depletedBtreeCursors[i])
- continue;
+ foundIn = -1;
+ for (int i = 0; i < numberOfTrees; i++) {
+ if (depletedBtreeCursors[i])
+ continue;
- if (frameTuple == null) {
- frameTuple = btreeCursors[i].getTuple();
- foundIn = i;
- continue;
- }
+ if (frameTuple == null) {
+ frameTuple = btreeCursors[i].getTuple();
+ foundIn = i;
+ continue;
+ }
- if (btreeCmp.compare(frameTuple, btreeCursors[i].getTuple()) > 0) {
- frameTuple = btreeCursors[i].getTuple();
- foundIn = i;
- }
- }
+ if (btreeCmp.compare(frameTuple, btreeCursors[i].getTuple()) > 0) {
+ frameTuple = btreeCursors[i].getTuple();
+ foundIn = i;
+ }
+ }
- if (foundIn == -1)
- return false;
+ if (foundIn == -1)
+ return false;
- boolean killed = false;
- buddyBtreeTuple.reset(frameTuple);
- for (int i = 0; i < foundIn; i++) {
- try {
- buddyBtreeCursors[i].reset();
- buddyBtreeRangePredicate.setHighKey(buddyBtreeTuple, true);
- btreeRangePredicate.setLowKey(buddyBtreeTuple, true);
- btreeAccessors[i].search(btreeCursors[i],
- btreeRangePredicate);
- } catch (IndexException e) {
- throw new HyracksDataException(e);
- }
- try {
- if (btreeCursors[i].hasNext()) {
- killed = true;
- break;
- }
- } finally {
- btreeCursors[i].close();
- }
- }
- if (!killed) {
- foundNext = true;
- }
- }
+ boolean killed = false;
+ buddyBtreeTuple.reset(frameTuple);
+ for (int i = 0; i < foundIn; i++) {
+ try {
+ buddyBtreeCursors[i].reset();
+ buddyBtreeRangePredicate.setHighKey(buddyBtreeTuple, true);
+ btreeRangePredicate.setLowKey(buddyBtreeTuple, true);
+ btreeAccessors[i].search(btreeCursors[i],
+ btreeRangePredicate);
+ } catch (IndexException e) {
+ throw new HyracksDataException(e);
+ }
+ try {
+ if (btreeCursors[i].hasNext()) {
+ killed = true;
+ break;
+ }
+ } finally {
+ btreeCursors[i].close();
+ }
+ }
+ if (!killed) {
+ foundNext = true;
+ }
+ }
- return true;
- }
+ return true;
+ }
- @Override
- public void next() throws HyracksDataException {
- foundNext = false;
- }
+ @Override
+ public void next() throws HyracksDataException {
+ foundNext = false;
+ }
- @Override
- public void open(ICursorInitialState initialState,
- ISearchPredicate searchPred) throws HyracksDataException,
- IndexException {
- super.open(initialState, searchPred);
+ @Override
+ public void open(ICursorInitialState initialState,
+ ISearchPredicate searchPred) throws HyracksDataException,
+ IndexException {
+ super.open(initialState, searchPred);
- depletedBtreeCursors = new boolean[numberOfTrees];
- foundNext = false;
- for (int i = 0; i < numberOfTrees; i++) {
- btreeCursors[i].reset();
- try {
- btreeAccessors[i].search(btreeCursors[i], btreeRangePredicate);
- } catch (IndexException e) {
- throw new HyracksDataException(e);
- }
- if (btreeCursors[i].hasNext()) {
- btreeCursors[i].next();
- } else {
- depletedBtreeCursors[i] = true;
- }
- }
- }
+ depletedBtreeCursors = new boolean[numberOfTrees];
+ foundNext = false;
+ for (int i = 0; i < numberOfTrees; i++) {
+ btreeCursors[i].reset();
+ try {
+ btreeAccessors[i].search(btreeCursors[i], btreeRangePredicate);
+ } catch (IndexException e) {
+ throw new HyracksDataException(e);
+ }
+ if (btreeCursors[i].hasNext()) {
+ btreeCursors[i].next();
+ } else {
+ depletedBtreeCursors[i] = true;
+ }
+ }
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java
index 0f0edd2..0496809 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java
@@ -36,46 +36,46 @@
public class LSMBuddyBTreeMergeCursor extends LSMIndexSearchCursor {
- public LSMBuddyBTreeMergeCursor(ILSMIndexOperationContext opCtx) {
- super(opCtx, true);
- }
+ public LSMBuddyBTreeMergeCursor(ILSMIndexOperationContext opCtx) {
+ super(opCtx, true);
+ }
- @Override
- protected boolean isDeleted(PriorityQueueElement checkElement)
- throws HyracksDataException, IndexException {
- return false;
- }
+ @Override
+ protected boolean isDeleted(PriorityQueueElement checkElement)
+ throws HyracksDataException, IndexException {
+ return false;
+ }
- @Override
- public void open(ICursorInitialState initialState,
- ISearchPredicate searchPred) throws IndexException,
- HyracksDataException {
- LSMBTreeWithBuddyCursorInitialState lsmInitialState = (LSMBTreeWithBuddyCursorInitialState) initialState;
- cmp = lsmInitialState.getBuddyBTreeCmp();
- operationalComponents = lsmInitialState.getOperationalComponents();
- // We intentionally set the lsmHarness to null so that we don't call
- // lsmHarness.endSearch() because we already do that when we merge
- // actual index.
- lsmHarness = null;
- int numBTrees = operationalComponents.size();
- rangeCursors = new IIndexCursor[numBTrees];
+ @Override
+ public void open(ICursorInitialState initialState,
+ ISearchPredicate searchPred) throws IndexException,
+ HyracksDataException {
+ LSMBTreeWithBuddyCursorInitialState lsmInitialState = (LSMBTreeWithBuddyCursorInitialState) initialState;
+ cmp = lsmInitialState.getBuddyBTreeCmp();
+ operationalComponents = lsmInitialState.getOperationalComponents();
+ // We intentionally set the lsmHarness to null so that we don't call
+ // lsmHarness.endSearch() because we already do that when we merge
+ // actual index.
+ lsmHarness = null;
+ int numBTrees = operationalComponents.size();
+ rangeCursors = new IIndexCursor[numBTrees];
- RangePredicate btreePredicate = new RangePredicate(null, null, true,
- true, cmp, cmp);
- IIndexAccessor[] btreeAccessors = new ITreeIndexAccessor[numBTrees];
- for (int i = 0; i < numBTrees; i++) {
- ILSMComponent component = operationalComponents.get(i);
- IBTreeLeafFrame leafFrame = (IBTreeLeafFrame) lsmInitialState
- .getBuddyBTreeLeafFrameFactory().createFrame();
- rangeCursors[i] = new BTreeRangeSearchCursor(leafFrame, false);
- BTree buddyBtree = (BTree) ((LSMBTreeWithBuddyDiskComponent) component)
- .getBuddyBTree();
- btreeAccessors[i] = buddyBtree.createAccessor(
- NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
- btreeAccessors[i].search(rangeCursors[i], btreePredicate);
- }
- setPriorityQueueComparator();
- initPriorityQueue();
- }
+ RangePredicate btreePredicate = new RangePredicate(null, null, true,
+ true, cmp, cmp);
+ IIndexAccessor[] btreeAccessors = new ITreeIndexAccessor[numBTrees];
+ for (int i = 0; i < numBTrees; i++) {
+ ILSMComponent component = operationalComponents.get(i);
+ IBTreeLeafFrame leafFrame = (IBTreeLeafFrame) lsmInitialState
+ .getBuddyBTreeLeafFrameFactory().createFrame();
+ rangeCursors[i] = new BTreeRangeSearchCursor(leafFrame, false);
+ BTree buddyBtree = (BTree) ((LSMBTreeWithBuddyDiskComponent) component)
+ .getBuddyBTree();
+ btreeAccessors[i] = buddyBtree.createAccessor(
+ NoOpOperationCallback.INSTANCE,
+ NoOpOperationCallback.INSTANCE);
+ btreeAccessors[i].search(rangeCursors[i], btreePredicate);
+ }
+ setPriorityQueueComparator();
+ initPriorityQueue();
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java
index b9f281b..4e814d0 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java
@@ -23,17 +23,17 @@
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
public class LSMBTreeCopyTupleWriter extends LSMBTreeTupleWriter {
- public LSMBTreeCopyTupleWriter(ITypeTraits[] typeTraits, int numKeyFields){
- // Third parameter is never used locally, just give false.
- super(typeTraits, numKeyFields, false);
- }
+ public LSMBTreeCopyTupleWriter(ITypeTraits[] typeTraits, int numKeyFields){
+ // Third parameter is never used locally, just give false.
+ super(typeTraits, numKeyFields, false);
+ }
- @Override
+ @Override
public int writeTuple(ITupleReference tuple, byte[] targetBuf, int targetOff) {
- int tupleSize = bytesRequired(tuple);
- byte[] buf = tuple.getFieldData(0);
- int tupleStartOff = ((LSMBTreeTupleReference)tuple).getTupleStart();
- System.arraycopy(buf, tupleStartOff, targetBuf, targetOff, tupleSize);
+ int tupleSize = bytesRequired(tuple);
+ byte[] buf = tuple.getFieldData(0);
+ int tupleStartOff = ((LSMBTreeTupleReference)tuple).getTupleStart();
+ System.arraycopy(buf, tupleStartOff, targetBuf, targetOff, tupleSize);
return tupleSize;
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriterFactory.java
index eb03e7a..928b3fa 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriterFactory.java
@@ -24,18 +24,18 @@
import org.apache.hyracks.storage.am.common.tuples.TypeAwareTupleWriterFactory;
public class LSMBTreeCopyTupleWriterFactory extends TypeAwareTupleWriterFactory {
- private static final long serialVersionUID = 1L;
- private final ITypeTraits[] typeTraits;
- private final int numKeyFields;
+ private static final long serialVersionUID = 1L;
+ private final ITypeTraits[] typeTraits;
+ private final int numKeyFields;
- public LSMBTreeCopyTupleWriterFactory(ITypeTraits[] typeTraits, int numKeyFields) {
- super(typeTraits);
- this.typeTraits = typeTraits;
- this.numKeyFields = numKeyFields;
- }
+ public LSMBTreeCopyTupleWriterFactory(ITypeTraits[] typeTraits, int numKeyFields) {
+ super(typeTraits);
+ this.typeTraits = typeTraits;
+ this.numKeyFields = numKeyFields;
+ }
- @Override
- public ITreeIndexTupleWriter createTupleWriter() {
- return new LSMBTreeCopyTupleWriter(typeTraits, numKeyFields);
- }
+ @Override
+ public ITreeIndexTupleWriter createTupleWriter() {
+ return new LSMBTreeCopyTupleWriter(typeTraits, numKeyFields);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeRefrencingTupleWriterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeRefrencingTupleWriterFactory.java
index fd7892d..24ae68c 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeRefrencingTupleWriterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeRefrencingTupleWriterFactory.java
@@ -30,40 +30,40 @@
*
*/
public class LSMBTreeRefrencingTupleWriterFactory extends TypeAwareTupleWriterFactory{
- private static final long serialVersionUID = 1L;
- private final ITypeTraits[] typeTraits;
- private final int numKeyFields;
- private boolean isDelete;
- private LSMBTreeTupleWriter createdTupleWriter;
+ private static final long serialVersionUID = 1L;
+ private final ITypeTraits[] typeTraits;
+ private final int numKeyFields;
+ private boolean isDelete;
+ private LSMBTreeTupleWriter createdTupleWriter;
- public LSMBTreeRefrencingTupleWriterFactory(ITypeTraits[] typeTraits, int numKeyFields, boolean isDelete) {
- super(typeTraits);
- this.typeTraits = typeTraits;
- this.numKeyFields = numKeyFields;
- this.isDelete = isDelete;
- }
+ public LSMBTreeRefrencingTupleWriterFactory(ITypeTraits[] typeTraits, int numKeyFields, boolean isDelete) {
+ super(typeTraits);
+ this.typeTraits = typeTraits;
+ this.numKeyFields = numKeyFields;
+ this.isDelete = isDelete;
+ }
- @Override
- public ITreeIndexTupleWriter createTupleWriter() {
- createdTupleWriter = new LSMBTreeTupleWriter(typeTraits, numKeyFields, isDelete);
- return createdTupleWriter;
- }
+ @Override
+ public ITreeIndexTupleWriter createTupleWriter() {
+ createdTupleWriter = new LSMBTreeTupleWriter(typeTraits, numKeyFields, isDelete);
+ return createdTupleWriter;
+ }
- public void setMode(IndexOperation op){
- if(op == IndexOperation.INSERT){
- this.isDelete = false;
- if(createdTupleWriter != null){
- this.createdTupleWriter.setAntimatter(false);
- }
- } else if(op == IndexOperation.DELETE){
- this.isDelete = true;
- if(createdTupleWriter != null){
- this.createdTupleWriter.setAntimatter(true);
- }
- }
- }
+ public void setMode(IndexOperation op){
+ if(op == IndexOperation.INSERT){
+ this.isDelete = false;
+ if(createdTupleWriter != null){
+ this.createdTupleWriter.setAntimatter(false);
+ }
+ } else if(op == IndexOperation.DELETE){
+ this.isDelete = true;
+ if(createdTupleWriter != null){
+ this.createdTupleWriter.setAntimatter(true);
+ }
+ }
+ }
- public LSMBTreeTupleWriter getCreatedTupleWriter() {
- return createdTupleWriter;
- }
+ public LSMBTreeTupleWriter getCreatedTupleWriter() {
+ return createdTupleWriter;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleReference.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleReference.java
index 6eb104b..4d6fa61 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleReference.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleReference.java
@@ -35,9 +35,9 @@
private final int numKeyFields;
public LSMBTreeTupleReference(ITypeTraits[] typeTraits, int numKeyFields) {
- super(typeTraits);
- this.numKeyFields = numKeyFields;
- }
+ super(typeTraits);
+ this.numKeyFields = numKeyFields;
+ }
public void setFieldCount(int fieldCount) {
super.setFieldCount(fieldCount);
@@ -75,23 +75,23 @@
resetByTupleOffset(frame.getBuffer(), frame.getTupleOffset(tupleIndex));
}
- @Override
- protected int getNullFlagsBytes() {
- // +1.0 is for matter/antimatter bit.
- return (int) Math.ceil((fieldCount + 1.0) / 8.0);
+ @Override
+ protected int getNullFlagsBytes() {
+ // +1.0 is for matter/antimatter bit.
+ return (int) Math.ceil((fieldCount + 1.0) / 8.0);
}
- @Override
- public boolean isAntimatter() {
- // Check if the leftmost bit is 0 or 1.
- final byte mask = (byte) (1 << 7);
- if ((buf.array()[tupleStartOff] & mask) != 0) {
- return true;
- }
- return false;
- }
+ @Override
+ public boolean isAntimatter() {
+ // Check if the leftmost bit is 0 or 1.
+ final byte mask = (byte) (1 << 7);
+ if ((buf.array()[tupleStartOff] & mask) != 0) {
+ return true;
+ }
+ return false;
+ }
public int getTupleStart() {
- return tupleStartOff;
+ return tupleStartOff;
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleWriterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleWriterFactory.java
index f3b372f..5ee2b81 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleWriterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleWriterFactory.java
@@ -25,18 +25,18 @@
public class LSMBTreeTupleWriterFactory extends TypeAwareTupleWriterFactory {
- private static final long serialVersionUID = 1L;
- private final int numKeyFields;
- private final boolean isDelete;
+ private static final long serialVersionUID = 1L;
+ private final int numKeyFields;
+ private final boolean isDelete;
- public LSMBTreeTupleWriterFactory(ITypeTraits[] typeTraits, int numKeyFields, boolean isDelete) {
- super(typeTraits);
- this.numKeyFields = numKeyFields;
- this.isDelete = isDelete;
- }
+ public LSMBTreeTupleWriterFactory(ITypeTraits[] typeTraits, int numKeyFields, boolean isDelete) {
+ super(typeTraits);
+ this.numKeyFields = numKeyFields;
+ this.isDelete = isDelete;
+ }
- @Override
- public ITreeIndexTupleWriter createTupleWriter() {
- return new LSMBTreeTupleWriter(typeTraits, numKeyFields, isDelete);
- }
+ @Override
+ public ITreeIndexTupleWriter createTupleWriter() {
+ return new LSMBTreeTupleWriter(typeTraits, numKeyFields, isDelete);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8TokenFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8TokenFactory.java
index 59fee05..56fa101 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8TokenFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8TokenFactory.java
@@ -20,17 +20,17 @@
package org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers;
public abstract class AbstractUTF8TokenFactory implements ITokenFactory {
- private static final long serialVersionUID = 1L;
- protected final byte tokenTypeTag;
- protected final byte countTypeTag;
+ private static final long serialVersionUID = 1L;
+ protected final byte tokenTypeTag;
+ protected final byte countTypeTag;
- public AbstractUTF8TokenFactory() {
- tokenTypeTag = -1;
- countTypeTag = -1;
- }
+ public AbstractUTF8TokenFactory() {
+ tokenTypeTag = -1;
+ countTypeTag = -1;
+ }
- public AbstractUTF8TokenFactory(byte tokenTypeTag, byte countTypeTag) {
- this.tokenTypeTag = tokenTypeTag;
- this.countTypeTag = countTypeTag;
- }
+ public AbstractUTF8TokenFactory(byte tokenTypeTag, byte countTypeTag) {
+ this.tokenTypeTag = tokenTypeTag;
+ this.countTypeTag = countTypeTag;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java
index 4dfdc88..81254fc 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java
@@ -20,23 +20,23 @@
package org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers;
public class DelimitedUTF8StringBinaryTokenizerFactory implements
- IBinaryTokenizerFactory {
+ IBinaryTokenizerFactory {
- private static final long serialVersionUID = 1L;
- private final boolean ignoreTokenCount;
- private final boolean sourceHasTypeTag;
- private final ITokenFactory tokenFactory;
+ private static final long serialVersionUID = 1L;
+ private final boolean ignoreTokenCount;
+ private final boolean sourceHasTypeTag;
+ private final ITokenFactory tokenFactory;
- public DelimitedUTF8StringBinaryTokenizerFactory(boolean ignoreTokenCount,
- boolean sourceHasTypeTag, ITokenFactory tokenFactory) {
- this.ignoreTokenCount = ignoreTokenCount;
- this.sourceHasTypeTag = sourceHasTypeTag;
- this.tokenFactory = tokenFactory;
- }
+ public DelimitedUTF8StringBinaryTokenizerFactory(boolean ignoreTokenCount,
+ boolean sourceHasTypeTag, ITokenFactory tokenFactory) {
+ this.ignoreTokenCount = ignoreTokenCount;
+ this.sourceHasTypeTag = sourceHasTypeTag;
+ this.tokenFactory = tokenFactory;
+ }
- @Override
- public IBinaryTokenizer createTokenizer() {
- return new DelimitedUTF8StringBinaryTokenizer(ignoreTokenCount,
- sourceHasTypeTag, tokenFactory);
- }
+ @Override
+ public IBinaryTokenizer createTokenizer() {
+ return new DelimitedUTF8StringBinaryTokenizer(ignoreTokenCount,
+ sourceHasTypeTag, tokenFactory);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8NGramTokenFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8NGramTokenFactory.java
index b593d3b..0bc01b6 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8NGramTokenFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8NGramTokenFactory.java
@@ -21,18 +21,18 @@
public class HashedUTF8NGramTokenFactory extends AbstractUTF8TokenFactory {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public HashedUTF8NGramTokenFactory() {
- super();
- }
+ public HashedUTF8NGramTokenFactory() {
+ super();
+ }
- public HashedUTF8NGramTokenFactory(byte tokenTypeTag, byte countTypeTag) {
- super(tokenTypeTag, countTypeTag);
- }
+ public HashedUTF8NGramTokenFactory(byte tokenTypeTag, byte countTypeTag) {
+ super(tokenTypeTag, countTypeTag);
+ }
- @Override
- public IToken createToken() {
- return new HashedUTF8NGramToken(tokenTypeTag, countTypeTag);
- }
+ @Override
+ public IToken createToken() {
+ return new HashedUTF8NGramToken(tokenTypeTag, countTypeTag);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8WordTokenFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8WordTokenFactory.java
index d560aeb..7819e16 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8WordTokenFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8WordTokenFactory.java
@@ -21,18 +21,18 @@
public class HashedUTF8WordTokenFactory extends AbstractUTF8TokenFactory {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public HashedUTF8WordTokenFactory() {
- super();
- }
+ public HashedUTF8WordTokenFactory() {
+ super();
+ }
- public HashedUTF8WordTokenFactory(byte tokenTypeTag, byte countTypeTag) {
- super(tokenTypeTag, countTypeTag);
- }
+ public HashedUTF8WordTokenFactory(byte tokenTypeTag, byte countTypeTag) {
+ super(tokenTypeTag, countTypeTag);
+ }
- @Override
- public IToken createToken() {
- return new HashedUTF8WordToken(tokenTypeTag, countTypeTag);
- }
+ @Override
+ public IToken createToken() {
+ return new HashedUTF8WordToken(tokenTypeTag, countTypeTag);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/IBinaryTokenizerFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/IBinaryTokenizerFactory.java
index 5edb05d..01e83a3 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/IBinaryTokenizerFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/IBinaryTokenizerFactory.java
@@ -22,5 +22,5 @@
import java.io.Serializable;
public interface IBinaryTokenizerFactory extends Serializable {
- public IBinaryTokenizer createTokenizer();
+ public IBinaryTokenizer createTokenizer();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/INGramToken.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/INGramToken.java
index 6671f72..3dc4f87 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/INGramToken.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/INGramToken.java
@@ -20,9 +20,9 @@
package org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers;
public interface INGramToken {
- public int getNumPostChars();
+ public int getNumPostChars();
- public int getNumPreChars();
+ public int getNumPreChars();
- public void setNumPrePostChars(int numPreChars, int numPostChars);
+ public void setNumPrePostChars(int numPreChars, int numPostChars);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8NGramTokenFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8NGramTokenFactory.java
index f8d241c..64f1e99 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8NGramTokenFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8NGramTokenFactory.java
@@ -21,19 +21,19 @@
public class UTF8NGramTokenFactory extends AbstractUTF8TokenFactory {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public UTF8NGramTokenFactory() {
- super();
- }
+ public UTF8NGramTokenFactory() {
+ super();
+ }
- public UTF8NGramTokenFactory(byte tokenTypeTag, byte countTypeTag) {
- super(tokenTypeTag, countTypeTag);
- }
+ public UTF8NGramTokenFactory(byte tokenTypeTag, byte countTypeTag) {
+ super(tokenTypeTag, countTypeTag);
+ }
- @Override
- public IToken createToken() {
- return new UTF8NGramToken(tokenTypeTag, countTypeTag);
- }
+ @Override
+ public IToken createToken() {
+ return new UTF8NGramToken(tokenTypeTag, countTypeTag);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8WordTokenFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8WordTokenFactory.java
index 5274fa3..3a8a048 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8WordTokenFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8WordTokenFactory.java
@@ -21,19 +21,19 @@
public class UTF8WordTokenFactory extends AbstractUTF8TokenFactory {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public UTF8WordTokenFactory() {
- super();
- }
+ public UTF8WordTokenFactory() {
+ super();
+ }
- public UTF8WordTokenFactory(byte tokenTypeTag, byte countTypeTag) {
- super(tokenTypeTag, countTypeTag);
- }
+ public UTF8WordTokenFactory(byte tokenTypeTag, byte countTypeTag) {
+ super(tokenTypeTag, countTypeTag);
+ }
- @Override
- public IToken createToken() {
- return new UTF8WordToken(tokenTypeTag, countTypeTag);
- }
+ @Override
+ public IToken createToken() {
+ return new UTF8WordToken(tokenTypeTag, countTypeTag);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/tuples/LSMTypeAwareTupleWriterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/tuples/LSMTypeAwareTupleWriterFactory.java
index bdc6708..ac4f3c8 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/tuples/LSMTypeAwareTupleWriterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/tuples/LSMTypeAwareTupleWriterFactory.java
@@ -26,23 +26,23 @@
public class LSMTypeAwareTupleWriterFactory extends TypeAwareTupleWriterFactory {
- private static final long serialVersionUID = 1L;
- private ITypeTraits[] typeTraits;
- private final boolean isDelete;
+ private static final long serialVersionUID = 1L;
+ private ITypeTraits[] typeTraits;
+ private final boolean isDelete;
- public LSMTypeAwareTupleWriterFactory(ITypeTraits[] typeTraits, boolean isDelete) {
- super(typeTraits);
- this.typeTraits = typeTraits;
- this.isDelete = isDelete;
- }
+ public LSMTypeAwareTupleWriterFactory(ITypeTraits[] typeTraits, boolean isDelete) {
+ super(typeTraits);
+ this.typeTraits = typeTraits;
+ this.isDelete = isDelete;
+ }
- @Override
- public ITreeIndexTupleWriter createTupleWriter() {
- if (isDelete) {
- return new TypeAwareTupleWriter(typeTraits);
- } else {
- return new RTreeTypeAwareTupleWriter(typeTraits);
- }
- }
+ @Override
+ public ITreeIndexTupleWriter createTupleWriter() {
+ if (isDelete) {
+ return new TypeAwareTupleWriter(typeTraits);
+ } else {
+ return new RTreeTypeAwareTupleWriter(typeTraits);
+ }
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java
index 18f20ae..1825003 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java
@@ -22,6 +22,6 @@
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
public interface IGenericPrimitiveSerializerDeserializer<T> extends
- ISerializerDeserializer<T> {
- public double getValue(byte[] bytes, int offset);
+ ISerializerDeserializer<T> {
+ public double getValue(byte[] bytes, int offset);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java
index 04111f9..d6d69bb 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java
@@ -20,5 +20,5 @@
package org.apache.hyracks.storage.am.rtree.impls;
public enum EntriesOrder {
- ASCENDING, DESCENDING
+ ASCENDING, DESCENDING
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java
index ec731c3..d89c12b 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java
@@ -25,134 +25,134 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexTupleReference;
public class RTreeSplitKey implements ISplitKey {
- public byte[] leftPageData = null;
- public ByteBuffer leftPageBuf = null;
- public ITreeIndexTupleReference leftTuple;
+ public byte[] leftPageData = null;
+ public ByteBuffer leftPageBuf = null;
+ public ITreeIndexTupleReference leftTuple;
- public byte[] rightPageData = null;
- public ByteBuffer rightPageBuf = null;
- public ITreeIndexTupleReference rightTuple;
+ public byte[] rightPageData = null;
+ public ByteBuffer rightPageBuf = null;
+ public ITreeIndexTupleReference rightTuple;
- public int keySize = 0;
+ public int keySize = 0;
- public RTreeSplitKey(ITreeIndexTupleReference leftTuple,
- ITreeIndexTupleReference rightTuple) {
- this.leftTuple = leftTuple;
- this.rightTuple = rightTuple;
- }
+ public RTreeSplitKey(ITreeIndexTupleReference leftTuple,
+ ITreeIndexTupleReference rightTuple) {
+ this.leftTuple = leftTuple;
+ this.rightTuple = rightTuple;
+ }
- public void initData(int keySize) {
- // try to reuse existing memory from a lower-level split if possible
- this.keySize = keySize;
- if (leftPageData != null) {
- if (leftPageData.length < keySize + 4) {
- leftPageData = new byte[keySize + 4]; // add 4 for the page
- leftPageBuf = ByteBuffer.wrap(leftPageData);
- }
- } else {
- leftPageData = new byte[keySize + 4]; // add 4 for the page
- leftPageBuf = ByteBuffer.wrap(leftPageData);
- }
- if (rightPageData != null) {
- if (rightPageData.length < keySize + 4) {
- rightPageData = new byte[keySize + 4]; // add 4 for the page
- rightPageBuf = ByteBuffer.wrap(rightPageData);
- }
- } else {
- rightPageData = new byte[keySize + 4]; // add 4 for the page
- rightPageBuf = ByteBuffer.wrap(rightPageData);
- }
+ public void initData(int keySize) {
+ // try to reuse existing memory from a lower-level split if possible
+ this.keySize = keySize;
+ if (leftPageData != null) {
+ if (leftPageData.length < keySize + 4) {
+ leftPageData = new byte[keySize + 4]; // add 4 for the page
+ leftPageBuf = ByteBuffer.wrap(leftPageData);
+ }
+ } else {
+ leftPageData = new byte[keySize + 4]; // add 4 for the page
+ leftPageBuf = ByteBuffer.wrap(leftPageData);
+ }
+ if (rightPageData != null) {
+ if (rightPageData.length < keySize + 4) {
+ rightPageData = new byte[keySize + 4]; // add 4 for the page
+ rightPageBuf = ByteBuffer.wrap(rightPageData);
+ }
+ } else {
+ rightPageData = new byte[keySize + 4]; // add 4 for the page
+ rightPageBuf = ByteBuffer.wrap(rightPageData);
+ }
- leftTuple.resetByTupleOffset(leftPageBuf, 0);
- rightTuple.resetByTupleOffset(rightPageBuf, 0);
- }
+ leftTuple.resetByTupleOffset(leftPageBuf, 0);
+ rightTuple.resetByTupleOffset(rightPageBuf, 0);
+ }
- public void resetLeftPage() {
- leftPageData = null;
- leftPageBuf = null;
- }
+ public void resetLeftPage() {
+ leftPageData = null;
+ leftPageBuf = null;
+ }
- public void resetRightPage() {
- rightPageData = null;
- rightPageBuf = null;
- }
+ public void resetRightPage() {
+ rightPageData = null;
+ rightPageBuf = null;
+ }
- public ByteBuffer getLeftPageBuffer() {
- return leftPageBuf;
- }
+ public ByteBuffer getLeftPageBuffer() {
+ return leftPageBuf;
+ }
- public ByteBuffer getRightPageBuffer() {
- return rightPageBuf;
- }
+ public ByteBuffer getRightPageBuffer() {
+ return rightPageBuf;
+ }
- public ITreeIndexTupleReference getLeftTuple() {
- return leftTuple;
- }
+ public ITreeIndexTupleReference getLeftTuple() {
+ return leftTuple;
+ }
- public ITreeIndexTupleReference getRightTuple() {
- return rightTuple;
- }
+ public ITreeIndexTupleReference getRightTuple() {
+ return rightTuple;
+ }
- public int getLeftPage() {
- return leftPageBuf.getInt(keySize);
- }
+ public int getLeftPage() {
+ return leftPageBuf.getInt(keySize);
+ }
- public int getRightPage() {
- return rightPageBuf.getInt(keySize);
- }
+ public int getRightPage() {
+ return rightPageBuf.getInt(keySize);
+ }
- public void setLeftPage(int page) {
- leftPageBuf.putInt(keySize, page);
- }
+ public void setLeftPage(int page) {
+ leftPageBuf.putInt(keySize, page);
+ }
- public void setRightPage(int page) {
- rightPageBuf.putInt(keySize, page);
- }
+ public void setRightPage(int page) {
+ rightPageBuf.putInt(keySize, page);
+ }
- public ISplitKey duplicate(ITreeIndexTupleReference copyLeftTuple,
- ITreeIndexTupleReference copyRightTuple) {
- RTreeSplitKey copy = new RTreeSplitKey(copyLeftTuple, copyRightTuple);
- copy.leftPageData = leftPageData.clone();
- copy.leftPageBuf = ByteBuffer.wrap(copy.leftPageData);
- copy.leftTuple.setFieldCount(leftTuple.getFieldCount());
- copy.leftTuple.resetByTupleOffset(copy.leftPageBuf, 0);
+ public ISplitKey duplicate(ITreeIndexTupleReference copyLeftTuple,
+ ITreeIndexTupleReference copyRightTuple) {
+ RTreeSplitKey copy = new RTreeSplitKey(copyLeftTuple, copyRightTuple);
+ copy.leftPageData = leftPageData.clone();
+ copy.leftPageBuf = ByteBuffer.wrap(copy.leftPageData);
+ copy.leftTuple.setFieldCount(leftTuple.getFieldCount());
+ copy.leftTuple.resetByTupleOffset(copy.leftPageBuf, 0);
- copy.rightPageData = rightPageData.clone();
- copy.rightPageBuf = ByteBuffer.wrap(copy.rightPageData);
- copy.rightTuple.setFieldCount(rightTuple.getFieldCount());
- copy.rightTuple.resetByTupleOffset(copy.rightPageBuf, 0);
- return copy;
- }
+ copy.rightPageData = rightPageData.clone();
+ copy.rightPageBuf = ByteBuffer.wrap(copy.rightPageData);
+ copy.rightTuple.setFieldCount(rightTuple.getFieldCount());
+ copy.rightTuple.resetByTupleOffset(copy.rightPageBuf, 0);
+ return copy;
+ }
- @Override
- public void reset() {
- leftPageData = null;
- leftPageBuf = null;
- rightPageData = null;
- rightPageBuf = null;
- }
+ @Override
+ public void reset() {
+ leftPageData = null;
+ leftPageBuf = null;
+ rightPageData = null;
+ rightPageBuf = null;
+ }
- @Override
- public ByteBuffer getBuffer() {
- // TODO Auto-generated method stub
- return null;
- }
+ @Override
+ public ByteBuffer getBuffer() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- @Override
- public ITreeIndexTupleReference getTuple() {
- // TODO Auto-generated method stub
- return null;
- }
+ @Override
+ public ITreeIndexTupleReference getTuple() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- @Override
- public void setPages(int leftPage, int rightPage) {
- leftPageBuf.putInt(keySize, leftPage);
- rightPageBuf.putInt(keySize, rightPage);
- }
+ @Override
+ public void setPages(int leftPage, int rightPage) {
+ leftPageBuf.putInt(keySize, leftPage);
+ rightPageBuf.putInt(keySize, rightPage);
+ }
- @Override
- public ISplitKey duplicate(ITreeIndexTupleReference copyTuple) {
- // TODO Auto-generated method stub
- return null;
- }
+ @Override
+ public ISplitKey duplicate(ITreeIndexTupleReference copyTuple) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntry.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntry.java
index a9176c9..21beb9c 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntry.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntry.java
@@ -22,35 +22,35 @@
import org.apache.hyracks.storage.am.rtree.frames.RTreeNSMFrame;
public class TupleEntry implements Comparable<TupleEntry> {
- private int tupleIndex;
- private double value;
+ private int tupleIndex;
+ private double value;
- public TupleEntry() {
- }
+ public TupleEntry() {
+ }
- public int getTupleIndex() {
- return tupleIndex;
- }
+ public int getTupleIndex() {
+ return tupleIndex;
+ }
- public void setTupleIndex(int tupleIndex) {
- this.tupleIndex = tupleIndex;
- }
+ public void setTupleIndex(int tupleIndex) {
+ this.tupleIndex = tupleIndex;
+ }
- public double getValue() {
- return value;
- }
+ public double getValue() {
+ return value;
+ }
- public void setValue(double value) {
- this.value = value;
- }
+ public void setValue(double value) {
+ this.value = value;
+ }
- public int compareTo(TupleEntry tupleEntry) {
- double cmp = this.getValue() - tupleEntry.getValue();
- if (cmp > RTreeNSMFrame.doubleEpsilon())
- return 1;
- cmp = tupleEntry.getValue() - this.getValue();
- if (cmp > RTreeNSMFrame.doubleEpsilon())
- return -1;
- return 0;
- }
+ public int compareTo(TupleEntry tupleEntry) {
+ double cmp = this.getValue() - tupleEntry.getValue();
+ if (cmp > RTreeNSMFrame.doubleEpsilon())
+ return 1;
+ cmp = tupleEntry.getValue() - this.getValue();
+ if (cmp > RTreeNSMFrame.doubleEpsilon())
+ return -1;
+ return 0;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntryArrayList.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntryArrayList.java
index e8dce65..59cfb59 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntryArrayList.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntryArrayList.java
@@ -23,61 +23,61 @@
import java.util.Collections;
public class TupleEntryArrayList {
- private TupleEntry[] data;
- private int size;
- private final int growth;
+ private TupleEntry[] data;
+ private int size;
+ private final int growth;
- public TupleEntryArrayList(int initialCapacity, int growth) {
- data = new TupleEntry[initialCapacity];
- size = 0;
- this.growth = growth;
- }
+ public TupleEntryArrayList(int initialCapacity, int growth) {
+ data = new TupleEntry[initialCapacity];
+ size = 0;
+ this.growth = growth;
+ }
- public int size() {
- return size;
- }
+ public int size() {
+ return size;
+ }
- public void add(int tupleIndex, double value) {
- if (size == data.length) {
- TupleEntry[] newData = new TupleEntry[data.length + growth];
- System.arraycopy(data, 0, newData, 0, data.length);
- data = newData;
- }
- if (data[size] == null) {
- data[size] = new TupleEntry();
- }
- data[size].setTupleIndex(tupleIndex);
- data[size].setValue(value);
- size++;
- }
+ public void add(int tupleIndex, double value) {
+ if (size == data.length) {
+ TupleEntry[] newData = new TupleEntry[data.length + growth];
+ System.arraycopy(data, 0, newData, 0, data.length);
+ data = newData;
+ }
+ if (data[size] == null) {
+ data[size] = new TupleEntry();
+ }
+ data[size].setTupleIndex(tupleIndex);
+ data[size].setValue(value);
+ size++;
+ }
- public void removeLast() {
- if (size > 0)
- size--;
- }
+ public void removeLast() {
+ if (size > 0)
+ size--;
+ }
- // WARNING: caller is responsible for checking size > 0
- public TupleEntry getLast() {
- return data[size - 1];
- }
+ // WARNING: caller is responsible for checking size > 0
+ public TupleEntry getLast() {
+ return data[size - 1];
+ }
- public TupleEntry get(int i) {
- return data[i];
- }
+ public TupleEntry get(int i) {
+ return data[i];
+ }
- public void clear() {
- size = 0;
- }
+ public void clear() {
+ size = 0;
+ }
- public boolean isEmpty() {
- return size == 0;
- }
+ public boolean isEmpty() {
+ return size == 0;
+ }
- public void sort(EntriesOrder order, int tupleCount) {
- if (order == EntriesOrder.ASCENDING) {
- Arrays.sort(data, 0, tupleCount);
- } else {
- Arrays.sort(data, 0, tupleCount, Collections.reverseOrder());
- }
- }
+ public void sort(EntriesOrder order, int tupleCount) {
+ if (order == EntriesOrder.ASCENDING) {
+ Arrays.sort(data, 0, tupleCount);
+ } else {
+ Arrays.sort(data, 0, tupleCount, Collections.reverseOrder());
+ }
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparatorFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparatorFactory.java
index 8c73e12..4a1637a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparatorFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparatorFactory.java
@@ -31,7 +31,7 @@
}
public HilbertDoubleComparatorFactory(int dim) {
- this.dim = dim;
+ this.dim = dim;
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparatorFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparatorFactory.java
index a2650d3..f5c6046 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparatorFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparatorFactory.java
@@ -31,7 +31,7 @@
}
public ZCurveDoubleComparatorFactory(int dim) {
- this.dim = dim;
+ this.dim = dim;
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveIntComparatorFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveIntComparatorFactory.java
index 4827a74..6a25995 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveIntComparatorFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveIntComparatorFactory.java
@@ -31,7 +31,7 @@
}
public ZCurveIntComparatorFactory(int dim) {
- this.dim = dim;
+ this.dim = dim;
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java
index ffdae7d..8a6996b 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java
@@ -37,52 +37,52 @@
fields[pos++] = e;
}
- @Override
- public int compareTo(T o) {
- CheckTuple<T> other = (CheckTuple<T>) o;
- int cmpFieldCount = Math.min(other.getNumKeys(), numKeys);
- for (int i = 0; i < cmpFieldCount; i++) {
- int cmp = fields[i].compareTo(other.getField(i));
- if (cmp != 0) {
- return cmp;
- }
- }
- if (other.getNumKeys() == numKeys) {
- return 0;
- }
- if (other.getNumKeys() < numKeys) {
- return (other.isHighKey) ? -1 : 1;
- }
- if (other.getNumKeys() > numKeys) {
+ @Override
+ public int compareTo(T o) {
+ CheckTuple<T> other = (CheckTuple<T>) o;
+ int cmpFieldCount = Math.min(other.getNumKeys(), numKeys);
+ for (int i = 0; i < cmpFieldCount; i++) {
+ int cmp = fields[i].compareTo(other.getField(i));
+ if (cmp != 0) {
+ return cmp;
+ }
+ }
+ if (other.getNumKeys() == numKeys) {
+ return 0;
+ }
+ if (other.getNumKeys() < numKeys) {
+ return (other.isHighKey) ? -1 : 1;
+ }
+ if (other.getNumKeys() > numKeys) {
return (isHighKey) ? 1 : -1;
}
- return 0;
- }
+ return 0;
+ }
- @Override
- public boolean equals(Object o) {
- if (!(o instanceof Comparable<?>)) {
- return false;
- }
- return compareTo((T) o) == 0;
- }
+ @Override
+ public boolean equals(Object o) {
+ if (!(o instanceof Comparable<?>)) {
+ return false;
+ }
+ return compareTo((T) o) == 0;
+ }
- @Override
- public int hashCode() {
- int hash = 0;
- for (int i = 0; i < numKeys; i++) {
- hash = 37 * hash + fields[i].hashCode();
- }
- return hash;
- }
+ @Override
+ public int hashCode() {
+ int hash = 0;
+ for (int i = 0; i < numKeys; i++) {
+ hash = 37 * hash + fields[i].hashCode();
+ }
+ return hash;
+ }
- public void setIsHighKey(boolean isHighKey) {
- this.isHighKey = isHighKey;
- }
+ public void setIsHighKey(boolean isHighKey) {
+ this.isHighKey = isHighKey;
+ }
- public T getField(int idx) {
- return (T) fields[idx];
- }
+ public T getField(int idx) {
+ return (T) fields[idx];
+ }
public void setField(int idx, T e) {
fields[idx] = e;
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexMultiThreadTestDriver.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexMultiThreadTestDriver.java
index 314cae9..32dd15d 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexMultiThreadTestDriver.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexMultiThreadTestDriver.java
@@ -51,11 +51,11 @@
public long[] run(int numThreads, int numRepeats, int numOps, int batchSize) throws InterruptedException,
TreeIndexException, HyracksDataException {
- int numBatches = (batchSize < 1 ? numOps : numOps / batchSize);
- if (numBatches < numThreads) {
- numThreads = numBatches;
- }
- int threadNumBatches = numBatches / numThreads;
+ int numBatches = (batchSize < 1 ? numOps : numOps / batchSize);
+ if (numBatches < numThreads) {
+ numThreads = numBatches;
+ }
+ int threadNumBatches = numBatches / numThreads;
long[] times = new long[numRepeats];
for (int i = 0; i < numRepeats; i++) {
DataGenThread dataGen = createDatagenThread(numThreads, numBatches, batchSize);
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java
index 44a102d..b53f0dc 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java
@@ -36,7 +36,7 @@
private static final int numDeleteRounds = AccessMethodTestsConfig.RTREE_NUM_DELETE_ROUNDS;
public AbstractRTreeDeleteTest(boolean testRstarPolicy) {
- super(testRstarPolicy);
+ super(testRstarPolicy);
this.rTreeTestUtils = new RTreeTestUtils();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java
index 5ad6f3b..c45b0bd 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java
@@ -39,7 +39,7 @@
private final RTreeTestUtils rTreeTestUtils;
public AbstractRTreeInsertTest(boolean testRstarPolicy) {
- super(testRstarPolicy);
+ super(testRstarPolicy);
this.rTreeTestUtils = new RTreeTestUtils();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestStorageManagerInterface.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestStorageManagerInterface.java
index e4f77fd..885ff9b 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestStorageManagerInterface.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestStorageManagerInterface.java
@@ -19,7 +19,6 @@
package org.apache.hyracks.test.support;
import org.apache.hyracks.api.context.IHyracksTaskContext;
-import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.storage.common.IStorageManagerInterface;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
import org.apache.hyracks.storage.common.file.IFileMapProvider;
@@ -44,8 +43,8 @@
return TestStorageManagerComponentHolder.getLocalResourceRepository(ctx);
}
- @Override
- public ResourceIdFactory getResourceIdFactory(IHyracksTaskContext ctx) {
- return TestStorageManagerComponentHolder.getResourceIdFactory(ctx);
- }
+ @Override
+ public ResourceIdFactory getResourceIdFactory(IHyracksTaskContext ctx) {
+ return TestStorageManagerComponentHolder.getResourceIdFactory(ctx);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java
index 2541bd8..7f782aa 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java
@@ -35,11 +35,11 @@
@SuppressWarnings("rawtypes")
public class RTreeDeleteTest extends AbstractRTreeDeleteTest {
- private final RTreeTestHarness harness = new RTreeTestHarness();
+ private final RTreeTestHarness harness = new RTreeTestHarness();
- public RTreeDeleteTest() {
- super(AccessMethodTestsConfig.RTREE_TEST_RSTAR_POLICY);
- }
+ public RTreeDeleteTest() {
+ super(AccessMethodTestsConfig.RTREE_TEST_RSTAR_POLICY);
+ }
@Before
public void setUp() throws HyracksDataException {
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java
index 621055b..7bd22fc 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java
@@ -35,11 +35,11 @@
@SuppressWarnings("rawtypes")
public class RTreeInsertTest extends AbstractRTreeInsertTest {
- private final RTreeTestHarness harness = new RTreeTestHarness();
+ private final RTreeTestHarness harness = new RTreeTestHarness();
- public RTreeInsertTest() {
- super(AccessMethodTestsConfig.RTREE_TEST_RSTAR_POLICY);
- }
+ public RTreeInsertTest() {
+ super(AccessMethodTestsConfig.RTREE_TEST_RSTAR_POLICY);
+ }
@Before
public void setUp() throws HyracksDataException {
--
To view, visit https://asterix-gerrit.ics.uci.edu/921
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0dfbeaa9b9b24d3da106ead85afd9df02b14ddaa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Change in asterixdb[master]: Eliminate Hard Tabs From Java Files
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Eliminate Hard Tabs From Java Files
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/1651/
--
To view, visit https://asterix-gerrit.ics.uci.edu/921
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0dfbeaa9b9b24d3da106ead85afd9df02b14ddaa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Eliminate Hard Tabs From Java Files
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: Eliminate Hard Tabs From Java Files
......................................................................
Patch Set 1:
Can we fail the build now, if a java file contains a tab?
--
To view, visit https://asterix-gerrit.ics.uci.edu/921
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0dfbeaa9b9b24d3da106ead85afd9df02b14ddaa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Eliminate Hard Tabs From Java Files
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Eliminate Hard Tabs From Java Files
......................................................................
Patch Set 1:
WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack
PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!
--
To view, visit https://asterix-gerrit.ics.uci.edu/921
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0dfbeaa9b9b24d3da106ead85afd9df02b14ddaa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Eliminate Hard Tabs From Java Files
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: Eliminate Hard Tabs From Java Files
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/921
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0dfbeaa9b9b24d3da106ead85afd9df02b14ddaa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Eliminate Hard Tabs From Java Files
Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Michael Blow has submitted this change and it was merged.
Change subject: Eliminate Hard Tabs From Java Files
......................................................................
Eliminate Hard Tabs From Java Files
tabs->spaces
Change-Id: I0dfbeaa9b9b24d3da106ead85afd9df02b14ddaa
Reviewed-on: https://asterix-gerrit.ics.uci.edu/921
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
---
M asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Deleter.java
M hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java
M hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java
M hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/ArrayTupleReference.java
M hyracks-fullstack/hyracks/hyracks-dataflow-hadoop/src/main/java/org/apache/hyracks/dataflow/hadoop/util/MRContextUtil.java
M hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProvider.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProviderFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISplitKey.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexMetaDataFrameFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexTupleWriterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleFilter.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdater.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdaterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/TreeIndexException.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/UnsortedInputException.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/ITreeIndexOperatorDescriptor.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/exceptions/TreeIndexNonExistentKeyException.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrameFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/IndexOp.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/LongArrayList.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/SlotOffTupleOff.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/TypeAwareTupleWriterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexBufferCacheWarmup.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStatsGatherer.java
M hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyDiskComponentFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMemoryComponent.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMergeOperation.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeRefrencingTupleWriterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleReference.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleWriterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8TokenFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8NGramTokenFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8WordTokenFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/IBinaryTokenizerFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/INGramToken.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8NGramTokenFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8WordTokenFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/tuples/LSMTypeAwareTupleWriterFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntry.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntryArrayList.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparatorFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparatorFactory.java
M hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveIntComparatorFactory.java
M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java
M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexMultiThreadTestDriver.java
M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java
M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java
M hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestStorageManagerInterface.java
M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java
M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java
67 files changed, 1,208 insertions(+), 1,209 deletions(-)
Approvals:
Till Westmann: Looks good to me, approved
Jenkins: Verified
diff --git a/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Deleter.java b/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Deleter.java
index 8c92cd1..05ba774 100644
--- a/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Deleter.java
+++ b/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Deleter.java
@@ -33,7 +33,7 @@
public static void main(String[] args) throws IOException {
- LogManager.getRootLogger().setLevel(Level.DEBUG);
+ LogManager.getRootLogger().setLevel(Level.DEBUG);
LOG.info("Obliterator args: " + Arrays.toString(args));
for (int i = 0; i < args.length; i++) {
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java
index a8af9a0..8318176 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java
@@ -30,45 +30,45 @@
public class LogicalExpressionPrettyPrintVisitor implements ILogicalExpressionVisitor<String, Integer> {
- @Override
- public String visitConstantExpression(ConstantExpression expr, Integer indent)
- throws AlgebricksException {
- return expr.toString();
- }
+ @Override
+ public String visitConstantExpression(ConstantExpression expr, Integer indent)
+ throws AlgebricksException {
+ return expr.toString();
+ }
- @Override
- public String visitVariableReferenceExpression(
- VariableReferenceExpression expr, Integer indent)
- throws AlgebricksException {
- return expr.toString();
- }
+ @Override
+ public String visitVariableReferenceExpression(
+ VariableReferenceExpression expr, Integer indent)
+ throws AlgebricksException {
+ return expr.toString();
+ }
- @Override
- public String visitAggregateFunctionCallExpression(
- AggregateFunctionCallExpression expr, Integer indent)
- throws AlgebricksException {
- return expr.toString();
- }
+ @Override
+ public String visitAggregateFunctionCallExpression(
+ AggregateFunctionCallExpression expr, Integer indent)
+ throws AlgebricksException {
+ return expr.toString();
+ }
- @Override
- public String visitScalarFunctionCallExpression(
- ScalarFunctionCallExpression expr, Integer indent)
- throws AlgebricksException {
- return expr.toString();
- }
+ @Override
+ public String visitScalarFunctionCallExpression(
+ ScalarFunctionCallExpression expr, Integer indent)
+ throws AlgebricksException {
+ return expr.toString();
+ }
- @Override
- public String visitStatefulFunctionCallExpression(
- StatefulFunctionCallExpression expr, Integer indent)
- throws AlgebricksException {
- return expr.toString();
- }
+ @Override
+ public String visitStatefulFunctionCallExpression(
+ StatefulFunctionCallExpression expr, Integer indent)
+ throws AlgebricksException {
+ return expr.toString();
+ }
- @Override
- public String visitUnnestingFunctionCallExpression(
- UnnestingFunctionCallExpression expr, Integer indent)
- throws AlgebricksException {
- return expr.toString();
- }
+ @Override
+ public String visitUnnestingFunctionCallExpression(
+ UnnestingFunctionCallExpression expr, Integer indent)
+ throws AlgebricksException {
+ return expr.toString();
+ }
}
diff --git a/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java b/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java
index c6b2e6b..0992489 100644
--- a/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java
+++ b/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java
@@ -24,6 +24,6 @@
public interface IBinaryHashFunctionFamilyProvider {
- public IBinaryHashFunctionFamily getBinaryHashFunctionFamily(Object type)
- throws AlgebricksException;
+ public IBinaryHashFunctionFamily getBinaryHashFunctionFamily(Object type)
+ throws AlgebricksException;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/ArrayTupleReference.java b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/ArrayTupleReference.java
index 8cb473d..9da28fb 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/ArrayTupleReference.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/ArrayTupleReference.java
@@ -29,31 +29,31 @@
* @author alexander.behm
*/
public class ArrayTupleReference implements ITupleReference {
- private int[] fEndOffsets;
- private byte[] tupleData;
+ private int[] fEndOffsets;
+ private byte[] tupleData;
- public void reset(int[] fEndOffsets, byte[] tupleData) {
- this.fEndOffsets = fEndOffsets;
- this.tupleData = tupleData;
- }
+ public void reset(int[] fEndOffsets, byte[] tupleData) {
+ this.fEndOffsets = fEndOffsets;
+ this.tupleData = tupleData;
+ }
- @Override
- public int getFieldCount() {
- return fEndOffsets.length;
- }
+ @Override
+ public int getFieldCount() {
+ return fEndOffsets.length;
+ }
- @Override
- public byte[] getFieldData(int fIdx) {
- return tupleData;
- }
+ @Override
+ public byte[] getFieldData(int fIdx) {
+ return tupleData;
+ }
- @Override
- public int getFieldStart(int fIdx) {
- return (fIdx == 0) ? 0 : fEndOffsets[fIdx - 1];
- }
+ @Override
+ public int getFieldStart(int fIdx) {
+ return (fIdx == 0) ? 0 : fEndOffsets[fIdx - 1];
+ }
- @Override
- public int getFieldLength(int fIdx) {
- return (fIdx == 0) ? fEndOffsets[0] : fEndOffsets[fIdx] - fEndOffsets[fIdx - 1];
- }
+ @Override
+ public int getFieldLength(int fIdx) {
+ return (fIdx == 0) ? fEndOffsets[0] : fEndOffsets[fIdx] - fEndOffsets[fIdx - 1];
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-hadoop/src/main/java/org/apache/hyracks/dataflow/hadoop/util/MRContextUtil.java b/hyracks-fullstack/hyracks/hyracks-dataflow-hadoop/src/main/java/org/apache/hyracks/dataflow/hadoop/util/MRContextUtil.java
index 17c5ec5..047a6fc 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-hadoop/src/main/java/org/apache/hyracks/dataflow/hadoop/util/MRContextUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-hadoop/src/main/java/org/apache/hyracks/dataflow/hadoop/util/MRContextUtil.java
@@ -41,7 +41,7 @@
* The wrapper to generate TaskTattemptContext
*/
public class MRContextUtil {
- // public static Reducer.Context = create
+ //public static Reducer.Context = create
@SuppressWarnings({ "rawtypes", "unchecked" })
public Mapper.Context createMapContext(Configuration conf, TaskAttemptID taskid, RecordReader reader,
diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java
index 5f40b28..52f3417 100644
--- a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java
+++ b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java
@@ -62,7 +62,7 @@
ChannelControlBlock allocateChannel() throws NetException {
synchronized (mConn) {
- cleanupClosedChannels();
+ cleanupClosedChannels();
int idx = allocationBitmap.nextClearBit(0);
if (idx < 0 || idx >= ccbArray.length) {
cleanupClosedChannels();
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProvider.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProvider.java
index fd9a0bc..d9ab69f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProvider.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProvider.java
@@ -20,5 +20,5 @@
package org.apache.hyracks.storage.am.common.api;
public interface IPrimitiveValueProvider {
- public double getValue(byte[] bytes, int offset);
+ public double getValue(byte[] bytes, int offset);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProviderFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProviderFactory.java
index 198f27a..ceb5f71 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProviderFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProviderFactory.java
@@ -22,5 +22,5 @@
import java.io.Serializable;
public interface IPrimitiveValueProviderFactory extends Serializable {
- public IPrimitiveValueProvider createPrimitiveValueProvider();
+ public IPrimitiveValueProvider createPrimitiveValueProvider();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISplitKey.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISplitKey.java
index 3f0f8bc..311fef4 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISplitKey.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISplitKey.java
@@ -21,23 +21,23 @@
import java.nio.ByteBuffer;
public interface ISplitKey {
- public void initData(int keySize);
+ public void initData(int keySize);
- public void reset();
+ public void reset();
- public ByteBuffer getBuffer();
+ public ByteBuffer getBuffer();
- public ITreeIndexTupleReference getTuple();
+ public ITreeIndexTupleReference getTuple();
- public int getLeftPage();
+ public int getLeftPage();
- public int getRightPage();
+ public int getRightPage();
- public void setLeftPage(int leftPage);
+ public void setLeftPage(int leftPage);
- public void setRightPage(int rightPage);
+ public void setRightPage(int rightPage);
- public void setPages(int leftPage, int rightPage);
+ public void setPages(int leftPage, int rightPage);
- public ISplitKey duplicate(ITreeIndexTupleReference copyTuple);
+ public ISplitKey duplicate(ITreeIndexTupleReference copyTuple);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java
index ac3fc3b..0dd327f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java
@@ -29,21 +29,21 @@
* concurrent operations).
*/
public interface ITreeIndexAccessor extends IIndexAccessor {
- /**
- * Creates a cursor appropriate for passing into diskOrderScan().
- *
- */
- public ITreeIndexCursor createDiskOrderScanCursor();
+ /**
+ * Creates a cursor appropriate for passing into diskOrderScan().
+ *
+ */
+ public ITreeIndexCursor createDiskOrderScanCursor();
- /**
- * Open the given cursor for a disk-order scan, positioning the cursor to
- * the first leaf tuple.
- *
- * @param icursor
- * Cursor to be opened for disk-order scanning.
- * @throws HyracksDataException
- * If the BufferCache throws while un/pinning or un/latching.
- */
- public void diskOrderScan(ITreeIndexCursor cursor)
- throws HyracksDataException;
+ /**
+ * Open the given cursor for a disk-order scan, positioning the cursor to
+ * the first leaf tuple.
+ *
+ * @param icursor
+ * Cursor to be opened for disk-order scanning.
+ * @throws HyracksDataException
+ * If the BufferCache throws while un/pinning or un/latching.
+ */
+ public void diskOrderScan(ITreeIndexCursor cursor)
+ throws HyracksDataException;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexMetaDataFrameFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexMetaDataFrameFactory.java
index 7405833..ff7deaf 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexMetaDataFrameFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexMetaDataFrameFactory.java
@@ -20,5 +20,5 @@
package org.apache.hyracks.storage.am.common.api;
public interface ITreeIndexMetaDataFrameFactory {
- public ITreeIndexMetaDataFrame createFrame();
+ public ITreeIndexMetaDataFrame createFrame();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexTupleWriterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexTupleWriterFactory.java
index 8fb8924..22bff98 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexTupleWriterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexTupleWriterFactory.java
@@ -22,5 +22,5 @@
import java.io.Serializable;
public interface ITreeIndexTupleWriterFactory extends Serializable {
- public ITreeIndexTupleWriter createTupleWriter();
+ public ITreeIndexTupleWriter createTupleWriter();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleFilter.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleFilter.java
index ac74021..50673cf 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleFilter.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleFilter.java
@@ -22,5 +22,5 @@
import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference;
public interface ITupleFilter {
- public boolean accept(IFrameTupleReference tuple) throws Exception;
+ public boolean accept(IFrameTupleReference tuple) throws Exception;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdater.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdater.java
index b0debc9..2cbb746 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdater.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdater.java
@@ -29,5 +29,5 @@
*
*/
public interface ITupleUpdater {
- public void updateTuple(ITupleReference tuple);
+ public void updateTuple(ITupleReference tuple);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdaterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdaterFactory.java
index 941d738..80d1d20 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdaterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdaterFactory.java
@@ -22,5 +22,5 @@
import java.io.Serializable;
public interface ITupleUpdaterFactory extends Serializable {
- public ITupleUpdater createTupleUpdater();
+ public ITupleUpdater createTupleUpdater();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/TreeIndexException.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/TreeIndexException.java
index 988a304..080752f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/TreeIndexException.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/TreeIndexException.java
@@ -21,22 +21,22 @@
public class TreeIndexException extends IndexException {
- private static final long serialVersionUID = 1L;
- private boolean handled = false;
+ private static final long serialVersionUID = 1L;
+ private boolean handled = false;
- public TreeIndexException(Exception e) {
- super(e);
- }
+ public TreeIndexException(Exception e) {
+ super(e);
+ }
- public TreeIndexException(String message) {
- super(message);
- }
+ public TreeIndexException(String message) {
+ super(message);
+ }
- public void setHandled(boolean handled) {
- this.handled = handled;
- }
+ public void setHandled(boolean handled) {
+ this.handled = handled;
+ }
- public boolean getHandled() {
- return handled;
- }
+ public boolean getHandled() {
+ return handled;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/UnsortedInputException.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/UnsortedInputException.java
index dd69cb1..52a8488 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/UnsortedInputException.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/UnsortedInputException.java
@@ -23,13 +23,13 @@
* Thrown when trying to bulk load an index with an unsorted input stream.
*/
public class UnsortedInputException extends IndexException {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public UnsortedInputException(Exception e) {
- super(e);
- }
+ public UnsortedInputException(Exception e) {
+ super(e);
+ }
- public UnsortedInputException(String message) {
+ public UnsortedInputException(String message) {
super(message);
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/ITreeIndexOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/ITreeIndexOperatorDescriptor.java
index 4ae6995..0a41e47 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/ITreeIndexOperatorDescriptor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/ITreeIndexOperatorDescriptor.java
@@ -24,9 +24,9 @@
import org.apache.hyracks.storage.am.common.api.ITupleFilterFactory;
public interface ITreeIndexOperatorDescriptor extends IIndexOperatorDescriptor {
- public IBinaryComparatorFactory[] getTreeIndexComparatorFactories();
+ public IBinaryComparatorFactory[] getTreeIndexComparatorFactories();
- public ITypeTraits[] getTreeIndexTypeTraits();
+ public ITypeTraits[] getTreeIndexTypeTraits();
- public ITupleFilterFactory getTupleFilterFactory();
+ public ITupleFilterFactory getTupleFilterFactory();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/exceptions/TreeIndexNonExistentKeyException.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/exceptions/TreeIndexNonExistentKeyException.java
index 7aba4c8..bd5e5c4 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/exceptions/TreeIndexNonExistentKeyException.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/exceptions/TreeIndexNonExistentKeyException.java
@@ -23,13 +23,13 @@
public class TreeIndexNonExistentKeyException extends TreeIndexException {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public TreeIndexNonExistentKeyException(Exception e) {
- super(e);
- }
+ public TreeIndexNonExistentKeyException(Exception e) {
+ super(e);
+ }
- public TreeIndexNonExistentKeyException(String message) {
- super(message);
- }
+ public TreeIndexNonExistentKeyException(String message) {
+ super(message);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java
index d9e119f..92ba631 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java
@@ -27,46 +27,46 @@
public static final int GREATEST_KEY_INDICATOR = -1;
public static final int ERROR_INDICATOR = -2;
- protected static final int slotSize = 4;
- protected ITreeIndexFrame frame;
+ protected static final int slotSize = 4;
+ protected ITreeIndexFrame frame;
- @Override
- public int getTupleOff(int offset) {
- return frame.getBuffer().getInt(offset);
- }
+ @Override
+ public int getTupleOff(int offset) {
+ return frame.getBuffer().getInt(offset);
+ }
- @Override
- public void setSlot(int offset, int value) {
- frame.getBuffer().putInt(offset, value);
- }
+ @Override
+ public void setSlot(int offset, int value) {
+ frame.getBuffer().putInt(offset, value);
+ }
- @Override
- public int getSlotEndOff() {
- return frame.getBuffer().capacity()
- - (frame.getTupleCount() * slotSize);
- }
+ @Override
+ public int getSlotEndOff() {
+ return frame.getBuffer().capacity()
+ - (frame.getTupleCount() * slotSize);
+ }
- @Override
- public int getSlotStartOff() {
- return frame.getBuffer().capacity() - slotSize;
- }
+ @Override
+ public int getSlotStartOff() {
+ return frame.getBuffer().capacity() - slotSize;
+ }
- @Override
- public int getSlotSize() {
- return slotSize;
- }
+ @Override
+ public int getSlotSize() {
+ return slotSize;
+ }
- @Override
- public void setFrame(ITreeIndexFrame frame) {
- this.frame = frame;
- }
+ @Override
+ public void setFrame(ITreeIndexFrame frame) {
+ this.frame = frame;
+ }
- @Override
- public int getSlotOff(int tupleIndex) {
- return getSlotStartOff() - tupleIndex * slotSize;
- }
+ @Override
+ public int getSlotOff(int tupleIndex) {
+ return getSlotStartOff() - tupleIndex * slotSize;
+ }
- @Override
+ @Override
public int getGreatestKeyIndicator() {
return GREATEST_KEY_INDICATOR;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrameFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrameFactory.java
index a130f3c..d2cec23 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrameFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrameFactory.java
@@ -23,8 +23,8 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexMetaDataFrameFactory;
public class LIFOMetaDataFrameFactory implements ITreeIndexMetaDataFrameFactory {
- @Override
- public ITreeIndexMetaDataFrame createFrame() {
- return new LIFOMetaDataFrame();
- }
+ @Override
+ public ITreeIndexMetaDataFrame createFrame() {
+ return new LIFOMetaDataFrame();
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java
index 781437f..ce2aa38 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java
@@ -20,5 +20,5 @@
package org.apache.hyracks.storage.am.common.ophelpers;
public enum FindTupleMode {
- INCLUSIVE, EXCLUSIVE, EXCLUSIVE_ERROR_IF_EXISTS, EXACT
+ INCLUSIVE, EXCLUSIVE, EXCLUSIVE_ERROR_IF_EXISTS, EXACT
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java
index d59dc11..e9dfaff 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java
@@ -20,5 +20,5 @@
package org.apache.hyracks.storage.am.common.ophelpers;
public enum FindTupleNoExactMatchPolicy {
- LOWER_KEY, HIGHER_KEY, NONE
+ LOWER_KEY, HIGHER_KEY, NONE
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/IndexOp.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/IndexOp.java
index 5d04dc8..7a0d4e8 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/IndexOp.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/IndexOp.java
@@ -20,5 +20,5 @@
package org.apache.hyracks.storage.am.common.ophelpers;
public enum IndexOp {
- INSERT, DELETE, UPDATE, UPSERT, SEARCH, DISKORDERSCAN, PHYSICALDELETE
+ INSERT, DELETE, UPDATE, UPSERT, SEARCH, DISKORDERSCAN, PHYSICALDELETE
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/LongArrayList.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/LongArrayList.java
index c15fe38..1da4f46 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/LongArrayList.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/LongArrayList.java
@@ -20,28 +20,28 @@
package org.apache.hyracks.storage.am.common.ophelpers;
public class LongArrayList {
- private long[] data;
- private int size;
- private int first;
- private final int growth;
+ private long[] data;
+ private int size;
+ private int first;
+ private final int growth;
- public LongArrayList(int initialCapacity, int growth) {
- data = new long[initialCapacity];
- size = 0;
- first = 0;
- this.growth = growth;
- }
+ public LongArrayList(int initialCapacity, int growth) {
+ data = new long[initialCapacity];
+ size = 0;
+ first = 0;
+ this.growth = growth;
+ }
- public int size() {
- return size;
- }
+ public int size() {
+ return size;
+ }
- public int first() {
- return first;
- }
+ public int first() {
+ return first;
+ }
- public void addFirst(long i) {
- long[] newData = new long[data.length + 1];
+ public void addFirst(long i) {
+ long[] newData = new long[data.length + 1];
System.arraycopy(data, 0, newData, 0, first);
System.arraycopy(data, first, newData, first + 1, size - first);
data = newData;
@@ -50,54 +50,54 @@
}
- public void add(long i) {
- if (size == data.length) {
- long[] newData = new long[data.length + growth];
- System.arraycopy(data, 0, newData, 0, data.length);
- data = newData;
- }
+ public void add(long i) {
+ if (size == data.length) {
+ long[] newData = new long[data.length + growth];
+ System.arraycopy(data, 0, newData, 0, data.length);
+ data = newData;
+ }
- data[size++] = i;
- }
+ data[size++] = i;
+ }
- public void removeLast() {
- if (size > 0)
- size--;
- }
+ public void removeLast() {
+ if (size > 0)
+ size--;
+ }
- // WARNING: caller is responsible for checking size > 0
- public long getLast() {
- return data[size - 1];
- }
+ // WARNING: caller is responsible for checking size > 0
+ public long getLast() {
+ return data[size - 1];
+ }
- public long get(int i) {
- return data[i];
- }
+ public long get(int i) {
+ return data[i];
+ }
- // WARNING: caller is responsible for checking i < size
- public void set(int i, long value) {
- data[i] = value;
+ // WARNING: caller is responsible for checking i < size
+ public void set(int i, long value) {
+ data[i] = value;
- }
+ }
- public long getFirst() {
- return data[first];
- }
+ public long getFirst() {
+ return data[first];
+ }
- public void moveFirst() {
- first++;
- }
+ public void moveFirst() {
+ first++;
+ }
- public void clear() {
- size = 0;
- first = 0;
- }
+ public void clear() {
+ size = 0;
+ first = 0;
+ }
- public boolean isLast() {
- return size == first;
- }
+ public boolean isLast() {
+ return size == first;
+ }
- public boolean isEmpty() {
- return size == 0;
- }
+ public boolean isEmpty() {
+ return size == 0;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/SlotOffTupleOff.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/SlotOffTupleOff.java
index 0944f13..f7845c7 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/SlotOffTupleOff.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/SlotOffTupleOff.java
@@ -20,23 +20,23 @@
package org.apache.hyracks.storage.am.common.ophelpers;
public class SlotOffTupleOff implements Comparable<SlotOffTupleOff> {
- public int tupleIndex;
- public int slotOff;
- public int tupleOff;
+ public int tupleIndex;
+ public int slotOff;
+ public int tupleOff;
- public SlotOffTupleOff(int tupleIndex, int slotOff, int recOff) {
- this.tupleIndex = tupleIndex;
- this.slotOff = slotOff;
- this.tupleOff = recOff;
- }
+ public SlotOffTupleOff(int tupleIndex, int slotOff, int recOff) {
+ this.tupleIndex = tupleIndex;
+ this.slotOff = slotOff;
+ this.tupleOff = recOff;
+ }
- @Override
- public int compareTo(SlotOffTupleOff o) {
- return tupleOff - o.tupleOff;
- }
+ @Override
+ public int compareTo(SlotOffTupleOff o) {
+ return tupleOff - o.tupleOff;
+ }
- @Override
- public String toString() {
- return tupleIndex + " " + slotOff + " " + tupleOff;
- }
+ @Override
+ public String toString() {
+ return tupleIndex + " " + slotOff + " " + tupleOff;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java
index 4d37049..9b16514 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java
@@ -96,8 +96,8 @@
return fieldCount * 2;
}
- @Override
- public int getTupleSize() {
- return nullFlagsBytes + fieldSlotsBytes + buf.getShort(tupleStartOff + nullFlagsBytes + (fieldCount-1) * 2);
- }
+ @Override
+ public int getTupleSize() {
+ return nullFlagsBytes + fieldSlotsBytes + buf.getShort(tupleStartOff + nullFlagsBytes + (fieldCount-1) * 2);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/TypeAwareTupleWriterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/TypeAwareTupleWriterFactory.java
index c367152..741a53a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/TypeAwareTupleWriterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/TypeAwareTupleWriterFactory.java
@@ -24,18 +24,18 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexTupleWriterFactory;
public class TypeAwareTupleWriterFactory implements
- ITreeIndexTupleWriterFactory {
+ ITreeIndexTupleWriterFactory {
- private static final long serialVersionUID = 1L;
- protected ITypeTraits[] typeTraits;
+ private static final long serialVersionUID = 1L;
+ protected ITypeTraits[] typeTraits;
- public TypeAwareTupleWriterFactory(ITypeTraits[] typeTraits) {
- this.typeTraits = typeTraits;
- }
+ public TypeAwareTupleWriterFactory(ITypeTraits[] typeTraits) {
+ this.typeTraits = typeTraits;
+ }
- @Override
- public ITreeIndexTupleWriter createTupleWriter() {
- return new TypeAwareTupleWriter(typeTraits);
- }
+ @Override
+ public ITreeIndexTupleWriter createTupleWriter() {
+ return new TypeAwareTupleWriter(typeTraits);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexBufferCacheWarmup.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexBufferCacheWarmup.java
index 5668992..ff76c5a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexBufferCacheWarmup.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexBufferCacheWarmup.java
@@ -32,74 +32,74 @@
import org.apache.hyracks.storage.common.file.BufferedFileHandle;
public class TreeIndexBufferCacheWarmup {
- private final IBufferCache bufferCache;
- private final IMetaDataPageManager freePageManager;
- private final int fileId;
- private final ArrayList<IntArrayList> pagesByLevel = new ArrayList<IntArrayList>();
- private final Random rnd = new Random();
+ private final IBufferCache bufferCache;
+ private final IMetaDataPageManager freePageManager;
+ private final int fileId;
+ private final ArrayList<IntArrayList> pagesByLevel = new ArrayList<IntArrayList>();
+ private final Random rnd = new Random();
- public TreeIndexBufferCacheWarmup(IBufferCache bufferCache,
- IMetaDataPageManager freePageManager, int fileId) {
- this.bufferCache = bufferCache;
- this.freePageManager = freePageManager;
- this.fileId = fileId;
- }
+ public TreeIndexBufferCacheWarmup(IBufferCache bufferCache,
+ IMetaDataPageManager freePageManager, int fileId) {
+ this.bufferCache = bufferCache;
+ this.freePageManager = freePageManager;
+ this.fileId = fileId;
+ }
- public void warmup(ITreeIndexFrame frame,
- ITreeIndexMetaDataFrame metaFrame, int[] warmupTreeLevels,
- int[] warmupRepeats) throws HyracksDataException {
- bufferCache.openFile(fileId);
+ public void warmup(ITreeIndexFrame frame,
+ ITreeIndexMetaDataFrame metaFrame, int[] warmupTreeLevels,
+ int[] warmupRepeats) throws HyracksDataException {
+ bufferCache.openFile(fileId);
- // scan entire file to determine pages in each level
- int maxPageId = freePageManager.getMaxPage(metaFrame);
- for (int pageId = 0; pageId <= maxPageId; pageId++) {
- ICachedPage page = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, pageId), false);
- page.acquireReadLatch();
- try {
- frame.setPage(page);
- byte level = frame.getLevel();
- while (level >= pagesByLevel.size()) {
- pagesByLevel.add(new IntArrayList(100, 100));
- }
- if (level >= 0) {
- // System.out.println("ADDING: " + level + " " + pageId);
- pagesByLevel.get(level).add(pageId);
- }
- } finally {
- page.releaseReadLatch();
- bufferCache.unpin(page);
- }
- }
+ // scan entire file to determine pages in each level
+ int maxPageId = freePageManager.getMaxPage(metaFrame);
+ for (int pageId = 0; pageId <= maxPageId; pageId++) {
+ ICachedPage page = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, pageId), false);
+ page.acquireReadLatch();
+ try {
+ frame.setPage(page);
+ byte level = frame.getLevel();
+ while (level >= pagesByLevel.size()) {
+ pagesByLevel.add(new IntArrayList(100, 100));
+ }
+ if (level >= 0) {
+ // System.out.println("ADDING: " + level + " " + pageId);
+ pagesByLevel.get(level).add(pageId);
+ }
+ } finally {
+ page.releaseReadLatch();
+ bufferCache.unpin(page);
+ }
+ }
- // pin certain pages again to simulate frequent access
- for (int i = 0; i < warmupTreeLevels.length; i++) {
- if (warmupTreeLevels[i] < pagesByLevel.size()) {
- int repeats = warmupRepeats[i];
- IntArrayList pageIds = pagesByLevel.get(warmupTreeLevels[i]);
- int[] remainingPageIds = new int[pageIds.size()];
- for (int r = 0; r < repeats; r++) {
- for (int j = 0; j < pageIds.size(); j++) {
- remainingPageIds[j] = pageIds.get(j);
- }
+ // pin certain pages again to simulate frequent access
+ for (int i = 0; i < warmupTreeLevels.length; i++) {
+ if (warmupTreeLevels[i] < pagesByLevel.size()) {
+ int repeats = warmupRepeats[i];
+ IntArrayList pageIds = pagesByLevel.get(warmupTreeLevels[i]);
+ int[] remainingPageIds = new int[pageIds.size()];
+ for (int r = 0; r < repeats; r++) {
+ for (int j = 0; j < pageIds.size(); j++) {
+ remainingPageIds[j] = pageIds.get(j);
+ }
- int remainingLength = pageIds.size();
- for (int j = 0; j < pageIds.size(); j++) {
- int index = MathUtil.stripSignBit(rnd.nextInt()) % remainingLength;
- int pageId = remainingPageIds[index];
+ int remainingLength = pageIds.size();
+ for (int j = 0; j < pageIds.size(); j++) {
+ int index = MathUtil.stripSignBit(rnd.nextInt()) % remainingLength;
+ int pageId = remainingPageIds[index];
- // pin & latch then immediately unlatch & unpin
- ICachedPage page = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, pageId), false);
- page.acquireReadLatch();
- page.releaseReadLatch();
- bufferCache.unpin(page);
+ // pin & latch then immediately unlatch & unpin
+ ICachedPage page = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, pageId), false);
+ page.acquireReadLatch();
+ page.releaseReadLatch();
+ bufferCache.unpin(page);
- remainingPageIds[index] = remainingPageIds[remainingLength - 1];
- remainingLength--;
- }
- }
- }
- }
+ remainingPageIds[index] = remainingPageIds[remainingLength - 1];
+ remainingLength--;
+ }
+ }
+ }
+ }
- bufferCache.closeFile(fileId);
- }
+ bufferCache.closeFile(fileId);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java
index 8251c6f..8a28f41 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java
@@ -26,140 +26,140 @@
public class TreeIndexStats {
- private TreeIndexNodeTypeStats rootStats = new TreeIndexNodeTypeStats();
- private TreeIndexNodeTypeStats interiorStats = new TreeIndexNodeTypeStats();
- private TreeIndexNodeTypeStats leafStats = new TreeIndexNodeTypeStats();
+ private TreeIndexNodeTypeStats rootStats = new TreeIndexNodeTypeStats();
+ private TreeIndexNodeTypeStats interiorStats = new TreeIndexNodeTypeStats();
+ private TreeIndexNodeTypeStats leafStats = new TreeIndexNodeTypeStats();
- private int freePages = 0;
- private int metaPages = 0;
- private int treeLevels = 0;
+ private int freePages = 0;
+ private int metaPages = 0;
+ private int treeLevels = 0;
- public void begin() {
- rootStats.clear();
- interiorStats.clear();
- leafStats.clear();
- freePages = 0;
- metaPages = 0;
- treeLevels = 0;
- }
+ public void begin() {
+ rootStats.clear();
+ interiorStats.clear();
+ leafStats.clear();
+ freePages = 0;
+ metaPages = 0;
+ treeLevels = 0;
+ }
- public void addRoot(ITreeIndexFrame frame) {
- treeLevels = frame.getLevel() + 1;
- rootStats.add(frame);
- }
+ public void addRoot(ITreeIndexFrame frame) {
+ treeLevels = frame.getLevel() + 1;
+ rootStats.add(frame);
+ }
- public void add(ITreeIndexFrame frame) {
- if (frame.isLeaf()) {
- leafStats.add(frame);
- } else if (frame.isInterior()) {
- interiorStats.add(frame);
- }
- }
+ public void add(ITreeIndexFrame frame) {
+ if (frame.isLeaf()) {
+ leafStats.add(frame);
+ } else if (frame.isInterior()) {
+ interiorStats.add(frame);
+ }
+ }
- public void add(ITreeIndexMetaDataFrame metaFrame,
- IMetaDataPageManager freePageManager) {
- if (freePageManager.isFreePage(metaFrame)) {
- freePages++;
- } else if (freePageManager.isMetaPage(metaFrame)) {
- metaPages++;
- }
- }
+ public void add(ITreeIndexMetaDataFrame metaFrame,
+ IMetaDataPageManager freePageManager) {
+ if (freePageManager.isFreePage(metaFrame)) {
+ freePages++;
+ } else if (freePageManager.isMetaPage(metaFrame)) {
+ metaPages++;
+ }
+ }
- public void end() {
- // nothing here currently
- }
+ public void end() {
+ // nothing here currently
+ }
- @Override
- public String toString() {
- StringBuilder strBuilder = new StringBuilder();
- DecimalFormat df = new DecimalFormat("#####.##");
+ @Override
+ public String toString() {
+ StringBuilder strBuilder = new StringBuilder();
+ DecimalFormat df = new DecimalFormat("#####.##");
- strBuilder.append("TREE LEVELS: " + treeLevels + "\n");
- strBuilder.append("FREE PAGES : " + freePages + "\n");
- strBuilder.append("META PAGES : " + metaPages + "\n");
- long totalPages = interiorStats.getNumPages() + leafStats.getNumPages()
- + freePages + metaPages;
- strBuilder.append("TOTAL PAGES : " + totalPages + "\n");
+ strBuilder.append("TREE LEVELS: " + treeLevels + "\n");
+ strBuilder.append("FREE PAGES : " + freePages + "\n");
+ strBuilder.append("META PAGES : " + metaPages + "\n");
+ long totalPages = interiorStats.getNumPages() + leafStats.getNumPages()
+ + freePages + metaPages;
+ strBuilder.append("TOTAL PAGES : " + totalPages + "\n");
- strBuilder.append("\n");
- strBuilder.append("ROOT STATS" + "\n");
- strBuilder
- .append("NUM TUPLES: " + rootStats.getNumTuples() + "\n");
- strBuilder.append("FILL FACTOR : "
- + df.format(rootStats.getAvgFillFactor()) + "\n");
+ strBuilder.append("\n");
+ strBuilder.append("ROOT STATS" + "\n");
+ strBuilder
+ .append("NUM TUPLES: " + rootStats.getNumTuples() + "\n");
+ strBuilder.append("FILL FACTOR : "
+ + df.format(rootStats.getAvgFillFactor()) + "\n");
- if (interiorStats.getNumPages() > 0) {
- strBuilder.append("\n");
- strBuilder.append("INTERIOR STATS" + "\n");
- strBuilder.append("NUM PAGES: " + interiorStats.getNumPages()
- + "\n");
- strBuilder.append("NUM TUPLES: "
- + interiorStats.getNumTuples() + "\n");
- strBuilder.append("AVG TUPLES/PAGE: "
- + df.format(interiorStats.getAvgNumTuples()) + "\n");
- strBuilder.append("AVG FILL FACTOR: "
- + df.format(interiorStats.getAvgFillFactor()) + "\n");
- }
+ if (interiorStats.getNumPages() > 0) {
+ strBuilder.append("\n");
+ strBuilder.append("INTERIOR STATS" + "\n");
+ strBuilder.append("NUM PAGES: " + interiorStats.getNumPages()
+ + "\n");
+ strBuilder.append("NUM TUPLES: "
+ + interiorStats.getNumTuples() + "\n");
+ strBuilder.append("AVG TUPLES/PAGE: "
+ + df.format(interiorStats.getAvgNumTuples()) + "\n");
+ strBuilder.append("AVG FILL FACTOR: "
+ + df.format(interiorStats.getAvgFillFactor()) + "\n");
+ }
- if (leafStats.getNumPages() > 0) {
- strBuilder.append("\n");
- strBuilder.append("LEAF STATS" + "\n");
- strBuilder.append("NUM PAGES: "
- + df.format(leafStats.getNumPages()) + "\n");
- strBuilder.append("NUM TUPLES: "
- + df.format(leafStats.getNumTuples()) + "\n");
- strBuilder.append("AVG TUPLES/PAGE: "
- + df.format(leafStats.getAvgNumTuples()) + "\n");
- strBuilder.append("AVG FILL FACTOR: "
- + df.format(leafStats.getAvgFillFactor()) + "\n");
- }
+ if (leafStats.getNumPages() > 0) {
+ strBuilder.append("\n");
+ strBuilder.append("LEAF STATS" + "\n");
+ strBuilder.append("NUM PAGES: "
+ + df.format(leafStats.getNumPages()) + "\n");
+ strBuilder.append("NUM TUPLES: "
+ + df.format(leafStats.getNumTuples()) + "\n");
+ strBuilder.append("AVG TUPLES/PAGE: "
+ + df.format(leafStats.getAvgNumTuples()) + "\n");
+ strBuilder.append("AVG FILL FACTOR: "
+ + df.format(leafStats.getAvgFillFactor()) + "\n");
+ }
- return strBuilder.toString();
- }
+ return strBuilder.toString();
+ }
- public class TreeIndexNodeTypeStats {
- private long numTuples;
- private long sumTuplesSizes;
- private long numPages;
- private double sumFillFactors;
+ public class TreeIndexNodeTypeStats {
+ private long numTuples;
+ private long sumTuplesSizes;
+ private long numPages;
+ private double sumFillFactors;
- public void clear() {
- numTuples = 0;
- sumTuplesSizes = 0;
- numPages = 0;
- }
+ public void clear() {
+ numTuples = 0;
+ sumTuplesSizes = 0;
+ numPages = 0;
+ }
- public void add(ITreeIndexFrame frame) {
- numPages++;
- numTuples += frame.getTupleCount();
- sumFillFactors += (double) (frame.getBuffer().capacity() - frame
- .getTotalFreeSpace())
- / (double) frame.getBuffer().capacity();
- }
+ public void add(ITreeIndexFrame frame) {
+ numPages++;
+ numTuples += frame.getTupleCount();
+ sumFillFactors += (double) (frame.getBuffer().capacity() - frame
+ .getTotalFreeSpace())
+ / (double) frame.getBuffer().capacity();
+ }
- public long getNumTuples() {
- return numTuples;
- }
+ public long getNumTuples() {
+ return numTuples;
+ }
- public long getSumTupleSizes() {
- return sumTuplesSizes;
- }
+ public long getSumTupleSizes() {
+ return sumTuplesSizes;
+ }
- public long getNumPages() {
- return numPages;
- }
+ public long getNumPages() {
+ return numPages;
+ }
- public double getAvgNumTuples() {
- return (double) numTuples / (double) numPages;
- }
+ public double getAvgNumTuples() {
+ return (double) numTuples / (double) numPages;
+ }
- public double getAvgTupleSize() {
- return (double) sumTuplesSizes / (double) numTuples;
- }
+ public double getAvgTupleSize() {
+ return (double) sumTuplesSizes / (double) numTuples;
+ }
- public double getAvgFillFactor() {
- return sumFillFactors / numPages;
- }
- }
+ public double getAvgFillFactor() {
+ return sumFillFactors / numPages;
+ }
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStatsGatherer.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStatsGatherer.java
index 712acb8..c24a90b 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStatsGatherer.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStatsGatherer.java
@@ -28,63 +28,63 @@
public class TreeIndexStatsGatherer {
- private final TreeIndexStats treeIndexStats = new TreeIndexStats();
- private final IBufferCache bufferCache;
- private final IMetaDataPageManager freePageManager;
- private final int fileId;
- private final int rootPage;
+ private final TreeIndexStats treeIndexStats = new TreeIndexStats();
+ private final IBufferCache bufferCache;
+ private final IMetaDataPageManager freePageManager;
+ private final int fileId;
+ private final int rootPage;
- public TreeIndexStatsGatherer(IBufferCache bufferCache,
- IMetaDataPageManager freePageManager, int fileId, int rootPage) {
- this.bufferCache = bufferCache;
- this.freePageManager = freePageManager;
- this.fileId = fileId;
- this.rootPage = rootPage;
- }
+ public TreeIndexStatsGatherer(IBufferCache bufferCache,
+ IMetaDataPageManager freePageManager, int fileId, int rootPage) {
+ this.bufferCache = bufferCache;
+ this.freePageManager = freePageManager;
+ this.fileId = fileId;
+ this.rootPage = rootPage;
+ }
- public TreeIndexStats gatherStats(ITreeIndexFrame leafFrame,
- ITreeIndexFrame interiorFrame, ITreeIndexMetaDataFrame metaFrame)
- throws HyracksDataException {
+ public TreeIndexStats gatherStats(ITreeIndexFrame leafFrame,
+ ITreeIndexFrame interiorFrame, ITreeIndexMetaDataFrame metaFrame)
+ throws HyracksDataException {
- bufferCache.openFile(fileId);
+ bufferCache.openFile(fileId);
- treeIndexStats.begin();
+ treeIndexStats.begin();
- int maxPageId = freePageManager.getMaxPage(metaFrame);
- for (int pageId = 0; pageId <= maxPageId; pageId++) {
- ICachedPage page = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, pageId), false);
- page.acquireReadLatch();
- try {
- metaFrame.setPage(page);
- leafFrame.setPage(page);
- interiorFrame.setPage(page);
+ int maxPageId = freePageManager.getMaxPage(metaFrame);
+ for (int pageId = 0; pageId <= maxPageId; pageId++) {
+ ICachedPage page = bufferCache.pin(BufferedFileHandle.getDiskPageId(fileId, pageId), false);
+ page.acquireReadLatch();
+ try {
+ metaFrame.setPage(page);
+ leafFrame.setPage(page);
+ interiorFrame.setPage(page);
- if (leafFrame.isLeaf()) {
- if (pageId == rootPage) {
- treeIndexStats.addRoot(leafFrame);
- } else {
- treeIndexStats.add(leafFrame);
- }
- } else if (interiorFrame.isInterior()) {
- if (pageId == rootPage) {
- treeIndexStats.addRoot(interiorFrame);
- } else {
- treeIndexStats.add(interiorFrame);
- }
- } else {
- treeIndexStats.add(metaFrame, freePageManager);
- }
+ if (leafFrame.isLeaf()) {
+ if (pageId == rootPage) {
+ treeIndexStats.addRoot(leafFrame);
+ } else {
+ treeIndexStats.add(leafFrame);
+ }
+ } else if (interiorFrame.isInterior()) {
+ if (pageId == rootPage) {
+ treeIndexStats.addRoot(interiorFrame);
+ } else {
+ treeIndexStats.add(interiorFrame);
+ }
+ } else {
+ treeIndexStats.add(metaFrame, freePageManager);
+ }
- } finally {
- page.releaseReadLatch();
- bufferCache.unpin(page);
- }
- }
+ } finally {
+ page.releaseReadLatch();
+ bufferCache.unpin(page);
+ }
+ }
- treeIndexStats.end();
+ treeIndexStats.end();
- bufferCache.closeFile(fileId);
+ bufferCache.closeFile(fileId);
- return treeIndexStats;
- }
+ return treeIndexStats;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java
index 7784d42..a4afe80 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java
@@ -27,17 +27,17 @@
@SuppressWarnings("rawtypes")
public class TreeIndexUtils {
- public static String printFrameTuples(ITreeIndexFrame frame, ISerializerDeserializer[] fieldSerdes) throws HyracksDataException {
- StringBuilder strBuilder = new StringBuilder();
- ITreeIndexTupleReference tuple = frame.createTupleReference();
- for (int i = 0; i < frame.getTupleCount(); i++) {
- tuple.resetByTupleIndex(frame, i);
- String tupleString = TupleUtils.printTuple(tuple, fieldSerdes);
- strBuilder.append(tupleString);
- if (i != frame.getTupleCount() - 1) {
- strBuilder.append(" | ");
- }
- }
- return strBuilder.toString();
+ public static String printFrameTuples(ITreeIndexFrame frame, ISerializerDeserializer[] fieldSerdes) throws HyracksDataException {
+ StringBuilder strBuilder = new StringBuilder();
+ ITreeIndexTupleReference tuple = frame.createTupleReference();
+ for (int i = 0; i < frame.getTupleCount(); i++) {
+ tuple.resetByTupleIndex(frame, i);
+ String tupleString = TupleUtils.printTuple(tuple, fieldSerdes);
+ strBuilder.append(tupleString);
+ if (i != frame.getTupleCount() - 1) {
+ strBuilder.append(" | ");
+ }
+ }
+ return strBuilder.toString();
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyDiskComponentFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyDiskComponentFactory.java
index b82e9ec..bddea2a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyDiskComponentFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyDiskComponentFactory.java
@@ -29,37 +29,37 @@
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
public class LSMBTreeWithBuddyDiskComponentFactory implements
- ILSMComponentFactory {
+ ILSMComponentFactory {
- private final TreeIndexFactory<BTree> btreeFactory;
- private final TreeIndexFactory<BTree> buddyBtreeFactory;
- private final BloomFilterFactory bloomFilterFactory;
+ private final TreeIndexFactory<BTree> btreeFactory;
+ private final TreeIndexFactory<BTree> buddyBtreeFactory;
+ private final BloomFilterFactory bloomFilterFactory;
- public LSMBTreeWithBuddyDiskComponentFactory(
- TreeIndexFactory<BTree> btreeFactory,
- TreeIndexFactory<BTree> buddyBtreeFactory,
- BloomFilterFactory bloomFilterFactory) {
- this.btreeFactory = btreeFactory;
- this.buddyBtreeFactory = buddyBtreeFactory;
- this.bloomFilterFactory = bloomFilterFactory;
- }
+ public LSMBTreeWithBuddyDiskComponentFactory(
+ TreeIndexFactory<BTree> btreeFactory,
+ TreeIndexFactory<BTree> buddyBtreeFactory,
+ BloomFilterFactory bloomFilterFactory) {
+ this.btreeFactory = btreeFactory;
+ this.buddyBtreeFactory = buddyBtreeFactory;
+ this.bloomFilterFactory = bloomFilterFactory;
+ }
- @Override
- public ILSMComponent createLSMComponentInstance(
- LSMComponentFileReferences cfr) throws IndexException,
- HyracksDataException {
- return new LSMBTreeWithBuddyDiskComponent(
- btreeFactory.createIndexInstance(cfr
- .getInsertIndexFileReference()),
- buddyBtreeFactory.createIndexInstance(cfr
- .getDeleteIndexFileReference()),
- bloomFilterFactory.createBloomFiltertInstance(cfr
- .getBloomFilterFileReference()));
- }
+ @Override
+ public ILSMComponent createLSMComponentInstance(
+ LSMComponentFileReferences cfr) throws IndexException,
+ HyracksDataException {
+ return new LSMBTreeWithBuddyDiskComponent(
+ btreeFactory.createIndexInstance(cfr
+ .getInsertIndexFileReference()),
+ buddyBtreeFactory.createIndexInstance(cfr
+ .getDeleteIndexFileReference()),
+ bloomFilterFactory.createBloomFiltertInstance(cfr
+ .getBloomFilterFileReference()));
+ }
- @Override
- public IBufferCache getBufferCache() {
- return btreeFactory.getBufferCache();
- }
+ @Override
+ public IBufferCache getBufferCache() {
+ return btreeFactory.getBufferCache();
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMemoryComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMemoryComponent.java
index b56aaff..a45cbf1 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMemoryComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMemoryComponent.java
@@ -27,37 +27,37 @@
* This class is also not needed at the moment but is implemented anyway
*/
public class LSMBTreeWithBuddyMemoryComponent extends
- AbstractMemoryLSMComponent {
+ AbstractMemoryLSMComponent {
- private final BTree btree;
- private final BTree buddyBtree;
+ private final BTree btree;
+ private final BTree buddyBtree;
- public LSMBTreeWithBuddyMemoryComponent(BTree btree, BTree buddyBtree,
- IVirtualBufferCache vbc, boolean isActive) {
- super(vbc, isActive);
- this.btree = btree;
- this.buddyBtree = buddyBtree;
- }
+ public LSMBTreeWithBuddyMemoryComponent(BTree btree, BTree buddyBtree,
+ IVirtualBufferCache vbc, boolean isActive) {
+ super(vbc, isActive);
+ this.btree = btree;
+ this.buddyBtree = buddyBtree;
+ }
- public BTree getBTree() {
- return btree;
- }
+ public BTree getBTree() {
+ return btree;
+ }
- public BTree getBuddyBTree() {
- return buddyBtree;
- }
+ public BTree getBuddyBTree() {
+ return buddyBtree;
+ }
- @Override
- protected void reset() throws HyracksDataException {
- super.reset();
- btree.deactivate();
- btree.destroy();
- btree.create();
- btree.activate();
- buddyBtree.deactivate();
- buddyBtree.destroy();
- buddyBtree.create();
- buddyBtree.activate();
- }
+ @Override
+ protected void reset() throws HyracksDataException {
+ super.reset();
+ btree.deactivate();
+ btree.destroy();
+ btree.create();
+ btree.activate();
+ buddyBtree.deactivate();
+ buddyBtree.destroy();
+ buddyBtree.create();
+ buddyBtree.activate();
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMergeOperation.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMergeOperation.java
index 61f68fb..d70bdd5 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMergeOperation.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMergeOperation.java
@@ -34,103 +34,103 @@
public class LSMBTreeWithBuddyMergeOperation implements ILSMIOOperation {
- private final ILSMIndexAccessorInternal accessor;
- private final List<ILSMComponent> mergingComponents;
- private final ITreeIndexCursor cursor;
- private final FileReference btreeMergeTarget;
- private final FileReference buddyBtreeMergeTarget;
- private final FileReference bloomFilterMergeTarget;
- private final ILSMIOOperationCallback callback;
- private final String indexIdentifier;
- private final boolean keepDeletedTuples;
+ private final ILSMIndexAccessorInternal accessor;
+ private final List<ILSMComponent> mergingComponents;
+ private final ITreeIndexCursor cursor;
+ private final FileReference btreeMergeTarget;
+ private final FileReference buddyBtreeMergeTarget;
+ private final FileReference bloomFilterMergeTarget;
+ private final ILSMIOOperationCallback callback;
+ private final String indexIdentifier;
+ private final boolean keepDeletedTuples;
- public LSMBTreeWithBuddyMergeOperation(ILSMIndexAccessorInternal accessor,
- List<ILSMComponent> mergingComponents, ITreeIndexCursor cursor,
- FileReference btreeMergeTarget,
- FileReference buddyBtreeMergeTarget,
- FileReference bloomFilterMergeTarget,
- ILSMIOOperationCallback callback, String indexIdentifier, boolean keepDeletedTuples) {
- this.accessor = accessor;
- this.mergingComponents = mergingComponents;
- this.cursor = cursor;
- this.btreeMergeTarget = btreeMergeTarget;
- this.buddyBtreeMergeTarget = buddyBtreeMergeTarget;
- this.bloomFilterMergeTarget = bloomFilterMergeTarget;
- this.callback = callback;
- this.indexIdentifier = indexIdentifier;
- this.keepDeletedTuples = keepDeletedTuples;
- }
+ public LSMBTreeWithBuddyMergeOperation(ILSMIndexAccessorInternal accessor,
+ List<ILSMComponent> mergingComponents, ITreeIndexCursor cursor,
+ FileReference btreeMergeTarget,
+ FileReference buddyBtreeMergeTarget,
+ FileReference bloomFilterMergeTarget,
+ ILSMIOOperationCallback callback, String indexIdentifier, boolean keepDeletedTuples) {
+ this.accessor = accessor;
+ this.mergingComponents = mergingComponents;
+ this.cursor = cursor;
+ this.btreeMergeTarget = btreeMergeTarget;
+ this.buddyBtreeMergeTarget = buddyBtreeMergeTarget;
+ this.bloomFilterMergeTarget = bloomFilterMergeTarget;
+ this.callback = callback;
+ this.indexIdentifier = indexIdentifier;
+ this.keepDeletedTuples = keepDeletedTuples;
+ }
- @Override
- public Set<IODeviceHandle> getReadDevices() {
- Set<IODeviceHandle> devs = new HashSet<IODeviceHandle>();
- for (ILSMComponent o : mergingComponents) {
- LSMBTreeWithBuddyDiskComponent component = (LSMBTreeWithBuddyDiskComponent) o;
- devs.add(component.getBTree().getFileReference().getDeviceHandle());
+ @Override
+ public Set<IODeviceHandle> getReadDevices() {
+ Set<IODeviceHandle> devs = new HashSet<IODeviceHandle>();
+ for (ILSMComponent o : mergingComponents) {
+ LSMBTreeWithBuddyDiskComponent component = (LSMBTreeWithBuddyDiskComponent) o;
+ devs.add(component.getBTree().getFileReference().getDeviceHandle());
- devs.add(component.getBuddyBTree().getFileReference()
- .getDeviceHandle());
- devs.add(component.getBloomFilter().getFileReference()
- .getDeviceHandle());
+ devs.add(component.getBuddyBTree().getFileReference()
+ .getDeviceHandle());
+ devs.add(component.getBloomFilter().getFileReference()
+ .getDeviceHandle());
- }
- return devs;
- }
+ }
+ return devs;
+ }
- @Override
- public Set<IODeviceHandle> getWriteDevices() {
- Set<IODeviceHandle> devs = new HashSet<IODeviceHandle>();
- devs.add(btreeMergeTarget.getDeviceHandle());
+ @Override
+ public Set<IODeviceHandle> getWriteDevices() {
+ Set<IODeviceHandle> devs = new HashSet<IODeviceHandle>();
+ devs.add(btreeMergeTarget.getDeviceHandle());
- devs.add(buddyBtreeMergeTarget.getDeviceHandle());
- devs.add(bloomFilterMergeTarget.getDeviceHandle());
+ devs.add(buddyBtreeMergeTarget.getDeviceHandle());
+ devs.add(bloomFilterMergeTarget.getDeviceHandle());
- return devs;
- }
+ return devs;
+ }
- @Override
- public Boolean call() throws HyracksDataException, IndexException {
- accessor.merge(this);
- return true;
- }
+ @Override
+ public Boolean call() throws HyracksDataException, IndexException {
+ accessor.merge(this);
+ return true;
+ }
- @Override
- public ILSMIOOperationCallback getCallback() {
- return callback;
- }
+ @Override
+ public ILSMIOOperationCallback getCallback() {
+ return callback;
+ }
- @Override
- public String getIndexUniqueIdentifier() {
- return indexIdentifier;
- }
+ @Override
+ public String getIndexUniqueIdentifier() {
+ return indexIdentifier;
+ }
- @Override
- public LSMIOOpertionType getIOOpertionType() {
- return LSMIOOpertionType.MERGE;
- }
+ @Override
+ public LSMIOOpertionType getIOOpertionType() {
+ return LSMIOOpertionType.MERGE;
+ }
- public FileReference getBTreeMergeTarget() {
- return btreeMergeTarget;
- }
+ public FileReference getBTreeMergeTarget() {
+ return btreeMergeTarget;
+ }
- public FileReference getBuddyBTreeMergeTarget() {
- return buddyBtreeMergeTarget;
- }
+ public FileReference getBuddyBTreeMergeTarget() {
+ return buddyBtreeMergeTarget;
+ }
- public FileReference getBloomFilterMergeTarget() {
- return bloomFilterMergeTarget;
- }
+ public FileReference getBloomFilterMergeTarget() {
+ return bloomFilterMergeTarget;
+ }
- public ITreeIndexCursor getCursor() {
- return cursor;
- }
+ public ITreeIndexCursor getCursor() {
+ return cursor;
+ }
- public List<ILSMComponent> getMergingComponents() {
- return mergingComponents;
- }
+ public List<ILSMComponent> getMergingComponents() {
+ return mergingComponents;
+ }
- public boolean isKeepDeletedTuples() {
- return keepDeletedTuples;
- }
+ public boolean isKeepDeletedTuples() {
+ return keepDeletedTuples;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java
index 6e04dd6..a109f3f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java
@@ -27,7 +27,7 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexOperationContext;
public class LSMBTreeWithBuddySearchCursor extends LSMBTreeWithBuddyAbstractCursor{
- private int currentCursor;
+ private int currentCursor;
private PermutingTupleReference buddyBTreeTuple;
public LSMBTreeWithBuddySearchCursor(ILSMIndexOperationContext opCtx, int[] buddyBTreeFields) {
@@ -65,7 +65,7 @@
private void searchNextCursor() throws HyracksDataException {
if (currentCursor < numberOfTrees) {
try {
- btreeCursors[currentCursor].reset();
+ btreeCursors[currentCursor].reset();
btreeAccessors[currentCursor].search(btreeCursors[currentCursor], btreeRangePredicate);
} catch (IndexException e) {
throw new HyracksDataException(e);
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java
index 11828a2..d045059 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySortedCursor.java
@@ -26,145 +26,145 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexOperationContext;
public class LSMBTreeWithBuddySortedCursor extends
- LSMBTreeWithBuddyAbstractCursor {
- // TODO: This class can be removed and instead use a search cursor that uses
- // a logic similar
- // to the one in LSMRTreeWithAntiMatterTuplesSearchCursor
+ LSMBTreeWithBuddyAbstractCursor {
+ // TODO: This class can be removed and instead use a search cursor that uses
+ // a logic similar
+ // to the one in LSMRTreeWithAntiMatterTuplesSearchCursor
// currently, this cursor is only used when doing merge operations.
- private boolean[] depletedBtreeCursors;
- private int foundIn = -1;
- private PermutingTupleReference buddyBtreeTuple;
+ private boolean[] depletedBtreeCursors;
+ private int foundIn = -1;
+ private PermutingTupleReference buddyBtreeTuple;
- public LSMBTreeWithBuddySortedCursor(ILSMIndexOperationContext opCtx,
- int[] buddyBTreeFields) throws HyracksDataException {
- super(opCtx);
- this.buddyBtreeTuple = new PermutingTupleReference(buddyBTreeFields);
- reset();
- }
+ public LSMBTreeWithBuddySortedCursor(ILSMIndexOperationContext opCtx,
+ int[] buddyBTreeFields) throws HyracksDataException {
+ super(opCtx);
+ this.buddyBtreeTuple = new PermutingTupleReference(buddyBTreeFields);
+ reset();
+ }
- public ILSMIndexOperationContext getOpCtx() {
- return opCtx;
- }
+ public ILSMIndexOperationContext getOpCtx() {
+ return opCtx;
+ }
- @Override
- public void reset() throws HyracksDataException {
- depletedBtreeCursors = new boolean[numberOfTrees];
- foundNext = false;
- try {
- for (int i = 0; i < numberOfTrees; i++) {
- btreeCursors[i].reset();
- try {
- btreeAccessors[i].search(btreeCursors[i],
- btreeRangePredicate);
- } catch (IndexException e) {
- throw new HyracksDataException(e);
- }
- if (btreeCursors[i].hasNext()) {
- btreeCursors[i].next();
- } else {
- depletedBtreeCursors[i] = true;
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- throw new HyracksDataException(
- "error while reseting the btrees of the lsm btree with buddy btree",
- e);
- } finally {
- if (open) {
- lsmHarness.endSearch(opCtx);
- }
- }
- }
+ @Override
+ public void reset() throws HyracksDataException {
+ depletedBtreeCursors = new boolean[numberOfTrees];
+ foundNext = false;
+ try {
+ for (int i = 0; i < numberOfTrees; i++) {
+ btreeCursors[i].reset();
+ try {
+ btreeAccessors[i].search(btreeCursors[i],
+ btreeRangePredicate);
+ } catch (IndexException e) {
+ throw new HyracksDataException(e);
+ }
+ if (btreeCursors[i].hasNext()) {
+ btreeCursors[i].next();
+ } else {
+ depletedBtreeCursors[i] = true;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new HyracksDataException(
+ "error while reseting the btrees of the lsm btree with buddy btree",
+ e);
+ } finally {
+ if (open) {
+ lsmHarness.endSearch(opCtx);
+ }
+ }
+ }
- @Override
- public boolean hasNext() throws HyracksDataException, IndexException {
- while (!foundNext) {
- frameTuple = null;
+ @Override
+ public boolean hasNext() throws HyracksDataException, IndexException {
+ while (!foundNext) {
+ frameTuple = null;
- if (foundIn != -1) {
- if (btreeCursors[foundIn].hasNext()) {
- btreeCursors[foundIn].next();
- } else {
- depletedBtreeCursors[foundIn] = true;
- }
- }
+ if (foundIn != -1) {
+ if (btreeCursors[foundIn].hasNext()) {
+ btreeCursors[foundIn].next();
+ } else {
+ depletedBtreeCursors[foundIn] = true;
+ }
+ }
- foundIn = -1;
- for (int i = 0; i < numberOfTrees; i++) {
- if (depletedBtreeCursors[i])
- continue;
+ foundIn = -1;
+ for (int i = 0; i < numberOfTrees; i++) {
+ if (depletedBtreeCursors[i])
+ continue;
- if (frameTuple == null) {
- frameTuple = btreeCursors[i].getTuple();
- foundIn = i;
- continue;
- }
+ if (frameTuple == null) {
+ frameTuple = btreeCursors[i].getTuple();
+ foundIn = i;
+ continue;
+ }
- if (btreeCmp.compare(frameTuple, btreeCursors[i].getTuple()) > 0) {
- frameTuple = btreeCursors[i].getTuple();
- foundIn = i;
- }
- }
+ if (btreeCmp.compare(frameTuple, btreeCursors[i].getTuple()) > 0) {
+ frameTuple = btreeCursors[i].getTuple();
+ foundIn = i;
+ }
+ }
- if (foundIn == -1)
- return false;
+ if (foundIn == -1)
+ return false;
- boolean killed = false;
- buddyBtreeTuple.reset(frameTuple);
- for (int i = 0; i < foundIn; i++) {
- try {
- buddyBtreeCursors[i].reset();
- buddyBtreeRangePredicate.setHighKey(buddyBtreeTuple, true);
- btreeRangePredicate.setLowKey(buddyBtreeTuple, true);
- btreeAccessors[i].search(btreeCursors[i],
- btreeRangePredicate);
- } catch (IndexException e) {
- throw new HyracksDataException(e);
- }
- try {
- if (btreeCursors[i].hasNext()) {
- killed = true;
- break;
- }
- } finally {
- btreeCursors[i].close();
- }
- }
- if (!killed) {
- foundNext = true;
- }
- }
+ boolean killed = false;
+ buddyBtreeTuple.reset(frameTuple);
+ for (int i = 0; i < foundIn; i++) {
+ try {
+ buddyBtreeCursors[i].reset();
+ buddyBtreeRangePredicate.setHighKey(buddyBtreeTuple, true);
+ btreeRangePredicate.setLowKey(buddyBtreeTuple, true);
+ btreeAccessors[i].search(btreeCursors[i],
+ btreeRangePredicate);
+ } catch (IndexException e) {
+ throw new HyracksDataException(e);
+ }
+ try {
+ if (btreeCursors[i].hasNext()) {
+ killed = true;
+ break;
+ }
+ } finally {
+ btreeCursors[i].close();
+ }
+ }
+ if (!killed) {
+ foundNext = true;
+ }
+ }
- return true;
- }
+ return true;
+ }
- @Override
- public void next() throws HyracksDataException {
- foundNext = false;
- }
+ @Override
+ public void next() throws HyracksDataException {
+ foundNext = false;
+ }
- @Override
- public void open(ICursorInitialState initialState,
- ISearchPredicate searchPred) throws HyracksDataException,
- IndexException {
- super.open(initialState, searchPred);
+ @Override
+ public void open(ICursorInitialState initialState,
+ ISearchPredicate searchPred) throws HyracksDataException,
+ IndexException {
+ super.open(initialState, searchPred);
- depletedBtreeCursors = new boolean[numberOfTrees];
- foundNext = false;
- for (int i = 0; i < numberOfTrees; i++) {
- btreeCursors[i].reset();
- try {
- btreeAccessors[i].search(btreeCursors[i], btreeRangePredicate);
- } catch (IndexException e) {
- throw new HyracksDataException(e);
- }
- if (btreeCursors[i].hasNext()) {
- btreeCursors[i].next();
- } else {
- depletedBtreeCursors[i] = true;
- }
- }
- }
+ depletedBtreeCursors = new boolean[numberOfTrees];
+ foundNext = false;
+ for (int i = 0; i < numberOfTrees; i++) {
+ btreeCursors[i].reset();
+ try {
+ btreeAccessors[i].search(btreeCursors[i], btreeRangePredicate);
+ } catch (IndexException e) {
+ throw new HyracksDataException(e);
+ }
+ if (btreeCursors[i].hasNext()) {
+ btreeCursors[i].next();
+ } else {
+ depletedBtreeCursors[i] = true;
+ }
+ }
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java
index 0f0edd2..0496809 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java
@@ -36,46 +36,46 @@
public class LSMBuddyBTreeMergeCursor extends LSMIndexSearchCursor {
- public LSMBuddyBTreeMergeCursor(ILSMIndexOperationContext opCtx) {
- super(opCtx, true);
- }
+ public LSMBuddyBTreeMergeCursor(ILSMIndexOperationContext opCtx) {
+ super(opCtx, true);
+ }
- @Override
- protected boolean isDeleted(PriorityQueueElement checkElement)
- throws HyracksDataException, IndexException {
- return false;
- }
+ @Override
+ protected boolean isDeleted(PriorityQueueElement checkElement)
+ throws HyracksDataException, IndexException {
+ return false;
+ }
- @Override
- public void open(ICursorInitialState initialState,
- ISearchPredicate searchPred) throws IndexException,
- HyracksDataException {
- LSMBTreeWithBuddyCursorInitialState lsmInitialState = (LSMBTreeWithBuddyCursorInitialState) initialState;
- cmp = lsmInitialState.getBuddyBTreeCmp();
- operationalComponents = lsmInitialState.getOperationalComponents();
- // We intentionally set the lsmHarness to null so that we don't call
- // lsmHarness.endSearch() because we already do that when we merge
- // actual index.
- lsmHarness = null;
- int numBTrees = operationalComponents.size();
- rangeCursors = new IIndexCursor[numBTrees];
+ @Override
+ public void open(ICursorInitialState initialState,
+ ISearchPredicate searchPred) throws IndexException,
+ HyracksDataException {
+ LSMBTreeWithBuddyCursorInitialState lsmInitialState = (LSMBTreeWithBuddyCursorInitialState) initialState;
+ cmp = lsmInitialState.getBuddyBTreeCmp();
+ operationalComponents = lsmInitialState.getOperationalComponents();
+ // We intentionally set the lsmHarness to null so that we don't call
+ // lsmHarness.endSearch() because we already do that when we merge
+ // actual index.
+ lsmHarness = null;
+ int numBTrees = operationalComponents.size();
+ rangeCursors = new IIndexCursor[numBTrees];
- RangePredicate btreePredicate = new RangePredicate(null, null, true,
- true, cmp, cmp);
- IIndexAccessor[] btreeAccessors = new ITreeIndexAccessor[numBTrees];
- for (int i = 0; i < numBTrees; i++) {
- ILSMComponent component = operationalComponents.get(i);
- IBTreeLeafFrame leafFrame = (IBTreeLeafFrame) lsmInitialState
- .getBuddyBTreeLeafFrameFactory().createFrame();
- rangeCursors[i] = new BTreeRangeSearchCursor(leafFrame, false);
- BTree buddyBtree = (BTree) ((LSMBTreeWithBuddyDiskComponent) component)
- .getBuddyBTree();
- btreeAccessors[i] = buddyBtree.createAccessor(
- NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
- btreeAccessors[i].search(rangeCursors[i], btreePredicate);
- }
- setPriorityQueueComparator();
- initPriorityQueue();
- }
+ RangePredicate btreePredicate = new RangePredicate(null, null, true,
+ true, cmp, cmp);
+ IIndexAccessor[] btreeAccessors = new ITreeIndexAccessor[numBTrees];
+ for (int i = 0; i < numBTrees; i++) {
+ ILSMComponent component = operationalComponents.get(i);
+ IBTreeLeafFrame leafFrame = (IBTreeLeafFrame) lsmInitialState
+ .getBuddyBTreeLeafFrameFactory().createFrame();
+ rangeCursors[i] = new BTreeRangeSearchCursor(leafFrame, false);
+ BTree buddyBtree = (BTree) ((LSMBTreeWithBuddyDiskComponent) component)
+ .getBuddyBTree();
+ btreeAccessors[i] = buddyBtree.createAccessor(
+ NoOpOperationCallback.INSTANCE,
+ NoOpOperationCallback.INSTANCE);
+ btreeAccessors[i].search(rangeCursors[i], btreePredicate);
+ }
+ setPriorityQueueComparator();
+ initPriorityQueue();
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java
index b9f281b..4e814d0 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriter.java
@@ -23,17 +23,17 @@
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
public class LSMBTreeCopyTupleWriter extends LSMBTreeTupleWriter {
- public LSMBTreeCopyTupleWriter(ITypeTraits[] typeTraits, int numKeyFields){
- // Third parameter is never used locally, just give false.
- super(typeTraits, numKeyFields, false);
- }
+ public LSMBTreeCopyTupleWriter(ITypeTraits[] typeTraits, int numKeyFields){
+ // Third parameter is never used locally, just give false.
+ super(typeTraits, numKeyFields, false);
+ }
- @Override
+ @Override
public int writeTuple(ITupleReference tuple, byte[] targetBuf, int targetOff) {
- int tupleSize = bytesRequired(tuple);
- byte[] buf = tuple.getFieldData(0);
- int tupleStartOff = ((LSMBTreeTupleReference)tuple).getTupleStart();
- System.arraycopy(buf, tupleStartOff, targetBuf, targetOff, tupleSize);
+ int tupleSize = bytesRequired(tuple);
+ byte[] buf = tuple.getFieldData(0);
+ int tupleStartOff = ((LSMBTreeTupleReference)tuple).getTupleStart();
+ System.arraycopy(buf, tupleStartOff, targetBuf, targetOff, tupleSize);
return tupleSize;
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriterFactory.java
index eb03e7a..928b3fa 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeCopyTupleWriterFactory.java
@@ -24,18 +24,18 @@
import org.apache.hyracks.storage.am.common.tuples.TypeAwareTupleWriterFactory;
public class LSMBTreeCopyTupleWriterFactory extends TypeAwareTupleWriterFactory {
- private static final long serialVersionUID = 1L;
- private final ITypeTraits[] typeTraits;
- private final int numKeyFields;
+ private static final long serialVersionUID = 1L;
+ private final ITypeTraits[] typeTraits;
+ private final int numKeyFields;
- public LSMBTreeCopyTupleWriterFactory(ITypeTraits[] typeTraits, int numKeyFields) {
- super(typeTraits);
- this.typeTraits = typeTraits;
- this.numKeyFields = numKeyFields;
- }
+ public LSMBTreeCopyTupleWriterFactory(ITypeTraits[] typeTraits, int numKeyFields) {
+ super(typeTraits);
+ this.typeTraits = typeTraits;
+ this.numKeyFields = numKeyFields;
+ }
- @Override
- public ITreeIndexTupleWriter createTupleWriter() {
- return new LSMBTreeCopyTupleWriter(typeTraits, numKeyFields);
- }
+ @Override
+ public ITreeIndexTupleWriter createTupleWriter() {
+ return new LSMBTreeCopyTupleWriter(typeTraits, numKeyFields);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeRefrencingTupleWriterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeRefrencingTupleWriterFactory.java
index fd7892d..24ae68c 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeRefrencingTupleWriterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeRefrencingTupleWriterFactory.java
@@ -30,40 +30,40 @@
*
*/
public class LSMBTreeRefrencingTupleWriterFactory extends TypeAwareTupleWriterFactory{
- private static final long serialVersionUID = 1L;
- private final ITypeTraits[] typeTraits;
- private final int numKeyFields;
- private boolean isDelete;
- private LSMBTreeTupleWriter createdTupleWriter;
+ private static final long serialVersionUID = 1L;
+ private final ITypeTraits[] typeTraits;
+ private final int numKeyFields;
+ private boolean isDelete;
+ private LSMBTreeTupleWriter createdTupleWriter;
- public LSMBTreeRefrencingTupleWriterFactory(ITypeTraits[] typeTraits, int numKeyFields, boolean isDelete) {
- super(typeTraits);
- this.typeTraits = typeTraits;
- this.numKeyFields = numKeyFields;
- this.isDelete = isDelete;
- }
+ public LSMBTreeRefrencingTupleWriterFactory(ITypeTraits[] typeTraits, int numKeyFields, boolean isDelete) {
+ super(typeTraits);
+ this.typeTraits = typeTraits;
+ this.numKeyFields = numKeyFields;
+ this.isDelete = isDelete;
+ }
- @Override
- public ITreeIndexTupleWriter createTupleWriter() {
- createdTupleWriter = new LSMBTreeTupleWriter(typeTraits, numKeyFields, isDelete);
- return createdTupleWriter;
- }
+ @Override
+ public ITreeIndexTupleWriter createTupleWriter() {
+ createdTupleWriter = new LSMBTreeTupleWriter(typeTraits, numKeyFields, isDelete);
+ return createdTupleWriter;
+ }
- public void setMode(IndexOperation op){
- if(op == IndexOperation.INSERT){
- this.isDelete = false;
- if(createdTupleWriter != null){
- this.createdTupleWriter.setAntimatter(false);
- }
- } else if(op == IndexOperation.DELETE){
- this.isDelete = true;
- if(createdTupleWriter != null){
- this.createdTupleWriter.setAntimatter(true);
- }
- }
- }
+ public void setMode(IndexOperation op){
+ if(op == IndexOperation.INSERT){
+ this.isDelete = false;
+ if(createdTupleWriter != null){
+ this.createdTupleWriter.setAntimatter(false);
+ }
+ } else if(op == IndexOperation.DELETE){
+ this.isDelete = true;
+ if(createdTupleWriter != null){
+ this.createdTupleWriter.setAntimatter(true);
+ }
+ }
+ }
- public LSMBTreeTupleWriter getCreatedTupleWriter() {
- return createdTupleWriter;
- }
+ public LSMBTreeTupleWriter getCreatedTupleWriter() {
+ return createdTupleWriter;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleReference.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleReference.java
index 6eb104b..4d6fa61 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleReference.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleReference.java
@@ -35,9 +35,9 @@
private final int numKeyFields;
public LSMBTreeTupleReference(ITypeTraits[] typeTraits, int numKeyFields) {
- super(typeTraits);
- this.numKeyFields = numKeyFields;
- }
+ super(typeTraits);
+ this.numKeyFields = numKeyFields;
+ }
public void setFieldCount(int fieldCount) {
super.setFieldCount(fieldCount);
@@ -75,23 +75,23 @@
resetByTupleOffset(frame.getBuffer(), frame.getTupleOffset(tupleIndex));
}
- @Override
- protected int getNullFlagsBytes() {
- // +1.0 is for matter/antimatter bit.
- return (int) Math.ceil((fieldCount + 1.0) / 8.0);
+ @Override
+ protected int getNullFlagsBytes() {
+ // +1.0 is for matter/antimatter bit.
+ return (int) Math.ceil((fieldCount + 1.0) / 8.0);
}
- @Override
- public boolean isAntimatter() {
- // Check if the leftmost bit is 0 or 1.
- final byte mask = (byte) (1 << 7);
- if ((buf.array()[tupleStartOff] & mask) != 0) {
- return true;
- }
- return false;
- }
+ @Override
+ public boolean isAntimatter() {
+ // Check if the leftmost bit is 0 or 1.
+ final byte mask = (byte) (1 << 7);
+ if ((buf.array()[tupleStartOff] & mask) != 0) {
+ return true;
+ }
+ return false;
+ }
public int getTupleStart() {
- return tupleStartOff;
+ return tupleStartOff;
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleWriterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleWriterFactory.java
index f3b372f..5ee2b81 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleWriterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTupleWriterFactory.java
@@ -25,18 +25,18 @@
public class LSMBTreeTupleWriterFactory extends TypeAwareTupleWriterFactory {
- private static final long serialVersionUID = 1L;
- private final int numKeyFields;
- private final boolean isDelete;
+ private static final long serialVersionUID = 1L;
+ private final int numKeyFields;
+ private final boolean isDelete;
- public LSMBTreeTupleWriterFactory(ITypeTraits[] typeTraits, int numKeyFields, boolean isDelete) {
- super(typeTraits);
- this.numKeyFields = numKeyFields;
- this.isDelete = isDelete;
- }
+ public LSMBTreeTupleWriterFactory(ITypeTraits[] typeTraits, int numKeyFields, boolean isDelete) {
+ super(typeTraits);
+ this.numKeyFields = numKeyFields;
+ this.isDelete = isDelete;
+ }
- @Override
- public ITreeIndexTupleWriter createTupleWriter() {
- return new LSMBTreeTupleWriter(typeTraits, numKeyFields, isDelete);
- }
+ @Override
+ public ITreeIndexTupleWriter createTupleWriter() {
+ return new LSMBTreeTupleWriter(typeTraits, numKeyFields, isDelete);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8TokenFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8TokenFactory.java
index 59fee05..56fa101 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8TokenFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8TokenFactory.java
@@ -20,17 +20,17 @@
package org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers;
public abstract class AbstractUTF8TokenFactory implements ITokenFactory {
- private static final long serialVersionUID = 1L;
- protected final byte tokenTypeTag;
- protected final byte countTypeTag;
+ private static final long serialVersionUID = 1L;
+ protected final byte tokenTypeTag;
+ protected final byte countTypeTag;
- public AbstractUTF8TokenFactory() {
- tokenTypeTag = -1;
- countTypeTag = -1;
- }
+ public AbstractUTF8TokenFactory() {
+ tokenTypeTag = -1;
+ countTypeTag = -1;
+ }
- public AbstractUTF8TokenFactory(byte tokenTypeTag, byte countTypeTag) {
- this.tokenTypeTag = tokenTypeTag;
- this.countTypeTag = countTypeTag;
- }
+ public AbstractUTF8TokenFactory(byte tokenTypeTag, byte countTypeTag) {
+ this.tokenTypeTag = tokenTypeTag;
+ this.countTypeTag = countTypeTag;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java
index 4dfdc88..81254fc 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java
@@ -20,23 +20,23 @@
package org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers;
public class DelimitedUTF8StringBinaryTokenizerFactory implements
- IBinaryTokenizerFactory {
+ IBinaryTokenizerFactory {
- private static final long serialVersionUID = 1L;
- private final boolean ignoreTokenCount;
- private final boolean sourceHasTypeTag;
- private final ITokenFactory tokenFactory;
+ private static final long serialVersionUID = 1L;
+ private final boolean ignoreTokenCount;
+ private final boolean sourceHasTypeTag;
+ private final ITokenFactory tokenFactory;
- public DelimitedUTF8StringBinaryTokenizerFactory(boolean ignoreTokenCount,
- boolean sourceHasTypeTag, ITokenFactory tokenFactory) {
- this.ignoreTokenCount = ignoreTokenCount;
- this.sourceHasTypeTag = sourceHasTypeTag;
- this.tokenFactory = tokenFactory;
- }
+ public DelimitedUTF8StringBinaryTokenizerFactory(boolean ignoreTokenCount,
+ boolean sourceHasTypeTag, ITokenFactory tokenFactory) {
+ this.ignoreTokenCount = ignoreTokenCount;
+ this.sourceHasTypeTag = sourceHasTypeTag;
+ this.tokenFactory = tokenFactory;
+ }
- @Override
- public IBinaryTokenizer createTokenizer() {
- return new DelimitedUTF8StringBinaryTokenizer(ignoreTokenCount,
- sourceHasTypeTag, tokenFactory);
- }
+ @Override
+ public IBinaryTokenizer createTokenizer() {
+ return new DelimitedUTF8StringBinaryTokenizer(ignoreTokenCount,
+ sourceHasTypeTag, tokenFactory);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8NGramTokenFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8NGramTokenFactory.java
index b593d3b..0bc01b6 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8NGramTokenFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8NGramTokenFactory.java
@@ -21,18 +21,18 @@
public class HashedUTF8NGramTokenFactory extends AbstractUTF8TokenFactory {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public HashedUTF8NGramTokenFactory() {
- super();
- }
+ public HashedUTF8NGramTokenFactory() {
+ super();
+ }
- public HashedUTF8NGramTokenFactory(byte tokenTypeTag, byte countTypeTag) {
- super(tokenTypeTag, countTypeTag);
- }
+ public HashedUTF8NGramTokenFactory(byte tokenTypeTag, byte countTypeTag) {
+ super(tokenTypeTag, countTypeTag);
+ }
- @Override
- public IToken createToken() {
- return new HashedUTF8NGramToken(tokenTypeTag, countTypeTag);
- }
+ @Override
+ public IToken createToken() {
+ return new HashedUTF8NGramToken(tokenTypeTag, countTypeTag);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8WordTokenFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8WordTokenFactory.java
index d560aeb..7819e16 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8WordTokenFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/HashedUTF8WordTokenFactory.java
@@ -21,18 +21,18 @@
public class HashedUTF8WordTokenFactory extends AbstractUTF8TokenFactory {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public HashedUTF8WordTokenFactory() {
- super();
- }
+ public HashedUTF8WordTokenFactory() {
+ super();
+ }
- public HashedUTF8WordTokenFactory(byte tokenTypeTag, byte countTypeTag) {
- super(tokenTypeTag, countTypeTag);
- }
+ public HashedUTF8WordTokenFactory(byte tokenTypeTag, byte countTypeTag) {
+ super(tokenTypeTag, countTypeTag);
+ }
- @Override
- public IToken createToken() {
- return new HashedUTF8WordToken(tokenTypeTag, countTypeTag);
- }
+ @Override
+ public IToken createToken() {
+ return new HashedUTF8WordToken(tokenTypeTag, countTypeTag);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/IBinaryTokenizerFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/IBinaryTokenizerFactory.java
index 5edb05d..01e83a3 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/IBinaryTokenizerFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/IBinaryTokenizerFactory.java
@@ -22,5 +22,5 @@
import java.io.Serializable;
public interface IBinaryTokenizerFactory extends Serializable {
- public IBinaryTokenizer createTokenizer();
+ public IBinaryTokenizer createTokenizer();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/INGramToken.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/INGramToken.java
index 6671f72..3dc4f87 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/INGramToken.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/INGramToken.java
@@ -20,9 +20,9 @@
package org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers;
public interface INGramToken {
- public int getNumPostChars();
+ public int getNumPostChars();
- public int getNumPreChars();
+ public int getNumPreChars();
- public void setNumPrePostChars(int numPreChars, int numPostChars);
+ public void setNumPrePostChars(int numPreChars, int numPostChars);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8NGramTokenFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8NGramTokenFactory.java
index f8d241c..64f1e99 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8NGramTokenFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8NGramTokenFactory.java
@@ -21,19 +21,19 @@
public class UTF8NGramTokenFactory extends AbstractUTF8TokenFactory {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public UTF8NGramTokenFactory() {
- super();
- }
+ public UTF8NGramTokenFactory() {
+ super();
+ }
- public UTF8NGramTokenFactory(byte tokenTypeTag, byte countTypeTag) {
- super(tokenTypeTag, countTypeTag);
- }
+ public UTF8NGramTokenFactory(byte tokenTypeTag, byte countTypeTag) {
+ super(tokenTypeTag, countTypeTag);
+ }
- @Override
- public IToken createToken() {
- return new UTF8NGramToken(tokenTypeTag, countTypeTag);
- }
+ @Override
+ public IToken createToken() {
+ return new UTF8NGramToken(tokenTypeTag, countTypeTag);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8WordTokenFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8WordTokenFactory.java
index 5274fa3..3a8a048 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8WordTokenFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/UTF8WordTokenFactory.java
@@ -21,19 +21,19 @@
public class UTF8WordTokenFactory extends AbstractUTF8TokenFactory {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public UTF8WordTokenFactory() {
- super();
- }
+ public UTF8WordTokenFactory() {
+ super();
+ }
- public UTF8WordTokenFactory(byte tokenTypeTag, byte countTypeTag) {
- super(tokenTypeTag, countTypeTag);
- }
+ public UTF8WordTokenFactory(byte tokenTypeTag, byte countTypeTag) {
+ super(tokenTypeTag, countTypeTag);
+ }
- @Override
- public IToken createToken() {
- return new UTF8WordToken(tokenTypeTag, countTypeTag);
- }
+ @Override
+ public IToken createToken() {
+ return new UTF8WordToken(tokenTypeTag, countTypeTag);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/tuples/LSMTypeAwareTupleWriterFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/tuples/LSMTypeAwareTupleWriterFactory.java
index bdc6708..ac4f3c8 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/tuples/LSMTypeAwareTupleWriterFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/tuples/LSMTypeAwareTupleWriterFactory.java
@@ -26,23 +26,23 @@
public class LSMTypeAwareTupleWriterFactory extends TypeAwareTupleWriterFactory {
- private static final long serialVersionUID = 1L;
- private ITypeTraits[] typeTraits;
- private final boolean isDelete;
+ private static final long serialVersionUID = 1L;
+ private ITypeTraits[] typeTraits;
+ private final boolean isDelete;
- public LSMTypeAwareTupleWriterFactory(ITypeTraits[] typeTraits, boolean isDelete) {
- super(typeTraits);
- this.typeTraits = typeTraits;
- this.isDelete = isDelete;
- }
+ public LSMTypeAwareTupleWriterFactory(ITypeTraits[] typeTraits, boolean isDelete) {
+ super(typeTraits);
+ this.typeTraits = typeTraits;
+ this.isDelete = isDelete;
+ }
- @Override
- public ITreeIndexTupleWriter createTupleWriter() {
- if (isDelete) {
- return new TypeAwareTupleWriter(typeTraits);
- } else {
- return new RTreeTypeAwareTupleWriter(typeTraits);
- }
- }
+ @Override
+ public ITreeIndexTupleWriter createTupleWriter() {
+ if (isDelete) {
+ return new TypeAwareTupleWriter(typeTraits);
+ } else {
+ return new RTreeTypeAwareTupleWriter(typeTraits);
+ }
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java
index 18f20ae..1825003 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java
@@ -22,6 +22,6 @@
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
public interface IGenericPrimitiveSerializerDeserializer<T> extends
- ISerializerDeserializer<T> {
- public double getValue(byte[] bytes, int offset);
+ ISerializerDeserializer<T> {
+ public double getValue(byte[] bytes, int offset);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java
index 04111f9..d6d69bb 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java
@@ -20,5 +20,5 @@
package org.apache.hyracks.storage.am.rtree.impls;
public enum EntriesOrder {
- ASCENDING, DESCENDING
+ ASCENDING, DESCENDING
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java
index ec731c3..d89c12b 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java
@@ -25,134 +25,134 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexTupleReference;
public class RTreeSplitKey implements ISplitKey {
- public byte[] leftPageData = null;
- public ByteBuffer leftPageBuf = null;
- public ITreeIndexTupleReference leftTuple;
+ public byte[] leftPageData = null;
+ public ByteBuffer leftPageBuf = null;
+ public ITreeIndexTupleReference leftTuple;
- public byte[] rightPageData = null;
- public ByteBuffer rightPageBuf = null;
- public ITreeIndexTupleReference rightTuple;
+ public byte[] rightPageData = null;
+ public ByteBuffer rightPageBuf = null;
+ public ITreeIndexTupleReference rightTuple;
- public int keySize = 0;
+ public int keySize = 0;
- public RTreeSplitKey(ITreeIndexTupleReference leftTuple,
- ITreeIndexTupleReference rightTuple) {
- this.leftTuple = leftTuple;
- this.rightTuple = rightTuple;
- }
+ public RTreeSplitKey(ITreeIndexTupleReference leftTuple,
+ ITreeIndexTupleReference rightTuple) {
+ this.leftTuple = leftTuple;
+ this.rightTuple = rightTuple;
+ }
- public void initData(int keySize) {
- // try to reuse existing memory from a lower-level split if possible
- this.keySize = keySize;
- if (leftPageData != null) {
- if (leftPageData.length < keySize + 4) {
- leftPageData = new byte[keySize + 4]; // add 4 for the page
- leftPageBuf = ByteBuffer.wrap(leftPageData);
- }
- } else {
- leftPageData = new byte[keySize + 4]; // add 4 for the page
- leftPageBuf = ByteBuffer.wrap(leftPageData);
- }
- if (rightPageData != null) {
- if (rightPageData.length < keySize + 4) {
- rightPageData = new byte[keySize + 4]; // add 4 for the page
- rightPageBuf = ByteBuffer.wrap(rightPageData);
- }
- } else {
- rightPageData = new byte[keySize + 4]; // add 4 for the page
- rightPageBuf = ByteBuffer.wrap(rightPageData);
- }
+ public void initData(int keySize) {
+ // try to reuse existing memory from a lower-level split if possible
+ this.keySize = keySize;
+ if (leftPageData != null) {
+ if (leftPageData.length < keySize + 4) {
+ leftPageData = new byte[keySize + 4]; // add 4 for the page
+ leftPageBuf = ByteBuffer.wrap(leftPageData);
+ }
+ } else {
+ leftPageData = new byte[keySize + 4]; // add 4 for the page
+ leftPageBuf = ByteBuffer.wrap(leftPageData);
+ }
+ if (rightPageData != null) {
+ if (rightPageData.length < keySize + 4) {
+ rightPageData = new byte[keySize + 4]; // add 4 for the page
+ rightPageBuf = ByteBuffer.wrap(rightPageData);
+ }
+ } else {
+ rightPageData = new byte[keySize + 4]; // add 4 for the page
+ rightPageBuf = ByteBuffer.wrap(rightPageData);
+ }
- leftTuple.resetByTupleOffset(leftPageBuf, 0);
- rightTuple.resetByTupleOffset(rightPageBuf, 0);
- }
+ leftTuple.resetByTupleOffset(leftPageBuf, 0);
+ rightTuple.resetByTupleOffset(rightPageBuf, 0);
+ }
- public void resetLeftPage() {
- leftPageData = null;
- leftPageBuf = null;
- }
+ public void resetLeftPage() {
+ leftPageData = null;
+ leftPageBuf = null;
+ }
- public void resetRightPage() {
- rightPageData = null;
- rightPageBuf = null;
- }
+ public void resetRightPage() {
+ rightPageData = null;
+ rightPageBuf = null;
+ }
- public ByteBuffer getLeftPageBuffer() {
- return leftPageBuf;
- }
+ public ByteBuffer getLeftPageBuffer() {
+ return leftPageBuf;
+ }
- public ByteBuffer getRightPageBuffer() {
- return rightPageBuf;
- }
+ public ByteBuffer getRightPageBuffer() {
+ return rightPageBuf;
+ }
- public ITreeIndexTupleReference getLeftTuple() {
- return leftTuple;
- }
+ public ITreeIndexTupleReference getLeftTuple() {
+ return leftTuple;
+ }
- public ITreeIndexTupleReference getRightTuple() {
- return rightTuple;
- }
+ public ITreeIndexTupleReference getRightTuple() {
+ return rightTuple;
+ }
- public int getLeftPage() {
- return leftPageBuf.getInt(keySize);
- }
+ public int getLeftPage() {
+ return leftPageBuf.getInt(keySize);
+ }
- public int getRightPage() {
- return rightPageBuf.getInt(keySize);
- }
+ public int getRightPage() {
+ return rightPageBuf.getInt(keySize);
+ }
- public void setLeftPage(int page) {
- leftPageBuf.putInt(keySize, page);
- }
+ public void setLeftPage(int page) {
+ leftPageBuf.putInt(keySize, page);
+ }
- public void setRightPage(int page) {
- rightPageBuf.putInt(keySize, page);
- }
+ public void setRightPage(int page) {
+ rightPageBuf.putInt(keySize, page);
+ }
- public ISplitKey duplicate(ITreeIndexTupleReference copyLeftTuple,
- ITreeIndexTupleReference copyRightTuple) {
- RTreeSplitKey copy = new RTreeSplitKey(copyLeftTuple, copyRightTuple);
- copy.leftPageData = leftPageData.clone();
- copy.leftPageBuf = ByteBuffer.wrap(copy.leftPageData);
- copy.leftTuple.setFieldCount(leftTuple.getFieldCount());
- copy.leftTuple.resetByTupleOffset(copy.leftPageBuf, 0);
+ public ISplitKey duplicate(ITreeIndexTupleReference copyLeftTuple,
+ ITreeIndexTupleReference copyRightTuple) {
+ RTreeSplitKey copy = new RTreeSplitKey(copyLeftTuple, copyRightTuple);
+ copy.leftPageData = leftPageData.clone();
+ copy.leftPageBuf = ByteBuffer.wrap(copy.leftPageData);
+ copy.leftTuple.setFieldCount(leftTuple.getFieldCount());
+ copy.leftTuple.resetByTupleOffset(copy.leftPageBuf, 0);
- copy.rightPageData = rightPageData.clone();
- copy.rightPageBuf = ByteBuffer.wrap(copy.rightPageData);
- copy.rightTuple.setFieldCount(rightTuple.getFieldCount());
- copy.rightTuple.resetByTupleOffset(copy.rightPageBuf, 0);
- return copy;
- }
+ copy.rightPageData = rightPageData.clone();
+ copy.rightPageBuf = ByteBuffer.wrap(copy.rightPageData);
+ copy.rightTuple.setFieldCount(rightTuple.getFieldCount());
+ copy.rightTuple.resetByTupleOffset(copy.rightPageBuf, 0);
+ return copy;
+ }
- @Override
- public void reset() {
- leftPageData = null;
- leftPageBuf = null;
- rightPageData = null;
- rightPageBuf = null;
- }
+ @Override
+ public void reset() {
+ leftPageData = null;
+ leftPageBuf = null;
+ rightPageData = null;
+ rightPageBuf = null;
+ }
- @Override
- public ByteBuffer getBuffer() {
- // TODO Auto-generated method stub
- return null;
- }
+ @Override
+ public ByteBuffer getBuffer() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- @Override
- public ITreeIndexTupleReference getTuple() {
- // TODO Auto-generated method stub
- return null;
- }
+ @Override
+ public ITreeIndexTupleReference getTuple() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- @Override
- public void setPages(int leftPage, int rightPage) {
- leftPageBuf.putInt(keySize, leftPage);
- rightPageBuf.putInt(keySize, rightPage);
- }
+ @Override
+ public void setPages(int leftPage, int rightPage) {
+ leftPageBuf.putInt(keySize, leftPage);
+ rightPageBuf.putInt(keySize, rightPage);
+ }
- @Override
- public ISplitKey duplicate(ITreeIndexTupleReference copyTuple) {
- // TODO Auto-generated method stub
- return null;
- }
+ @Override
+ public ISplitKey duplicate(ITreeIndexTupleReference copyTuple) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntry.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntry.java
index a9176c9..21beb9c 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntry.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntry.java
@@ -22,35 +22,35 @@
import org.apache.hyracks.storage.am.rtree.frames.RTreeNSMFrame;
public class TupleEntry implements Comparable<TupleEntry> {
- private int tupleIndex;
- private double value;
+ private int tupleIndex;
+ private double value;
- public TupleEntry() {
- }
+ public TupleEntry() {
+ }
- public int getTupleIndex() {
- return tupleIndex;
- }
+ public int getTupleIndex() {
+ return tupleIndex;
+ }
- public void setTupleIndex(int tupleIndex) {
- this.tupleIndex = tupleIndex;
- }
+ public void setTupleIndex(int tupleIndex) {
+ this.tupleIndex = tupleIndex;
+ }
- public double getValue() {
- return value;
- }
+ public double getValue() {
+ return value;
+ }
- public void setValue(double value) {
- this.value = value;
- }
+ public void setValue(double value) {
+ this.value = value;
+ }
- public int compareTo(TupleEntry tupleEntry) {
- double cmp = this.getValue() - tupleEntry.getValue();
- if (cmp > RTreeNSMFrame.doubleEpsilon())
- return 1;
- cmp = tupleEntry.getValue() - this.getValue();
- if (cmp > RTreeNSMFrame.doubleEpsilon())
- return -1;
- return 0;
- }
+ public int compareTo(TupleEntry tupleEntry) {
+ double cmp = this.getValue() - tupleEntry.getValue();
+ if (cmp > RTreeNSMFrame.doubleEpsilon())
+ return 1;
+ cmp = tupleEntry.getValue() - this.getValue();
+ if (cmp > RTreeNSMFrame.doubleEpsilon())
+ return -1;
+ return 0;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntryArrayList.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntryArrayList.java
index e8dce65..59cfb59 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntryArrayList.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/TupleEntryArrayList.java
@@ -23,61 +23,61 @@
import java.util.Collections;
public class TupleEntryArrayList {
- private TupleEntry[] data;
- private int size;
- private final int growth;
+ private TupleEntry[] data;
+ private int size;
+ private final int growth;
- public TupleEntryArrayList(int initialCapacity, int growth) {
- data = new TupleEntry[initialCapacity];
- size = 0;
- this.growth = growth;
- }
+ public TupleEntryArrayList(int initialCapacity, int growth) {
+ data = new TupleEntry[initialCapacity];
+ size = 0;
+ this.growth = growth;
+ }
- public int size() {
- return size;
- }
+ public int size() {
+ return size;
+ }
- public void add(int tupleIndex, double value) {
- if (size == data.length) {
- TupleEntry[] newData = new TupleEntry[data.length + growth];
- System.arraycopy(data, 0, newData, 0, data.length);
- data = newData;
- }
- if (data[size] == null) {
- data[size] = new TupleEntry();
- }
- data[size].setTupleIndex(tupleIndex);
- data[size].setValue(value);
- size++;
- }
+ public void add(int tupleIndex, double value) {
+ if (size == data.length) {
+ TupleEntry[] newData = new TupleEntry[data.length + growth];
+ System.arraycopy(data, 0, newData, 0, data.length);
+ data = newData;
+ }
+ if (data[size] == null) {
+ data[size] = new TupleEntry();
+ }
+ data[size].setTupleIndex(tupleIndex);
+ data[size].setValue(value);
+ size++;
+ }
- public void removeLast() {
- if (size > 0)
- size--;
- }
+ public void removeLast() {
+ if (size > 0)
+ size--;
+ }
- // WARNING: caller is responsible for checking size > 0
- public TupleEntry getLast() {
- return data[size - 1];
- }
+ // WARNING: caller is responsible for checking size > 0
+ public TupleEntry getLast() {
+ return data[size - 1];
+ }
- public TupleEntry get(int i) {
- return data[i];
- }
+ public TupleEntry get(int i) {
+ return data[i];
+ }
- public void clear() {
- size = 0;
- }
+ public void clear() {
+ size = 0;
+ }
- public boolean isEmpty() {
- return size == 0;
- }
+ public boolean isEmpty() {
+ return size == 0;
+ }
- public void sort(EntriesOrder order, int tupleCount) {
- if (order == EntriesOrder.ASCENDING) {
- Arrays.sort(data, 0, tupleCount);
- } else {
- Arrays.sort(data, 0, tupleCount, Collections.reverseOrder());
- }
- }
+ public void sort(EntriesOrder order, int tupleCount) {
+ if (order == EntriesOrder.ASCENDING) {
+ Arrays.sort(data, 0, tupleCount);
+ } else {
+ Arrays.sort(data, 0, tupleCount, Collections.reverseOrder());
+ }
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparatorFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparatorFactory.java
index 8c73e12..4a1637a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparatorFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparatorFactory.java
@@ -31,7 +31,7 @@
}
public HilbertDoubleComparatorFactory(int dim) {
- this.dim = dim;
+ this.dim = dim;
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparatorFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparatorFactory.java
index a2650d3..f5c6046 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparatorFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparatorFactory.java
@@ -31,7 +31,7 @@
}
public ZCurveDoubleComparatorFactory(int dim) {
- this.dim = dim;
+ this.dim = dim;
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveIntComparatorFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveIntComparatorFactory.java
index 4827a74..6a25995 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveIntComparatorFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveIntComparatorFactory.java
@@ -31,7 +31,7 @@
}
public ZCurveIntComparatorFactory(int dim) {
- this.dim = dim;
+ this.dim = dim;
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java
index ffdae7d..8a6996b 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java
@@ -37,52 +37,52 @@
fields[pos++] = e;
}
- @Override
- public int compareTo(T o) {
- CheckTuple<T> other = (CheckTuple<T>) o;
- int cmpFieldCount = Math.min(other.getNumKeys(), numKeys);
- for (int i = 0; i < cmpFieldCount; i++) {
- int cmp = fields[i].compareTo(other.getField(i));
- if (cmp != 0) {
- return cmp;
- }
- }
- if (other.getNumKeys() == numKeys) {
- return 0;
- }
- if (other.getNumKeys() < numKeys) {
- return (other.isHighKey) ? -1 : 1;
- }
- if (other.getNumKeys() > numKeys) {
+ @Override
+ public int compareTo(T o) {
+ CheckTuple<T> other = (CheckTuple<T>) o;
+ int cmpFieldCount = Math.min(other.getNumKeys(), numKeys);
+ for (int i = 0; i < cmpFieldCount; i++) {
+ int cmp = fields[i].compareTo(other.getField(i));
+ if (cmp != 0) {
+ return cmp;
+ }
+ }
+ if (other.getNumKeys() == numKeys) {
+ return 0;
+ }
+ if (other.getNumKeys() < numKeys) {
+ return (other.isHighKey) ? -1 : 1;
+ }
+ if (other.getNumKeys() > numKeys) {
return (isHighKey) ? 1 : -1;
}
- return 0;
- }
+ return 0;
+ }
- @Override
- public boolean equals(Object o) {
- if (!(o instanceof Comparable<?>)) {
- return false;
- }
- return compareTo((T) o) == 0;
- }
+ @Override
+ public boolean equals(Object o) {
+ if (!(o instanceof Comparable<?>)) {
+ return false;
+ }
+ return compareTo((T) o) == 0;
+ }
- @Override
- public int hashCode() {
- int hash = 0;
- for (int i = 0; i < numKeys; i++) {
- hash = 37 * hash + fields[i].hashCode();
- }
- return hash;
- }
+ @Override
+ public int hashCode() {
+ int hash = 0;
+ for (int i = 0; i < numKeys; i++) {
+ hash = 37 * hash + fields[i].hashCode();
+ }
+ return hash;
+ }
- public void setIsHighKey(boolean isHighKey) {
- this.isHighKey = isHighKey;
- }
+ public void setIsHighKey(boolean isHighKey) {
+ this.isHighKey = isHighKey;
+ }
- public T getField(int idx) {
- return (T) fields[idx];
- }
+ public T getField(int idx) {
+ return (T) fields[idx];
+ }
public void setField(int idx, T e) {
fields[idx] = e;
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexMultiThreadTestDriver.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexMultiThreadTestDriver.java
index 314cae9..32dd15d 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexMultiThreadTestDriver.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexMultiThreadTestDriver.java
@@ -51,11 +51,11 @@
public long[] run(int numThreads, int numRepeats, int numOps, int batchSize) throws InterruptedException,
TreeIndexException, HyracksDataException {
- int numBatches = (batchSize < 1 ? numOps : numOps / batchSize);
- if (numBatches < numThreads) {
- numThreads = numBatches;
- }
- int threadNumBatches = numBatches / numThreads;
+ int numBatches = (batchSize < 1 ? numOps : numOps / batchSize);
+ if (numBatches < numThreads) {
+ numThreads = numBatches;
+ }
+ int threadNumBatches = numBatches / numThreads;
long[] times = new long[numRepeats];
for (int i = 0; i < numRepeats; i++) {
DataGenThread dataGen = createDatagenThread(numThreads, numBatches, batchSize);
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java
index 44a102d..b53f0dc 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java
@@ -36,7 +36,7 @@
private static final int numDeleteRounds = AccessMethodTestsConfig.RTREE_NUM_DELETE_ROUNDS;
public AbstractRTreeDeleteTest(boolean testRstarPolicy) {
- super(testRstarPolicy);
+ super(testRstarPolicy);
this.rTreeTestUtils = new RTreeTestUtils();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java
index 5ad6f3b..c45b0bd 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeInsertTest.java
@@ -39,7 +39,7 @@
private final RTreeTestUtils rTreeTestUtils;
public AbstractRTreeInsertTest(boolean testRstarPolicy) {
- super(testRstarPolicy);
+ super(testRstarPolicy);
this.rTreeTestUtils = new RTreeTestUtils();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestStorageManagerInterface.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestStorageManagerInterface.java
index e4f77fd..885ff9b 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestStorageManagerInterface.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestStorageManagerInterface.java
@@ -19,7 +19,6 @@
package org.apache.hyracks.test.support;
import org.apache.hyracks.api.context.IHyracksTaskContext;
-import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.storage.common.IStorageManagerInterface;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
import org.apache.hyracks.storage.common.file.IFileMapProvider;
@@ -44,8 +43,8 @@
return TestStorageManagerComponentHolder.getLocalResourceRepository(ctx);
}
- @Override
- public ResourceIdFactory getResourceIdFactory(IHyracksTaskContext ctx) {
- return TestStorageManagerComponentHolder.getResourceIdFactory(ctx);
- }
+ @Override
+ public ResourceIdFactory getResourceIdFactory(IHyracksTaskContext ctx) {
+ return TestStorageManagerComponentHolder.getResourceIdFactory(ctx);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java
index 2541bd8..7f782aa 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeDeleteTest.java
@@ -35,11 +35,11 @@
@SuppressWarnings("rawtypes")
public class RTreeDeleteTest extends AbstractRTreeDeleteTest {
- private final RTreeTestHarness harness = new RTreeTestHarness();
+ private final RTreeTestHarness harness = new RTreeTestHarness();
- public RTreeDeleteTest() {
- super(AccessMethodTestsConfig.RTREE_TEST_RSTAR_POLICY);
- }
+ public RTreeDeleteTest() {
+ super(AccessMethodTestsConfig.RTREE_TEST_RSTAR_POLICY);
+ }
@Before
public void setUp() throws HyracksDataException {
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java
index 621055b..7bd22fc 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeInsertTest.java
@@ -35,11 +35,11 @@
@SuppressWarnings("rawtypes")
public class RTreeInsertTest extends AbstractRTreeInsertTest {
- private final RTreeTestHarness harness = new RTreeTestHarness();
+ private final RTreeTestHarness harness = new RTreeTestHarness();
- public RTreeInsertTest() {
- super(AccessMethodTestsConfig.RTREE_TEST_RSTAR_POLICY);
- }
+ public RTreeInsertTest() {
+ super(AccessMethodTestsConfig.RTREE_TEST_RSTAR_POLICY);
+ }
@Before
public void setUp() throws HyracksDataException {
--
To view, visit https://asterix-gerrit.ics.uci.edu/921
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0dfbeaa9b9b24d3da106ead85afd9df02b14ddaa
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mi...@couchbase.com>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: abdullah alamoudi <ba...@gmail.com>