simplify change by removing format changes.

Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/99867266
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/99867266
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/99867266

Branch: refs/heads/ecarm002/interval_join_merge
Commit: 998672669f37db5d3752dab511fd06e271331668
Parents: c44a7d9
Author: Preston Carman <prest...@apache.org>
Authored: Sat Jul 16 22:56:35 2016 -0700
Committer: Preston Carman <prest...@apache.org>
Committed: Sat Jul 16 22:56:35 2016 -0700

----------------------------------------------------------------------
 .../comparisons/AbstractComparisonEvaluator.java      |  1 -
 .../physical/RandomPartitionExchangePOperator.java    |  2 +-
 .../physical/SortMergeExchangePOperator.java          |  4 ++--
 .../rewriter/rules/ConsolidateSelectsRule.java        |  4 ++--
 .../rules/ExtractFunctionsFromJoinConditionRule.java  | 13 ++++++-------
 .../std/sort/util/DeletableFrameTupleAppender.java    |  2 +-
 .../storage/am/btree/impls/BTreeOpContext.java        |  5 ++---
 .../am/common/util/TreeIndexBufferCacheWarmup.java    |  5 ++---
 .../am/rtree/frames/RTreeNSMInteriorFrame.java        | 14 ++++++--------
 9 files changed, 22 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/99867266/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java
----------------------------------------------------------------------
diff --git 
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java
 
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java
index 2389fe3..0ed89dd 100644
--- 
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java
+++ 
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/AbstractComparisonEvaluator.java
@@ -20,7 +20,6 @@ package org.apache.asterix.runtime.evaluators.comparisons;
 
 import java.io.DataOutput;
 
-import org.apache.asterix.common.exceptions.AsterixException;
 import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider;
 import org.apache.asterix.om.base.ABoolean;
 import org.apache.asterix.om.base.ANull;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/99867266/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomPartitionExchangePOperator.java
----------------------------------------------------------------------
diff --git 
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomPartitionExchangePOperator.java
 
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomPartitionExchangePOperator.java
index 06cac01..cba8f97 100644
--- 
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomPartitionExchangePOperator.java
+++ 
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/RandomPartitionExchangePOperator.java
@@ -68,7 +68,7 @@ public class RandomPartitionExchangePOperator extends 
AbstractExchangePOperator
             ILogicalOperator op, IOperatorSchema opSchema, JobGenContext 
