You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/03/25 01:49:32 UTC
[iotdb] 01/01: Merge branch 'master' of
https://github.com/apache/iotdb into NewDoc
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch NewDoc
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 193b0c739dc1d61f30caaa50ae3ccf10869411e4
Merge: b6fb052 8fc8de3
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Mar 25 09:47:30 2021 +0800
Merge branch 'master' of https://github.com/apache/iotdb into NewDoc
.github/workflows/client.yml | 30 +-
.github/workflows/greetings.yml | 13 +
.github/workflows/sonar-coveralls.yml | 14 +-
antlr/pom.xml | 19 +
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 2 +-
client-cpp/README.md | 6 +-
cluster/pom.xml | 2 +-
.../resources/conf/iotdb-cluster.properties | 44 +-
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 | 115 ++---
.../iotdb/cluster/client/DataClientProvider.java | 7 +-
.../cluster/client/async/AsyncClientPool.java | 44 +-
.../cluster/client/async/AsyncDataClient.java | 2 +-
.../client/async/AsyncDataHeartbeatClient.java | 2 +-
.../cluster/client/async/AsyncMetaClient.java | 2 +-
.../client/async/AsyncMetaHeartbeatClient.java | 2 +-
.../cluster/client/sync/SyncClientAdaptor.java | 17 +
.../iotdb/cluster/client/sync/SyncClientPool.java | 69 +--
.../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 | 87 +++-
.../iotdb/cluster/config/ClusterConstant.java | 2 -
.../iotdb/cluster/config/ClusterDescriptor.java | 170 +++-----
.../iotdb/cluster/coordinator/Coordinator.java | 29 +-
.../exception/BadSeedUrlFormatException.java | 3 +-
.../exception/CheckConsistencyException.java | 4 +
.../org/apache/iotdb/cluster/log/HardState.java | 52 +--
.../java/org/apache/iotdb/cluster/log/Log.java | 10 +
.../apache/iotdb/cluster/log/LogDispatcher.java | 8 +-
.../cluster/log/manage/CommittedEntryManager.java | 34 ++
.../iotdb/cluster/log/manage/RaftLogManager.java | 37 +-
.../log/snapshot/PullSnapshotTaskDescriptor.java | 12 +
.../apache/iotdb/cluster/metadata/CMManager.java | 184 ++++----
.../apache/iotdb/cluster/metadata/MetaPuller.java | 28 +-
.../cluster/partition/slot/SlotPartitionTable.java | 3 -
.../cluster/query/ClusterDataQueryExecutor.java | 8 +
.../cluster/query/ClusterPhysicalGenerator.java | 20 +-
.../iotdb/cluster/query/ClusterPlanExecutor.java | 133 ++++--
.../iotdb/cluster/query/LocalQueryExecutor.java | 15 +-
.../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 +-
.../iotdb/cluster/query/reader/EmptyReader.java | 3 +-
.../cluster/query/reader/MergedReaderByTime.java | 8 +-
.../reader/RemoteSeriesReaderByTimestamp.java | 40 +-
.../apache/iotdb/cluster/server/ClientServer.java | 17 +-
.../iotdb/cluster/server/DataClusterServer.java | 41 +-
.../iotdb/cluster/server/MetaClusterServer.java | 16 +-
.../cluster/server/PullSnapshotHintService.java | 9 +-
.../apache/iotdb/cluster/server/RaftServer.java | 14 +-
.../caller/GetChildNodeNextLevelHandler.java | 59 +++
.../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 | 77 ++--
.../iotdb/cluster/server/member/RaftMember.java | 150 +++++--
.../iotdb/cluster/server/monitor/NodeReport.java | 2 +-
.../cluster/server/service/BaseAsyncService.java | 3 +-
.../cluster/server/service/BaseSyncService.java | 15 +-
.../cluster/server/service/DataAsyncService.java | 21 +-
.../cluster/server/service/DataSyncService.java | 36 +-
.../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 | 156 ++++++-
.../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/SyncClientAdaptorTest.java | 9 +
.../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 +-
.../iotdb/cluster/common/TestAsyncDataClient.java | 13 +-
.../cluster/common/TestManagedSeriesReader.java | 23 +-
.../cluster/common/TestPartitionedLogManager.java | 5 +-
.../org/apache/iotdb/cluster/common/TestUtils.java | 5 +-
.../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/log/manage/RaftLogManagerTest.java | 35 ++
.../cluster/partition/SlotPartitionTableTest.java | 23 +-
.../apache/iotdb/cluster/query/BaseQueryTest.java | 4 +-
.../query/groupby/RemoteGroupByExecutorTest.java | 4 +-
.../query/manage/ClusterQueryManagerTest.java | 2 +-
.../reader/RemoteSeriesReaderByTimestampTest.java | 68 +--
.../handlers/caller/HeartbeatHandlerTest.java | 4 +-
.../member/{MemberTest.java => BaseMember.java} | 180 +-------
.../cluster/server/member/DataGroupMemberTest.java | 39 +-
.../cluster/server/member/MetaGroupMemberTest.java | 53 ++-
.../cluster/server/member/RaftMemberTest.java | 244 +++++++++++
.../org/apache/iotdb/cluster/utils/Constants.java} | 13 +-
.../resources/node1conf/iotdb-cluster.properties | 36 ++
.../resources/node1conf/iotdb-engine.properties | 29 ++
.../resources/node2conf/iotdb-cluster.properties | 36 ++
.../resources/node2conf/iotdb-engine.properties | 29 ++
.../resources/node3conf/iotdb-cluster.properties | 36 ++
.../resources/node3conf/iotdb-engine.properties | 29 ++
docs/SystemDesign/QueryEngine/QueryEngine.md | 2 +-
docs/SystemDesign/StorageEngine/WAL.md | 6 +-
docs/SystemDesign/TsFile/Format.md | 2 +-
.../UserGuide/Ecosystem Integration/Flink IoTDB.md | 124 ++++++
.../Ecosystem Integration/Flink TsFile.md | 180 ++++++++
docs/UserGuide/Operation Manual/Kill Query.md | 2 +-
.../Operation Manual/UDF User Defined Function.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/StorageEngine/WAL.md | 7 +-
docs/zh/SystemDesign/TsFile/Format.md | 2 +-
.../UserGuide/Ecosystem Integration/Flink IoTDB.md | 122 ++++++
.../Ecosystem Integration/Flink Tsfile.md | 179 ++++++++
docs/zh/UserGuide/Operation Manual/Kill Query.md | 2 +-
.../Operation Manual/UDF User Defined Function.md | 2 +-
docs/zh/UserGuide/Server/Cluster Setup.md | 71 ++--
docs/zh/UserGuide/System Tools/NodeTool.md | 44 +-
example/client-cpp-example/README.md | 2 +-
hive-connector/pom.xml | 12 +-
pom.xml | 2 +-
.../resources/conf/iotdb-engine.properties | 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 | 30 +-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 1 -
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 55 +--
.../apache/iotdb/db/cost/statistic/Operation.java | 1 +
.../org/apache/iotdb/db/engine/StorageEngine.java | 4 +-
.../db/engine/compaction/TsFileManagement.java | 8 +
.../level/LevelCompactionTsFileManagement.java | 31 ++
.../engine/compaction/utils/CompactionUtils.java | 5 +-
.../db/engine/merge/manage/MergeResource.java | 27 ++
.../iotdb/db/engine/merge/task/MergeFileTask.java | 26 +-
.../db/engine/merge/task/MergeMultiChunkTask.java | 4 +
.../engine/storagegroup/StorageGroupProcessor.java | 4 +-
.../db/engine/storagegroup/TsFileResource.java | 10 +
.../storagegroup/timeindex/DeviceTimeIndex.java | 12 +
.../storagegroup/timeindex/FileTimeIndex.java | 12 +
.../engine/storagegroup/timeindex/ITimeIndex.java | 16 +
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 31 ++
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 32 ++
.../iotdb/db/qp/physical/crud/FillQueryPlan.java | 9 +
.../iotdb/db/qp/physical/crud/QueryPlan.java | 18 +-
.../apache/iotdb/db/qp/physical/crud/UDTFPlan.java | 8 +
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 471 ++++++++++-----------
.../db/query/aggregation/AggregateResult.java | 4 +
.../db/query/aggregation/impl/AvgAggrResult.java | 25 +-
.../db/query/aggregation/impl/CountAggrResult.java | 18 +-
.../aggregation/impl/FirstValueAggrResult.java | 26 +-
.../aggregation/impl/FirstValueDescAggrResult.java | 20 +-
.../aggregation/impl/LastValueAggrResult.java | 26 +-
.../aggregation/impl/LastValueDescAggrResult.java | 37 +-
.../query/aggregation/impl/MaxTimeAggrResult.java | 20 +-
.../aggregation/impl/MaxTimeDescAggrResult.java | 31 +-
.../query/aggregation/impl/MaxValueAggrResult.java | 18 +-
.../query/aggregation/impl/MinTimeAggrResult.java | 24 +-
.../aggregation/impl/MinTimeDescAggrResult.java | 17 +-
.../query/aggregation/impl/MinValueAggrResult.java | 18 +-
.../db/query/aggregation/impl/SumAggrResult.java | 15 +-
.../db/query/control/QueryResourceManager.java | 9 +
.../iotdb/db/query/control/QueryTimeManager.java | 16 +-
.../dataset/RawQueryDataSetWithValueFilter.java | 172 +++++---
.../db/query/executor/AggregationExecutor.java | 87 ++--
.../adapter/ByTimestampReaderAdapter.java | 48 ++-
.../reader/chunk/DiskChunkReaderByTimestamp.java | 55 +--
.../db/query/reader/series/IReaderByTimestamp.java | 2 +-
.../reader/series/SeriesReaderByTimestamp.java | 17 +-
.../org/apache/iotdb/db/rescon/SystemInfo.java | 56 +--
.../java/org/apache/iotdb/db/service/IoTDB.java | 9 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 237 ++++++-----
.../apache/iotdb/db/tools/TsFileSketchTool.java | 6 +-
.../org/apache/iotdb/db/utils/SerializeUtils.java | 42 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 55 +++
.../integration/IOTDBGroupByInnerIntervalIT.java | 135 +++---
.../iotdb/db/integration/IoTDBExecuteBatchIT.java | 79 ++++
.../db/integration/IoTDBNewTsFileCompactionIT.java | 2 +-
.../iotdb/db/integration/IoTDBQueryDemoIT.java | 8 +-
.../aggregation/IoTDBAggregationIT.java | 137 +++---
.../apache/iotdb/db/metadata/mnode/MNodeTest.java | 27 ++
.../reader/series/SeriesReaderByTimestampTest.java | 12 +-
.../apache/iotdb/db/utils/SerializeUtilsTest.java | 4 +-
site/src/main/.vuepress/config.js | 8 +-
thrift/pom.xml | 19 +
thrift/src/main/thrift/cluster.thrift | 15 +-
.../file/metadata/enums/CompressionType.java | 24 +-
.../file/metadata/enums/MetadataIndexNodeType.java | 17 +-
.../tsfile/file/metadata/enums/TSDataType.java | 21 +-
.../tsfile/file/metadata/enums/TSEncoding.java | 27 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 15 +-
.../query/dataset/DataSetWithTimeGenerator.java | 2 +-
.../tsfile/read/query/dataset/QueryDataSet.java | 5 +
.../read/query/timegenerator/TimeGenerator.java | 52 ++-
.../read/query/timegenerator/node/AndNode.java | 18 +-
.../read/query/timegenerator/node/OrNode.java | 42 +-
.../iotdb/tsfile/read/reader/LocalTsFileInput.java | 1 +
.../apache/iotdb/tsfile/write/schema/Schema.java | 2 +-
...easurementChunkMetadataListMapIteratorTest.java | 65 ++-
.../tsfile/read/reader/FakedTimeGenerator.java | 15 +-
.../zeppelin/iotdb/IoTDBInterpreterTest.java | 2 +-
215 files changed, 4760 insertions(+), 2201 deletions(-)
diff --cc docs/zh/UserGuide/Operation Manual/Kill Query.md
index ae2eaae,13917ec..93bc205
--- a/docs/zh/UserGuide/Operation Manual/Kill Query.md
+++ b/docs/zh/UserGuide/Operation Manual/Kill Query.md
@@@ -62,16 -25,13 +62,16 @@@ IoTDB> CREATE SNAPSHOT FOR SCHEM
从 0.12 版本开始，IoTDB 对执行时间过长的查询给出了两种解决方案：查询超时和查询中止。
-## 查询超时
+#### 查询超时
-对于执行时间过长的查询，IoTDB 将强行中断该查询，并抛出超时异常，如图所示：
+对于执行时间过长的查询，IoTDB 将强行中断该查询，并抛出超时异常，如下所示：
-
+```
+IoTDB> select * from root;
+Msg: 701 Current query is time out, please check your statement or modify timeout parameter.
+```
- 系统默认的超时时间为 60000 ms，可以在配置文件中通过 `query_time_threshold` 参数进行自定义配置。
+ 系统默认的超时时间为 60000 ms，可以在配置文件中通过 `query_timeout_threshold` 参数进行自定义配置。
如果您使用 JDBC 或 Session，还支持对单个查询设置超时时间（单位为 ms）：