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 3b3045b Merge branch 'master' into cluster_new
add 02d9918 first implementation of aggregation and tests
No new revisions were added by this update.
Summary of changes:
.../cluster/query/ClusterAggregateExecutor.java | 39 ++++--
.../iotdb/cluster/query/ClusterQueryRouter.java | 9 +-
.../cluster/query/manage/ClusterQueryManager.java | 12 ++
...gedMergeReader.java => BatchedPointReader.java} | 28 +++-
.../iotdb/cluster/query/reader/EmptyReader.java | 14 +-
.../cluster/query/reader/MergeAggregateReader.java | 84 ++++++++++++
.../query/reader/RemoteAggregateReader.java | 61 +++++++++
.../query/reader/RemoteSimpleSeriesReader.java | 8 +-
.../iotdb/cluster/server/DataClusterServer.java | 34 ++++-
.../iotdb/cluster/server/MetaClusterServer.java | 1 -
.../cluster/server/member/DataGroupMember.java | 99 +++++++++++++-
.../cluster/server/member/MetaGroupMember.java | 148 ++++++++++++++++++---
.../iotdb/cluster/common/TestAggregateReader.java | 70 ++++++++++
.../iotdb/cluster/common/TestPointReader.java | 37 ++++++
.../org/apache/iotdb/cluster/common/TestUtils.java | 37 ++++++
.../query/ClusterAggregateExecutorTest.java | 109 +++++++++++++++
.../cluster/query/ClusterQueryRouterTest.java | 46 +++++++
.../query/manage/ClusterQueryManagerTest.java | 35 +++++
.../query/reader/BatchedPointReaderTest.java | 47 +++++++
.../query/reader/MergeAggregateReaderTest.java | 57 ++++++++
.../query/reader/RemoteAggregateReaderTest.java | 133 ++++++++++++++++++
.../cluster/server/member/DataGroupMemberTest.java | 130 ++++++++++++++++++
.../cluster/server/member/MetaGroupMemberTest.java | 90 ++++++++++++-
.../db/query/executor/AggregateEngineExecutor.java | 80 +++++++----
.../reader/universal/PriorityMergeReader.java | 2 +-
service-rpc/src/main/thrift/cluster.thrift | 21 +++
.../org/apache/iotdb/tsfile/read/common/Field.java | 40 ++++++
27 files changed, 1385 insertions(+), 86 deletions(-)
copy
cluster/src/main/java/org/apache/iotdb/cluster/query/reader/{ManagedMergeReader.java
=> BatchedPointReader.java} (72%)
create mode 100644
cluster/src/main/java/org/apache/iotdb/cluster/query/reader/MergeAggregateReader.java
create mode 100644
cluster/src/main/java/org/apache/iotdb/cluster/query/reader/RemoteAggregateReader.java
create mode 100644
cluster/src/test/java/org/apache/iotdb/cluster/common/TestAggregateReader.java
create mode 100644
cluster/src/test/java/org/apache/iotdb/cluster/common/TestPointReader.java
create mode 100644
cluster/src/test/java/org/apache/iotdb/cluster/query/ClusterAggregateExecutorTest.java
create mode 100644
cluster/src/test/java/org/apache/iotdb/cluster/query/reader/BatchedPointReaderTest.java
create mode 100644
cluster/src/test/java/org/apache/iotdb/cluster/query/reader/MergeAggregateReaderTest.java
create mode 100644
cluster/src/test/java/org/apache/iotdb/cluster/query/reader/RemoteAggregateReaderTest.java
