Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A40A3200B33 for ; Tue, 14 Jun 2016 16:57:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A2E7B160A06; Tue, 14 Jun 2016 14:57:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7BBB1160A47 for ; Tue, 14 Jun 2016 16:57:29 +0200 (CEST) Received: (qmail 16565 invoked by uid 500); 14 Jun 2016 14:57:28 -0000 Mailing-List: contact commits-help@asterixdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.apache.org Delivered-To: mailing list commits@asterixdb.apache.org Received: (qmail 16553 invoked by uid 99); 14 Jun 2016 14:57:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jun 2016 14:57:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 880B9E0252; Tue, 14 Jun 2016 14:57:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mblow@apache.org To: commits@asterixdb.apache.org Date: Tue, 14 Jun 2016 14:57:29 -0000 Message-Id: <4cd1ca6fceb14c11b5bb888bb4700a1f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] asterixdb git commit: Eliminate Hard Tabs From Java Files archived-at: Tue, 14 Jun 2016 14:57:31 -0000 Eliminate Hard Tabs From Java Files tabs->spaces Change-Id: I0dfbeaa9b9b24d3da106ead85afd9df02b14ddaa Reviewed-on: https://asterix-gerrit.ics.uci.edu/921 Tested-by: Jenkins Reviewed-by: Till Westmann Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/d2ca97ab Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/d2ca97ab Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/d2ca97ab Branch: refs/heads/master Commit: d2ca97abaf7bee46b2a1aed55e1ca7185afe23e6 Parents: 171ff2f Author: Michael Blow Authored: Mon Jun 13 23:14:09 2016 -0400 Committer: Michael Blow Committed: Tue Jun 14 07:56:48 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/asterix/aoya/Deleter.java | 2 +- .../LogicalExpressionPrettyPrintVisitor.java | 70 ++--- .../data/IBinaryHashFunctionFamilyProvider.java | 4 +- .../common/comm/io/ArrayTupleReference.java | 44 +-- .../dataflow/hadoop/util/MRContextUtil.java | 2 +- .../net/protocols/muxdemux/ChannelSet.java | 2 +- .../am/common/api/IPrimitiveValueProvider.java | 2 +- .../api/IPrimitiveValueProviderFactory.java | 2 +- .../storage/am/common/api/ISplitKey.java | 20 +- .../am/common/api/ITreeIndexAccessor.java | 32 +-- .../api/ITreeIndexMetaDataFrameFactory.java | 2 +- .../api/ITreeIndexTupleWriterFactory.java | 2 +- .../storage/am/common/api/ITupleFilter.java | 2 +- .../storage/am/common/api/ITupleUpdater.java | 2 +- .../am/common/api/ITupleUpdaterFactory.java | 2 +- .../am/common/api/TreeIndexException.java | 28 +- .../am/common/api/UnsortedInputException.java | 10 +- .../dataflow/ITreeIndexOperatorDescriptor.java | 6 +- .../TreeIndexNonExistentKeyException.java | 14 +- .../am/common/frames/AbstractSlotManager.java | 64 ++--- .../common/frames/LIFOMetaDataFrameFactory.java | 8 +- .../am/common/ophelpers/FindTupleMode.java | 2 +- .../ophelpers/FindTupleNoExactMatchPolicy.java | 2 +- .../storage/am/common/ophelpers/IndexOp.java | 2 +- .../am/common/ophelpers/LongArrayList.java | 122 ++++---- .../am/common/ophelpers/SlotOffTupleOff.java | 32 +-- .../am/common/tuples/SimpleTupleReference.java | 8 +- .../tuples/TypeAwareTupleWriterFactory.java | 20 +- .../common/util/TreeIndexBufferCacheWarmup.java | 124 ++++----- .../storage/am/common/util/TreeIndexStats.java | 270 +++++++++--------- .../am/common/util/TreeIndexStatsGatherer.java | 98 +++---- .../storage/am/common/util/TreeIndexUtils.java | 24 +- .../LSMBTreeWithBuddyDiskComponentFactory.java | 56 ++-- .../impls/LSMBTreeWithBuddyMemoryComponent.java | 64 ++--- .../impls/LSMBTreeWithBuddyMergeOperation.java | 196 ++++++------- .../impls/LSMBTreeWithBuddySearchCursor.java | 4 +- .../impls/LSMBTreeWithBuddySortedCursor.java | 278 +++++++++---------- .../btree/impls/LSMBuddyBTreeMergeCursor.java | 78 +++--- .../btree/tuples/LSMBTreeCopyTupleWriter.java | 18 +- .../tuples/LSMBTreeCopyTupleWriterFactory.java | 24 +- .../LSMBTreeRefrencingTupleWriterFactory.java | 64 ++--- .../btree/tuples/LSMBTreeTupleReference.java | 34 +-- .../tuples/LSMBTreeTupleWriterFactory.java | 24 +- .../tokenizers/AbstractUTF8TokenFactory.java | 22 +- ...limitedUTF8StringBinaryTokenizerFactory.java | 32 +-- .../tokenizers/HashedUTF8NGramTokenFactory.java | 22 +- .../tokenizers/HashedUTF8WordTokenFactory.java | 22 +- .../tokenizers/IBinaryTokenizerFactory.java | 2 +- .../invertedindex/tokenizers/INGramToken.java | 6 +- .../tokenizers/UTF8NGramTokenFactory.java | 22 +- .../tokenizers/UTF8WordTokenFactory.java | 22 +- .../tuples/LSMTypeAwareTupleWriterFactory.java | 32 +-- ...IGenericPrimitiveSerializerDeserializer.java | 4 +- .../storage/am/rtree/impls/EntriesOrder.java | 2 +- .../storage/am/rtree/impls/RTreeSplitKey.java | 260 ++++++++--------- .../storage/am/rtree/impls/TupleEntry.java | 62 ++--- .../am/rtree/impls/TupleEntryArrayList.java | 96 +++---- .../HilbertDoubleComparatorFactory.java | 2 +- .../ZCurveDoubleComparatorFactory.java | 2 +- .../linearize/ZCurveIntComparatorFactory.java | 2 +- .../hyracks/storage/am/common/CheckTuple.java | 80 +++--- .../am/common/IndexMultiThreadTestDriver.java | 10 +- .../am/rtree/AbstractRTreeDeleteTest.java | 2 +- .../am/rtree/AbstractRTreeInsertTest.java | 2 +- .../support/TestStorageManagerInterface.java | 9 +- .../storage/am/rtree/RTreeDeleteTest.java | 8 +- .../storage/am/rtree/RTreeInsertTest.java | 8 +- 67 files changed, 1297 insertions(+), 1298 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Deleter.java ---------------------------------------------------------------------- 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 class Deleter { 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++) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalExpressionPrettyPrintVisitor.java ---------------------------------------------------------------------- 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 @@ import org.apache.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVis public class LogicalExpressionPrettyPrintVisitor implements ILogicalExpressionVisitor { - @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(); + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/algebricks/algebricks-data/src/main/java/org/apache/hyracks/algebricks/data/IBinaryHashFunctionFamilyProvider.java ---------------------------------------------------------------------- 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 @@ import org.apache.hyracks.api.dataflow.value.IBinaryHashFunctionFamily; public interface IBinaryHashFunctionFamilyProvider { - public IBinaryHashFunctionFamily getBinaryHashFunctionFamily(Object type) - throws AlgebricksException; + public IBinaryHashFunctionFamily getBinaryHashFunctionFamily(Object type) + throws AlgebricksException; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/comm/io/ArrayTupleReference.java ---------------------------------------------------------------------- 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 @@ import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference; * @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]; + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-dataflow-hadoop/src/main/java/org/apache/hyracks/dataflow/hadoop/util/MRContextUtil.java ---------------------------------------------------------------------- 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 @@ import org.apache.hyracks.api.exceptions.HyracksDataException; * 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, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/ChannelSet.java ---------------------------------------------------------------------- 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 @@ public class ChannelSet { ChannelControlBlock allocateChannel() throws NetException { synchronized (mConn) { - cleanupClosedChannels(); + cleanupClosedChannels(); int idx = allocationBitmap.nextClearBit(0); if (idx < 0 || idx >= ccbArray.length) { cleanupClosedChannels(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProvider.java ---------------------------------------------------------------------- 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); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/IPrimitiveValueProviderFactory.java ---------------------------------------------------------------------- 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 @@ package org.apache.hyracks.storage.am.common.api; import java.io.Serializable; public interface IPrimitiveValueProviderFactory extends Serializable { - public IPrimitiveValueProvider createPrimitiveValueProvider(); + public IPrimitiveValueProvider createPrimitiveValueProvider(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ISplitKey.java ---------------------------------------------------------------------- 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 @@ package org.apache.hyracks.storage.am.common.api; 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); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexAccessor.java ---------------------------------------------------------------------- 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 @@ import org.apache.hyracks.api.exceptions.HyracksDataException; * 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; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexMetaDataFrameFactory.java ---------------------------------------------------------------------- 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(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITreeIndexTupleWriterFactory.java ---------------------------------------------------------------------- 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 @@ package org.apache.hyracks.storage.am.common.api; import java.io.Serializable; public interface ITreeIndexTupleWriterFactory extends Serializable { - public ITreeIndexTupleWriter createTupleWriter(); + public ITreeIndexTupleWriter createTupleWriter(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleFilter.java ---------------------------------------------------------------------- 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 @@ package org.apache.hyracks.storage.am.common.api; 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; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdater.java ---------------------------------------------------------------------- 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 @@ import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference; * */ public interface ITupleUpdater { - public void updateTuple(ITupleReference tuple); + public void updateTuple(ITupleReference tuple); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/ITupleUpdaterFactory.java ---------------------------------------------------------------------- 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 @@ package org.apache.hyracks.storage.am.common.api; import java.io.Serializable; public interface ITupleUpdaterFactory extends Serializable { - public ITupleUpdater createTupleUpdater(); + public ITupleUpdater createTupleUpdater(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/TreeIndexException.java ---------------------------------------------------------------------- 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 @@ package org.apache.hyracks.storage.am.common.api; 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; + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/api/UnsortedInputException.java ---------------------------------------------------------------------- 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 @@ package org.apache.hyracks.storage.am.common.api; * 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); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/ITreeIndexOperatorDescriptor.java ---------------------------------------------------------------------- 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.api.dataflow.value.ITypeTraits; 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(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/exceptions/TreeIndexNonExistentKeyException.java ---------------------------------------------------------------------- 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 @@ import org.apache.hyracks.storage.am.common.api.TreeIndexException; 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); + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/AbstractSlotManager.java ---------------------------------------------------------------------- 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 abstract class AbstractSlotManager implements ISlotManager { 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; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/frames/LIFOMetaDataFrameFactory.java ---------------------------------------------------------------------- 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.ITreeIndexMetaDataFrame; 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(); + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleMode.java ---------------------------------------------------------------------- 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 } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/FindTupleNoExactMatchPolicy.java ---------------------------------------------------------------------- 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 } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/IndexOp.java ---------------------------------------------------------------------- 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 } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/LongArrayList.java ---------------------------------------------------------------------- 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; - - public LongArrayList(int initialCapacity, int growth) { - data = new long[initialCapacity]; - size = 0; - first = 0; - this.growth = growth; - } - - public int size() { - return size; - } - - public int first() { - return first; - } - - public void addFirst(long i) { - long[] newData = new long[data.length + 1]; + 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 int size() { + return size; + } + + public int first() { + return first; + } + + 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 class LongArrayList { } - 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; + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/ophelpers/SlotOffTupleOff.java ---------------------------------------------------------------------- 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 { - 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; + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/SimpleTupleReference.java ---------------------------------------------------------------------- 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 @@ public class SimpleTupleReference implements ITreeIndexTupleReference { 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); + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/tuples/TypeAwareTupleWriterFactory.java ---------------------------------------------------------------------- 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.ITreeIndexTupleWriter; 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); + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexBufferCacheWarmup.java ---------------------------------------------------------------------- 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.buffercache.ICachedPage; 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 pagesByLevel = new ArrayList(); - private final Random rnd = new Random(); + private final IBufferCache bufferCache; + private final IMetaDataPageManager freePageManager; + private final int fileId; + private final ArrayList pagesByLevel = new ArrayList(); + 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); + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStats.java ---------------------------------------------------------------------- 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 @@ import org.apache.hyracks.storage.am.common.api.ITreeIndexMetaDataFrame; public class TreeIndexStats { - 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; - - 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 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 end() { - // nothing here currently - } - - @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("\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 (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(); - } - - 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 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 getSumTupleSizes() { - return sumTuplesSizes; - } - - public long getNumPages() { - return numPages; - } - - public double getAvgNumTuples() { - return (double) numTuples / (double) numPages; - } - - public double getAvgTupleSize() { - return (double) sumTuplesSizes / (double) numTuples; - } - - public double getAvgFillFactor() { - return sumFillFactors / numPages; - } - } + 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; + + 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 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 end() { + // nothing here currently + } + + @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("\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 (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(); + } + + 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 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 getSumTupleSizes() { + return sumTuplesSizes; + } + + public long getNumPages() { + return numPages; + } + + public double getAvgNumTuples() { + return (double) numTuples / (double) numPages; + } + + public double getAvgTupleSize() { + return (double) sumTuplesSizes / (double) numTuples; + } + + public double getAvgFillFactor() { + return sumFillFactors / numPages; + } + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexStatsGatherer.java ---------------------------------------------------------------------- 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 @@ import org.apache.hyracks.storage.common.file.BufferedFileHandle; 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; + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexUtils.java ---------------------------------------------------------------------- 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 @@ import org.apache.hyracks.storage.am.common.api.ITreeIndexTupleReference; @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(); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyDiskComponentFactory.java ---------------------------------------------------------------------- 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.am.lsm.common.impls.TreeIndexFactory; import org.apache.hyracks.storage.common.buffercache.IBufferCache; public class LSMBTreeWithBuddyDiskComponentFactory implements - ILSMComponentFactory { + ILSMComponentFactory { - private final TreeIndexFactory btreeFactory; - private final TreeIndexFactory buddyBtreeFactory; - private final BloomFilterFactory bloomFilterFactory; + private final TreeIndexFactory btreeFactory; + private final TreeIndexFactory buddyBtreeFactory; + private final BloomFilterFactory bloomFilterFactory; - public LSMBTreeWithBuddyDiskComponentFactory( - TreeIndexFactory btreeFactory, - TreeIndexFactory buddyBtreeFactory, - BloomFilterFactory bloomFilterFactory) { - this.btreeFactory = btreeFactory; - this.buddyBtreeFactory = buddyBtreeFactory; - this.bloomFilterFactory = bloomFilterFactory; - } + public LSMBTreeWithBuddyDiskComponentFactory( + TreeIndexFactory btreeFactory, + TreeIndexFactory 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(); + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMemoryComponent.java ---------------------------------------------------------------------- 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 @@ import org.apache.hyracks.storage.am.lsm.common.impls.AbstractMemoryLSMComponent * This class is also not needed at the moment but is implemented anyway */ public class LSMBTreeWithBuddyMemoryComponent extends - AbstractMemoryLSMComponent { - - 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 BTree getBTree() { - return btree; - } - - 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(); - } + AbstractMemoryLSMComponent { + + 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 BTree getBTree() { + return btree; + } + + 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(); + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyMergeOperation.java ---------------------------------------------------------------------- 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 @@ import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessorInternal; public class LSMBTreeWithBuddyMergeOperation implements ILSMIOOperation { - private final ILSMIndexAccessorInternal accessor; - private final List 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 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 getReadDevices() { - Set devs = new HashSet(); - 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()); - - } - return devs; - } - - @Override - public Set getWriteDevices() { - Set devs = new HashSet(); - devs.add(btreeMergeTarget.getDeviceHandle()); - - devs.add(buddyBtreeMergeTarget.getDeviceHandle()); - devs.add(bloomFilterMergeTarget.getDeviceHandle()); - - return devs; - } - - @Override - public Boolean call() throws HyracksDataException, IndexException { - accessor.merge(this); - return true; - } - - @Override - public ILSMIOOperationCallback getCallback() { - return callback; - } - - @Override - public String getIndexUniqueIdentifier() { - return indexIdentifier; - } - - @Override - public LSMIOOpertionType getIOOpertionType() { - return LSMIOOpertionType.MERGE; - } - - public FileReference getBTreeMergeTarget() { - return btreeMergeTarget; - } - - public FileReference getBuddyBTreeMergeTarget() { - return buddyBtreeMergeTarget; - } - - public FileReference getBloomFilterMergeTarget() { - return bloomFilterMergeTarget; - } - - public ITreeIndexCursor getCursor() { - return cursor; - } - - public List getMergingComponents() { - return mergingComponents; - } - - public boolean isKeepDeletedTuples() { - return keepDeletedTuples; - } + private final ILSMIndexAccessorInternal accessor; + private final List 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 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 getReadDevices() { + Set devs = new HashSet(); + 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()); + + } + return devs; + } + + @Override + public Set getWriteDevices() { + Set devs = new HashSet(); + devs.add(btreeMergeTarget.getDeviceHandle()); + + devs.add(buddyBtreeMergeTarget.getDeviceHandle()); + devs.add(bloomFilterMergeTarget.getDeviceHandle()); + + return devs; + } + + @Override + public Boolean call() throws HyracksDataException, IndexException { + accessor.merge(this); + return true; + } + + @Override + public ILSMIOOperationCallback getCallback() { + return callback; + } + + @Override + public String getIndexUniqueIdentifier() { + return indexIdentifier; + } + + @Override + public LSMIOOpertionType getIOOpertionType() { + return LSMIOOpertionType.MERGE; + } + + public FileReference getBTreeMergeTarget() { + return btreeMergeTarget; + } + + public FileReference getBuddyBTreeMergeTarget() { + return buddyBtreeMergeTarget; + } + + public FileReference getBloomFilterMergeTarget() { + return bloomFilterMergeTarget; + } + + public ITreeIndexCursor getCursor() { + return cursor; + } + + public List getMergingComponents() { + return mergingComponents; + } + + public boolean isKeepDeletedTuples() { + return keepDeletedTuples; + } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d2ca97ab/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddySearchCursor.java ---------------------------------------------------------------------- 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.common.tuples.PermutingTupleReference; 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 @@ public class LSMBTreeWithBuddySearchCursor extends LSMBTreeWithBuddyAbstractCurs 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);