context) throws AlgebricksException {
         ITuplePartitionComputerFactory tpcf = new 
RandomPartitionComputerFactory();
         MToNPartitioningConnectorDescriptor conn = new 
MToNPartitioningConnectorDescriptor(spec, tpcf);
-        return new Pair<>(conn, null);
+        return new Pair<IConnectorDescriptor, TargetConstraint>(conn, null);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/99867266/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/SortMergeExchangePOperator.java
----------------------------------------------------------------------
diff --git 
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/SortMergeExchangePOperator.java
 
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/SortMergeExchangePOperator.java
index 4cf5194..81f6e6b 100644
--- 
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/SortMergeExchangePOperator.java
+++ 
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/SortMergeExchangePOperator.java
@@ -124,8 +124,8 @@ public class SortMergeExchangePOperator extends 
AbstractExchangePOperator {
             IPhysicalPropertiesVector reqdByParent, IOptimizationContext 
context) {
         List<ILocalStructuralProperty> localProps = new 
ArrayList<ILocalStructuralProperty>(sortColumns.length);
         localProps.add(new LocalOrderProperty(Arrays.asList(sortColumns)));
-        StructuralPropertiesVector[] r = new StructuralPropertiesVector[] {
-                new StructuralPropertiesVector(null, localProps) };
+        StructuralPropertiesVector[] r = new StructuralPropertiesVector[] { 
new StructuralPropertiesVector(null,
+                localProps) };
         return new PhysicalRequirements(r, 
IPartitioningRequirementsCoordinator.NO_COORDINATION);
     }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/99867266/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ConsolidateSelectsRule.java
----------------------------------------------------------------------
diff --git 
a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ConsolidateSelectsRule.java
 
b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ConsolidateSelectsRule.java
index 7cb4e39..ae52c35 100644
--- 
a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ConsolidateSelectsRule.java
+++ 
b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ConsolidateSelectsRule.java
@@ -36,9 +36,9 @@ import 
org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
 
 /**
  * Matches the following operator pattern:
- * (select) &lt;-- ((assign)* &lt;-- (select)*)+
+ * (select) <-- ((assign)* <-- (select)*)+
  * Consolidates the selects to:
- * (select) &lt;-- (assign)*
+ * (select) <-- (assign)*
  */
 public class ConsolidateSelectsRule implements IAlgebraicRewriteRule {
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/99867266/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractFunctionsFromJoinConditionRule.java
----------------------------------------------------------------------
diff --git 
a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractFunctionsFromJoinConditionRule.java
 
b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractFunctionsFromJoinConditionRule.java
index 2ddad26..71a00bf 100644
--- 
a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractFunctionsFromJoinConditionRule.java
+++ 
b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/ExtractFunctionsFromJoinConditionRule.java
@@ -55,16 +55,15 @@ import 
org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
  *
  * After plan:
  *
- *   join ( eq($$3, $$4) )
- *   assign [$$4] &lt;- [funcY($$2)]
- *   assign [$$3] &lt;- [funcX($$1)]
+ *   join (eq($$3,$$4))
+ *   assign [$$4] <- [funcY($$2)]
+ *   assign [$$3] <- [funcX($$1)]
  * </pre>
  */
 public class ExtractFunctionsFromJoinConditionRule implements 
IAlgebraicRewriteRule {
 
     @Override
-    public boolean rewritePre(Mutable<ILogicalOperator> opRef, 
IOptimizationContext context)
-            throws AlgebricksException {
+    public boolean rewritePre(Mutable<ILogicalOperator> opRef, 
IOptimizationContext context) throws AlgebricksException {
         return false;
     }
 
@@ -105,8 +104,8 @@ public class ExtractFunctionsFromJoinConditionRule 
implements IAlgebraicRewriteR
             for (Mutable<ILogicalExpression> exprRef : fexp.getArguments()) {
                 if (exprRef.getValue().getExpressionTag() == 
LogicalExpressionTag.FUNCTION_CALL) {
                     LogicalVariable newVar = context.newVar();
-                    AssignOperator newAssign = new AssignOperator(newVar,
-                            new 
MutableObject<ILogicalExpression>(exprRef.getValue().cloneExpression()));
+                    AssignOperator newAssign = new AssignOperator(newVar, new 
MutableObject<ILogicalExpression>(exprRef
+                            .getValue().cloneExpression()));
                     newAssign.setExecutionMode(joinOp.getExecutionMode());
 
                     // Place assign below joinOp.

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/99867266/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppender.java
----------------------------------------------------------------------
diff --git 
a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppender.java
 
b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppender.java
index 6604622..7d4db64 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppender.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppender.java
@@ -107,7 +107,7 @@ public class DeletableFrameTupleAppender implements 
IAppendDeletableFrameTupleAc
      *
      * @param tupleAccessor
      * @param tIndex
-     * @return int
+     * @return
      * @throws HyracksDataException
      */
     @Override

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/99867266/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeOpContext.java
----------------------------------------------------------------------
diff --git 
a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeOpContext.java
 
b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeOpContext.java
index 12749ef..f894c70 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeOpContext.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeOpContext.java
@@ -24,7 +24,6 @@ import java.util.Deque;
 
 import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
 import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.api.storage.IGrowableIntArray;
 import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder;
 import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleReference;
 import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
@@ -64,8 +63,8 @@ public class BTreeOpContext implements 
IIndexOperationContext, IExtraPageBlockHe
     public RangePredicate pred;
     public BTreeSplitKey splitKey;
     public LongArrayList pageLsns;
-    public IGrowableIntArray smPages;
-    public IGrowableIntArray freePages;
+    public IntArrayList smPages;
+    public IntArrayList freePages;
     public int opRestarts = 0;
     public boolean exceptionHandled;
     public IModificationOperationCallback modificationCallback;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/99867266/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 83f012e..b4239d7 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
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.Random;
 
 import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.api.storage.IGrowableIntArray;
+import org.apache.hyracks.util.MathUtil;
 import org.apache.hyracks.storage.am.common.api.IMetaDataPageManager;
 import org.apache.hyracks.storage.am.common.api.ITreeIndexFrame;
 import org.apache.hyracks.storage.am.common.api.ITreeIndexMetaDataFrame;
@@ -30,7 +30,6 @@ import 
org.apache.hyracks.storage.common.arraylist.IntArrayList;
 import org.apache.hyracks.storage.common.buffercache.IBufferCache;
 import org.apache.hyracks.storage.common.buffercache.ICachedPage;
 import org.apache.hyracks.storage.common.file.BufferedFileHandle;
-import org.apache.hyracks.util.MathUtil;
 
 public class TreeIndexBufferCacheWarmup {
     private final IBufferCache bufferCache;
@@ -75,7 +74,7 @@ public class TreeIndexBufferCacheWarmup {
         for (int i = 0; i < warmupTreeLevels.length; i++) {
             if (warmupTreeLevels[i] < pagesByLevel.size()) {
                 int repeats = warmupRepeats[i];
-                IGrowableIntArray pageIds = 
pagesByLevel.get(warmupTreeLevels[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++) {

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/99867266/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrame.java
----------------------------------------------------------------------
diff --git 
a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrame.java
 
b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrame.java
index 0960bdb..a368c9a 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrame.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrame.java
@@ -130,8 +130,7 @@ public class RTreeNSMInteriorFrame extends RTreeNSMFrame 
implements IRTreeInteri
             if (c == 0) {
                 return i;
             } else {
-                int pageId = 
IntegerPointable.getInteger(frameTuple.getFieldData(cmp.getKeyFieldCount() - 1),
-                        getChildPointerOff(frameTuple));
+                int pageId = 
IntegerPointable.getInteger(frameTuple.getFieldData(cmp.getKeyFieldCount() - 
1), getChildPointerOff(frameTuple));
                 traverseList.add(pageId, -1, parentIndex);
             }
         }
@@ -216,9 +215,9 @@ public class RTreeNSMInteriorFrame extends RTreeNSMFrame 
implements IRTreeInteri
 
     protected int pointerCmp(ITupleReference tupleA, ITupleReference tupleB, 
MultiComparator cmp)
             throws HyracksDataException {
-        return childPtrCmp.compare(tupleA.getFieldData(cmp.getKeyFieldCount() 
- 1), getChildPointerOff(tupleA),
-                childPtrSize, tupleB.getFieldData(cmp.getKeyFieldCount() - 1), 
getChildPointerOff(tupleB),
-                childPtrSize);
+        return childPtrCmp
+                .compare(tupleA.getFieldData(cmp.getKeyFieldCount() - 1), 
getChildPointerOff(tupleA), childPtrSize,
+                        tupleB.getFieldData(cmp.getKeyFieldCount() - 1), 
getChildPointerOff(tupleB), childPtrSize);
     }
 
     public int getTupleSize(ITupleReference tuple) {
@@ -295,9 +294,8 @@ public class RTreeNSMInteriorFrame extends RTreeNSMFrame 
implements IRTreeInteri
         for (int i = 0; i < tupleCount; i++) {
             int tupleOff = slotManager.getTupleOff(slotManager.getSlotOff(i));
             frameTuple.resetByTupleOffset(buf, tupleOff);
-            int intVal = IntegerPointable.getInteger(buf.array(),
-                    frameTuple.getFieldStart(frameTuple.getFieldCount() - 1)
-                            + 
frameTuple.getFieldLength(frameTuple.getFieldCount() - 1));
+            int intVal = IntegerPointable.getInteger(buf.array(), 
frameTuple.getFieldStart(frameTuple.getFieldCount() - 1)
+            + frameTuple.getFieldLength(frameTuple.getFieldCount() - 1));
             ret.add(intVal);
         }
         return ret;

Reply via email to