You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2020/02/19 23:10:12 UTC
[asterixdb] 06/07: Merge branch 'gerrit/mad-hatter'

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 3daffa48f34af4e6fe94f44764bc1d5666d690b5
Merge: b2ae954 749974f
Author: Michael Blow <mb...@apache.org>
AuthorDate: Tue Feb 18 22:56:13 2020 -0500

    Merge branch 'gerrit/mad-hatter'
    
    Change-Id: I6355433a57698addc340120880095af8e2ecaac2

 .../asterix/hyracks/bootstrap/CCApplication.java   |  3 -
 .../asterix/hyracks/bootstrap/NCApplication.java   |  7 +-
 .../api/common/AsterixHyracksIntegrationUtil.java  |  1 +
 .../queries/quantifiers/query-ASTERIXDB-2696.sqlpp | 19 ++---
 .../results/quantifiers/query-ASTERIXDB-2696.plan  | 25 +++++++
 .../query-ASTERIXDB-2696.1.query.sqlpp             | 19 ++---
 .../query-ASTERIXDB-2696.1.adm                     |  2 +
 .../test/resources/runtimets/testsuite_sqlpp.xml   |  5 ++
 .../asterix/test/base/AsterixTestHelper.java       |  1 -
 .../asterix/replication/api/PartitionReplica.java  |  9 +--
 .../replication/api/ReplicationDestination.java    | 11 ++-
 .../visitors/CardinalityInferenceVisitor.java      |  3 +-
 .../hyracks/api/service/IControllerService.java    |  2 +
 .../org/apache/hyracks/api/util/InvokeUtil.java    | 11 +--
 .../hyracks/control/cc/BaseCCApplication.java      | 30 ++++++--
 .../control/cc/ClusterControllerService.java       |  8 ++-
 .../control/cc/work/ClusterShutdownWork.java       |  9 ++-
 .../control/common/ControllerShutdownHook.java}    | 18 ++---
 .../control/common/controllers/CCConfig.java       |  3 -
 .../shutdown/IShutdownStatusConditionVariable.java |  3 +-
 .../control/common/shutdown/ShutdownRun.java       | 32 ++++++---
 .../hyracks/control/nc/BaseNCApplication.java      | 26 ++++++-
 .../hyracks/control/nc/NodeControllerService.java  | 84 ++++++++++------------
 .../hyracks/ipc/impl/IPCConnectionManager.java     | 37 +++++++++-
 .../org/apache/hyracks/ipc/impl/IPCHandle.java     |  2 +-
 .../java/org/apache/hyracks/util/ExitUtil.java     | 22 ++++++
 26 files changed, 262 insertions(+), 130 deletions(-)