You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ch...@apache.org on 2021/03/10 08:00:23 UTC

[iotdb] branch feature/metric2021 updated (81a8100 -> f90bbca)

This is an automated email from the ASF dual-hosted git repository.

chaow pushed a change to branch feature/metric2021
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 81a8100  fix code smell
     add 66dec47  fix code smell
     add 7f9aaaa  [IOTDB-1043] Change rpc port &use internal ip for communication between nodes in cluster (#2740)
     add d718827  fix NPE bug in QueryTimeManager
     add 45210d7  apply spotless
     add f63b849  fix bug
     add 5fcff40  Merge pull request #2759 from apache/fixQueryInfoNull
     add 76b6d82  Downgrade readlock to writelock in delete (#2774)
     add 371b852  Fix the sketch tool in new tsfile format (#2775)
     add 4de1f8b  change the default max JVM heap size from 8G to 64G (#2771)
     add ba4cfaa  [IOTDB-1118] [Distributed] Limit query log lag in mid consistency level (#2766)
     add 5409c37  Update the picture of tsfile format (#2773)
     add c50628b  [IOTDB-1181] Upgrade jetty jar to fix CVE-2020-27216
     add d622fe8  Add welcome info for who submit issues/PRs the first time. (#2779)
     add e9bd562  [IOTDB-1186] Remove redundant sync meta leader in query process for cluster module
     add 7c40ce7  Update IoTDBConstant.java  remove unused field (#2777)
     add 4c2a3b5  [IOTDB-1189] [Distributed]optimize thread pool client close (#2782)
     add ca02b36  Add max direct memory size parameter to env.sh
     add 6694c5d  Update the SeedUrl Format Exception Info when using cluster mode (#2786)
     add 6832eee  [ISSUE-2661] SyncClientPool And AsyncClientPool have concurrency problem (#2791)
     add f90bbca  merge master

No new revisions were added by this update.

Summary of changes:
 .github/workflows/greetings.yml                    |  13 ++
 .../resources/conf/iotdb-cluster.properties        |  31 ++-
 cluster/src/assembly/resources/sbin/start-node.bat |  48 +++--
 cluster/src/assembly/resources/sbin/start-node.sh  |  39 ++--
 .../java/org/apache/iotdb/cluster/ClientMain.java  |   4 +-
 .../java/org/apache/iotdb/cluster/ClusterMain.java | 110 +++-------
 .../iotdb/cluster/client/DataClientProvider.java   |   7 +-
 .../cluster/client/async/AsyncClientPool.java      |  34 ++--
 .../cluster/client/async/AsyncDataClient.java      |   2 +-
 .../client/async/AsyncDataHeartbeatClient.java     |   2 +-
 .../cluster/client/async/AsyncMetaClient.java      |   2 +-
 .../client/async/AsyncMetaHeartbeatClient.java     |   2 +-
 .../iotdb/cluster/client/sync/SyncClientPool.java  |  59 +++---
 .../iotdb/cluster/client/sync/SyncDataClient.java  |  13 +-
 .../client/sync/SyncDataHeartbeatClient.java       |   2 +-
 .../iotdb/cluster/client/sync/SyncMetaClient.java  |  19 +-
 .../client/sync/SyncMetaHeartbeatClient.java       |   2 +-
 .../apache/iotdb/cluster/config/ClusterConfig.java |  61 +++---
 .../iotdb/cluster/config/ClusterConstant.java      |   2 -
 .../iotdb/cluster/config/ClusterDescriptor.java    | 153 +++++---------
 .../iotdb/cluster/coordinator/Coordinator.java     |   2 +-
 .../exception/BadSeedUrlFormatException.java       |   3 +-
 .../exception/CheckConsistencyException.java       |   4 +
 .../org/apache/iotdb/cluster/log/HardState.java    |  52 ++---
 .../log/snapshot/PullSnapshotTaskDescriptor.java   |  12 ++
 .../apache/iotdb/cluster/metadata/CMManager.java   | 123 ++++++-----
 .../apache/iotdb/cluster/metadata/MetaPuller.java  |  25 +--
 .../cluster/partition/slot/SlotPartitionTable.java |   3 -
 .../cluster/query/ClusterDataQueryExecutor.java    |   8 +
 .../iotdb/cluster/query/ClusterPlanExecutor.java   |  43 ++--
 .../cluster/query/aggregate/ClusterAggregator.java |  14 +-
 .../cluster/query/fill/ClusterPreviousFill.java    |  14 +-
 .../query/groupby/RemoteGroupByExecutor.java       |  27 +--
 .../query/last/ClusterLastQueryExecutor.java       |  14 +-
 .../cluster/query/reader/ClusterReaderFactory.java |  24 +--
 .../cluster/query/reader/ClusterTimeGenerator.java |   4 +-
 .../iotdb/cluster/query/reader/DataSourceInfo.java |  12 +-
 .../apache/iotdb/cluster/server/ClientServer.java  |  15 +-
 .../iotdb/cluster/server/DataClusterServer.java    |  15 +-
 .../iotdb/cluster/server/MetaClusterServer.java    |  16 +-
 .../cluster/server/PullSnapshotHintService.java    |   9 +-
 .../apache/iotdb/cluster/server/RaftServer.java    |  14 +-
 .../server/heartbeat/DataHeartbeatServer.java      |   4 +-
 .../cluster/server/heartbeat/HeartbeatServer.java  |   6 +-
 .../server/heartbeat/MetaHeartbeatServer.java      |  12 +-
 .../cluster/server/member/DataGroupMember.java     |   5 +-
 .../cluster/server/member/MetaGroupMember.java     |  24 ++-
 .../iotdb/cluster/server/member/RaftMember.java    | 139 +++++++++----
 .../iotdb/cluster/server/monitor/NodeReport.java   |   2 +-
 .../cluster/server/service/BaseAsyncService.java   |   3 +-
 .../cluster/server/service/BaseSyncService.java    |  15 +-
 .../cluster/server/service/DataSyncService.java    |   7 +-
 .../cluster/server/service/MetaSyncService.java    |   5 +-
 .../apache/iotdb/cluster/utils/ClusterNode.java    |  28 ++-
 .../apache/iotdb/cluster/utils/ClusterUtils.java   |  26 +--
 .../utils/nodetool/function/NodeToolCmd.java       |   3 +-
 .../cluster/client/DataClientProviderTest.java     | 138 ++++++++++++-
 .../cluster/client/async/AsyncDataClientTest.java  |   4 +-
 .../client/async/AsyncDataHeartbeatClientTest.java |   2 +-
 .../cluster/client/async/AsyncMetaClientTest.java  |   4 +-
 .../client/async/AsyncMetaHeartbeatClientTest.java |   4 +-
 .../cluster/client/sync/SyncClientPoolTest.java    |  17 +-
 .../cluster/client/sync/SyncDataClientTest.java    |  60 +++++-
 .../client/sync/SyncDataHeartbeatClientTest.java   |   6 +-
 .../cluster/client/sync/SyncMetaClientTest.java    |  52 ++++-
 .../client/sync/SyncMetaHeartbeatClientTest.java   |   6 +-
 .../cluster/common/TestAsyncClientFactory.java     |   2 +-
 .../cluster/common/TestPartitionedLogManager.java  |   5 +-
 .../org/apache/iotdb/cluster/common/TestUtils.java |   4 +-
 .../cluster/integration/BaseSingleNodeTest.java    |   7 +-
 .../apache/iotdb/cluster/log/HardStateTest.java    |   3 +-
 .../cluster/log/applier/DataLogApplierTest.java    |   3 +-
 .../cluster/log/applier/MetaLogApplierTest.java    |   4 +-
 .../cluster/log/catchup/LogCatchUpTaskTest.java    |  22 +-
 .../log/catchup/SnapshotCatchUpTaskTest.java       |  44 ++--
 .../cluster/log/logtypes/SerializeLogTest.java     |   4 +-
 .../cluster/partition/SlotPartitionTableTest.java  |  23 ++-
 .../handlers/caller/HeartbeatHandlerTest.java      |   4 +-
 .../cluster/server/member/DataGroupMemberTest.java |   7 +-
 .../iotdb/cluster/server/member/MemberTest.java    | 224 +++++++++++++--------
 .../cluster/server/member/MetaGroupMemberTest.java |  10 +-
 .../org/apache/iotdb/cluster/utils/Constants.java  |   6 +-
 .../resources/node1conf/iotdb-cluster.properties   |  30 +--
 .../resources/node1conf}/iotdb-engine.properties   |  14 +-
 .../resources/node2conf/iotdb-cluster.properties   |  30 +--
 .../resources/node2conf}/iotdb-engine.properties   |  14 +-
 .../resources/node3conf/iotdb-cluster.properties   |  30 +--
 .../resources/node3conf}/iotdb-engine.properties   |  14 +-
 docs/SystemDesign/QueryEngine/QueryEngine.md       |   2 +-
 docs/SystemDesign/TsFile/Format.md                 |   2 +-
 docs/UserGuide/Server/Cluster Setup.md             |  71 +++----
 docs/UserGuide/System Tools/NodeTool.md            |  42 ++--
 docs/zh/SystemDesign/QueryEngine/QueryEngine.md    |   2 +-
 docs/zh/SystemDesign/TsFile/Format.md              |   2 +-
 docs/zh/UserGuide/Server/Cluster Setup.md          |  71 +++----
 docs/zh/UserGuide/System Tools/NodeTool.md         |  44 ++--
 .../iotdb/metrics/dropwizard/MetricName.java       |   2 +
 pom.xml                                            |   2 +-
 server/src/assembly/resources/conf/iotdb-env.bat   |   7 +-
 server/src/assembly/resources/conf/iotdb-env.sh    |  11 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  18 +-
 .../org/apache/iotdb/db/conf/IoTDBConstant.java    |   1 -
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  51 ++---
 .../db/engine/cache/TimeSeriesMetadataCache.java   |  30 +--
 .../engine/storagegroup/StorageGroupProcessor.java |   4 +-
 .../iotdb/db/query/control/QueryTimeManager.java   |  14 +-
 .../java/org/apache/iotdb/db/service/IoTDB.java    |   9 +-
 .../apache/iotdb/db/tools/TsFileSketchTool.java    |   6 +-
 .../org/apache/iotdb/db/utils/SerializeUtils.java  |  42 ++--
 .../apache/iotdb/db/utils/SerializeUtilsTest.java  |   4 +-
 thrift/src/main/thrift/cluster.thrift              |   6 +-
 .../iotdb/tsfile/read/reader/LocalTsFileInput.java |   1 +
 112 files changed, 1492 insertions(+), 1086 deletions(-)
 create mode 100644 .github/workflows/greetings.yml
 copy server/src/main/java/org/apache/iotdb/db/metrics/source/Source.java => cluster/src/test/java/org/apache/iotdb/cluster/utils/Constants.java (88%)
 copy .asf.yaml => cluster/src/test/resources/node1conf/iotdb-cluster.properties (60%)
 copy {cross-tests/src/test/resources => cluster/src/test/resources/node1conf}/iotdb-engine.properties (78%)
 copy .asf.yaml => cluster/src/test/resources/node2conf/iotdb-cluster.properties (60%)
 copy {cross-tests/src/test/resources => cluster/src/test/resources/node2conf}/iotdb-engine.properties (78%)
 copy .asf.yaml => cluster/src/test/resources/node3conf/iotdb-cluster.properties (60%)
 copy {cross-tests/src/test/resources => cluster/src/test/resources/node3conf}/iotdb-engine.properties (78%)