[incubator-iotdb] branch cluster_new updated (ff835a3 -> a1ec059)

[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 ff835a3  Merge branch 'master' into cluster_new
     add a1ec059  fix merge

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/iotdb/cluster/ClientMain.java  |  1 -
 .../apache/iotdb/cluster/RemoteTsFileResource.java |  4 +-
 .../org/apache/iotdb/cluster/log/LogManager.java   |  3 +-
 .../cluster/log/logtypes/PhysicalPlanLog.java      | 52 +++++++++++-
 .../manage/FilePartitionedSnapshotLogManager.java  |  5 +-
 .../iotdb/cluster/log/snapshot/FileSnapshot.java   |  2 +-
 .../cluster/query/ClusterAggregateExecutor.java    | 21 +++--
 .../cluster/query/ClusterDataQueryExecutor.java    | 19 +++--
 .../iotdb/cluster/query/ClusterFillExecutor.java   |  7 +-
 .../iotdb/cluster/query/ClusterQueryRouter.java    |  5 +-
 .../groupby/ClusterGroupByNoVFilterDataSet.java    | 11 ++-
 .../groupby/ClusterGroupByVFilterDataSet.java      | 19 +++--
 .../query/groupby/MergeGroupByExecutor.java        | 10 ++-
 .../cluster/query/reader/ClusterTimeGenerator.java | 13 +--
 .../iotdb/cluster/query/reader/EmptyReader.java    | 25 ++++--
 .../cluster/query/reader/MergedReaderByTime.java   | 23 ++----
 .../reader/RemoteSeriesReaderByTimestamp.java      |  6 +-
 .../apache/iotdb/cluster/server/ClientServer.java  |  4 -
 .../iotdb/cluster/server/DataClusterServer.java    |  4 +-
 .../iotdb/cluster/server/MetaClusterServer.java    |  5 +-
 .../cluster/server/member/DataGroupMember.java     | 88 +++++++++++---------
 .../cluster/server/member/MetaGroupMember.java     | 94 ++++++++++++++--------
 .../iotdb/cluster/server/member/RaftMember.java    |  4 +-
 .../apache/iotdb/cluster/utils/PartitionUtils.java |  5 +-
 .../iotdb/cluster/client/ClientPoolTest.java       |  1 -
 .../iotdb/cluster/common/EnvironmentUtils.java     |  2 -
 .../org/apache/iotdb/cluster/common/IoTDBTest.java |  8 +-
 .../iotdb/cluster/common/TestDataClient.java       | 14 +---
 .../iotdb/cluster/common/TestLogApplier.java       |  1 -
 .../cluster/common/TestManagedSeriesReader.java    | 12 ---
 .../iotdb/cluster/common/TestMetaClient.java       |  7 --
 .../cluster/common/TestPartitionedLogManager.java  |  6 --
 .../cluster/common/TestRemoteFileSnapshot.java     |  3 +-
 .../org/apache/iotdb/cluster/common/TestUtils.java | 10 +--
 .../cluster/log/applier/DataLogApplierTest.java    |  3 +-
 .../cluster/log/applier/MetaLogApplierTest.java    |  6 --
 .../cluster/log/logtypes/SerializeLogTest.java     |  7 +-
 .../FilePartitionedSnapshotLogManagerTest.java     |  5 +-
 .../cluster/log/manage/MemoryLogManagerTest.java   |  6 --
 .../query/ClusterAggregateExecutorTest.java        |  6 +-
 .../query/ClusterDataQueryExecutorTest.java        |  9 ++-
 .../cluster/query/ClusterFillExecutorTest.java     |  5 +-
 .../iotdb/cluster/query/ClusterPlannerTest.java    |  1 -
 .../cluster/query/ClusterQueryRouterTest.java      |  8 +-
 .../ClusterGroupByNoVFilterDataSetTest.java        |  3 +-
 .../groupby/ClusterGroupByVFilterDataSetTest.java  |  3 +-
 .../query/groupby/MergeGroupByExecutorTest.java    |  8 +-
 .../query/groupby/RemoteGroupByExecutorTest.java   |  8 +-
 .../query/manage/ClusterQueryManagerTest.java      | 34 +++++---
 .../cluster/query/manage/QueryCoordinatorTest.java |  3 +-
 .../query/reader/ClusterTimeGeneratorTest.java     | 15 ++--
 .../reader/RemoteSeriesReaderByTimestampTest.java  | 48 +++++------
 .../cluster/server/member/DataGroupMemberTest.java | 53 +++++-------
 .../cluster/server/member/MetaGroupMemberTest.java | 16 ++--
 .../db/engine/storagegroup/TsFileResource.java     |  7 +-
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  | 39 +++++++--
 .../iotdb/db/qp/physical/crud/BatchInsertPlan.java |  6 +-
 .../iotdb/db/qp/physical/crud/DeletePlan.java      |  6 +-
 .../iotdb/db/qp/physical/crud/InsertPlan.java      | 29 ++++++-
 .../db/qp/physical/sys/CreateTimeSeriesPlan.java   |  4 +-
 .../db/qp/physical/sys/SetStorageGroupPlan.java    |  4 +-
 .../iotdb/db/query/reader/series/SeriesReader.java |  4 +-
 .../db/writelog/node/ExclusiveWriteLogNode.java    |  4 +-
 .../org/apache/iotdb/db/tools/WalCheckerTest.java  |  4 +-
 .../iotdb/db/writelog/io/LogWriterReaderTest.java  |  2 +-
 .../db/writelog/io/MultiFileLogReaderTest.java     |  2 +-
 service-rpc/src/main/thrift/cluster.thrift         | 10 ++-
 67 files changed, 494 insertions(+), 368 deletions(-)