http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java ----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/asterixdb/asterix-app/src/test/resources/logging.properties ---------------------------------------------------------------------- diff --cc asterixdb/asterix-app/src/test/resources/logging.properties index d07819d,5b5e3b6..baf225c --- a/asterixdb/asterix-app/src/test/resources/logging.properties +++ b/asterixdb/asterix-app/src/test/resources/logging.properties @@@ -16,18 -16,18 +16,18 @@@ # specific language governing permissions and limitations # under the License. ############################################################ - # Default Logging Configuration File + # Default Logging Configuration File # # You can use a different file by specifying a filename -# with the java.util.logging.config.file system property. +# with the java.util.logging.config.file system property. # For example java -Djava.util.logging.config.file=myfile ############################################################ ############################################################ - # Global properties + # Global properties ############################################################ -# "handlers" specifies a comma separated list of log Handler +# "handlers" specifies a comma separated list of log Handler # classes. These handlers will be installed during VM startup. # Note that these classes must be on the system classpath. # By default we only configure a ConsoleHandler, which will only http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/asterixdb/asterix-om/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/asterixdb/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/IPartitioningProperty.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/OrderedPartitionedProperty.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/OrderedPartitionedProperty.java index c90aff9,23c8273..c1dcd97 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/OrderedPartitionedProperty.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/OrderedPartitionedProperty.java @@@ -77,9 -59,11 +77,11 @@@ public class OrderedPartitionedPropert } @Override - public void normalize(Map<LogicalVariable, EquivalenceClass> equivalenceClasses, List<FunctionalDependency> fds) { - orderColumns = PropertiesUtil.replaceOrderColumnsByEqClasses(orderColumns, equivalenceClasses); - orderColumns = PropertiesUtil.applyFDsToOrderColumns(orderColumns, fds); + public IPartitioningProperty normalize(Map<LogicalVariable, EquivalenceClass> equivalenceClasses, + List<FunctionalDependency> fds) { + List<OrderColumn> columns = PropertiesUtil.replaceOrderColumnsByEqClasses(orderColumns, equivalenceClasses); + columns = PropertiesUtil.applyFDsToOrderColumns(columns, fds); - return new OrderedPartitionedProperty(columns, domain); ++ return new OrderedPartitionedProperty(columns, domain, rangeMap); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/PhysicalOptimizationConfig.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java index 45f1b76,56ea55e..c4d5638 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/util/JoinUtils.java @@@ -83,8 -85,8 +85,8 @@@ public class JoinUtils } private static void setNLJoinOp(AbstractBinaryJoinOperator op, IOptimizationContext context) { - op.setPhysicalOperator(new NestedLoopJoinPOperator(op.getJoinKind(), JoinPartitioningType.BROADCAST, context - .getPhysicalOptimizationConfig().getMaxFramesForJoin())); - op.setPhysicalOperator(new NLJoinPOperator(op.getJoinKind(), JoinPartitioningType.BROADCAST, ++ op.setPhysicalOperator(new NestedLoopJoinPOperator(op.getJoinKind(), JoinPartitioningType.BROADCAST, + context.getPhysicalOptimizationConfig().getMaxFramesForJoin())); } private static void setHashJoinOp(AbstractBinaryJoinOperator op, JoinPartitioningType partitioningType, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeOpContext.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTreeOpContext.java index 3b2a943,3649433..12749ef --- 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 @@@ -41,11 -41,12 +42,12 @@@ import org.apache.hyracks.storage.am.co import org.apache.hyracks.storage.am.common.api.ITreeIndexMetaDataFrame; import org.apache.hyracks.storage.am.common.api.ITreeIndexTupleReference; import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation; -import org.apache.hyracks.storage.am.common.ophelpers.IntArrayList; -import org.apache.hyracks.storage.am.common.ophelpers.LongArrayList; import org.apache.hyracks.storage.am.common.ophelpers.MultiComparator; +import org.apache.hyracks.storage.common.arraylist.IntArrayList; +import org.apache.hyracks.storage.common.arraylist.LongArrayList; + import org.apache.hyracks.storage.common.buffercache.IExtraPageBlockHelper; - public class BTreeOpContext implements IIndexOperationContext { + public class BTreeOpContext implements IIndexOperationContext, IExtraPageBlockHelper { private final int INIT_ARRAYLIST_SIZE = 6; public IIndexAccessor accessor; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f7ac985/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexBufferCacheWarmup.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/util/TreeIndexBufferCacheWarmup.java index 4c906fa,ff76c5a..066cdc0 --- 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 @@@ -34,14 -33,15 +34,15 @@@ import org.apache.hyracks.util.MathUtil public class TreeIndexBufferCacheWarmup { private final IBufferCache bufferCache; - private final IMetaDataPageManager metaDataPageManager; + private final IMetaDataPageManager freePageManager; private final int fileId; -- private final ArrayList<IntArrayList> pagesByLevel = new ArrayList<IntArrayList>(); ++ private final ArrayList<IntArrayList> pagesByLevel = new ArrayList<>(); private final Random rnd = new Random(); - public TreeIndexBufferCacheWarmup(IBufferCache bufferCache, IMetaDataPageManager metaDataPageManager, int fileId) { + public TreeIndexBufferCacheWarmup(IBufferCache bufferCache, + IMetaDataPageManager freePageManager, int fileId) { this.bufferCache = bufferCache; - this.metaDataPageManager = metaDataPageManager; + this.freePageManager = freePageManager; this.fileId = fileId; }
