[incubator-iotdb] branch cluster_new updated (6754915 -> c99fa9d)

[ji...@apache.org]

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 6754915  Merge branch 'fix_default_directory' into cluster_new
     add c99fa9d  partially fix

No new revisions were added by this update.

Summary of changes:
 .../cluster/query/ClusterAggregateExecutor.java    |   2 +-
 .../cluster/query/ClusterDataQueryExecutor.java    |  32 ++-
 ...QueryExecutor.java => ClusterPlanExecutor.java} |   9 +-
 ...ClusterQueryParser.java => ClusterPlanner.java} |   7 +-
 .../iotdb/cluster/query/ClusterQueryRouter.java    |  17 +-
 .../cluster/query/manage/ClusterQueryManager.java  |   6 +-
 .../cluster/query/reader/BatchedPointReader.java   |  15 +-
 .../query/reader/ClusterNodeConstructor.java       |  55 -----
 .../cluster/query/reader/ClusterTimeGenerator.java |  33 ++-
 .../iotdb/cluster/query/reader/EmptyReader.java    |  67 ++++-
 .../cluster/query/reader/ManagedMergeReader.java   |  10 +-
 .../cluster/query/reader/MergedReaderByTime.java   |  35 +++
 .../query/reader/RemoteAggregateReader.java        |  91 -------
 .../reader/RemoteSeriesReaderByTimestamp.java      |  14 +-
 .../query/reader/RemoteSimpleSeriesReader.java     |  92 ++-----
 .../apache/iotdb/cluster/server/ClientServer.java  |  10 +-
 .../cluster/server/member/DataGroupMember.java     | 170 ++++---------
 .../cluster/server/member/MetaGroupMember.java     | 213 +++++-----------
 .../iotdb/cluster/server/member/RaftMember.java    |   9 +-
 .../apache/iotdb/cluster/utils/SerializeUtils.java |  29 ++-
 ...cutorTest.java => ClusterPlanExecutorTest.java} |   6 +-
 ...ueryParserTest.java => ClusterPlannerTest.java} |   6 +-
 .../cluster/server/member/DataGroupMemberTest.java |   2 -
 .../cluster/server/member/MetaGroupMemberTest.java |   2 +-
 .../db/exception/metadata/MetadataException.java   |   4 +
 .../org/apache/iotdb/db/metadata/MManager.java     |  29 +++
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |   2 +-
 .../db/query/executor/AggregationExecutor.java     |   1 +
 .../iotdb/db/query/executor/QueryRouter.java       |   7 +-
 .../db/query/executor/RawDataQueryExecutor.java    |  16 +-
 .../reader/series/SeriesReaderByTimestamp.java     |   4 +
 .../seriesRelated/SeriesReaderWithValueFilter.java | 115 ---------
 .../SeriesReaderWithoutValueFilter.java            | 270 ---------------------
 .../query/timegenerator/EngineNodeConstructor.java |  80 ------
 .../query/timegenerator/EngineTimeGenerator.java   |  71 ------
 .../query/timegenerator/ServerTimeGenerator.java   |   4 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |   4 +-
 .../db/query/reader/series/SeriesReaderTest.java   |   1 +
 service-rpc/src/main/thrift/cluster.thrift         |  32 +--
 .../iotdb/tsfile/utils/ReadWriteIOUtils.java       |   7 +-
 40 files changed, 410 insertions(+), 1169 deletions(-)
 rename cluster/src/main/java/org/apache/iotdb/cluster/query/{ClusterQueryExecutor.java => ClusterPlanExecutor.java} (94%)
 rename cluster/src/main/java/org/apache/iotdb/cluster/query/{ClusterQueryParser.java => ClusterPlanner.java} (89%)
 delete mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterNodeConstructor.java
 create mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/reader/MergedReaderByTime.java
 delete mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/reader/RemoteAggregateReader.java
 rename cluster/src/test/java/org/apache/iotdb/cluster/query/{ClusterQueryExecutorTest.java => ClusterPlanExecutorTest.java} (93%)
 rename cluster/src/test/java/org/apache/iotdb/cluster/query/{ClusterQueryParserTest.java => ClusterPlannerTest.java} (92%)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineNodeConstructor.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/timegenerator/EngineTimeGenerator.java