Change in asterixdb[master]: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#27). Change subject: Configuration Revamp .. Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections as appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] - Sort properties alphabetically when returned by HTTP api Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NodeControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/util/FaultToleranceUtil.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestHelper.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java M asterixdb/asterix-app/src/test/resources/runtimets/api.xml A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml D asterixdb/asterix-app/src/test/resources/runtimets/queries/api/replication/replication.1.get.http M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm D asterixdb/asterix-app/src/test/resources/runtimets/results/api/replication/replication.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java C asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCCConfig.java A asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixNCConfig.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M
Change in asterixdb[master]: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#29). Change subject: Configuration Revamp .. Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections as appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] - Sort properties alphabetically when returned by HTTP api Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NodeControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/util/FaultToleranceUtil.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestHelper.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java M asterixdb/asterix-app/src/test/resources/runtimets/api.xml A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml D asterixdb/asterix-app/src/test/resources/runtimets/queries/api/replication/replication.1.get.http M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm D asterixdb/asterix-app/src/test/resources/runtimets/results/api/replication/replication.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java C asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCCConfig.java A asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixNCConfig.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M
Change in asterixdb[master]: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#26). Change subject: Configuration Revamp .. Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections as appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] - Sort properties alphabetically when returned by HTTP api Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NodeControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/util/FaultToleranceUtil.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestHelper.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java C asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCCConfig.java A asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixNCConfig.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MetadataProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/PropertiesAccessor.java D asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/PropertyInterpreters.java
Change in asterixdb[master]: Make Xmx small on 32bit JVM
Michael Blow has posted comments on this change. Change subject: Make Xmx small on 32bit JVM .. Patch Set 8: (1 comment) Already did a plus two, but... https://asterix-gerrit.ics.uci.edu/#/c/1521/8/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCService.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCService.java: PS8, Line 128: (proportionalRamSize <= 1024 ? proportionalRamSize : 1024) Math.min(1024, proportionalRamSize)? -- To view, visit https://asterix-gerrit.ics.uci.edu/1521 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I025174fc2ca53e8d15ed53fac31b43bea3ddf281 Gerrit-PatchSet: 8 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian MaxonGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: Yes
Change in asterixdb[master]: Cleanup and bug fixes in Feeds pipeline
Michael Blow has posted comments on this change. Change subject: Cleanup and bug fixes in Feeds pipeline .. Patch Set 8: (2 comments) https://asterix-gerrit.ics.uci.edu/#/c/1523/8/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java File asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java: PS8, Line 64: writer.open(); why close() if open() fails? it looks like this will fail in at least some writer implementations... https://asterix-gerrit.ics.uci.edu/#/c/1523/8/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/ArrayValueReference.java File hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/freepage/ArrayValueReference.java: Line 23: public class ArrayValueReference implements IValueReference { This seems mutable still, why the name change? -- To view, visit https://asterix-gerrit.ics.uci.edu/1523 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie97b2133ebecb7380cf0ba336e60ed714d06f8ee Gerrit-PatchSet: 8 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: Yes
Change in asterixdb[master]: WIP: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#19). Change subject: WIP: Configuration Revamp .. WIP: Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - IN PROGRESS: Fix ncservice documentation issues, including to reflect which configuration that belongs in [app] section, [ncservice] config - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections where appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] Also, add 'ClusterControllerService' to RAT exclude list, as these still seem to get generated outside of 'target' in some cases... Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NodeControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/util/FaultToleranceUtil.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestHelper.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java M asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java C asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCCConfig.java A asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixNCConfig.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MetadataProperties.java M
Change in asterixdb[master]: WIP: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#10). Change subject: WIP: Configuration Revamp .. WIP: Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - IN PROGRESS: Fix ncservice documentation issues, including to reflect which configuration that belongs in [app] section, [ncservice] config - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections where appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] Also, add 'ClusterControllerService' to RAT exclude list, as these still seem to get generated outside of 'target' in some cases... Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java C asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCCConfig.java A asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixNCConfig.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MetadataProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/PropertiesAccessor.java D asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/PropertyInterpreters.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ReplicationProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/TransactionProperties.java M asterixdb/asterix-doc/src/site/markdown/ncservice.md M asterixdb/asterix-docker/docker/supervisord.conf M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java M asterixdb/asterix-events/src/main/resources/events/cc_start/cc_start.sh M asterixdb/asterix-events/src/main/resources/events/node_join/nc_join.sh M asterixdb/asterix-events/src/main/resources/events/node_restart/nc_restart.sh M asterixdb/asterix-installer/pom.xml M asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml M
Change in asterixdb[master]: WIP: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#11). Change subject: WIP: Configuration Revamp .. WIP: Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - IN PROGRESS: Fix ncservice documentation issues, including to reflect which configuration that belongs in [app] section, [ncservice] config - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections where appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] Also, add 'ClusterControllerService' to RAT exclude list, as these still seem to get generated outside of 'target' in some cases... Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java C asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCCConfig.java A asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixNCConfig.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MetadataProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/PropertiesAccessor.java D asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/PropertyInterpreters.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ReplicationProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/TransactionProperties.java M asterixdb/asterix-common/src/main/resources/schema/cluster.xsd M asterixdb/asterix-doc/src/site/markdown/ncservice.md M asterixdb/asterix-docker/docker/supervisord.conf M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java M asterixdb/asterix-events/src/main/resources/events/cc_start/cc_start.sh M asterixdb/asterix-events/src/main/resources/events/node_join/nc_join.sh M asterixdb/asterix-events/src/main/resources/events/node_restart/nc_restart.sh M asterixdb/asterix-installer/pom.xml M asterixdb/asterix-installer/src/main/resources/clusters/local/local.xml M
Change in asterixdb[master]: WIP: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#12). Change subject: WIP: Configuration Revamp .. WIP: Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - IN PROGRESS: Fix ncservice documentation issues, including to reflect which configuration that belongs in [app] section, [ncservice] config - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections where appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] Also, add 'ClusterControllerService' to RAT exclude list, as these still seem to get generated outside of 'target' in some cases... Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java C asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCCConfig.java A asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixNCConfig.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MetadataProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/PropertiesAccessor.java D asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/PropertyInterpreters.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ReplicationProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/TransactionProperties.java M asterixdb/asterix-common/src/main/resources/schema/cluster.xsd M asterixdb/asterix-doc/src/site/markdown/ncservice.md M asterixdb/asterix-docker/docker/supervisord.conf M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java M asterixdb/asterix-events/src/main/resources/events/cc_start/cc_start.sh M asterixdb/asterix-events/src/main/resources/events/node_join/nc_join.sh M asterixdb/asterix-events/src/main/resources/events/node_restart/nc_restart.sh M asterixdb/asterix-installer/pom.xml M asterixdb/asterix-installer/src/main/resources/clusters/local/local.xml M
Change in asterixdb[master]: WIP: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#15). Change subject: WIP: Configuration Revamp .. WIP: Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - IN PROGRESS: Fix ncservice documentation issues, including to reflect which configuration that belongs in [app] section, [ncservice] config - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections where appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] Also, add 'ClusterControllerService' to RAT exclude list, as these still seem to get generated outside of 'target' in some cases... Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NodeControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java C asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCCConfig.java A asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixNCConfig.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MetadataProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/PropertiesAccessor.java D asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/PropertyInterpreters.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ReplicationProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/TransactionProperties.java M asterixdb/asterix-common/src/main/resources/schema/cluster.xsd M asterixdb/asterix-doc/src/site/markdown/ncservice.md M asterixdb/asterix-docker/docker/supervisord.conf M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java M
Change in asterixdb[master]: ASTERIXDB-1804: update AsterixDB servlets
Michael Blow has posted comments on this change. Change subject: ASTERIXDB-1804: update AsterixDB servlets .. Patch Set 5: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1519 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id48a4753775a19094b28876ef3544bda989f918d Gerrit-PatchSet: 5 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Yingyi Bu Gerrit-Reviewer: abdullah alamoudi Gerrit-HasComments: No
Change in asterixdb[master]: WIP: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#18). Change subject: WIP: Configuration Revamp .. WIP: Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - IN PROGRESS: Fix ncservice documentation issues, including to reflect which configuration that belongs in [app] section, [ncservice] config - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections where appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] Also, add 'ClusterControllerService' to RAT exclude list, as these still seem to get generated outside of 'target' in some cases... Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NodeControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/util/FaultToleranceUtil.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestHelper.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java M asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java C asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCCConfig.java A asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixNCConfig.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MetadataProperties.java M
Change in asterixdb[master]: Debian Packaging for NCService
Michael Blow has posted comments on this change. Change subject: Debian Packaging for NCService .. Patch Set 4: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1492 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1b5d0895ed5a34700d4e2f666715b857ce275127 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian MaxonGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: Fix async result delivery
Michael Blow has posted comments on this change. Change subject: Fix async result delivery .. Patch Set 42: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1394 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iafba65d9c7bd8643c42e5126c8d89164ae328908 Gerrit-PatchSet: 42 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Steven Jacobs Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: Add necesasary plugins for simple release method
Michael Blow has posted comments on this change. Change subject: Add necesasary plugins for simple release method .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1493 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8768ff760235f2f7f0c33d5af633bcdefa0b51e5 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian MaxonGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: Add init parameter option for external functions.
Michael Blow has posted comments on this change. Change subject: Add init parameter option for external functions. .. Patch Set 6: Hi Xikui, this is an old change, but it looks like you were awaiting response: Not sure why SQ mentioned all those false-positives; you should not need to address these. If this change is still relevant, can you rebase and resubmit? -- To view, visit https://asterix-gerrit.ics.uci.edu/1006 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I437880a700f61440ffab9f44035798e538fb9ff5 Gerrit-PatchSet: 6 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-HasComments: No
Change in asterixdb[master]: Fix async result delivery
Michael Blow has posted comments on this change. Change subject: Fix async result delivery .. Patch Set 40: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/1394/40/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/dataset/DatasetJobRecord.java File hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/dataset/DatasetJobRecord.java: PS40, Line 109: getOrCreateDirectoryRecord seems like this method should be synchronized as well -- To view, visit https://asterix-gerrit.ics.uci.edu/1394 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iafba65d9c7bd8643c42e5126c8d89164ae328908 Gerrit-PatchSet: 40 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Steven Jacobs Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: Yes
Change in asterixdb[master]: Fix the names of Let to Servlet
Michael Blow has posted comments on this change. Change subject: Fix the names of Let to Servlet .. Patch Set 7: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1486 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f63f37ee9ef063930478028e3e05ca9dd4742c Gerrit-PatchSet: 7 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: abdullah alamoudi Gerrit-HasComments: No
Change in asterixdb[master]: Fix asterix-docker
Michael Blow has posted comments on this change. Change subject: Fix asterix-docker .. Patch Set 1: Code-Review+2 Integration-Tests+1 Verified+1 -- To view, visit https://asterix-gerrit.ics.uci.edu/1506 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifac17caf603f1d4f1c53413996d833869d68a266 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian MaxonGerrit-Reviewer: Jenkins Gerrit-Reviewer: Jianfeng Jia Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: abdullah alamoudi Gerrit-HasComments: No
Change in asterixdb[master]: Fix the names of Let to Servlet
Michael Blow has posted comments on this change. Change subject: Fix the names of Let to Servlet .. Patch Set 6: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/1486/6/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/Servlets.java File asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/Servlets.java: PS6, Line 23: public static final String AQL = "/aql"; > because those enums were actually just a wrapper around a string Is there a compelling reason to revert that? Enums make switch generation much easier. -- To view, visit https://asterix-gerrit.ics.uci.edu/1486 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f63f37ee9ef063930478028e3e05ca9dd4742c Gerrit-PatchSet: 6 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: abdullah alamoudi Gerrit-HasComments: Yes
Change in asterixdb[master]: Fix the names of Let to Servlet
Michael Blow has posted comments on this change. Change subject: Fix the names of Let to Servlet .. Patch Set 6: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/1486/6/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/Servlets.java File asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/Servlets.java: PS6, Line 23: public static final String AQL = "/aql"; Why the change from Enum to Strings? -- To view, visit https://asterix-gerrit.ics.uci.edu/1486 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib2f63f37ee9ef063930478028e3e05ca9dd4742c Gerrit-PatchSet: 6 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: abdullah alamoudi Gerrit-HasComments: Yes
Change in asterixdb[master]: Modularize feed adaptors
Michael Blow has posted comments on this change. Change subject: Modularize feed adaptors .. Patch Set 4: (7 comments) https://asterix-gerrit.ics.uci.edu/#/c/1430/4/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/HDFSDataSourceFactory.java File asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/HDFSDataSourceFactory.java: Line 235: return Collections.unmodifiableList(Arrays.asList(recordReaderNames)); Comments which apply to all of the impls: - Should we just store the collection instead of the array, to avoid rebuilding it each time? - Make it static final? - Should this be a Set<> instead of a List<>? Seems these are unique, if order matters, could use SortedSet<>? https://asterix-gerrit.ics.uci.edu/#/c/1430/4/asterixdb/asterix-villain/pom.xml File asterixdb/asterix-villain/pom.xml: Line 84: 0.8.9-SNAPSHOT Use ${project.version} here (same as other 0.8.9-SNAPSHOTs below) Line 126: 0.2.18-SNAPSHOT Use ${hyracks.version} here (same as other 0.2.18-SNAPSHOTs below) Line 141: 1.2.17 I believe this version is already defined in depdendencyManagement, and should not be redefined here. Please check the other deps with versions for the same. (Not sure about Eclipse, but IDEA indicates in the IDE for this pom when the definition is being overridden) https://asterix-gerrit.ics.uci.edu/#/c/1430/4/asterixdb/asterix-villain/src/main/resources/META-INF/services/org.apache.asterix.external.api.IDataParserFactory File asterixdb/asterix-villain/src/main/resources/META-INF/services/org.apache.asterix.external.api.IDataParserFactory: Line 2: org.apache.asterix.villain.external.parser.rss.RSSParserFactory These are both nice to make modular, but probably should each be in their own module, not combined into one. https://asterix-gerrit.ics.uci.edu/#/c/1430/4/asterixdb/asterix-villain/src/main/resources/META-INF/services/org.apache.asterix.external.api.IRecordReaderFactory File asterixdb/asterix-villain/src/main/resources/META-INF/services/org.apache.asterix.external.api.IRecordReaderFactory: Line 2: org.apache.asterix.villain.external.reader.rss.RSSRecordReaderFactory These are both nice to make modular, but probably should each be in their own module, not combined into one. https://asterix-gerrit.ics.uci.edu/#/c/1430/4/asterixdb/asterix-villain/src/test/resources/runtimets/testsuite.xml File asterixdb/asterix-villain/src/test/resources/runtimets/testsuite.xml: Line 26: All of these entity decls are unused here and should be removed. -- To view, visit https://asterix-gerrit.ics.uci.edu/1430 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic4f95255f5493a813ee1f875b63a62e74bc47602 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Xikui Wang Gerrit-HasComments: Yes
Change in asterixdb[master]: ASTERIXDB-1320, ASTERIXDB-1323: License Fixes
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1463 to look at the new patch set (#3). Change subject: ASTERIXDB-1320, ASTERIXDB-1323: License Fixes .. ASTERIXDB-1320, ASTERIXDB-1323: License Fixes ASTERIXDB-1320: - LICENSE lists a large number of CDDL licensed bits of software. CDDL is Category B we should provide a link to the source code (see 3.1. Availability of Source Code in (1)) ASTERIXDB-1323: - Missing normalize.css (MIT) ./asterix-examples/src/main/resources /admaql101-demo/static/css/bootstrap.min.css - Missing license for second bottle file (MIT) ./asterix-examples /src/main/resources/tweetbook-demo/bottle.py - Bootstrap version bundled is Apache licensed not MIT licensed ./asterix-app/src/main/resources/webui/static/js/bootstrap.min.js - It’s also not mentioned for all licenses what each license is (MIT/BSD etc) that can be helpful. The version of the bundled software is also helpful. - Should include text of RainbowVis-JS license (or better still a pointer to a copy of the license file) [5] not a pointer to a URL on github Change-Id: Ie9fe9c18f63624896ccda420e1bf83ae0127021e --- M asterixdb/LICENSE M asterixdb/asterix-app/pom.xml M asterixdb/asterix-examples/src/main/appended-resources/META-INF/LICENSE M asterixdb/asterix-installer/pom.xml M asterixdb/asterix-metadata/pom.xml M asterixdb/asterix-server/pom.xml M asterixdb/asterix-yarn/pom.xml M asterixdb/pom.xml M asterixdb/src/main/appended-resources/supplemental-models.xml R asterixdb/src/main/licenses/content/paranamer-2.3_LICENSE.txt M asterixdb/src/main/licenses/content/protobuf_2.5.0_LICENSE.txt M asterixdb/src/main/licenses/templates/asterix-license.ftl M asterixdb/src/main/licenses/templates/source_licenses.ftl M asterixdb/src/main/licenses/templates/source_only_licenses.ftl M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/Project.java 18 files changed, 626 insertions(+), 47 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/63/1463/3 -- To view, visit https://asterix-gerrit.ics.uci.edu/1463 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie9fe9c18f63624896ccda420e1bf83ae0127021e Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins
Change in asterixdb[master]: Replace Servlets with Netty Based HTTP Servers
Michael Blow has posted comments on this change. Change subject: Replace Servlets with Netty Based HTTP Servers .. Patch Set 3: (7 comments) https://asterix-gerrit.ics.uci.edu/#/c/1429/3/asterixdb/asterix-app/pom.xml File asterixdb/asterix-app/pom.xml: Line 347: 2.2.2 inherit (remove) version https://asterix-gerrit.ics.uci.edu/#/c/1429/3/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiLet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiLet.java: Line 116: IHyracksDataset hds; Consider combining declaration & assignment for these two? (hcc/hds) https://asterix-gerrit.ics.uci.edu/#/c/1429/3/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiLet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiLet.java: Line 134: requestURL.append(request.getHeader(HttpHeaderNames.HOST.toString())); superflous toString() https://asterix-gerrit.ics.uci.edu/#/c/1429/3/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceLet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceLet.java: Line 512: hcc = (IHyracksClientConnection) ctx.get(HYRACKS_CONNECTION_ATTR); Who sets HYRACKS_CONNECTION_ATTR if null above? https://asterix-gerrit.ics.uci.edu/#/c/1429/3/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiLet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiLet.java: Line 81: hds = new HyracksDataset(hcc, ResultReader.FRAME_SIZE, ResultReader.NUM_READERS); This is only use of hcc, consider inline or move var decl & set into this block? https://asterix-gerrit.ics.uci.edu/#/c/1429/3/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiLet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiLet.java: Line 176: IHyracksDataset hds; Consider combining declaration & assignment for these two? (hcc/hds) https://asterix-gerrit.ics.uci.edu/#/c/1429/3/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractLet.java File hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractLet.java: Line 23: public abstract class AbstractLet implements IServLet { ServLet/Let consistent naming? (applies to all in change) -- To view, visit https://asterix-gerrit.ics.uci.edu/1429 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3d552d4eb8c868535ca4c41cbcf7e352217b18ae Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: abdullah alamoudi Gerrit-HasComments: Yes
Change in asterixdb[master]: WIP: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#6). Change subject: WIP: Configuration Revamp .. WIP: Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - IN PROGRESS: Fix ncservice documentation issues, including to reflect which configuration that belongs in [app] section, [ncservice] config - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections where appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] Also, add 'ClusterControllerService' to RAT exclude list, as these still seem to get generated outside of 'target' in some cases... Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java C asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCCConfig.java A asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixNCConfig.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MetadataProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/PropertiesAccessor.java D asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/PropertyInterpreters.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ReplicationProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/TransactionProperties.java M asterixdb/asterix-doc/src/site/markdown/ncservice.md M asterixdb/asterix-docker/docker/supervisord.conf M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java M asterixdb/asterix-events/src/main/resources/events/cc_start/cc_start.sh M asterixdb/asterix-events/src/main/resources/events/node_join/nc_join.sh M asterixdb/asterix-events/src/main/resources/events/node_restart/nc_restart.sh M asterixdb/asterix-installer/pom.xml M asterixdb/asterix-maven-plugins/asterix-grammar-extension-maven-plugin/pom.xml M asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationChannel.java M asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationManager.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java M asterixdb/asterix-server/pom.xml M asterixdb/asterix-server/src/main/java/org/apache/asterixdb/aws/ConfigGenerator.java M asterixdb/asterix-server/src/main/samples/local/conf/cc.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf M asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AsterixApplicationMaster.java M
Change in asterixdb[release-0.8.9]: Fix AsterixDB Source Assembly, Rename Hyracks Source Assembly
Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1449 Change subject: Fix AsterixDB Source Assembly, Rename Hyracks Source Assembly .. Fix AsterixDB Source Assembly, Rename Hyracks Source Assembly - Update source assembly descriptor to include missing files, filter out extranous files. - /apache-asterixdb-hyracks/apache-hyracks/ Change-Id: I6a1597b4d6322b43617fd5a348ab3116ff2d14f8 --- M asterixdb/src/main/assembly/source.xml M hyracks-fullstack/pom.xml 2 files changed, 6 insertions(+), 31 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/49/1449/1 diff --git a/asterixdb/src/main/assembly/source.xml b/asterixdb/src/main/assembly/source.xml index b29da54..97cf01f 100644 --- a/asterixdb/src/main/assembly/source.xml +++ b/asterixdb/src/main/assembly/source.xml @@ -28,38 +28,13 @@ ${project.basedir} / true - -**/LICENSE -**/NOTICE -**/README -**/src/** -**/results/** -**/pom.xml -**/build*.xml -**/findbugs*.xml -**/*site.xml -**/*.adm -**/*.json -**/*.aql -**/*.ddl -**/*.seq -**/*.rc -**/*.big -**/*textFileS -**/*large_text -**/*.csv* -**/*.tbl -**/*.txt -**/part-* -**/*.cleaned -**/*.md -**/*.hcli -**/*.properties -**/*.scm -**/*.sh - **/${project.build.directory}/** +**/git.properties +release.properties +asterix-app/src/test/resources/externallib/** + asterix-installer/src/test/resources/clusterts/asterix-installer-*-binary-assembly/** +DEPENDENCIES diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 1213ba0..f01fa5f 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 org.apache.hyracks - apache-asterixdb-hyracks + apache-hyracks 0.2.18-SNAPSHOT pom hyracks-ecosystem-full-stack -- To view, visit https://asterix-gerrit.ics.uci.edu/1449 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a1597b4d6322b43617fd5a348ab3116ff2d14f8 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: release-0.8.9 Gerrit-Owner: Michael Blow
Change in asterixdb[release-0.8.9]: Fix AsterixDB Source Assembly, Rename Hyracks Source Assembly
Hello Ian Maxon, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1449 to look at the new patch set (#2). Change subject: Fix AsterixDB Source Assembly, Rename Hyracks Source Assembly .. Fix AsterixDB Source Assembly, Rename Hyracks Source Assembly - Update source assembly descriptor to include missing files, filter out extranous files. - /apache-asterixdb-hyracks/apache-hyracks/ Change-Id: I6a1597b4d6322b43617fd5a348ab3116ff2d14f8 --- M asterixdb/src/main/assembly/source.xml M hyracks-fullstack/algebricks/pom.xml M hyracks-fullstack/hyracks-fullstack-license/pom.xml M hyracks-fullstack/hyracks/pom.xml M hyracks-fullstack/pom.xml 5 files changed, 9 insertions(+), 36 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/49/1449/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1449 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6a1597b4d6322b43617fd5a348ab3116ff2d14f8 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: release-0.8.9 Gerrit-Owner: Michael BlowGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Till Westmann
Change in asterixdb[release-0.8.9]: Fix AsterixDB Source Assembly, Rename Hyracks Source Assembly
Michael Blow has submitted this change and it was merged. Change subject: Fix AsterixDB Source Assembly, Rename Hyracks Source Assembly .. Fix AsterixDB Source Assembly, Rename Hyracks Source Assembly - Update source assembly descriptor to include missing files, filter out extranous files. - /apache-asterixdb-hyracks/apache-hyracks/ Change-Id: I6a1597b4d6322b43617fd5a348ab3116ff2d14f8 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1449 Reviewed-by: Ian MaxonSonar-Qube: Jenkins Tested-by: Jenkins BAD: Jenkins --- M asterixdb/src/main/assembly/source.xml M hyracks-fullstack/algebricks/pom.xml M hyracks-fullstack/hyracks-fullstack-license/pom.xml M hyracks-fullstack/hyracks/pom.xml M hyracks-fullstack/pom.xml 5 files changed, 9 insertions(+), 36 deletions(-) Approvals: Ian Maxon: Looks good to me, approved Jenkins: Verified; No violations found; No violations found diff --git a/asterixdb/src/main/assembly/source.xml b/asterixdb/src/main/assembly/source.xml index b29da54..97cf01f 100644 --- a/asterixdb/src/main/assembly/source.xml +++ b/asterixdb/src/main/assembly/source.xml @@ -28,38 +28,13 @@ ${project.basedir} / true - -**/LICENSE -**/NOTICE -**/README -**/src/** -**/results/** -**/pom.xml -**/build*.xml -**/findbugs*.xml -**/*site.xml -**/*.adm -**/*.json -**/*.aql -**/*.ddl -**/*.seq -**/*.rc -**/*.big -**/*textFileS -**/*large_text -**/*.csv* -**/*.tbl -**/*.txt -**/part-* -**/*.cleaned -**/*.md -**/*.hcli -**/*.properties -**/*.scm -**/*.sh - **/${project.build.directory}/** +**/git.properties +release.properties +asterix-app/src/test/resources/externallib/** + asterix-installer/src/test/resources/clusterts/asterix-installer-*-binary-assembly/** +DEPENDENCIES diff --git a/hyracks-fullstack/algebricks/pom.xml b/hyracks-fullstack/algebricks/pom.xml index ba31be5..403ed15 100644 --- a/hyracks-fullstack/algebricks/pom.xml +++ b/hyracks-fullstack/algebricks/pom.xml @@ -19,14 +19,13 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 - org.apache.hyracks algebricks pom algebricks org.apache.hyracks -apache-asterixdb-hyracks +apache-hyracks 0.2.18-SNAPSHOT diff --git a/hyracks-fullstack/hyracks-fullstack-license/pom.xml b/hyracks-fullstack/hyracks-fullstack-license/pom.xml index a25c0d6..7105a5f 100644 --- a/hyracks-fullstack/hyracks-fullstack-license/pom.xml +++ b/hyracks-fullstack/hyracks-fullstack-license/pom.xml @@ -22,7 +22,7 @@ hyracks-fullstack-license org.apache.hyracks -apache-asterixdb-hyracks +apache-hyracks 0.2.18-SNAPSHOT diff --git a/hyracks-fullstack/hyracks/pom.xml b/hyracks-fullstack/hyracks/pom.xml index cb2d661..b45cf8c 100644 --- a/hyracks-fullstack/hyracks/pom.xml +++ b/hyracks-fullstack/hyracks/pom.xml @@ -19,14 +19,13 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 - org.apache.hyracks hyracks pom hyracks org.apache.hyracks -apache-asterixdb-hyracks +apache-hyracks 0.2.18-SNAPSHOT diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 1213ba0..f01fa5f 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -20,7 +20,7 @@ http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 org.apache.hyracks - apache-asterixdb-hyracks + apache-hyracks 0.2.18-SNAPSHOT pom hyracks-ecosystem-full-stack -- To view, visit https://asterix-gerrit.ics.uci.edu/1449 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a1597b4d6322b43617fd5a348ab3116ff2d14f8 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: release-0.8.9 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: Fix Issues With Binary Assembly Licenses, Cleanup
Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1442 Change subject: Fix Issues With Binary Assembly Licenses, Cleanup .. Fix Issues With Binary Assembly Licenses, Cleanup - cleanup / fix supplemental model - remove unused licenses - add missing client helper jars to LICENSE - allow same dependency to be mappped into multiple license dependencySets - prune extraneous supplemental model files Change-Id: I8b9d1f13960bd5cf8782f0cc785eed8f3414b123 --- M asterixdb/LICENSE D asterixdb/asterix-app/src/main/appended-resources/supplemental-models.xml M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-external-data/pom.xml D asterixdb/asterix-installer/src/main/appended-resources/supplemental-models.xml M asterixdb/asterix-server/pom.xml M asterixdb/asterix-yarn/pom.xml D asterixdb/asterix-yarn/src/main/appended-resources/supplemental-models.xml M asterixdb/asterix-yarn/src/main/assembly/binary-assembly.xml M asterixdb/pom.xml M asterixdb/src/main/appended-resources/supplemental-models.xml D asterixdb/src/main/licenses/content/hamcrest_1.3_LICENSE.txt D asterixdb/src/main/licenses/content/jdom--jdom--1.0_licenses_jdom.txt D asterixdb/src/main/licenses/content/raw.githubusercontent.com_kohsuke_args4j_b72102efeedc3f20ab5a998533711d042ba004a8_LICENSE.txt D asterixdb/src/main/licenses/content/www.antlr.org_license.html.txt D asterixdb/src/main/licenses/content/www.eclipse.org_legal_epl-v10.html.txt D asterixdb/src/main/licenses/content/www.json.org_license.html.txt M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java D hyracks-fullstack/src/main/appended-resources/supplemental-models.xml 21 files changed, 258 insertions(+), 1,753 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/42/1442/1 diff --git a/asterixdb/LICENSE b/asterixdb/LICENSE index 62d1c3e..7896416 100644 --- a/asterixdb/LICENSE +++ b/asterixdb/LICENSE @@ -342,7 +342,30 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + queryui/css/bootstrap.min.css also contains normalize.css v3.0.3 + (http://github.com/necolas/normalize.css), having the following copyright: + + Copyright © Nicolas Gallagher and Jonathan Neal + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + the Software, and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- + Portions of the AsterixDB QueryUI located at: asterix-app/src/main/resources/queryui/js/angular.min.js diff --git a/asterixdb/asterix-app/src/main/appended-resources/supplemental-models.xml b/asterixdb/asterix-app/src/main/appended-resources/supplemental-models.xml deleted file mode 12 index a3e53f9..000 --- a/asterixdb/asterix-app/src/main/appended-resources/supplemental-models.xml +++ /dev/null @@ -1 +0,0 @@ -../../../../src/main/appended-resources/supplemental-models.xml \ No newline at end of file diff --git a/asterixdb/asterix-client-helper/pom.xml b/asterixdb/asterix-client-helper/pom.xml index d3a6d4e..0466f21 100644 --- a/asterixdb/asterix-client-helper/pom.xml +++ b/asterixdb/asterix-client-helper/pom.xml @@ -66,6 +66,134 @@ +org.apache.hyracks +license-automation-plugin +${hyracks.version} + + +generate-resources + + generate + + + + + ${basedir}/../../ + + + asterixdb/src/main/licenses/templates/asterix-license.ftl + LICENSE +
Change in asterixdb[master]: Fix Issues With Binary Assembly Licenses, Cleanup
Michael Blow has uploaded a new patch set (#2). Change subject: Fix Issues With Binary Assembly Licenses, Cleanup .. Fix Issues With Binary Assembly Licenses, Cleanup - cleanup / fix supplemental model - remove unused licenses - add missing client helper jars to LICENSE - allow same dependency to be mappped into multiple license dependencySets - prune extraneous supplemental model files Change-Id: I8b9d1f13960bd5cf8782f0cc785eed8f3414b123 --- M asterixdb/LICENSE D asterixdb/asterix-app/src/main/appended-resources/supplemental-models.xml M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-external-data/pom.xml D asterixdb/asterix-installer/src/main/appended-resources/supplemental-models.xml M asterixdb/asterix-server/pom.xml M asterixdb/asterix-yarn/pom.xml D asterixdb/asterix-yarn/src/main/appended-resources/supplemental-models.xml M asterixdb/asterix-yarn/src/main/assembly/binary-assembly.xml M asterixdb/pom.xml M asterixdb/src/main/appended-resources/supplemental-models.xml D asterixdb/src/main/licenses/content/hamcrest_1.3_LICENSE.txt D asterixdb/src/main/licenses/content/jdom--jdom--1.0_licenses_jdom.txt D asterixdb/src/main/licenses/content/raw.githubusercontent.com_kohsuke_args4j_b72102efeedc3f20ab5a998533711d042ba004a8_LICENSE.txt D asterixdb/src/main/licenses/content/www.antlr.org_license.html.txt D asterixdb/src/main/licenses/content/www.eclipse.org_legal_epl-v10.html.txt D asterixdb/src/main/licenses/content/www.json.org_license.html.txt M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java D hyracks-fullstack/src/main/appended-resources/supplemental-models.xml 21 files changed, 258 insertions(+), 1,753 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/42/1442/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1442 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8b9d1f13960bd5cf8782f0cc785eed8f3414b123 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow
Change in asterixdb[master]: Maven Artifact License / Notice Files
Michael Blow has submitted this change and it was merged. Change subject: Maven Artifact License / Notice Files .. Maven Artifact License / Notice Files Change-Id: I9c409a58fb93aee81e3d5661525d09cb377e5882 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1444 Reviewed-by: Ian MaxonSonar-Qube: Jenkins Tested-by: Michael Blow --- M asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE M asterixdb/pom.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE M hyracks-fullstack/pom.xml 4 files changed, 312 insertions(+), 75 deletions(-) Approvals: Michael Blow: Verified Ian Maxon: Looks good to me, approved Jenkins: No violations found diff --git a/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE b/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE index de42a8e..78371a6 100644 --- a/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE +++ b/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE @@ -1,31 +1,248 @@ +=== + AsterixDB includes source code with separate copyright notices and + license terms. Your use of this source code is subject to the terms + and condition of the following licenses. +=== + Portions of the AsterixDB WebUI + located at: + webui/static/js/jquery.min.js, + webui/static/js/jquery.autosize-min.js, + and + queryui/js/jquery-1.12.4.min.js -ASTERIXDB COMPONENTS: + are available under an MIT-style license: +--- + Copyright jQuery Foundation and other contributors, https://jquery.org/ -AsterixDB includes a number of subcomponents with separate copyright -notices and license terms. Your use of the source code for these -subcomponents is subject to the terms and condition of the following -licenses. + This software consists of voluntary contributions made by many + individuals. For exact contribution history, see the revision history + available at https://github.com/jquery/jquery + The following license applies to all parts of this software except as + documented below: - The MIT License + - - jQuery (webui/static/js/jquery.min.js) - - Bootstrap (webui/static/js/bootstrap.min.js), - (webui/static/js/bootstrap.min.css), - (webui/static/js/bootstrap-responsive.min.css) - - Smoothie Charts (webui/static/js/smoothie.js) + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: -The text of The MIT License is below for convenience. Refer to the website of each project for exact details. + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. -The MIT License (MIT) + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Copyright (c) + -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + All files located in the node_modules and external directories are + externally maintained libraries used by this software which have their + own licenses; we recommend you read them, as their terms may differ from + the terms above. +--- + Portions of the AsterixDB WebUI + located at: + webui/static/js/bootstrap.min.js, + webui/static/css/bootstrap-responsive.min.css, + and + webui/static/css/bootstrap.min.css -The above copyright notice and this permission notice shall be included in all
Change in asterixdb[master]: Add scm tag back to Hyracks pom
Michael Blow has posted comments on this change. Change subject: Add scm tag back to Hyracks pom .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1445 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9c409a58fb93aee81e3d5661525d09cb377e5884 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian MaxonGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-HasComments: No
Change in asterixdb[master]: Maven Artifact License / Notice Files
Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1444 Change subject: Maven Artifact License / Notice Files .. Maven Artifact License / Notice Files Change-Id: I9c409a58fb93aee81e3d5661525d09cb377e5882 --- M asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE M asterixdb/pom.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE M hyracks-fullstack/pom.xml 4 files changed, 312 insertions(+), 75 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/44/1444/1 diff --git a/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE b/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE index de42a8e..78371a6 100644 --- a/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE +++ b/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE @@ -1,31 +1,248 @@ +=== + AsterixDB includes source code with separate copyright notices and + license terms. Your use of this source code is subject to the terms + and condition of the following licenses. +=== + Portions of the AsterixDB WebUI + located at: + webui/static/js/jquery.min.js, + webui/static/js/jquery.autosize-min.js, + and + queryui/js/jquery-1.12.4.min.js -ASTERIXDB COMPONENTS: + are available under an MIT-style license: +--- + Copyright jQuery Foundation and other contributors, https://jquery.org/ -AsterixDB includes a number of subcomponents with separate copyright -notices and license terms. Your use of the source code for these -subcomponents is subject to the terms and condition of the following -licenses. + This software consists of voluntary contributions made by many + individuals. For exact contribution history, see the revision history + available at https://github.com/jquery/jquery + The following license applies to all parts of this software except as + documented below: - The MIT License + - - jQuery (webui/static/js/jquery.min.js) - - Bootstrap (webui/static/js/bootstrap.min.js), - (webui/static/js/bootstrap.min.css), - (webui/static/js/bootstrap-responsive.min.css) - - Smoothie Charts (webui/static/js/smoothie.js) + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: -The text of The MIT License is below for convenience. Refer to the website of each project for exact details. + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. -The MIT License (MIT) + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Copyright (c) + -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + All files located in the node_modules and external directories are + externally maintained libraries used by this software which have their + own licenses; we recommend you read them, as their terms may differ from + the terms above. +--- + Portions of the AsterixDB WebUI + located at: + webui/static/js/bootstrap.min.js, + webui/static/css/bootstrap-responsive.min.css, + and + webui/static/css/bootstrap.min.css -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + are available under the following license: +--- + Copyright 2012 Twitter, Inc. + http://www.apache.org/licenses/LICENSE-2.0.txt +---
Change in asterixdb[release-0.8.9]: Fix Issues in 0.9.0 RC1 Release Assemblies
Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1452 Change subject: Fix Issues in 0.9.0 RC1 Release Assemblies .. Fix Issues in 0.9.0 RC1 Release Assemblies - Unable to build *DB from source assembly due to: o Git plugin requiring build from within Git clone o License automation templates referenced hyracks sources (expected co-location) - Missing APLv2 license text from head of binary assembly LICENSE files - Added license text to head of NCService conf files - Exclude useless DEPENDENCIES from asterixdb source assembly Change-Id: I1821416abb0387ee05b9add9f9c15798deed25e1 --- M asterixdb/LICENSE M asterixdb/asterix-app/pom.xml M asterixdb/asterix-client-helper/pom.xml A asterixdb/asterix-hivecompat/src/main/appended-resources/META-INF/LICENSE M asterixdb/asterix-installer/pom.xml M asterixdb/asterix-license/pom.xml M asterixdb/asterix-server/pom.xml M asterixdb/asterix-server/src/main/samples/local/conf/blue.conf M asterixdb/asterix-server/src/main/samples/local/conf/cc.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice1.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/ncservice2.conf M asterixdb/asterix-yarn/pom.xml M asterixdb/src/main/assembly/source.xml M asterixdb/src/main/licenses/templates/asterix-license.ftl A asterixdb/src/main/licenses/templates/asterix-notice.ftl A asterixdb/src/main/licenses/templates/hyracks-fullstack_source_licenses.ftl M asterixdb/src/main/licenses/templates/source_licenses.ftl M hyracks-fullstack/hyracks-fullstack-license/pom.xml M hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/asterix-notice.ftl M hyracks-fullstack/hyracks-fullstack-license/src/main/licenses/templates/source_licenses.ftl M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/cc.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-blue.conf M hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-red.conf 24 files changed, 434 insertions(+), 32 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/52/1452/1 diff --git a/asterixdb/LICENSE b/asterixdb/LICENSE index 7896416..e7b3a06 100644 --- a/asterixdb/LICENSE +++ b/asterixdb/LICENSE @@ -447,6 +447,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- + Portions of the AsterixDB runtime + located at: + asterix-hivecompat/src/main/java/org/apache/asterix/hivecompat/io/* + + are available under The Apache License, Version 2.0: +--- + Source files in asterix-hivecompat are derived from portions of Apache Hive + Query Language v0.13.0 (org.apache.hive:hive-exec). +--- Portions of the AsterixDB API examples located at: asterix-examples/src/main/resources/admaql101-demo/bottle.py diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index d4a9e5f..7cdf78a 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -75,6 +75,10 @@ ./target/classes/git.properties + + + false diff --git a/asterixdb/asterix-client-helper/pom.xml b/asterixdb/asterix-client-helper/pom.xml index defb488..b053331 100644 --- a/asterixdb/asterix-client-helper/pom.xml +++ b/asterixdb/asterix-client-helper/pom.xml @@ -79,12 +79,6 @@ ${basedir}/../../ - - - asterixdb/src/main/licenses/templates/asterix-license.ftl - LICENSE - - repo/ ${project.build.directory}/generated-resources/license_map.json diff --git a/asterixdb/asterix-hivecompat/src/main/appended-resources/META-INF/LICENSE b/asterixdb/asterix-hivecompat/src/main/appended-resources/META-INF/LICENSE new file mode 100644 index 000..b0cc878 --- /dev/null +++ b/asterixdb/asterix-hivecompat/src/main/appended-resources/META-INF/LICENSE @@ -0,0 +1,9 @@ +=== + AsterixDB includes source code with separate copyright notices and + license terms. Your use of this source code is subject to the terms + and condition of the following licenses. +=== + Source files org/apache/asterix/hivecompat/io/* are derived from portions + of Apache Hive Query Language v0.13.0 (org.apache.hive:hive-exec), + made available under The Apache License, Version 2.0: +--- diff --git a/asterixdb/asterix-installer/pom.xml b/asterixdb/asterix-installer/pom.xml index d0b84ae..c8aa0a8 100644 --- a/asterixdb/asterix-installer/pom.xml +++ b/asterixdb/asterix-installer/pom.xml @@ -54,13 +54,14 @@ + ${basedir}/../src/main/licenses/templates -
Change in asterixdb[master]: Replace Servlets with Netty Based HTTP Servers
Michael Blow has posted comments on this change. Change subject: Replace Servlets with Netty Based HTTP Servers .. Patch Set 1: (5 comments) (partial review) https://asterix-gerrit.ics.uci.edu/#/c/1429/1/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiLet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiLet.java: Line 109: hds = (IHyracksDataset) map.get(HYRACKS_DATASET_ATTR); This is not thread safe, this can return a partially initialized IHyracksDataset as coded here. https://asterix-gerrit.ics.uci.edu/#/c/1429/1/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiLet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiLet.java: Line 128: requestURL.append(request.getHeader(HttpHeaderNames.HOST.toString())); Update getHeader(String) -> getHeader(CharSequence)? https://asterix-gerrit.ics.uci.edu/#/c/1429/1/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ILet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ILet.java: Line 23: public interface ILet { Why Let? Seems a little too nondescript. Can we stick with Servlet, or use Httplet, Weblet, something...? https://asterix-gerrit.ics.uci.edu/#/c/1429/1/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ILetResponse.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ILetResponse.java: Line 83: response.addHeader(HttpHeaderNames.CONTENT_TYPE, type + "; charset=" + charset); It seems this won't do the right thing if setCharacterEndoding/setContentType() is called twice, as addHeader seems additive... https://asterix-gerrit.ics.uci.edu/#/c/1429/1/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiLet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryStatusApiLet.java: Line 60: hds = (IHyracksDataset) map.get(HYRACKS_DATASET_ATTR); This is not thread safe, this can return a partially initialized IHyracksDataset as coded here. -- To view, visit https://asterix-gerrit.ics.uci.edu/1429 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3d552d4eb8c868535ca4c41cbcf7e352217b18ae Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-HasComments: Yes
Change in asterixdb[master]: Add Record Literal and Byte Array Value Reference
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1098 to look at the new patch set (#3). Change subject: Add Record Literal and Byte Array Value Reference .. Add Record Literal and Byte Array Value Reference This change include 3 different parts: 1. It introduced record literals in order to enable the use of constant records as function input. 2. It introduces ByteArrayValueReference which is a mutable reference that can be wrapped around byte[]. 3. It improves the Schemaless record serializer deserializer. Change-Id: I25c5054a361128a3bee4241d7b9b40da7e61373f --- M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ConstantHelper.java M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Literal.java A asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/RecordLiteral.java M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/LangRecordParseUtil.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/ARecordSerializerDeserializer.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ARecord.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/util/ConstantExpressionUtil.java A hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/accessors/ByteArrayValueReference.java 8 files changed, 151 insertions(+), 8 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/98/1098/3 -- To view, visit https://asterix-gerrit.ics.uci.edu/1098 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I25c5054a361128a3bee4241d7b9b40da7e61373f Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Yingyi Bu
Change in asterixdb[master]: Improved Error Reporting When Repsonse Is Non-JSON
Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1099 Change subject: Improved Error Reporting When Repsonse Is Non-JSON .. Improved Error Reporting When Repsonse Is Non-JSON Change-Id: I2d27945a1d39bdc3304abcb8fd75c5173aee74c4 --- M asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java 1 file changed, 17 insertions(+), 8 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/99/1099/1 diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java index 3321065..47290e7 100644 --- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java +++ b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java @@ -58,6 +58,7 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.StandardHttpRequestRetryHandler; import org.apache.http.util.EntityUtils; +import org.json.JSONException; import org.json.JSONObject; public class TestExecutor { @@ -267,14 +268,22 @@ // In future this may be changed depending on the requested // output format sent to the servlet. String errorBody = EntityUtils.toString(httpResponse.getEntity()); -JSONObject result = new JSONObject(errorBody); -String[] errors = { result.getJSONArray("error-code").getString(0), result.getString("summary"), -result.getString("stacktrace") }; -GlobalConfig.ASTERIX_LOGGER.log(Level.SEVERE, errors[2]); -String exceptionMsg = "HTTP operation failed: " + errors[0] -+ "\nSTATUS LINE: " + httpResponse.getStatusLine() -+ "\nSUMMARY: " + errors[1] + "\nSTACKTRACE: " + errors[2]; -throw new Exception(exceptionMsg); +try { +JSONObject result = new JSONObject(errorBody); +String[] errors = {result.getJSONArray("error-code").getString(0), result.getString("summary"), +result.getString("stacktrace")}; +GlobalConfig.ASTERIX_LOGGER.log(Level.SEVERE, errors[2]); +String exceptionMsg = "HTTP operation failed: " + errors[0] ++ "\nSTATUS LINE: " + httpResponse.getStatusLine() ++ "\nSUMMARY: " + errors[1] + "\nSTACKTRACE: " + errors[2]; +throw new Exception(exceptionMsg); +} catch (JSONException e) { +GlobalConfig.ASTERIX_LOGGER.log(Level.SEVERE, errorBody); +String exceptionMsg = "HTTP operation failed: response is not valid-JSON (see nested exception)" ++ "\nSTATUS LINE: " + httpResponse.getStatusLine() ++ "\nERROR_BODY: " + errorBody; +throw new Exception(exceptionMsg, e); +} } return httpResponse; } -- To view, visit https://asterix-gerrit.ics.uci.edu/1099 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d27945a1d39bdc3304abcb8fd75c5173aee74c4 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow
Change in asterixdb[master]: some WebUI hackery
Michael Blow has posted comments on this change. Change subject: some WebUI hackery .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1097 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I32361a523e656c62a6bc878b1eed9750579097f9 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: Add Record Literal and Byte Array Value Reference
Michael Blow has posted comments on this change. Change subject: Add Record Literal and Byte Array Value Reference .. Patch Set 2: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/1098/2/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/RecordLiteral.java File asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/literal/RecordLiteral.java: Line 47: return super.equals(o) && ObjectUtils.equals(record, ((RecordLiteral) o).record); these two checks are redundant -- To view, visit https://asterix-gerrit.ics.uci.edu/1098 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I25c5054a361128a3bee4241d7b9b40da7e61373f Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: Yes
Change in asterixdb[master]: Make setupQueryWebServer Accessible From Extensions
Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1100 Change subject: Make setupQueryWebServer Accessible From Extensions .. Make setupQueryWebServer Accessible From Extensions Change-Id: Iaf5f86cb133d7b135a8edb621b97a7794014aefc --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/00/1100/1 diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java index 1e40d837..6a2456d 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java @@ -18,9 +18,6 @@ */ package org.apache.asterix.hyracks.bootstrap; -import static org.apache.asterix.api.http.servlet.ServletConstants.ASTERIX_BUILD_PROP_ATTR; -import static org.apache.asterix.api.http.servlet.ServletConstants.HYRACKS_CONNECTION_ATTR; - import java.util.ArrayList; import java.util.List; import java.util.logging.Level; @@ -29,7 +26,6 @@ import javax.servlet.Servlet; import org.apache.asterix.api.http.servlet.APIServlet; -import org.apache.asterix.api.http.servlet.QueryWebInterfaceServlet; import org.apache.asterix.api.http.servlet.AQLAPIServlet; import org.apache.asterix.api.http.servlet.ClusterAPIServlet; import org.apache.asterix.api.http.servlet.ConnectorAPIServlet; @@ -39,6 +35,7 @@ import org.apache.asterix.api.http.servlet.QueryResultAPIServlet; import org.apache.asterix.api.http.servlet.QueryServiceServlet; import org.apache.asterix.api.http.servlet.QueryStatusAPIServlet; +import org.apache.asterix.api.http.servlet.QueryWebInterfaceServlet; import org.apache.asterix.api.http.servlet.ShutdownAPIServlet; import org.apache.asterix.api.http.servlet.UpdateAPIServlet; import org.apache.asterix.api.http.servlet.VersionAPIServlet; @@ -71,6 +68,9 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; + +import static org.apache.asterix.api.http.servlet.ServletConstants.ASTERIX_BUILD_PROP_ATTR; +import static org.apache.asterix.api.http.servlet.ServletConstants.HYRACKS_CONNECTION_ATTR; public class CCApplicationEntryPoint implements ICCApplicationEntryPoint { @@ -218,7 +218,7 @@ return jsonAPIServer; } -private Server setupQueryWebServer(AsterixExternalProperties externalProperties) throws Exception { +protected Server setupQueryWebServer(AsterixExternalProperties externalProperties) throws Exception { Server queryWebServer = new Server(externalProperties.getQueryWebInterfacePort()); -- To view, visit https://asterix-gerrit.ics.uci.edu/1100 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf5f86cb133d7b135a8edb621b97a7794014aefc Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow
Change in asterixdb[master]: Add tests for ASTERIXDB-1300
Michael Blow has posted comments on this change. Change subject: Add tests for ASTERIXDB-1300 .. Patch Set 1: TRIGGER asterix-gerrit-integration-tests -- To view, visit https://asterix-gerrit.ics.uci.edu/1093 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I797bdb37fda1c29c9cfc45efb6fbcba4e7b6c29e Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Jianfeng JiaGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: RangeGenerator aggfunc for the numeric/asciiString datatype ...
Michael Blow has posted comments on this change. Change subject: RangeGenerator aggfunc for the numeric/asciiString datatype based on parallel streaming histogram. The following commits from your working branch will be included: .. Patch Set 41: TRIGGER asterix-gerrit-integration-tests -- To view, visit https://asterix-gerrit.ics.uci.edu/806 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I450d0962fbeacfb2b6ab9fae0750f025ef17ba01 Gerrit-PatchSet: 41 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Wenhai LiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Jianfeng Jia Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Preston Carman Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Wenhai Li Gerrit-Reviewer: Yingyi Bu Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: Read Test Resources as UTF-8
Hello Till Westmann, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1090 to look at the new patch set (#2). Change subject: Read Test Resources as UTF-8 .. Read Test Resources as UTF-8 Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06 --- M asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/90/1090/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1090 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: Read Test Resources as UTF-8
Michael Blow has submitted this change and it was merged. Change subject: Read Test Resources as UTF-8 .. Read Test Resources as UTF-8 Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1090 Sonar-Qube: JenkinsReviewed-by: Till Westmann Tested-by: Jenkins --- M asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified; No violations found diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java index 45a5fc4..3321065 100644 --- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java +++ b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java @@ -23,7 +23,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintWriter; @@ -423,8 +422,9 @@ // and returns the contents as a string // This string is later passed to REST API for execution. public String readTestFile(File testFile) throws Exception { -BufferedReader reader = new BufferedReader(new FileReader(testFile)); -String line = null; +BufferedReader reader = +new BufferedReader(new InputStreamReader(new FileInputStream(testFile), StandardCharsets.UTF_8)); +String line; StringBuilder stringBuilder = new StringBuilder(); String ls = System.getProperty("line.separator"); while ((line = reader.readLine()) != null) { -- To view, visit https://asterix-gerrit.ics.uci.edu/1090 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e0bfe916632a7783decd84420bba38ec3efac06 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: drop support for HTTP GET
Michael Blow has posted comments on this change. Change subject: drop support for HTTP GET .. Patch Set 3: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1088 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5f922ea1524ba1f07efcb081769b2bbbfeabe1f2 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: No
Change in asterixdb[master]: ASTERIXDB-1571: fix and add regression tests
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1075 to look at the new patch set (#4). Change subject: ASTERIXDB-1571: fix and add regression tests .. ASTERIXDB-1571: fix and add regression tests - also fix the left outer type propagation policy Change-Id: I45d6dbabdef709c9ba3cb883412301ab7fd69a85 --- A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-2/query-ASTERIXDB-1571-2.1.ddl.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-2/query-ASTERIXDB-1571-2.2.update.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-2/query-ASTERIXDB-1571-2.3.query.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-3/query-ASTERIXDB-1571-3.1.ddl.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-3/query-ASTERIXDB-1571-3.2.update.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-3/query-ASTERIXDB-1571-3.3.query.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-4/query-ASTERIXDB-1571-4.1.ddl.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-4/query-ASTERIXDB-1571-4.2.update.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571-4/query-ASTERIXDB-1571-4.3.query.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571/query-ASTERIXDB-1571.1.ddl.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571/query-ASTERIXDB-1571.2.update.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/subquery/query-ASTERIXDB-1571/query-ASTERIXDB-1571.3.query.sqlpp A asterixdb/asterix-app/src/test/resources/runtimets/results/subquery/query-ASTERIXDB-1571-3/query-ASTERIXDB-1571-3.1.adm A asterixdb/asterix-app/src/test/resources/runtimets/results/subquery/query-ASTERIXDB-1571-4/query-ASTERIXDB-1571-4.1.adm A asterixdb/asterix-app/src/test/resources/runtimets/results/subquery/query-ASTERIXDB-1571/query-ASTERIXDB-1571.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml M asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/DeepCopyVisitor.java M asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppAstPrintVisitor.java M asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppFormatPrintVisitor.java M hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/TypePropagationPolicy.java 20 files changed, 392 insertions(+), 2 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/75/1075/4 -- To view, visit https://asterix-gerrit.ics.uci.edu/1075 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I45d6dbabdef709c9ba3cb883412301ab7fd69a85 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Yingyi BuGerrit-Reviewer: Jenkins Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: Log exception on managix failure
Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1080 Change subject: Log exception on managix failure .. Log exception on managix failure Change-Id: I108be36c531ddceebf976e7cbe44e957ef2b7340 --- M asterixdb/asterix-installer/src/main/java/org/apache/asterix/installer/driver/InstallerDriver.java 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/80/1080/1 diff --git a/asterixdb/asterix-installer/src/main/java/org/apache/asterix/installer/driver/InstallerDriver.java b/asterixdb/asterix-installer/src/main/java/org/apache/asterix/installer/driver/InstallerDriver.java index 61e7916..00648be 100644 --- a/asterixdb/asterix-installer/src/main/java/org/apache/asterix/installer/driver/InstallerDriver.java +++ b/asterixdb/asterix-installer/src/main/java/org/apache/asterix/installer/driver/InstallerDriver.java @@ -23,14 +23,13 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.Unmarshaller; -import org.apache.log4j.Logger; - import org.apache.asterix.event.service.AsterixEventService; import org.apache.asterix.event.service.ILookupService; import org.apache.asterix.event.service.ServiceProvider; import org.apache.asterix.installer.command.CommandHandler; import org.apache.asterix.installer.command.ConfigureCommand; import org.apache.asterix.installer.schema.conf.Configuration; +import org.apache.log4j.Logger; public class InstallerDriver { @@ -96,10 +95,11 @@ LOGGER.error("Unknown command"); printUsage(); } catch (Exception e) { -LOGGER.error(e.getMessage()); if (e.getMessage() == null || e.getMessage().length() < 10) { // less than 10 characters of error message is probably not enough -e.printStackTrace(); +LOGGER.error(e.toString(), e); +} else { +LOGGER.error(e.getMessage(), e); } } } -- To view, visit https://asterix-gerrit.ics.uci.edu/1080 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I108be36c531ddceebf976e7cbe44e957ef2b7340 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow
Change in asterixdb[master]: Log exception on managix failure
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1080 to look at the new patch set (#2). Change subject: Log exception on managix failure .. Log exception on managix failure Double tick interval to 2s Change-Id: I108be36c531ddceebf976e7cbe44e957ef2b7340 --- M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ZooKeeperService.java M asterixdb/asterix-installer/src/main/java/org/apache/asterix/installer/driver/InstallerDriver.java 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/80/1080/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1080 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I108be36c531ddceebf976e7cbe44e957ef2b7340 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins
Change in asterixdb[master]: Fulltext search initial implementation
Michael Blow has posted comments on this change. Change subject: Fulltext search initial implementation .. Patch Set 14: (11 comments) Also, +1 on the SonarQube comments- seems there are a lot of good ones there that we should address. https://asterix-gerrit.ics.uci.edu/#/c/989/14/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj File asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj: Line 1741: op.addOperand(operand); indent Line 1742: op.setCurrentop(true); indent Line 1744: try{ missing space https://asterix-gerrit.ics.uci.edu/#/c/989/14/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java: Line 249: public final static FunctionIdentifier STRING_CONTAINS = new FunctionIdentifier(FunctionConstants.ASTERIX_NS, revert static final -> final static Line 251: public final static FunctionIdentifier STRING_STARTS_WITH = new FunctionIdentifier(FunctionConstants.ASTERIX_NS, revert static final -> final static Line 429: public final static FunctionIdentifier EDIT_DISTANCE_STRING_CONTAINS = new FunctionIdentifier(FunctionConstants.ASTERIX_NS, revert static final -> final static https://asterix-gerrit.ics.uci.edu/#/c/989/14/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/util/AsterixConstantExpressionUtil.java File asterixdb/asterix-om/src/main/java/org/apache/asterix/om/util/AsterixConstantExpressionUtil.java: Line 51: if (b) { inline? i.e. return new ConstantExpression(new AsterixConstantValue(b ? ABoolean.TRUE : ABoolean.FALSE) https://asterix-gerrit.ics.uci.edu/#/c/989/14/hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/BinaryHashSet.java File hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/util/BinaryHashSet.java: Line 298: return hasNextElement(false); hasNext() should be a no-op if next() has not been called since the last hasNext() was called. Line 362: return val; This seems scary- if we call next() without calling hasNext(), we'll get the same entry twice. Should we set some state and call hasNext() throwing if it is false? https://asterix-gerrit.ics.uci.edu/#/c/989/14/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/SerializableHashTable.java File hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/SerializableHashTable.java: Line 459: return hasNextEntry(false); hasNext() should be a no-op if next() has not been called since the last hasNext() was called. Line 588: return currentTuplePointer; same comment as in other iterator- seems scary to not guard against forgetting to call hasNext(). -- To view, visit https://asterix-gerrit.ics.uci.edu/989 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I71887c2ea847e4488f4c98a11f8a5bcad02cac5a Gerrit-PatchSet: 14 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Taewoo KimGerrit-Reviewer: Heri Ramampiaro Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Jianfeng Jia Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Taewoo Kim Gerrit-Reviewer: Till Westmann Gerrit-HasComments: Yes
Change in asterixdb[master]: Compile a plan that matches user query in the case of nonpur...
Michael Blow has posted comments on this change. Change subject: Compile a plan that matches user query in the case of nonpure functions .. Patch Set 3: Code-Review+1 I don't see any issues other than a number of the SonarQube comments would be good to address; I would prefer someone who understands the optimizer to look it over. -- To view, visit https://asterix-gerrit.ics.uci.edu/1057 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2dec322b30835625430c06acd7626d902bada137 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Steven JacobsGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Steven Jacobs Gerrit-HasComments: No
Change in asterixdb[master]: Log exception on managix failure
Michael Blow has abandoned this change. Change subject: Log exception on managix failure .. Abandoned -- To view, visit https://asterix-gerrit.ics.uci.edu/1080 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I108be36c531ddceebf976e7cbe44e957ef2b7340 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins
Change in asterixdb[master]: some code reduction/cleanup
Michael Blow has posted comments on this change. Change subject: some code reduction/cleanup .. Patch Set 8: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/916 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I179a16fc183bd50d5d58cc12321234df1615abfd Gerrit-PatchSet: 8 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Cameron Samak Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: Make setupQueryWebServer Accessible From Extensions
Michael Blow has submitted this change and it was merged. Change subject: Make setupQueryWebServer Accessible From Extensions .. Make setupQueryWebServer Accessible From Extensions Change-Id: Iaf5f86cb133d7b135a8edb621b97a7794014aefc Reviewed-on: https://asterix-gerrit.ics.uci.edu/1100 Sonar-Qube: JenkinsTested-by: Jenkins Integration-Tests: Jenkins Reviewed-by: Till Westmann --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified; No violations found; Verified diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java index 1e40d837..6a2456d 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java @@ -18,9 +18,6 @@ */ package org.apache.asterix.hyracks.bootstrap; -import static org.apache.asterix.api.http.servlet.ServletConstants.ASTERIX_BUILD_PROP_ATTR; -import static org.apache.asterix.api.http.servlet.ServletConstants.HYRACKS_CONNECTION_ATTR; - import java.util.ArrayList; import java.util.List; import java.util.logging.Level; @@ -29,7 +26,6 @@ import javax.servlet.Servlet; import org.apache.asterix.api.http.servlet.APIServlet; -import org.apache.asterix.api.http.servlet.QueryWebInterfaceServlet; import org.apache.asterix.api.http.servlet.AQLAPIServlet; import org.apache.asterix.api.http.servlet.ClusterAPIServlet; import org.apache.asterix.api.http.servlet.ConnectorAPIServlet; @@ -39,6 +35,7 @@ import org.apache.asterix.api.http.servlet.QueryResultAPIServlet; import org.apache.asterix.api.http.servlet.QueryServiceServlet; import org.apache.asterix.api.http.servlet.QueryStatusAPIServlet; +import org.apache.asterix.api.http.servlet.QueryWebInterfaceServlet; import org.apache.asterix.api.http.servlet.ShutdownAPIServlet; import org.apache.asterix.api.http.servlet.UpdateAPIServlet; import org.apache.asterix.api.http.servlet.VersionAPIServlet; @@ -71,6 +68,9 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; + +import static org.apache.asterix.api.http.servlet.ServletConstants.ASTERIX_BUILD_PROP_ATTR; +import static org.apache.asterix.api.http.servlet.ServletConstants.HYRACKS_CONNECTION_ATTR; public class CCApplicationEntryPoint implements ICCApplicationEntryPoint { @@ -218,7 +218,7 @@ return jsonAPIServer; } -private Server setupQueryWebServer(AsterixExternalProperties externalProperties) throws Exception { +protected Server setupQueryWebServer(AsterixExternalProperties externalProperties) throws Exception { Server queryWebServer = new Server(externalProperties.getQueryWebInterfacePort()); -- To view, visit https://asterix-gerrit.ics.uci.edu/1100 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf5f86cb133d7b135a8edb621b97a7794014aefc Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: ASTERIXDB-1516: Unable to find free page in buffer cache aft...
Michael Blow has submitted this change and it was merged. Change subject: ASTERIXDB-1516: Unable to find free page in buffer cache after 3 cycles .. ASTERIXDB-1516: Unable to find free page in buffer cache after 3 cycles Update exhaustion logic to be two-tiered: - emit warning when cycle count exceeds warning threshold (3) - fail if cycle count reaches the failure threshold (1000) Change-Id: I46fa6bbda8c2f81e5e570dd6c07e4f4b794ef5bb Reviewed-on: https://asterix-gerrit.ics.uci.edu/1038 Tested-by: JenkinsIntegration-Tests: Jenkins Reviewed-by: Murtadha Hubail --- M hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java 1 file changed, 392 insertions(+), 417 deletions(-) Approvals: Murtadha Hubail: Looks good to me, approved Jenkins: Verified; Verified Objections: Jenkins: Violations found diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java index 080c76f..1b75f94 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java @@ -37,7 +37,6 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import java.util.function.Supplier; import java.util.logging.Level; import java.util.logging.Logger; @@ -57,7 +56,8 @@ private static final int MIN_CLEANED_COUNT_DIFF = 3; private static final int PIN_MAX_WAIT_TIME = 50; -private static final int MAX_PIN_ATTEMPT_CYCLES = 3; +private static final int PIN_ATTEMPT_CYCLES_WARNING_THRESHOLD = 3; +private static final int MAX_PIN_ATTEMPT_CYCLES = 1000; public static final boolean DEBUG = false; private final int pageSize; @@ -107,7 +107,7 @@ closed = false; fifoWriter = new AsyncFIFOPageQueueManager(this); -if( DEBUG ) { +if ( DEBUG ) { confiscatedPages = new ArrayList<>(); confiscatedPagesOwner = new HashMap<>(); confiscateLock = new ReentrantLock(); @@ -200,7 +200,7 @@ throw new IllegalStateException(); } } -} finally{ +} finally { confiscateLock.unlock(); } } @@ -216,267 +216,227 @@ cPage.valid = true; } pageReplacementStrategy.notifyCachePageAccess(cPage); -if(DEBUG){ +if (DEBUG){ pinnedPageOwner.put(cPage, Thread.currentThread().getStackTrace()); } return cPage; } private CachedPage findPage(long dpid) throws HyracksDataException { +return (CachedPage) getPageLoop(dpid, -1, false); +} -for (int i = 0; i < MAX_PIN_ATTEMPT_CYCLES; i++) { -int startCleanedCount = cleanerThread.cleanedCount; - -CachedPage cPage = null; +private ICachedPage findPageInner(long dpid) { +CachedPage cPage; +/* + * Hash dpid to get a bucket and then check if the page exists in + * the bucket. + */ +int hash = hash(dpid); +CacheBucket bucket = pageMap[hash]; +bucket.bucketLock.lock(); +try { +cPage = bucket.cachedPage; +while (cPage != null) { +if (DEBUG) { +assert bucket.cachedPage != bucket.cachedPage.next; +} +if (cPage.dpid == dpid) { +if (DEBUG) { +assert !cPage.confiscated.get(); +} +cPage.pinCount.incrementAndGet(); +return cPage; +} +cPage = cPage.next; +} +} finally { +bucket.bucketLock.unlock(); +} +/* + * If we got here, the page was not in the hash table. Now we ask + * the page replacement strategy to find us a victim. + */ +CachedPage victim = (CachedPage) pageReplacementStrategy.findVictim(); +if (victim == null) { +return null; +} +/* + * We have a victim with the following invariants. 1. The dpid + * on the CachedPage may or may not be valid. 2. We have a pin + * on the CachedPage. We have to deal with three cases here. + * Case 1: The dpid on the CachedPage is invalid (-1). This +
Change in asterixdb[master]: ASTERIXDB-1516: Unable to find free page in buffer cache aft...
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1038 to look at the new patch set (#3). Change subject: ASTERIXDB-1516: Unable to find free page in buffer cache after 3 cycles .. ASTERIXDB-1516: Unable to find free page in buffer cache after 3 cycles Update exhaustion logic to be two-tiered: - emit warning when cycle count exceeds warning threshold (3) - fail if cycle count reaches the failure threshold (1000) Change-Id: I46fa6bbda8c2f81e5e570dd6c07e4f4b794ef5bb --- M hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java 1 file changed, 392 insertions(+), 417 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/38/1038/3 -- To view, visit https://asterix-gerrit.ics.uci.edu/1038 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I46fa6bbda8c2f81e5e570dd6c07e4f4b794ef5bb Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: Yingyi Bu
Change in asterixdb[master]: Make Xmx small on 32bit JVM
Michael Blow has posted comments on this change. Change subject: Make Xmx small on 32bit JVM .. Patch Set 9: Code-Review+2 (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/1521/8/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCService.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCService.java: PS8, Line 128: (proportionalRamSize <= 1024 ? proportionalRamSize : 1024) > There's no method call for Math.min(). I'm a little sad we didn't put back Math.min() since we spun another patch... -- To view, visit https://asterix-gerrit.ics.uci.edu/1521 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I025174fc2ca53e8d15ed53fac31b43bea3ddf281 Gerrit-PatchSet: 9 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian MaxonGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: Yes
Change in asterixdb[master]: Introduced new storage format bit, which signifies if the tu...
Michael Blow has posted comments on this change. Change subject: Introduced new storage format bit, which signifies if the tuple in BTree was updated in-place .. Patch Set 2: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/1538/2//COMMIT_MSG Commit Message: PS2, Line 7: Introduced new storage format bit, which signifies if the tuple in BTree was updated in-place Please limit subject to 50 characters, and capitalize each word. Subsequent lines should be wrapped at 72 characters. -- To view, visit https://asterix-gerrit.ics.uci.edu/1538 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I12a67eff8431b52d1f9051b793a5a64b15c009e9 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ildar AbsalyamovGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-HasComments: Yes
Change in asterixdb[master]: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#35). Change subject: Configuration Revamp .. Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections as appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] - Sort properties alphabetically when returned by HTTP api Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NodeControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/util/FaultToleranceUtil.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestHelper.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java M asterixdb/asterix-app/src/test/resources/runtimets/api.xml A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml D asterixdb/asterix-app/src/test/resources/runtimets/queries/api/replication/replication.1.get.http M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm D asterixdb/asterix-app/src/test/resources/runtimets/results/api/replication/replication.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/IPropertiesProvider.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M
Change in asterixdb[master]: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#37). Change subject: Configuration Revamp .. Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections as appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] - Sort properties alphabetically when returned by HTTP api Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NodeControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/util/FaultToleranceUtil.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java A asterixdb/asterix-app/src/test/java/org/apache/asterix/common/config/ConfigUsageTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestHelper.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java M asterixdb/asterix-app/src/test/resources/runtimets/api.xml A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml D asterixdb/asterix-app/src/test/resources/runtimets/queries/api/replication/replication.1.get.http M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm D asterixdb/asterix-app/src/test/resources/runtimets/results/api/replication/replication.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/IPropertiesProvider.java M
Change in asterixdb[master]: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#38). Change subject: Configuration Revamp .. Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections as appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] - Sort properties alphabetically when returned by HTTP api Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NodeControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/util/FaultToleranceUtil.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java A asterixdb/asterix-app/src/test/java/org/apache/asterix/common/config/ConfigUsageTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestHelper.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java M asterixdb/asterix-app/src/test/resources/runtimets/api.xml A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml D asterixdb/asterix-app/src/test/resources/runtimets/queries/api/replication/replication.1.get.http M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm D asterixdb/asterix-app/src/test/resources/runtimets/results/api/replication/replication.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/IPropertiesProvider.java M
Change in asterixdb[master]: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#36). Change subject: Configuration Revamp .. Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections as appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] - Sort properties alphabetically when returned by HTTP api Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NodeControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/util/FaultToleranceUtil.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestHelper.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java M asterixdb/asterix-app/src/test/resources/runtimets/api.xml A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml D asterixdb/asterix-app/src/test/resources/runtimets/queries/api/replication/replication.1.get.http M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm D asterixdb/asterix-app/src/test/resources/runtimets/results/api/replication/replication.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/IPropertiesProvider.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M
Change in asterixdb[master]: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#31). Change subject: Configuration Revamp .. Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections as appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] - Sort properties alphabetically when returned by HTTP api Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NodeControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/util/FaultToleranceUtil.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestHelper.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java M asterixdb/asterix-app/src/test/resources/runtimets/api.xml A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml D asterixdb/asterix-app/src/test/resources/runtimets/queries/api/replication/replication.1.get.http M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm D asterixdb/asterix-app/src/test/resources/runtimets/results/api/replication/replication.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java C asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCCConfig.java A asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixNCConfig.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M
Change in asterixdb[master]: Make Xmx small on 32bit JVM
Michael Blow has posted comments on this change. Change subject: Make Xmx small on 32bit JVM .. Patch Set 8: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/1521/8/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCService.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCService.java: PS8, Line 128: (proportionalRamSize <= 1024 ? proportionalRamSize : 1024) > I had that originally but I changed it due to Yingyi's comment. It does sav There's no method call for Math.min(). -- To view, visit https://asterix-gerrit.ics.uci.edu/1521 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I025174fc2ca53e8d15ed53fac31b43bea3ddf281 Gerrit-PatchSet: 8 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian MaxonGerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Xikui Wang Gerrit-Reviewer: Yingyi Bu Gerrit-HasComments: Yes
Change in asterixdb[master]: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#32). Change subject: Configuration Revamp .. Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections as appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] - Sort properties alphabetically when returned by HTTP api Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NodeControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/util/FaultToleranceUtil.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestHelper.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java M asterixdb/asterix-app/src/test/resources/runtimets/api.xml A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml D asterixdb/asterix-app/src/test/resources/runtimets/queries/api/replication/replication.1.get.http M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm D asterixdb/asterix-app/src/test/resources/runtimets/results/api/replication/replication.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/IPropertiesProvider.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M
Change in asterixdb[master]: Configuration Revamp
Michael Blow has posted comments on this change. Change subject: Configuration Revamp .. Patch Set 30: (2 comments) https://asterix-gerrit.ics.uci.edu/#/c/1487/30/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java: PS30, Line 126: getCCConfig > i.e. shouldn't it already, since we had it registerConfigOptions with it, o Done https://asterix-gerrit.ics.uci.edu/#/c/1487/30/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm File asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm: PS30, Line 7: config > Where do we find the missing info? ports have moved to CC config; storage, core dump dirs, txn log dirs have moved to NC config. the following configs aren't returned by the API any longer, as they are derived. We can restore these if desired: - partition info - node stores -- To view, visit https://asterix-gerrit.ics.uci.edu/1487 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 Gerrit-PatchSet: 30 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-HasComments: Yes
Change in asterixdb[master]: Configuration Revamp
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1487 to look at the new patch set (#33). Change subject: Configuration Revamp .. Configuration Revamp - Ini section of node / cc details now returns ini param names instead of managix option names - Normalized command line -vs- ini file configuration parameter names - Eliminated unused parameters - Ini validation - Migrate *DB parameters out of [app] and into nc / cc sections as appropriate - Eliminate [app] section. Cluster-wide configuration lives in [common] - Sort properties alphabetically when returned by HTTP api Change-Id: I95b7e0bd4538ef42817c8826e76412150074b754 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/scripts/asterix/startnc.sh M asterixdb/asterix-app/scripts/idefix/startnc1.sh M asterixdb/asterix-app/scripts/idefix/startnc2.sh M asterixdb/asterix-app/scripts/rainbow/startnc.sh M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ClusterControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/DiagnosticsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NodeControllerDetailsApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/VersionApiServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ServletConstants.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/util/FaultToleranceUtil.java M asterixdb/asterix-app/src/main/resources/asterix-build-configuration.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/VersionApiServletTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestHelper.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/OptimizerParserTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/SmokeParserTest.java M asterixdb/asterix-app/src/test/resources/runtimets/api.xml A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/APIQueries.xml D asterixdb/asterix-app/src/test/resources/runtimets/queries/api/replication/replication.1.get.http M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.adm D asterixdb/asterix-app/src/test/resources/runtimets/results/api/replication/replication.1.adm M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-common/pom.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/BuildProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/FeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/IPropertiesProvider.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/MessagingProperties.java M
Change in asterixdb[master]: Configuration Revamp
Michael Blow has posted comments on this change. Change subject: Configuration Revamp .. Patch Set 30: (27 comments) https://asterix-gerrit.ics.uci.edu/#/c/1487/30/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java: PS30, Line 126: getCCConfig > Does the ICCApplicationEntryPoint know about the config manager? i.e. shouldn't it already, since we had it registerConfigOptions with it, or that it seems wrong that it should? https://asterix-gerrit.ics.uci.edu/#/c/1487/30/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java File asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ClusterStateDefaultParameterTest.java: PS30, Line 68: /node/asterix_nc1/config > How did the HTTP API change here? These are NC options now, reported under the NC config, not [app] options (i.e. global) as before. https://asterix-gerrit.ics.uci.edu/#/c/1487/30/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java File asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java: PS30, Line 21: .*; > Resolve '*' includes? Done https://asterix-gerrit.ics.uci.edu/#/c/1487/30/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java File asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/ExternalProperties.java: PS30, Line 63: CC > Is this correct? No, and neither is NC; same goes for CC above for CC_JAVA_OPTS. These are options only used by asterix-configuration.xml & managix, and are not used in the ncservice world. I've introduced a new section type (NULL) for these. It's possible these should be merged with virtual options. https://asterix-gerrit.ics.uci.edu/#/c/1487/30/asterixdb/asterix-events/src/main/resources/events/node_join/nc_join.sh File asterixdb/asterix-events/src/main/resources/events/node_join/nc_join.sh: PS30, Line 24: > fix WS? Done PS30, Line 25: > fix WS? Done https://asterix-gerrit.ics.uci.edu/#/c/1487/30/asterixdb/asterix-events/src/main/resources/events/node_restart/nc_restart.sh File asterixdb/asterix-events/src/main/resources/events/node_restart/nc_restart.sh: PS30, Line 26: > fix WS? Done https://asterix-gerrit.ics.uci.edu/#/c/1487/30/hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/util/AlgebricksHyracksIntegrationUtil.java File hyracks-fullstack/algebricks/algebricks-tests/src/test/java/org/apache/hyracks/algebricks/tests/util/AlgebricksHyracksIntegrationUtil.java: PS30, Line 66: data > line too long? Done PS30, Line 78: data > line too long? Done https://asterix-gerrit.ics.uci.edu/#/c/1487/30/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IOption.java File hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/config/IOption.java: PS30, Line 24: IOption > I think that we need some javadoc here - especially on "hidden" and "virtua Done PS30, Line 52: defaultValue > Not a big fan of default implementations - especially if they get complicat Done PS30, Line 67: usage > Not a big fan of default implementations - especially if they get complicat Done https://asterix-gerrit.ics.uci.edu/#/c/1487/30/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/ICCContext.java File hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/ICCContext.java: PS30, Line 37: getConfigManager > Do we need to get the config manager from the ICCContext? It seems that the Done https://asterix-gerrit.ics.uci.edu/#/c/1487/30/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java: PS30, Line 147: aep > Validate that the now necessary AEP is not null? Done https://asterix-gerrit.ics.uci.edu/#/c/1487/30/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/OptionMarker.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/OptionMarker.java: PS30, Line 32: setter > Add an example? Setters is not implemented, doc updated. https://asterix-gerrit.ics.uci.edu/#/c/1487/30/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java: PS30, Line
Change in asterixdb[master]: Test SonarQube Scan For JavaScript Files
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1102 to look at the new patch set (#2). Change subject: Test SonarQube Scan For JavaScript Files .. Test SonarQube Scan For JavaScript Files Change-Id: I43f10cf6b352034069f9331cde5771de8bf3 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/src/main/resources/feed/smoothie.js M asterixdb/asterix-app/src/main/resources/queryui/js/angular.min.js M asterixdb/asterix-app/src/main/resources/queryui/js/aql-mode.js M asterixdb/asterix-app/src/main/resources/queryui/js/bootstrap.min.js M asterixdb/asterix-app/src/main/resources/queryui/js/codemirror.js M asterixdb/asterix-app/src/main/resources/queryui/js/javascript.js M asterixdb/asterix-app/src/main/resources/queryui/js/jquery-1.12.4.min.js M asterixdb/asterix-app/src/main/resources/queryui/js/json-formatter.min.js M asterixdb/asterix-app/src/main/resources/queryui/js/main.js M asterixdb/asterix-app/src/main/resources/queryui/js/ui-codemirror.js M asterixdb/asterix-app/src/main/resources/sdk/static/AdmAql101/js/demo.js M asterixdb/asterix-app/src/main/resources/sdk/static/js/asterix-sdk-stable.js M asterixdb/asterix-app/src/main/resources/webui/static/js/bootstrap.min.js M asterixdb/asterix-app/src/main/resources/webui/static/js/jquery.autosize-min.js M asterixdb/asterix-app/src/main/resources/webui/static/js/jquery.min.js M asterixdb/asterix-app/src/main/resources/webui/static/js/smoothie.js M asterixdb/asterix-examples/pom.xml M asterixdb/asterix-examples/src/main/resources/admaql101-demo/static/js/asterix-sdk-stable.js M asterixdb/asterix-examples/src/main/resources/admaql101-demo/static/js/bootstrap.min.js M asterixdb/asterix-examples/src/main/resources/admaql101-demo/static/js/demo.js M asterixdb/asterix-examples/src/main/resources/admaql101-demo/static/js/jquery.min.js M asterixdb/asterix-examples/src/main/resources/asterix-sdk-stable.js M asterixdb/asterix-examples/src/main/resources/tweetbook-demo/static/js/asterix-sdk-stable.js M asterixdb/asterix-examples/src/main/resources/tweetbook-demo/static/js/bootstrap.min.js M asterixdb/asterix-examples/src/main/resources/tweetbook-demo/static/js/geostats.js M asterixdb/asterix-examples/src/main/resources/tweetbook-demo/static/js/rainbowvis.js M asterixdb/asterix-examples/src/main/resources/tweetbook-demo/static/js/tweetbook.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/Graphs.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/JobDetailsPage.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/NodeDetailsPage.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/json.human.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/excanvas.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.colorhelpers.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.crosshair.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.fillbetween.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.image.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.navigate.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.pie.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.resize.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.selection.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.stack.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.symbol.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.threshold.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/jquery/jquery.min.js M
Change in asterixdb[master]: Include JavaScript Files For SonarQube Scan
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1102 to look at the new patch set (#3). Change subject: Include JavaScript Files For SonarQube Scan .. Include JavaScript Files For SonarQube Scan Change-Id: I43f10cf6b352034069f9331cde5771de8bf3 --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-examples/pom.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml 3 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/02/1102/3 -- To view, visit https://asterix-gerrit.ics.uci.edu/1102 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I43f10cf6b352034069f9331cde5771de8bf3 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins
Change in asterixdb[master]: Test SonarQube Scan For JavaScript Files
Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1102 Change subject: Test SonarQube Scan For JavaScript Files .. Test SonarQube Scan For JavaScript Files Change-Id: I43f10cf6b352034069f9331cde5771de8bf3 --- M asterixdb/asterix-app/src/main/resources/feed/smoothie.js M asterixdb/asterix-app/src/main/resources/queryui/js/angular.min.js M asterixdb/asterix-app/src/main/resources/queryui/js/aql-mode.js M asterixdb/asterix-app/src/main/resources/queryui/js/bootstrap.min.js M asterixdb/asterix-app/src/main/resources/queryui/js/codemirror.js M asterixdb/asterix-app/src/main/resources/queryui/js/javascript.js M asterixdb/asterix-app/src/main/resources/queryui/js/jquery-1.12.4.min.js M asterixdb/asterix-app/src/main/resources/queryui/js/json-formatter.min.js M asterixdb/asterix-app/src/main/resources/queryui/js/main.js M asterixdb/asterix-app/src/main/resources/queryui/js/ui-codemirror.js M asterixdb/asterix-app/src/main/resources/sdk/static/AdmAql101/js/demo.js M asterixdb/asterix-app/src/main/resources/sdk/static/js/asterix-sdk-stable.js M asterixdb/asterix-app/src/main/resources/webui/static/js/bootstrap.min.js M asterixdb/asterix-app/src/main/resources/webui/static/js/jquery.autosize-min.js M asterixdb/asterix-app/src/main/resources/webui/static/js/jquery.min.js M asterixdb/asterix-app/src/main/resources/webui/static/js/smoothie.js M asterixdb/asterix-examples/src/main/resources/admaql101-demo/static/js/asterix-sdk-stable.js M asterixdb/asterix-examples/src/main/resources/admaql101-demo/static/js/bootstrap.min.js M asterixdb/asterix-examples/src/main/resources/admaql101-demo/static/js/demo.js M asterixdb/asterix-examples/src/main/resources/admaql101-demo/static/js/jquery.min.js M asterixdb/asterix-examples/src/main/resources/asterix-sdk-stable.js M asterixdb/asterix-examples/src/main/resources/tweetbook-demo/static/js/asterix-sdk-stable.js M asterixdb/asterix-examples/src/main/resources/tweetbook-demo/static/js/bootstrap.min.js M asterixdb/asterix-examples/src/main/resources/tweetbook-demo/static/js/geostats.js M asterixdb/asterix-examples/src/main/resources/tweetbook-demo/static/js/rainbowvis.js M asterixdb/asterix-examples/src/main/resources/tweetbook-demo/static/js/tweetbook.js M asterixdb/pom.xml M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/Graphs.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/JobDetailsPage.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/NodeDetailsPage.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/json.human.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/excanvas.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.colorhelpers.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.crosshair.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.fillbetween.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.image.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.navigate.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.pie.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.resize.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.selection.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.stack.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.symbol.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/jquery.flot.threshold.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/jquery/jquery.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/jquery/plugins/jquery-ui.min.js M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/jquery/plugins/jquery.getParams.js M
Change in asterixdb[master]: Misc Cleanup, SonarQube Fixes
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1108 to look at the new patch set (#2). Change subject: Misc Cleanup, SonarQube Fixes .. Misc Cleanup, SonarQube Fixes Change-Id: If87126cdd435067a50087e339522a36021fbc2c0 --- M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceSelectAccessMethodRule.java M asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/FuzzyJoinMemory.java M asterixdb/asterix-fuzzyjoin/src/main/java/org/apache/asterix/fuzzyjoin/recordgroup/RecordGroupLengthCount.java M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/OperatorType.java M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/UnaryExprType.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/ADouble.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/AFloat.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/AbstractComplexType.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java M asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicaStateChecker.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksConnection.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TriggerNCWork.java 12 files changed, 67 insertions(+), 71 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/08/1108/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1108 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If87126cdd435067a50087e339522a36021fbc2c0 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins
Change in asterixdb[master]: Avoid NPE in AsterixHyracksIntegrationUtil.deinit
Michael Blow has submitted this change and it was merged. Change subject: Avoid NPE in AsterixHyracksIntegrationUtil.deinit .. Avoid NPE in AsterixHyracksIntegrationUtil.deinit Change-Id: I4af385918becc2dfbc40462c9505135d91ea859f Reviewed-on: https://asterix-gerrit.ics.uci.edu/1107 Sonar-Qube: JenkinsTested-by: Jenkins Integration-Tests: Jenkins Reviewed-by: Michael Blow --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Michael Blow: Looks good to me, approved Jenkins: Verified; No violations found; Verified diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java index b1bf418..03ed3c4 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java @@ -56,6 +56,7 @@ private AsterixPropertiesAccessor propertiesAccessor; public void init(boolean deleteOldInstanceData) throws Exception { +ncs = new NodeControllerService[0]; // ensure that ncs is not null propertiesAccessor = new AsterixPropertiesAccessor(); if (deleteOldInstanceData) { deleteTransactionLogs(); -- To view, visit https://asterix-gerrit.ics.uci.edu/1107 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4af385918becc2dfbc40462c9505135d91ea859f Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till Westmann Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow
Change in asterixdb[master]: Avoid NPE in AsterixHyracksIntegrationUtil.deinit
Michael Blow has posted comments on this change. Change subject: Avoid NPE in AsterixHyracksIntegrationUtil.deinit .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1107 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4af385918becc2dfbc40462c9505135d91ea859f Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: Enable ExecutionTestUtil to Handle Different IntegrationUtil...
Michael Blow has posted comments on this change. Change subject: Enable ExecutionTestUtil to Handle Different IntegrationUtil Implementations .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1105 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I34ed919b39789c2254d63961c1628dd7b60f5ff2 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: Enable ExecutionTestUtil to Handle Different IntegrationUtil...
Michael Blow has posted comments on this change. Change subject: Enable ExecutionTestUtil to Handle Different IntegrationUtil Implementations .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1105 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I34ed919b39789c2254d63961c1628dd7b60f5ff2 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: abdullah alamoudi Gerrit-HasComments: No
Change in asterixdb[master]: Extensibility, Cleanup For Client Helper
Michael Blow has submitted this change and it was merged. Change subject: Extensibility, Cleanup For Client Helper .. Extensibility, Cleanup For Client Helper Change-Id: Ifa24e952c1b49d7d3a5b971906915ae1560086c8 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1133 Sonar-Qube: JenkinsTested-by: Jenkins Reviewed-by: Till Westmann --- M asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/AsterixHelperExecution.java M asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/ClientCommand.java M asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/RemoteCommand.java 3 files changed, 17 insertions(+), 8 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified; No violations found diff --git a/asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/AsterixHelperExecution.java b/asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/AsterixHelperExecution.java index 82e8386..419e660 100644 --- a/asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/AsterixHelperExecution.java +++ b/asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/AsterixHelperExecution.java @@ -33,6 +33,7 @@ public class AsterixHelperExecution { public static final String ASTERIX_HELPER = "asterixhelper"; +public static final int COMMAND_USAGE_ALIGNMENT = 20; protected AsterixHelperExecution() { } @@ -41,7 +42,7 @@ "squid:S106", // use of System.err "squid:S1166" // rethrow or log exception }) -protected int execute(String [] argArray) throws IOException { +public int execute(String [] argArray) throws IOException { Args args = createArgs(); CmdLineParser parser = createParser(args); try { @@ -59,7 +60,7 @@ System.err.println("ERROR: " + e.getMessage() + "\n\n" + "Usage: " + getHelperCommandName() + " [options] \n\n" + "Commands:"); -printCommandUsage(System.err); +printCommandsUsage(System.err); System.err.println("Options:"); parser.printUsage(System.err); System.err.flush(); @@ -71,12 +72,20 @@ return ASTERIX_HELPER; } -protected void printCommandUsage(PrintStream out) { +protected void printCommandsUsage(PrintStream out) { for (Command command : Command.values()) { -out.println(" " + command.name().toLowerCase() + " " + command.usage()); +printCommandUsage(out, command.name(), command.usage()); } } +protected void printCommandUsage(PrintStream out, String name, String usage) { +StringBuilder padding = new StringBuilder(); +for (int i = name.length(); i < COMMAND_USAGE_ALIGNMENT; i++) { +padding.append(' '); +} +out.println(" " + name.toLowerCase() + padding.toString() + " : " + usage); +} + protected CmdLineParser createParser(Args args) { return new CmdLineParser(args, ParserProperties.defaults().withUsageWidth(120)); } diff --git a/asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/ClientCommand.java b/asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/ClientCommand.java index 734d87b..8f0cac0 100644 --- a/asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/ClientCommand.java +++ b/asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/ClientCommand.java @@ -28,9 +28,9 @@ public abstract class ClientCommand { public enum Command { -GET_CLUSTER_STATE("- Get state of cluster (errorcode 0 = UP, non-zero = DOWN)"), -WAIT_FOR_CLUSTER(" - Wait for cluster to be ready (errorcode 0 = UP, non-zero = UNKNOWN)\")"), -SHUTDOWN_CLUSTER(" - Instructs the cluster to shut down"),; +GET_CLUSTER_STATE("Get state of cluster (errorcode 0 = UP, non-zero = DOWN)"), +WAIT_FOR_CLUSTER("Wait for cluster to be ready (errorcode 0 = UP, non-zero = UNKNOWN)"), +SHUTDOWN_CLUSTER("Instructs the cluster to shut down"),; private final String usage; private static final Map nameMap = new HashMap<>(); diff --git a/asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/RemoteCommand.java b/asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/RemoteCommand.java index 1440b70..77ccbb4 100644 --- a/asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/RemoteCommand.java +++
Change in asterixdb[master]: Output From ShutdownAPIServlet; status 405 on GET
Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1136 Change subject: Output From ShutdownAPIServlet; status 405 on GET .. Output From ShutdownAPIServlet; status 405 on GET Change-Id: I3f1a7d707ebdcb2a6502bc06d35d7ed38121e472 --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java 1 file changed, 22 insertions(+), 10 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/36/1136/1 diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java index 6d8c444..dd2f799 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java @@ -19,6 +19,8 @@ package org.apache.asterix.api.http.servlet; import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; import java.util.logging.Level; import javax.servlet.ServletContext; @@ -28,7 +30,9 @@ import javax.servlet.http.HttpServletResponse; import org.apache.asterix.common.config.GlobalConfig; +import org.apache.asterix.om.util.AsterixClusterProperties; import org.apache.hyracks.api.client.IHyracksClientConnection; +import org.json.JSONObject; import static org.apache.asterix.api.http.servlet.ServletConstants.HYRACKS_CONNECTION_ATTR; @@ -39,23 +43,31 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { -response.setContentType("application/json"); -response.setCharacterEncoding("utf-8"); - ServletContext context = getServletContext(); IHyracksClientConnection hcc = (IHyracksClientConnection) context.getAttribute(HYRACKS_CONNECTION_ATTR); Thread t = new Thread(() -> { try { hcc.stopCluster(); } catch (Exception e) { -GlobalConfig.ASTERIX_LOGGER.log(Level.SEVERE, e.getMessage(), e); +GlobalConfig.ASTERIX_LOGGER.log(Level.SEVERE, "Exception stopping cluster", e); } -}); -t.start(); -response.setStatus(HttpServletResponse.SC_ACCEPTED); -} +}, "Shutdown Servlet Worker"); -@Override -public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { +response.setContentType("application/json"); +response.setCharacterEncoding("utf-8"); +response.setStatus(HttpServletResponse.SC_ACCEPTED); +JSONObject jsonObject = new JSONObject(); +try { +jsonObject.put("status", "SHUTTING_DOWN"); +jsonObject.put("date", new Date()); +jsonObject.put("cluster" , AsterixClusterProperties.INSTANCE.getClusterStateDescription()); + +final PrintWriter writer = response.getWriter(); +writer.print(jsonObject.toString(4)); +writer.close(); +} catch (Exception e) { +GlobalConfig.ASTERIX_LOGGER.log(Level.INFO, "Exception writing response", e); +} +t.start(); } } -- To view, visit https://asterix-gerrit.ics.uci.edu/1136 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f1a7d707ebdcb2a6502bc06d35d7ed38121e472 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow
Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1142 to look at the new patch set (#2). Change subject: Start/Stop Sample Scripts for Windows .. Start/Stop Sample Scripts for Windows - Fix windows binaries (ncservice, cc, nc, helper) - Add windows start/stop sample cluster scripts Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 --- M .gitignore M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-client-helper/src/main/assembly/assembly.xml M asterixdb/asterix-server/pom.xml M asterixdb/asterix-server/src/main/assembly/binary-assembly.xml A asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat A asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat 7 files changed, 174 insertions(+), 11 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/42/1142/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1142 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Michael Blow has posted comments on this change. Change subject: Start/Stop Sample Scripts for Windows .. Patch Set 1: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/1142/1/asterixdb/asterix-client-helper/pom.xml File asterixdb/asterix-client-helper/pom.xml: Line 51: cbashelper > That's a strange name. copy n' paste problems. Done. -- To view, visit https://asterix-gerrit.ics.uci.edu/1142 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-HasComments: Yes
Change in asterixdb[master]: improve display of end-time for jobs in Hyracks console
Michael Blow has posted comments on this change. Change subject: improve display of end-time for jobs in Hyracks console .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1140 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I80383dd0d35d0bbb83e00f56e094392d6d375a6d Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: Extend Cluster API Servlet, += Config / Stats
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1147 to look at the new patch set (#2). Change subject: Extend Cluster API Servlet, += Config / Stats .. Extend Cluster API Servlet, += Config / Stats New APIs to return NC stats & configs, discoverable URIs returned as part of /admin/cluster. Change-Id: Ia7549f2bb0b6621886356d50df800d447928aa2c --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java A asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterNodeDetailsAPIServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/ServletUtil.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/AsterixClusterProperties.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceRemoteProxy.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksConnection.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientConnection.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientInterface.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/NodeControllerState.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/NodesRESTAPIFunction.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeDetailsJSONWork.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java A hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/utils/PidHelper.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java 17 files changed, 426 insertions(+), 76 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/47/1147/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia7549f2bb0b6621886356d50df800d447928aa2c Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: Add upsert option for feed
Michael Blow has posted comments on this change. Change subject: Add upsert option for feed .. Patch Set 13: Code-Review+1 Would like Abdullah to review as well. -- To view, visit https://asterix-gerrit.ics.uci.edu/1068 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic5133e7c6941fea4110cc9983f99502f364dc810 Gerrit-PatchSet: 13 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Xikui WangGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: abdullah alamoudi Gerrit-HasComments: No
Change in asterixdb[master]: Small Cleanup
Michael Blow has posted comments on this change. Change subject: Small Cleanup .. Patch Set 1: (3 comments) https://asterix-gerrit.ics.uci.edu/#/c/1145/1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IExternalDataSourceFactory.java File asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IExternalDataSourceFactory.java: Line 92: throw new AlgebricksException("Configurations don't have any stores"); What are the multiple configurations? Should this be Configuration doesn't? Line 95: while (i < count) { if a label (e.g. outer) is added to this while, you can keep the foreach and just add the break outer when incrementing i below, and you can remove all the intermediate && i < count checks Line 102: i++; e.g. if (++i == count) { break outer; } -- To view, visit https://asterix-gerrit.ics.uci.edu/1145 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib527f2eee283faf75c04323b6961c31a6d739d07 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: Yes
Change in asterixdb[master]: Small Cleanup
Michael Blow has posted comments on this change. Change subject: Small Cleanup .. Patch Set 1: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/1145/1/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IExternalDataSourceFactory.java File asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IExternalDataSourceFactory.java: Line 95: while (i < count) { > Done We can either ignore the warning, or extract a method for the loop, then use no label and "return locs" instead of "break outer" -- To view, visit https://asterix-gerrit.ics.uci.edu/1145 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib527f2eee283faf75c04323b6961c31a6d739d07 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: abdullah alamoudi Gerrit-HasComments: Yes
Change in asterixdb[master]: Small Cleanup
Michael Blow has posted comments on this change. Change subject: Small Cleanup .. Patch Set 2: Code-Review+2 If we don't like the SQ error with labels, we could extract a method for the outer loop. -- To view, visit https://asterix-gerrit.ics.uci.edu/1145 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib527f2eee283faf75c04323b6961c31a6d739d07 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudiGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: abdullah alamoudi Gerrit-HasComments: No
Change in asterixdb[master]: Small Cleanup
Michael Blow has submitted this change and it was merged. Change subject: Small Cleanup .. Small Cleanup Change-Id: Ib527f2eee283faf75c04323b6961c31a6d739d07 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1145 Tested-by: JenkinsReviewed-by: Michael Blow Integration-Tests: Jenkins --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/adapter/factory/GenericAdapterFactory.java M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/adapter/factory/LookupAdapterFactory.java M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IAdapterFactory.java M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IExternalDataSourceFactory.java M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/rss/RSSRecordReaderFactory.java M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/stream/StreamRecordReaderFactory.java M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/twitter/TwitterRecordReaderFactory.java M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/factory/SocketClientInputStreamFactory.java M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/provider/AdapterFactoryProvider.java M asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/input/record/reader/RecordWithPKTestReaderFactory.java M asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java M asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/LangRecordParseUtil.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/ARecordSerializerDeserializer.java 14 files changed, 143 insertions(+), 60 deletions(-) Approvals: Michael Blow: Looks good to me, approved Jenkins: Verified; Verified Objections: Jenkins: Violations found diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java index c8a9566..5df687a 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java @@ -38,7 +38,6 @@ import org.apache.asterix.common.ioopcallbacks.LSMBTreeIOOperationCallbackFactory; import org.apache.asterix.common.ioopcallbacks.LSMBTreeWithBuddyIOOperationCallbackFactory; import org.apache.asterix.common.ioopcallbacks.LSMRTreeIOOperationCallbackFactory; -import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider; import org.apache.asterix.dataflow.data.nontagged.valueproviders.AqlPrimitiveValueProviderFactory; import org.apache.asterix.external.api.IAdapterFactory; import org.apache.asterix.external.indexing.ExternalFile; @@ -71,6 +70,7 @@ import org.apache.asterix.om.types.IAType; import org.apache.asterix.om.util.NonTaggedFormatUtil; import org.apache.asterix.runtime.util.AsterixAppContextInfo; +import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider; import org.apache.asterix.transaction.management.opcallbacks.SecondaryIndexOperationTrackerProvider; import org.apache.asterix.transaction.management.resource.ExternalBTreeLocalResourceMetadata; import org.apache.asterix.transaction.management.resource.PersistentLocalResourceFactoryProvider; @@ -90,6 +90,7 @@ import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; import org.apache.hyracks.api.dataflow.value.ITypeTraits; import org.apache.hyracks.api.dataflow.value.RecordDescriptor; +import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.job.JobSpecification; import org.apache.hyracks.dataflow.std.file.IFileSplitProvider; import org.apache.hyracks.storage.am.common.api.IPrimitiveValueProviderFactory; @@ -255,13 +256,15 @@ * @param files * @param indexerDesc * @return - * @throws AsterixException + * @throws AlgebricksException + * @throws HyracksDataException * @throws Exception */ private static Pair getExternalDataIndexingOperator( AqlMetadataProvider metadataProvider, JobSpecification jobSpec, IAType itemType, Dataset dataset, -List files, RecordDescriptor indexerDesc) throws AsterixException { +List files,
Change in asterixdb[master]: Access To Node Configuration & Statistics
Michael Blow has posted comments on this change. Change subject: Access To Node Configuration & Statistics .. Patch Set 1: (7 comments) https://asterix-gerrit.ics.uci.edu/#/c/1147/1/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java: Line 242: ServletMapping mapping = new ServletMapping(); > What does this add? This enables a servlet to be mapped to multiple paths. https://asterix-gerrit.ics.uci.edu/#/c/1147/1/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientConnection.java File hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientConnection.java: Line 34: import org.json.JSONObject; > Would be nice not to have a dependency on JSONObject in this interface. Done Line 197: *@param includeConfig @return {@link JSONObject} containing the node details > WS Done Line 200: public String getNodeDetailsJSON(String nodeId, boolean includeStats, boolean includeConfig) throws Exception; > It seems that we don't use this method. Do we need to expose it on the Hyra The next patch will introduce a usage, sorry. https://asterix-gerrit.ics.uci.edu/#/c/1147/1/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientInterface.java File hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientInterface.java: Line 59: public String getNodeDetailsJSON(String nodeId, boolean includeStats, boolean includeConfig) throws Exception; > This also seems to be unused. The next patch will introduce a usage, sorry. https://asterix-gerrit.ics.uci.edu/#/c/1147/1/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/NodeControllerState.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/NodeControllerState.java: Line 291: if (includeConfig) { > How do I access add this information from the HTTP API? Do we have docs/a t Is the existing HTTP API documented somewhere? I can update that. A test is forthcoming. https://asterix-gerrit.ics.uci.edu/#/c/1147/1/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeDetailsJSONWork.java File hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeDetailsJSONWork.java: Line 56: detail = ncs.toDetailedJSON(includeStats, includeConfig); > Conditional expression? Done -- To view, visit https://asterix-gerrit.ics.uci.edu/1147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia7549f2bb0b6621886356d50df800d447928aa2c Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-HasComments: Yes
Change in asterixdb[master]: Extend Cluster API Servlet, += Config / Stats
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1147 to look at the new patch set (#3). Change subject: Extend Cluster API Servlet, += Config / Stats .. Extend Cluster API Servlet, += Config / Stats New APIs to return NC stats & configs, discoverable URIs returned as part of /admin/cluster. Change-Id: Ia7549f2bb0b6621886356d50df800d447928aa2c --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java A asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterNodeDetailsAPIServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/ServletUtil.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/AsterixClusterProperties.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceRemoteProxy.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksConnection.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientConnection.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientInterface.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/NodeControllerState.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/NodesRESTAPIFunction.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeDetailsJSONWork.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java A hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/utils/PidHelper.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java 17 files changed, 426 insertions(+), 76 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/47/1147/3 -- To view, visit https://asterix-gerrit.ics.uci.edu/1147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia7549f2bb0b6621886356d50df800d447928aa2c Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: set HTTP status code before writing the result
Michael Blow has posted comments on this change. Change subject: set HTTP status code before writing the result .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1134 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46adb4aeaaa1ada6669b7535bb6d0879a26bc319 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till WestmannGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: No
Change in asterixdb[master]: Depend on asterix-opt-bom 1.0.0-SNAPSHOT
Michael Blow has posted comments on this change. Change subject: Depend on asterix-opt-bom 1.0.0-SNAPSHOT .. Patch Set 1: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/1137/1/asterixdb/asterix-server/pom.xml File asterixdb/asterix-server/pom.xml: Line 179: 1.0.0-SNAPSHOT I think this should match the asterixdb version (i.e. ${project.version}) -- To view, visit https://asterix-gerrit.ics.uci.edu/1137 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifd5b95bc052c87419d0e925e46f7741b97cc1132 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Chris HilleryGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: Yes
Change in asterixdb[master]: Depend on asterix-opt-bom 1.0.0-SNAPSHOT
Michael Blow has posted comments on this change. Change subject: Depend on asterix-opt-bom 1.0.0-SNAPSHOT .. Patch Set 1: (1 comment) https://asterix-gerrit.ics.uci.edu/#/c/1137/1/asterixdb/asterix-server/pom.xml File asterixdb/asterix-server/pom.xml: Line 179: 1.0.0-SNAPSHOT > It can be anything we want. I'd almost prefer for it to be a never-changing Not sure how realistic it is, especially given that we only release semi-annually but I was thinking of a case where we multiple versions are sharing a single local maven repo- that wouldn't work very well if we keep a constant snapshot version across releases. That was my thought. -- To view, visit https://asterix-gerrit.ics.uci.edu/1137 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifd5b95bc052c87419d0e925e46f7741b97cc1132 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Chris HilleryGerrit-Reviewer: Chris Hillery Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-HasComments: Yes
Change in asterixdb[master]: Start/Stop Sample Scripts for Windows
Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1142 Change subject: Start/Stop Sample Scripts for Windows .. Start/Stop Sample Scripts for Windows - Fix windows binaries (ncservice, cc, nc, helper) - Add windows start/stop sample cluster scripts Change-Id: Id6eee2156a5c6e40e0e864c2b8be2c08593e71b1 --- M .gitignore M asterixdb/asterix-client-helper/pom.xml M asterixdb/asterix-client-helper/src/main/assembly/assembly.xml M asterixdb/asterix-server/pom.xml M asterixdb/asterix-server/src/main/assembly/binary-assembly.xml A asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat A asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat 7 files changed, 174 insertions(+), 11 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/42/1142/1 diff --git a/.gitignore b/.gitignore index 11d149b..ba4e894 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ invIndex* primaryBTree* -bin target .classpath .settings @@ -13,8 +12,6 @@ build asterixdb/asterix-opt asterixdb/asterix-app/src/test/resources/externallib -asterixdb/asterix-app/rttest -asterixdb/asterix-app/mdtest asterixdb/asterix-app/opttest asterixdb/asterix-app/parserts asterixdb/asterix-app/library @@ -51,4 +48,4 @@ .DS_Store *.swp .m2* -ß \ No newline at end of file +ß diff --git a/asterixdb/asterix-client-helper/pom.xml b/asterixdb/asterix-client-helper/pom.xml index 7068cf6..e6d5684 100644 --- a/asterixdb/asterix-client-helper/pom.xml +++ b/asterixdb/asterix-client-helper/pom.xml @@ -29,7 +29,7 @@ org.codehaus.mojo appassembler-maven-plugin -1.3 +1.10 ${project.build.directory}/appassembler @@ -46,7 +46,15 @@ org.apache.asterix.clienthelper.AsterixHelper - + + + cbashelper + org.apache.asterix.clienthelper.AsterixHelper + +booter-windows + + + @@ -84,5 +92,10 @@ javax.servlet javax.servlet-api + + org.codehaus.mojo.appassembler + appassembler-booter + 1.10 + diff --git a/asterixdb/asterix-client-helper/src/main/assembly/assembly.xml b/asterixdb/asterix-client-helper/src/main/assembly/assembly.xml index 2e4e133..122ee38 100644 --- a/asterixdb/asterix-client-helper/src/main/assembly/assembly.xml +++ b/asterixdb/asterix-client-helper/src/main/assembly/assembly.xml @@ -34,5 +34,17 @@ bin 0755 + + target/generated-resources/appassembler/booter-windows/etc + etc + +*.xml + + + + target/generated-resources/appassembler/booter-windows/bin + bin + 0755 + diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 269c219..0897145 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -44,7 +44,7 @@ org.codehaus.mojo appassembler-maven-plugin -1.3 +1.10 ${project.build.directory}/appassembler @@ -235,7 +235,7 @@ org.codehaus.mojo.appassembler appassembler-booter - 1.3.1 + 1.10 org.apache.asterix diff --git a/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml b/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml index 0c82f41..19f0034 100644 --- a/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml +++ b/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml @@ -69,10 +69,9 @@ target/generated-resources/appassembler/booter-windows/etc - bin + etc -asterixcc.xml -asterixnc.xml +*.xml diff --git a/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat b/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat new file mode 100644 index 000..4d10261 --- /dev/null +++ b/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat @@ -0,0 +1,83 @@ +@REM +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software
Change in asterixdb[master]: Expose Asterix Configuration on Cluster Servlet
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1153 to look at the new patch set (#3). Change subject: Expose Asterix Configuration on Cluster Servlet .. Expose Asterix Configuration on Cluster Servlet Also, a few test executor improvements Change-Id: I828d6a61afe615f7826079ede4b1d638bbd7ac5d --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/cluster_state_1/cluster_state_1.1.cstate.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/cluster_state_2/cluster_state_2.1.cstate.aql A asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractAsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixFeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixReplicationProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixStorageProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixTransactionProperties.java M asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java M asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AbstractExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NCServiceExecutionIT.java 15 files changed, 350 insertions(+), 78 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/53/1153/3 -- To view, visit https://asterix-gerrit.ics.uci.edu/1153 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I828d6a61afe615f7826079ede4b1d638bbd7ac5d Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: Depend on asterix-opt-bom with same version as AsterixDB itself
Michael Blow has posted comments on this change. Change subject: Depend on asterix-opt-bom with same version as AsterixDB itself .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/1137 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifd5b95bc052c87419d0e925e46f7741b97cc1132 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Chris HilleryGerrit-Reviewer: Chris Hillery Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-HasComments: No
Change in asterixdb[master]: Expose Asterix Configuration on Cluster Servlet
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1153 to look at the new patch set (#4). Change subject: Expose Asterix Configuration on Cluster Servlet .. Expose Asterix Configuration on Cluster Servlet Also, a few test executor improvements Change-Id: I828d6a61afe615f7826079ede4b1d638bbd7ac5d --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/cluster_state_1/cluster_state_1.1.cstate.aql A asterixdb/asterix-app/src/test/resources/runtimets/queries/api/cluster_state_2/cluster_state_2.1.cstate.aql A asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractAsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixFeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixReplicationProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixStorageProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixTransactionProperties.java M asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java M asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AbstractExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NCServiceExecutionIT.java 15 files changed, 350 insertions(+), 78 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/53/1153/4 -- To view, visit https://asterix-gerrit.ics.uci.edu/1153 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I828d6a61afe615f7826079ede4b1d638bbd7ac5d Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: Depend on asterix-opt-bom with same version as AsterixDB itself
Michael Blow has submitted this change and it was merged. Change subject: Depend on asterix-opt-bom with same version as AsterixDB itself .. Depend on asterix-opt-bom with same version as AsterixDB itself Change-Id: Ifd5b95bc052c87419d0e925e46f7741b97cc1132 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1137 Sonar-Qube: JenkinsTested-by: Jenkins Integration-Tests: Jenkins Reviewed-by: Michael Blow --- M asterixdb/asterix-server/pom.xml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Michael Blow: Looks good to me, approved Jenkins: Verified; No violations found; Verified diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 0897145..58b0393 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -176,7 +176,7 @@ org.apache.asterix asterix-opt-bom - 0.1-SNAPSHOT + ${project.version} pom -- To view, visit https://asterix-gerrit.ics.uci.edu/1137 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd5b95bc052c87419d0e925e46f7741b97cc1132 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Chris Hillery Gerrit-Reviewer: Chris Hillery Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: Expose Asterix Configuration on Cluster Servlet
Michael Blow has posted comments on this change. Change subject: Expose Asterix Configuration on Cluster Servlet .. Patch Set 4: TRIGGER asterix-gerrit-integration-tests -- To view, visit https://asterix-gerrit.ics.uci.edu/1153 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I828d6a61afe615f7826079ede4b1d638bbd7ac5d Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-HasComments: No
Change in asterixdb[master]: Extend Cluster API Servlet, += Config / Stats
Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/1147 to look at the new patch set (#4). Change subject: Extend Cluster API Servlet, += Config / Stats .. Extend Cluster API Servlet, += Config / Stats New APIs to return NC stats & configs, discoverable URIs returned as part of /admin/cluster. Change-Id: Ia7549f2bb0b6621886356d50df800d447928aa2c --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java A asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterNodeDetailsAPIServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/ServletUtil.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/AsterixClusterProperties.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceRemoteProxy.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksConnection.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientConnection.java M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientInterface.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/NodeControllerState.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/web/NodesRESTAPIFunction.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeDetailsJSONWork.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NodeRegistration.java A hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/utils/PidHelper.java M hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java 17 files changed, 429 insertions(+), 76 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/47/1147/4 -- To view, visit https://asterix-gerrit.ics.uci.edu/1147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia7549f2bb0b6621886356d50df800d447928aa2c Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann
Change in asterixdb[master]: Extend Cluster API Servlet, += Config / Stats
Michael Blow has posted comments on this change. Change subject: Extend Cluster API Servlet, += Config / Stats .. Patch Set 3: (5 comments) https://asterix-gerrit.ics.uci.edu/#/c/1147/3/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterNodeDetailsAPIServlet.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterNodeDetailsAPIServlet.java: Line 73: throw new IllegalArgumentException(); > Shouldn't we just get a 404 here, ff the path (URL) is not valid? Done Line 88: throw new IllegalArgumentException("unknown nc: " + node); > Same here? Done Line 100: throw new IllegalArgumentException(); > Or here? Done Line 125: throw new IllegalArgumentException("unknown nc: " + node); > Or here? Done https://asterix-gerrit.ics.uci.edu/#/c/1147/3/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java File asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java: Line 76: import static org.apache.asterix.api.http.servlet.ServletConstants.HYRACKS_CONNECTION_ATTR; > Wow, these sure seem to be moving around :) Do we have a convention? Eclipse and IDEA's defaults seem to disagree... -- To view, visit https://asterix-gerrit.ics.uci.edu/1147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia7549f2bb0b6621886356d50df800d447928aa2c Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael BlowGerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Till Westmann Gerrit-HasComments: Yes
Change in asterixdb[master]: Expose Asterix Configuration on Cluster Servlet
Michael Blow has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1153 Change subject: Expose Asterix Configuration on Cluster Servlet .. Expose Asterix Configuration on Cluster Servlet Change-Id: I828d6a61afe615f7826079ede4b1d638bbd7ac5d --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractAsterixProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixCompilerProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixExternalProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixFeedProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixReplicationProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixStorageProperties.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixTransactionProperties.java 8 files changed, 165 insertions(+), 38 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/53/1153/1 diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java index c7cf1ea..8a16cd7 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java @@ -20,12 +20,16 @@ import java.io.IOException; import java.io.PrintWriter; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.asterix.app.result.ResultUtil; +import org.apache.asterix.common.config.AbstractAsterixProperties; import org.apache.asterix.runtime.util.AsterixClusterProperties; import org.json.JSONException; import org.json.JSONObject; @@ -40,7 +44,9 @@ PrintWriter responseWriter = response.getWriter(); try { JSONObject responseObject = AsterixClusterProperties.INSTANCE.getClusterStateDescription(); -responseWriter.write(responseObject.toString()); +MapallProperties = getAllClusterProperties(); +responseObject.put("config", allProperties); +responseWriter.write(responseObject.toString(4)); response.setStatus(HttpServletResponse.SC_OK); } catch (JSONException e) { ResultUtil.apiErrorHandler(responseWriter, e); @@ -48,4 +54,16 @@ } responseWriter.flush(); } + +protected Map getAllClusterProperties() { +Map allProperties = new HashMap<>(); +for (AbstractAsterixProperties properties : getPropertiesInstances()) { +allProperties.putAll(properties.getProperties()); +} +return allProperties; +} + +protected List getPropertiesInstances() { +return AbstractAsterixProperties.getImplementations(); +} } diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractAsterixProperties.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractAsterixProperties.java index e68676e..845483e 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractAsterixProperties.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AbstractAsterixProperties.java @@ -18,10 +18,49 @@ */ package org.apache.asterix.common.config; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + public abstract class AbstractAsterixProperties { +private static final Logger LOGGER = Logger.getLogger(AbstractAsterixProperties.class.getName()); +private static final List IMPLS = Collections.synchronizedList(new ArrayList<>()); + protected final AsterixPropertiesAccessor accessor; public AbstractAsterixProperties(AsterixPropertiesAccessor accessor) { this.accessor = accessor; +IMPLS.add(this); +} + +public Map getProperties() { +Map properties = new HashMap<>(); +for (Method m : getClass().getMethods()) { +PropertyKey key = m.getAnnotation(PropertyKey.class); +if (key !=