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 c908ed1520e4f74c934f18baacabd9dbe7831c72 Merge: fb5bb82 da3bb88 Author: Apache AsterixDB Gerrit <[email protected]> AuthorDate: Fri Oct 2 01:04:05 2020 +0000 Merge "Merge branch gerrit/mad-hatter" .../org/apache/asterix/active/ActiveManager.java | 6 +++ .../active/IActiveEntityEventSubscriber.java | 2 +- .../active/IActiveEntityEventsListener.java | 2 +- .../active/message/ActiveManagerMessage.java | 2 +- .../active/message/ActiveStatsRequestMessage.java | 10 +++++ .../api/http/server/RebalanceApiServlet.java | 25 ++++++----- .../app/active/ActiveEntityEventsListener.java | 25 ++++++++--- .../asterix/app/translator/QueryTranslator.java | 20 ++++++++- .../org/apache/asterix/utils/RebalanceUtil.java | 5 +-- .../org/apache/asterix/common/TestDataUtil.java | 2 +- .../asterix/test/active/ActiveStatsTest.java | 19 ++++++-- .../apache/asterix/test/common/TestExecutor.java | 38 ++++++++++------ .../test/runtime/ResultStreamingFailureTest.java | 2 +- .../src/test/resources/runtimets/only_sqlpp.xml | 10 +++++ .../test.000.ddl.sqlpp} | 13 +++--- .../test.001.ddl.sqlpp} | 3 +- .../test.002.ddl.sqlpp} | 3 +- .../test.003.ddl.sqlpp} | 3 +- .../test.004.ddl.sqlpp} | 3 +- .../test.005.ddl.sqlpp} | 3 +- .../test.006.ddl.sqlpp} | 3 +- .../test.007.ddl.sqlpp} | 3 +- .../test.008.ddl.sqlpp} | 3 +- .../test.009.ddl.sqlpp} | 3 +- .../test.010.ddl.sqlpp} | 3 +- .../test.011.ddl.sqlpp} | 3 +- .../test.999.ddl.sqlpp} | 3 +- .../invalid-dataverse.001.ddl.sqlpp | 4 +- .../invalid-dataverse.002.ddl.sqlpp | 6 ++- .../invalid-dataverse.003.ddl.sqlpp | 7 +-- .../invalid-dataverse.004.ddl.sqlpp | 8 ++-- .../invalid-dataverse.005.ddl.sqlpp | 8 ++-- .../invalid-dataverse.006.ddl.sqlpp | 8 ++-- .../invalid-dataverse.007.ddl.sqlpp | 2 + .../invalid-dataverse.008.ddl.sqlpp | 2 + .../empty-dataset/empty-dataset.01.ddl.sqlpp} | 8 +++- .../empty-dataset/empty-dataset.02.update.sqlpp} | 3 +- .../empty-dataset/empty-dataset.03.query.sqlpp} | 4 +- .../empty-dataset/empty-dataset.04.query.sqlpp} | 4 +- .../empty-dataset/empty-dataset.05.query.sqlpp} | 4 +- .../empty-dataset/empty-dataset.06.query.sqlpp} | 4 +- .../push-limit-to-primary-scan-select.1.ddl.sqlpp | 24 +++++++++- ...sh-limit-to-primary-scan-select.10.query.sqlpp} | 40 +++++++++-------- ...sh-limit-to-primary-scan-select.11.query.sqlpp} | 25 +++++++++-- ...ush-limit-to-primary-scan-select.2.update.sqlpp | 6 +-- .../push-limit-to-primary-scan.1.ddl.sqlpp | 21 +++++++++ .../push-limit-to-primary-scan.2.update.sqlpp | 3 +- .../push-limit-to-primary-scan.6.query.sqlpp} | 27 +++++++++-- ...pp => push-limit-to-primary-scan.7.query.sqlpp} | 24 +++++++++- .../identical_location.3.post.http | 2 +- .../empty-dataset/empty-dataset.03.adm | 1 + .../empty-dataset/empty-dataset.04.adm | 0 .../empty-dataset/empty-dataset.05.adm | 0 .../empty-dataset/empty-dataset.06.adm | 0 .../push-limit-to-primary-scan-select.10.adm | 1 + .../push-limit-to-primary-scan-select.11.adm | 52 ++++++++++++++++++++++ .../push-limit-to-primary-scan.6.adm | 1 + .../push-limit-to-primary-scan.7.adm | 52 ++++++++++++++++++++++ .../runtimets/testsuite_external_dataset.xml | 2 + .../test/resources/runtimets/testsuite_sqlpp.xml | 28 +++++++++--- .../asterix/common/exceptions/ErrorCode.java | 1 + .../asterix/common/exceptions/ExceptionUtils.java | 15 +++++++ .../src/main/resources/asx_errormsg/en.properties | 1 + .../external/feed/watch/AbstractSubscriber.java | 29 +++++++++--- .../feed/watch/WaitForStateSubscriber.java | 2 +- .../visitors/IsomorphismOperatorVisitor.java | 11 +++-- .../hyracks/dataflow/std/join/NestedLoopJoin.java | 32 +++++++++++-- 67 files changed, 554 insertions(+), 135 deletions(-)
