merge master
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/f186da9e Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/f186da9e Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/f186da9e Branch: refs/heads/ecarm002/interval_join_merge Commit: f186da9ede14f4beeb3e24c2b14f25407a456bd4 Parents: dc6842d 2a73f41 Author: Preston Carman <prest...@apache.org> Authored: Fri Sep 9 10:04:44 2016 -0700 Committer: Preston Carman <prest...@apache.org> Committed: Fri Sep 9 10:04:44 2016 -0700 ---------------------------------------------------------------------- .../api/http/servlet/ClusterAPIServlet.java | 50 +- .../servlet/ClusterNodeDetailsAPIServlet.java | 163 ++++ .../app/nc/AsterixNCAppRuntimeContext.java | 3 +- .../bootstrap/CCApplicationEntryPoint.java | 20 +- .../cluster_state_1.1.cstate.aql | 24 + .../cluster_state_2.1.cstate.aql | 25 + .../cluster_state_3.1.cstate.aql | 25 + .../cluster_state_4.1.cstate.aql | 25 + .../datetime_functions.3.query.aql | 4 + .../datetime_functions.3.query.sqlpp | 2 + .../api/cluster_state_1/cluster_state_1.1.adm | 74 ++ .../api/cluster_state_3/cluster_state_3.1.adm | 20 + .../api/cluster_state_4/cluster_state_4.1.adm | 9 + .../datetime_functions/datetime_functions.1.adm | 2 +- .../datetime_functions/datetime_functions.3.ast | 26 + .../src/test/resources/runtimets/testsuite.xml | 23 + .../config/AbstractAsterixProperties.java | 39 + .../config/AsterixCompilerProperties.java | 17 +- .../config/AsterixExternalProperties.java | 28 +- .../common/config/AsterixFeedProperties.java | 22 +- .../config/AsterixReplicationProperties.java | 29 +- .../common/config/AsterixStorageProperties.java | 34 +- .../config/AsterixTransactionProperties.java | 35 +- .../asterix/common/utils/ServletUtil.java | 3 +- .../apache/asterix/test/aql/TestExecutor.java | 69 +- asterixdb/asterix-doc/pom.xml | 22 + .../src/main/markdown/sqlpp/0_toc.md | 69 ++ .../src/main/markdown/sqlpp/1_intro.md | 6 + .../src/main/markdown/sqlpp/2_expr.md | 294 +++++++ .../src/main/markdown/sqlpp/3_query.md | 882 +++++++++++++++++++ .../src/main/markdown/sqlpp/4_ddl.md | 452 ++++++++++ .../installer/test/AbstractExecutionIT.java | 8 + .../runtime/util/AsterixAppContextInfo.java | 3 +- .../runtime/util/AsterixClusterProperties.java | 15 +- asterixdb/asterix-server/pom.xml | 2 +- .../server/test/NCServiceExecutionIT.java | 6 +- .../client/HyracksClientInterfaceFunctions.java | 33 +- .../HyracksClientInterfaceRemoteProxy.java | 7 + .../hyracks/api/client/HyracksConnection.java | 6 + .../api/client/IHyracksClientConnection.java | 9 + .../api/client/IHyracksClientInterface.java | 1 + .../control/cc/ClusterControllerService.java | 23 +- .../hyracks/control/cc/NodeControllerState.java | 98 ++- .../control/cc/web/NodesRESTAPIFunction.java | 2 +- .../control/cc/work/GetNodeDetailsJSONWork.java | 25 +- .../common/controllers/NodeRegistration.java | 13 +- .../hyracks/control/common/utils/PidHelper.java | 52 ++ .../control/nc/NodeControllerService.java | 4 +- .../std/group/HashSpillableTableFactory.java | 31 +- 49 files changed, 2665 insertions(+), 169 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f186da9e/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f186da9e/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCompilerProperties.java ---------------------------------------------------------------------- diff --cc asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCompilerProperties.java index b79c2cb,af5124b..232a541 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCompilerProperties.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCompilerProperties.java @@@ -18,27 -18,24 +18,32 @@@ */ package org.apache.asterix.common.config; + import org.apache.hyracks.util.StorageUtil; + + import static org.apache.hyracks.util.StorageUtil.StorageUnit.KILOBYTE; + import static org.apache.hyracks.util.StorageUtil.StorageUnit.MEGABYTE; + public class AsterixCompilerProperties extends AbstractAsterixProperties { + private static final int MB = 1048576; + private static final String COMPILER_SORTMEMORY_KEY = "compiler.sortmemory"; - private static final long COMPILER_SORTMEMORY_DEFAULT = 32 << 20; // 32MB + private static final long COMPILER_SORTMEMORY_DEFAULT = StorageUtil.getSizeInBytes(32, MEGABYTE); private static final String COMPILER_GROUPMEMORY_KEY = "compiler.groupmemory"; - private static final long COMPILER_GROUPMEMORY_DEFAULT = 32 << 20; // 32MB + private static final long COMPILER_GROUPMEMORY_DEFAULT = StorageUtil.getSizeInBytes(32, MEGABYTE); private static final String COMPILER_JOINMEMORY_KEY = "compiler.joinmemory"; - private static final long COMPILER_JOINMEMORY_DEFAULT = 32 << 20; // 32MB + private static final long COMPILER_JOINMEMORY_DEFAULT = StorageUtil.getSizeInBytes(32, MEGABYTE); + private static final String COMPILER_INTERVAL_MAXDURATION_KEY = "compiler.interval.maxduration"; + private static final long COMPILER_INTERVAL_MAXDURATION_DEFAULT = 1000; + private static final String COMPILER_FRAMESIZE_KEY = "compiler.framesize"; - private static final int COMPILER_FRAMESIZE_DEFAULT = 32 << 10; // 32KB + private static final int COMPILER_FRAMESIZE_DEFAULT = StorageUtil.getSizeInBytes(32, KILOBYTE); + private static final String COMPILER_JOIN_LEFTINPUT_KEY = "compiler.join.leftinput"; + private static final long COMPILER_JOIN_LEFTINPUT_DEFAULT = (int) ((140L * 1024 * MB) / COMPILER_FRAMESIZE_DEFAULT); // 140GB + private static final String COMPILER_PREGELIX_HOME = "compiler.pregelix.home"; private static final String COMPILER_PREGELIX_HOME_DEFAULT = "~/pregelix"; @@@ -66,11 -61,7 +73,12 @@@ PropertyInterpreters.getLongBytePropertyInterpreter()); } + public long getIntervalMaxDuration() { + return accessor.getProperty(COMPILER_INTERVAL_MAXDURATION_KEY, COMPILER_INTERVAL_MAXDURATION_DEFAULT, + PropertyInterpreters.getLongPropertyInterpreter()); + } + + @PropertyKey(COMPILER_FRAMESIZE_KEY) public int getFrameSize() { return accessor.getProperty(COMPILER_FRAMESIZE_KEY, COMPILER_FRAMESIZE_DEFAULT, PropertyInterpreters.getIntegerBytePropertyInterpreter());
