This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 2c22ebe95d210c047fc58a1247509aed5854048f Merge: ee4a056 56759ec Author: Michael Blow <[email protected]> AuthorDate: Fri Feb 12 18:48:21 2021 -0500 Merge branch 'gerrit/cheshire-cat' Change-Id: If9b2e4f8b46d2f3b03917b74b08f98694fba4ece .../org/apache/asterix/active/ActiveManager.java | 2 +- .../rules/SetAsterixMemoryRequirementsRule.java | 3 + .../apache/asterix/api/common/APIFramework.java | 3 +- .../api/http/server/NCQueryServiceServlet.java | 16 +- .../api/http/server/QueryServiceServlet.java | 8 +- .../message/ExecuteStatementRequestMessage.java | 11 +- .../app/replication/NcLifecycleCoordinator.java | 24 +- .../apache/asterix/test/common/TestExecutor.java | 32 +- .../apache/asterix/test/txn/LogManagerTest.java | 2 +- .../asterix/test/txn/RecoveryManagerTest.java | 18 + .../ngram-edit-distance-inline.sqlpp | 2 + .../ngram-fuzzyeq-edit-distance.sqlpp | 2 +- .../olist-edit-distance-inline.sqlpp | 2 + ...pidx-with-join-edit-distance-check-idx_01.sqlpp | 2 + ...x-with-join-edit-distance-check-idx_01_ps.sqlpp | 2 +- .../ngram-edit-distance-check_02.sqlpp | 2 + .../ngram-edit-distance-check_03.sqlpp | 2 + .../ngram-edit-distance-check_04.sqlpp | 2 + .../ngram-edit-distance_02.sqlpp | 2 + .../ngram-edit-distance_03.sqlpp | 2 + .../ngram-edit-distance_04.sqlpp | 2 + .../ngram-fuzzyeq-edit-distance_01.sqlpp | 2 +- .../ngram-fuzzyeq-edit-distance_03.sqlpp | 2 +- .../olist-edit-distance-check_02.sqlpp | 2 + .../olist-edit-distance-check_03.sqlpp | 2 + .../olist-edit-distance-check_04.sqlpp | 2 + .../olist-edit-distance_02.sqlpp | 2 + .../olist-edit-distance_03.sqlpp | 2 + .../olist-edit-distance_04.sqlpp | 2 + .../olist-fuzzyeq-edit-distance_02.sqlpp | 2 +- .../olist-fuzzyeq-edit-distance_03.sqlpp | 2 +- ...x-with-join-edit-distance-check-idx_01_ps.sqlpp | 1 + ...x-with-join-edit-distance-check-idx_01_ps.sqlpp | 1 + ...x-with-join-edit-distance-check-idx_01_ps.sqlpp | 1 + .../non-s3-region/external_dataset.000.ddl.sqlpp} | 24 +- .../non-s3-region/external_dataset.099.ddl.sqlpp} | 9 +- .../grouping-sets-1.16.query.sqlpp} | 12 +- .../grouping-sets-1.17.query.sqlpp} | 18 +- .../grouping-sets-1.18.query.sqlpp} | 14 +- .../grouping-sets-1.19.query.sqlpp} | 14 +- ...probe-pidx-with-join-invidx-sidx2.3.query.sqlpp | 1 + .../metadata_only_01.2.plans.sqlpp} | 21 +- ...probe-pidx-with-join-invidx-sidx2.3.query.sqlpp | 1 + ...probe-pidx-with-join-invidx-sidx2.3.query.sqlpp | 1 + ...probe-pidx-with-join-invidx-sidx2.3.query.sqlpp | 1 + .../{q49/q49.1.ddl.sqlpp => q05/q05.1.ddl.sqlpp} | 367 ++++++++++------- .../q49.2.update.sqlpp => q05/q05.2.update.sqlpp} | 20 +- .../queries_sqlpp/tpcds/q05/q05.3.query.sqlpp | 155 ++++++++ .../queries_sqlpp/tpcds/q15/q15.1.ddl.sqlpp | 1 + .../queries_sqlpp/tpcds/q15/q15.2.update.sqlpp | 8 +- .../{q26/q26.1.ddl.sqlpp => q18/q18.1.ddl.sqlpp} | 151 +++---- .../q15.2.update.sqlpp => q18/q18.2.update.sqlpp} | 11 +- .../queries_sqlpp/tpcds/q18/q18.3.query.sqlpp | 50 +++ .../queries_sqlpp/tpcds/q20/q20.1.ddl.sqlpp | 1 + .../queries_sqlpp/tpcds/q20/q20.2.update.sqlpp | 6 +- .../queries_sqlpp/tpcds/q20/q20.3.query.sqlpp | 2 +- .../{q37/q37.1.ddl.sqlpp => q22/q22.1.ddl.sqlpp} | 40 -- .../q20.2.update.sqlpp => q22/q22.2.update.sqlpp} | 7 +- .../q20.2.update.sqlpp => q22/q22.3.query.sqlpp} | 17 +- .../queries_sqlpp/tpcds/q25/q25.1.ddl.sqlpp | 2 + .../queries_sqlpp/tpcds/q26/q26.1.ddl.sqlpp | 1 + .../queries_sqlpp/tpcds/q26/q26.2.update.sqlpp | 10 +- .../{q29/q29.1.ddl.sqlpp => q27/q27.1.ddl.sqlpp} | 80 +--- .../q26.2.update.sqlpp => q27/q27.2.update.sqlpp} | 11 +- .../q26.2.update.sqlpp => q27/q27.3.query.sqlpp} | 30 +- .../queries_sqlpp/tpcds/q29/q29.1.ddl.sqlpp | 2 + .../{q29/q29.1.ddl.sqlpp => q36/q36.1.ddl.sqlpp} | 65 ---- .../q20.2.update.sqlpp => q36/q36.2.update.sqlpp} | 7 +- .../queries_sqlpp/tpcds/q36/q36.3.query.sqlpp | 48 +++ .../queries_sqlpp/tpcds/q37/q37.1.ddl.sqlpp | 1 + .../queries_sqlpp/tpcds/q49/q49.1.ddl.sqlpp | 1 + .../queries_sqlpp/tpcds/q49/q49.2.update.sqlpp | 14 +- .../queries_sqlpp/tpcds/q49/q49.3.query.sqlpp | 10 +- .../queries_sqlpp/tpcds/q57/q57.1.ddl.sqlpp | 1 + .../queries_sqlpp/tpcds/q57/q57.3.query.sqlpp | 4 +- .../{q29/q29.1.ddl.sqlpp => q67/q67.1.ddl.sqlpp} | 65 ---- .../q20.2.update.sqlpp => q67/q67.2.update.sqlpp} | 7 +- .../queries_sqlpp/tpcds/q67/q67.3.query.sqlpp | 42 ++ .../{q29/q29.1.ddl.sqlpp => q70/q70.1.ddl.sqlpp} | 94 ----- .../q20.2.update.sqlpp => q70/q70.2.update.sqlpp} | 7 +- .../queries_sqlpp/tpcds/q70/q70.3.query.sqlpp | 61 +++ .../{q49/q49.1.ddl.sqlpp => q77/q77.1.ddl.sqlpp} | 340 +++++++++------- .../q49.2.update.sqlpp => q77/q77.2.update.sqlpp} | 18 +- .../queries_sqlpp/tpcds/q77/q77.3.query.sqlpp | 115 ++++++ .../{q49/q49.1.ddl.sqlpp => q80/q80.1.ddl.sqlpp} | 432 ++++++++++++++------- .../q49.2.update.sqlpp => q80/q80.2.update.sqlpp} | 26 +- .../queries_sqlpp/tpcds/q80/q80.3.query.sqlpp | 109 ++++++ .../{q20/q20.1.ddl.sqlpp => q86/q86.1.ddl.sqlpp} | 119 +++--- .../q20.2.update.sqlpp => q86/q86.2.update.sqlpp} | 7 +- .../q20.2.update.sqlpp => q86/q86.3.query.sqlpp} | 28 +- .../api/cluster_state_1/cluster_state_1.1.regexadm | 1 + .../cluster_state_1_full.1.regexadm | 1 + .../cluster_state_1_less.1.regexadm | 1 + .../grouping-sets-1/grouping-sets-1.16.adm | 7 + .../grouping-sets-1/grouping-sets-1.17.adm | 7 + .../grouping-sets-1/grouping-sets-1.18.adm | 7 + .../grouping-sets-1/grouping-sets-1.19.adm | 7 + .../misc/metadata_only_01/metadata_only_01.2.regex | 1 + .../runtimets/results/tpcds/q05/q05.1.adm | 15 + .../runtimets/results/tpcds/q15/q15.1.adm | 2 +- .../runtimets/results/tpcds/q18/q18.1.adm | 5 + .../runtimets/results/tpcds/q20/q20.1.adm | 5 +- .../runtimets/results/tpcds/q22/q22.1.adm | 21 + .../runtimets/results/tpcds/q26/q26.1.adm | 2 +- .../runtimets/results/tpcds/q27/q27.1.adm | 13 + .../runtimets/results/tpcds/q36/q36.1.adm | 19 + .../runtimets/results/tpcds/q49/q49.1.adm | 11 +- .../runtimets/results/tpcds/q57/q57.1.adm | 2 +- .../runtimets/results/tpcds/q67/q67.1.adm | 47 +++ .../runtimets/results/tpcds/q70/q70.1.adm | 3 + .../runtimets/results/tpcds/q77/q77.1.adm | 12 + .../runtimets/results/tpcds/q80/q80.1.adm | 13 + .../runtimets/results/tpcds/q86/q86.1.adm | 10 + .../grouping-sets-1/grouping-sets-1.16.ast | 156 ++++++++ .../grouping-sets-1/grouping-sets-1.17.ast | 342 ++++++++++++++++ .../grouping-sets-1/grouping-sets-1.18.ast | 193 +++++++++ .../grouping-sets-1/grouping-sets-1.19.ast | 208 ++++++++++ .../probe-pidx-with-join-invidx-sidx2.3.ast | 1 + .../probe-pidx-with-join-invidx-sidx2.3.ast | 1 + .../probe-pidx-with-join-invidx-sidx2.3.ast | 1 + .../probe-pidx-with-join-invidx-sidx2.3.ast | 1 + .../runtimets/testsuite_external_dataset_s3.xml | 5 + .../test/resources/runtimets/testsuite_sqlpp.xml | 50 +++ asterixdb/asterix-common/pom.xml | 108 ------ .../asterix/common/config/CompilerProperties.java | 12 +- .../asterix/common/config/ExternalProperties.java | 3 +- .../common/config/OptimizationConfUtil.java | 3 + .../replication/INcLifecycleCoordinator.java | 5 +- asterixdb/asterix-external-data/pom.xml | 4 + .../record/reader/aws/AwsS3InputStreamFactory.java | 125 ++++-- .../external/util/ExternalDataConstants.java | 3 +- .../asterix/external/util/ExternalDataUtils.java | 97 +++-- .../asterix/replication/api/PartitionReplica.java | 4 +- .../messaging/ReplicaFailedMessage.java | 54 +++ .../asterix/runtime/utils/ClusterStateManager.java | 23 +- .../management/service/logging/LogReader.java | 2 +- asterixdb/pom.xml | 5 + .../logical/visitors/VariableUtilities.java | 3 +- .../core/algebra/plan/PlanStructureVerifier.java | 101 ++++- .../algebricks/core/config/AlgebricksConfig.java | 1 + .../rewriter/base/PhysicalOptimizationConfig.java | 11 +- .../rewriter/rules/ComplexUnnestToProductRule.java | 10 +- .../rules/subplan/PushSubplanIntoGroupByRule.java | 5 +- .../org/apache/hyracks/api/io/IODeviceHandle.java | 3 +- .../hyracks/control/common/config/OptionTypes.java | 258 +++++++----- .../apache/hyracks/control/nc/io/IOManager.java | 4 +- .../hyracks/ipc/sockets/SslSocketChannel.java | 11 +- 147 files changed, 3545 insertions(+), 1353 deletions(-)
