You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ji...@apache.org on 2020/02/28 05:14:29 UTC

[incubator-iotdb] branch cluster_new updated (4a9810d -> f2c33fa)

This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a change to branch cluster_new
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 4a9810d  Merge branch 'master' into cluster_new
     add f2c33fa  fix aggregation

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/iotdb/cluster/ClientMain.java  | 15 ++++---
 .../iotdb/cluster/query/ClusterPlanExecutor.java   |  1 +
 .../cluster/query/filter/SlotTsFileFilter.java     |  4 ++
 .../iotdb/cluster/server/DataClusterServer.java    |  3 +-
 .../cluster/server/member/DataGroupMember.java     | 38 ++++++++++++----
 .../cluster/server/member/MetaGroupMember.java     | 50 +++++++++++++++++++---
 .../db/query/aggregation/AggregateResult.java      |  5 +++
 .../java/org/apache/iotdb/rpc/TSStatusCode.java    |  2 +-
 service-rpc/src/main/thrift/cluster.thrift         |  2 +-
 9 files changed, 94 insertions(+), 26 deletions(-)