You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/05/21 01:51:35 UTC
[incubator-iotdb] 08/11: Merge branch 'cluster' into
cluster_fill_aggre_groupby
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch cluster
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit d079f5e3aca5d0303d0f0554cb45d449621a86a4
Merge: 9487dbf 618cc39
Author: lta <li...@163.com>
AuthorDate: Mon May 20 17:29:00 2019 +0800
Merge branch 'cluster' into cluster_fill_aggre_groupby
.../org/apache/iotdb/cluster/entity/Server.java | 6 +-
.../cluster/qp/executor/QueryMetadataExecutor.java | 148 +++++++++++++++++++--
.../QueryJobNumAsyncProcessor.java} | 17 +--
.../QueryMetricAsyncProcessor.java | 7 +-
.../QueryStatusAsyncProcessor.java} | 18 +--
.../QueryJobNumRequest.java} | 18 +--
.../{ => querymetric}/QueryMetricRequest.java | 11 +-
.../QueryStatusRequest.java} | 16 +--
.../QueryJobNumResponse.java} | 19 +--
.../{ => querymetric}/QueryMetricResponse.java | 3 +-
.../QueryStatusResponse.java} | 24 ++--
.../iotdb/cluster/service/ClusterMonitor.java | 9 +-
.../iotdb/cluster/service/ClusterMonitorMBean.java | 13 +-
.../iotdb/cluster/service/nodetool/NodeTool.java | 3 +-
.../iotdb/cluster/service/nodetool/Query.java | 20 ++-
.../service/nodetool/{Query.java => Status.java} | 10 +-
.../org/apache/iotdb/cluster/utils/RaftUtils.java | 144 +++++++++++++++++++-
.../UserGuideV0.7.0/7-Tools-NodeTool.md | 58 ++++++--
18 files changed, 430 insertions(+), 114 deletions(-)