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/09/18 09:59:43 UTC

[incubator-iotdb] branch cluster_new updated (f9749fb -> 842619d)

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 f9749fb  Merge branch 'cluster_premerge' into cluster_new
     add 842619d  fix after merge

No new revisions were added by this update.

Summary of changes:
 .../cluster/client/sync/SyncClientAdaptor.java     | 13 ++++
 .../cluster/query/ClusterDataQueryExecutor.java    | 22 +++----
 .../iotdb/cluster/query/LocalQueryExecutor.java    | 41 +++++++++---
 .../query/aggregate/ClusterAggregateExecutor.java  |  6 +-
 .../cluster/query/aggregate/ClusterAggregator.java | 14 ++--
 .../cluster/query/fill/ClusterLinearFill.java      |  5 +-
 .../groupby/ClusterGroupByNoVFilterDataSet.java    |  5 +-
 .../groupby/ClusterGroupByVFilterDataSet.java      |  5 +-
 .../query/groupby/MergeGroupByExecutor.java        | 34 +++++++++-
 .../query/groupby/RemoteGroupByExecutor.java       | 37 +++++++++++
 .../cluster/query/reader/ClusterReaderFactory.java | 74 ++++++++++++----------
 .../cluster/query/reader/ClusterTimeGenerator.java |  2 +-
 .../iotdb/cluster/query/reader/EmptyReader.java    |  6 ++
 .../iotdb/cluster/server/DataClusterServer.java    | 25 ++++++--
 .../cluster/server/service/DataAsyncService.java   | 10 +++
 .../cluster/server/service/DataSyncService.java    | 10 +++
 .../query/ClusterDataQueryExecutorTest.java        |  4 +-
 .../query/groupby/MergeGroupByExecutorTest.java    |  4 +-
 .../query/groupby/RemoteGroupByExecutorTest.java   |  4 +-
 .../cluster/server/member/DataGroupMemberTest.java |  7 ++
 .../iotdb/cluster/server/member/MemberTest.java    | 10 +++
 .../cluster/server/member/MetaGroupMemberTest.java |  9 ++-
 .../db/exception/query/QueryProcessException.java  |  4 ++
 .../groupby/GroupByWithValueFilterDataSet.java     |  3 +
 .../db/query/executor/RawDataQueryExecutor.java    |  2 +-
 .../iotdb/db/query/reader/chunk/MemPageReader.java |  7 +-
 .../reader/series/SeriesReaderByTimestamp.java     |  3 +
 thrift/src/main/thrift/cluster.thrift              |  6 ++
 .../iotdb/tsfile/read/reader/page/PageReader.java  |  7 +-
 .../tsfile/write/schema/MeasurementSchema.java     | 12 ++--
 30 files changed, 296 insertions(+), 95 deletions(-)