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/26 08:53:09 UTC
[incubator-iotdb] branch cluster_new updated (41cb534 -> fd10ec6)
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 41cb534 Merge branch 'master' into cluster_new
add fd10ec6 still fixing
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/iotdb/cluster/ClusterMain.java | 3 +-
.../iotdb/cluster/log/applier/BaseApplier.java | 15 +-
.../log/manage/PartitionedSnapshotLogManager.java | 4 +-
.../iotdb/cluster/partition/PartitionTable.java | 38 +-
.../cluster/query/ClusterAggregateExecutor.java | 2 +-
.../iotdb/cluster/query/ClusterPlanExecutor.java | 6 +-
.../cluster/query/reader/MergeAggregateReader.java | 84 -----
.../iotdb/cluster/server/DataClusterServer.java | 39 +--
.../iotdb/cluster/server/MetaClusterServer.java | 4 +-
.../cluster/server/member/DataGroupMember.java | 54 +++
.../cluster/server/member/MetaGroupMember.java | 23 +-
.../apache/iotdb/cluster/utils/SerializeUtils.java | 3 +-
.../cluster/utils/nodetool/ClusterMonitor.java | 8 +-
.../iotdb/cluster/common/EnvironmentUtils.java | 3 -
.../org/apache/iotdb/cluster/common/IoTDBTest.java | 32 +-
.../iotdb/cluster/common/TestAggregateReader.java | 70 ----
.../apache/iotdb/cluster/common/TestClient.java | 3 -
.../iotdb/cluster/common/TestDataGroupMember.java | 1 -
.../org/apache/iotdb/cluster/common/TestLog.java | 9 -
.../cluster/common/TestManagedSeriesReader.java | 37 +-
.../iotdb/cluster/common/TestPartitionTable.java | 114 ------
.../iotdb/cluster/common/TestPointReader.java | 37 --
.../cluster/common/TestRemoteFileSnapshot.java | 1 -
.../org/apache/iotdb/cluster/common/TestUtils.java | 16 +-
.../cluster/log/applier/DataLogApplierTest.java | 6 +-
.../cluster/log/applier/MetaLogApplierTest.java | 4 +-
.../iotdb/cluster/partition/MManagerWhiteBox.java | 8 +-
.../cluster/partition/SlotPartitionTableTest.java | 22 +-
.../apache/iotdb/cluster/query/BaseQueryTest.java | 68 +---
.../query/ClusterAggregateExecutorTest.java | 5 +-
.../query/ClusterDataQueryExecutorTest.java | 13 +-
.../query/ClusterPhysicalGeneratorTest.java | 6 +-
.../cluster/query/ClusterPlanExecutorTest.java | 6 +-
.../iotdb/cluster/query/ClusterPlannerTest.java | 4 +-
.../cluster/query/ClusterQueryRouterTest.java | 12 +-
.../query/manage/ClusterQueryManagerTest.java | 15 +-
.../query/reader/ClusterTimeGeneratorTest.java | 13 +-
.../query/reader/MergeAggregateReaderTest.java | 57 ---
.../query/reader/RemoteAggregateReaderTest.java | 124 -------
.../reader/RemoteSeriesReaderByTimestampTest.java | 45 ++-
.../query/reader/RemoteSimpleSeriesReaderTest.java | 18 +-
.../handlers/caller/HeartBeatHandlerTest.java | 2 +-
.../server/heartbeat/HeartBeatThreadTest.java | 3 +-
.../cluster/server/member/DataGroupMemberTest.java | 214 +++---------
.../iotdb/cluster/server/member/MemberTest.java | 8 +-
.../cluster/server/member/MetaGroupMemberTest.java | 168 +++------
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 -
.../qp/executor/AbstractQueryProcessExecutor.java | 388 ---------------------
.../iotdb/db/qp/plan/ConcatOptimizerTest.java | 2 +-
.../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 205 -----------
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 193 ----------
.../reader/series/SeriesAggregateReaderTest.java | 1 +
.../reader/series/SeriesReaderByTimestampTest.java | 1 +
.../query/reader/series/SeriesReaderTestUtil.java | 1 +
service-rpc/src/main/thrift/cluster.thrift | 3 +
55 files changed, 350 insertions(+), 1873 deletions(-)
delete mode 100644 cluster/src/main/java/org/apache/iotdb/cluster/query/reader/MergeAggregateReader.java
delete mode 100644 cluster/src/test/java/org/apache/iotdb/cluster/common/TestAggregateReader.java
delete mode 100644 cluster/src/test/java/org/apache/iotdb/cluster/common/TestPartitionTable.java
delete mode 100644 cluster/src/test/java/org/apache/iotdb/cluster/common/TestPointReader.java
delete mode 100644 cluster/src/test/java/org/apache/iotdb/cluster/query/reader/MergeAggregateReaderTest.java
delete mode 100644 cluster/src/test/java/org/apache/iotdb/cluster/query/reader/RemoteAggregateReaderTest.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/qp/plan/QPUpdateTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/qp/utils/MemIntQpExecutor.java