You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/12/29 12:43:38 UTC
[iotdb] branch lmh/addQueryMetrics updated (574db2eaa1 -> 8de1c75743)
This is an automated email from the ASF dual-hosted git repository.
hui pushed a change to branch lmh/addQueryMetrics
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 574db2eaa1 Merge remote-tracking branch 'origin/master' into lmh/addQueryMetrics
add b1b17f971a change STARTUP_RETRY_INTERVAL_IN_MS from 30s to 3s (#8629)
add 8bb400d17a Fix Bug in NullColumn
add 8ad71667cd [IOTDB-5278] fix connection problem of dbeaver and supports more functions (#8624)
add dd7291dbf2 Bump wheel from 0.36.2 to 0.38.1 in /client-py (#8617)
add db38945c16 [IOTDB-5297] Add maxRetryTimes for IoTDBClusterNodeErrorStartUpIT to avoid infinite loop (#8628)
add 217e3d7747 [IOTDB-5106] Parse PathPattern to Deterministic Finite Automate (#8607)
add 905a356c8f [IOTDB-5306] Change default port of ConfigNode and DataNode (#8635)
add 14db9f8784 fix grafana-connector bug (#8636)
add 48bd8c9b68 [IOTDB-5290] Add retry failed tasks thread for sync and trigger(#8610)
add 15c9231120 [IOTDB-5300] Added node status check in migrate Region sql (#8641)
add 5a73bc30e9 [IOTDB-5282] Add SQL: show cluster parameter (#8643)
add 1af7fbe3c4 set isClosed to true after submitting close signal (#8623)
add 08f924c707 Add SHOW_CQ privilege (#8655)
add 6762bcb65c [IOTDB-5266] Refine the code of cross selector and fix the bug when using FileTimeIndex (#8579)
add 0fedffd303 [IOTDB-5313] Fix python client didn't handle redirection status code correctly (#8659)
add 0e9c0d322a Merge remote-tracking branch 'origin/master' into lmh/addQueryMetrics
add 8de1c75743 fix review
No new revisions were added by this update.
Summary of changes:
.../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 1 +
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 9 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 10 +-
client-py/iotdb/Session.py | 5 +-
client-py/iotdb/dbapi/tests/test_connection.py | 1 +
client-py/iotdb/dbapi/tests/test_cursor.py | 1 +
client-py/iotdb/sqlalchemy/tests/test_dialect.py | 3 +-
client-py/requirements_dev.txt | 2 +-
client-py/tests/test_aligned_timeseries.py | 1 +
client-py/tests/test_delete_data.py | 1 +
client-py/tests/test_one_device.py | 1 +
client-py/tests/test_session.py | 5 +-
.../resources/conf/iotdb-confignode.properties | 8 +-
.../assembly/resources/sbin/start-confignode.bat | 4 +-
.../iotdb/confignode/conf/ConfigNodeConfig.java | 6 +-
.../confignode/conf/SystemPropertiesUtils.java | 9 +-
.../statemachine/ConfigNodeRegionStateMachine.java | 4 +-
.../iotdb/confignode/manager/ConfigManager.java | 121 ++-
.../apache/iotdb/confignode/manager/IManager.java | 20 +
.../iotdb/confignode/manager/ProcedureManager.java | 50 +-
.../confignode/manager/RetryFailedTasksThread.java | 195 +++++
.../iotdb/confignode/manager/SyncManager.java | 7 +-
.../iotdb/confignode/manager/node/NodeManager.java | 72 --
.../OperatePipeProcedureRollbackProcessor.java | 122 ---
.../iotdb/confignode/service/ConfigNode.java | 19 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 6 +
.../request/ConfigPhysicalPlanSerDeTest.java | 56 +-
.../load/balancer/router/RegionRouteMapTest.java | 8 +-
.../router/priority/GreedyPriorityTest.java | 8 +-
.../priority/LeaderPriorityBalancerTest.java | 16 +-
.../confignode/persistence/PartitionInfoTest.java | 8 +-
.../impl/CreateRegionGroupsProcedureTest.java | 16 +-
.../impl/node/AddConfigNodeProcedureTest.java | 2 +-
.../impl/node/RemoveConfigNodeProcedureTest.java | 2 +-
.../confignode1conf/iotdb-confignode.properties | 6 +-
.../confignode2conf/iotdb-confignode.properties | 6 +-
.../confignode3conf/iotdb-confignode.properties | 6 +-
docker/ReadMe.md | 6 +-
.../DockerCompose/docker-compose-cluster-1c2d.yml | 6 +-
.../DockerCompose/docker-compose-cluster-3c3d.yml | 16 +-
.../DockerCompose/docker-compose-host-3c3d.yml | 16 +-
.../DockerCompose/docker-compose-standalone.yml | 4 +-
docker/src/main/Dockerfile-0.12.6-cluster | 6 +-
docker/src/main/Dockerfile-0.13.0-cluster | 6 +-
docker/src/main/Dockerfile-1.0.0-confignode | 4 +-
docker/src/main/Dockerfile-1.0.0-datanode | 4 +-
.../Administration-Management/Administration.md | 65 +-
docs/UserGuide/Cluster/Cluster-Maintenance.md | 85 +-
docs/UserGuide/Cluster/Cluster-Setup.md | 44 +-
.../Edge-Cloud-Collaboration/Sync-Tool.md | 8 +-
docs/UserGuide/QuickStart/ClusterQuickStart.md | 92 +--
docs/UserGuide/QuickStart/WayToGetIoTDB.md | 26 +-
.../Reference/ConfigNode-Config-Manual.md | 6 +-
docs/UserGuide/Reference/DataNode-Config-Manual.md | 10 +-
.../Administration-Management/Administration.md | 65 +-
docs/zh/UserGuide/Cluster/Cluster-Concept.md | 24 +-
docs/zh/UserGuide/Cluster/Cluster-Maintenance.md | 85 +-
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 42 +-
.../Edge-Cloud-Collaboration/Sync-Tool.md | 8 +-
docs/zh/UserGuide/QuickStart/ClusterQuickStart.md | 102 +--
docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md | 24 +-
.../Reference/ConfigNode-Config-Manual.md | 6 +-
.../UserGuide/Reference/DataNode-Config-Manual.md | 10 +-
.../web/grafana/interceptor/LoginInterceptor.java | 3 +
.../org/apache/iotdb/it/env/RemoteServerEnv.java | 2 +-
.../org/apache/iotdb/itbase/env/BaseConfig.java | 30 +-
.../confignode/it/IoTDBConfigNodeSnapshotIT.java | 2 +-
.../it/cluster/IoTDBClusterNodeErrorStartUpIT.java | 51 +-
.../it/cluster/IoTDBClusterNodeGetterIT.java | 73 +-
.../it/cluster/IoTDBClusterRestartIT.java | 2 +-
.../it/load/IoTDBConfigNodeSwitchLeaderIT.java | 2 +-
.../it/partition/IoTDBPartitionDurableIT.java | 2 +-
.../it/partition/IoTDBPartitionGetterIT.java | 2 +-
.../confignode/it/utils/ConfigNodeTestUtils.java | 46 +-
.../java/org/apache/iotdb/db/it/cq/IoTDBCQIT.java | 88 ++
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 166 +---
node-commons/pom.xml | 4 +
.../src/assembly/resources/sbin/iotdb-common.sh | 12 +-
.../iotdb/commons/auth/entity/PrivilegeType.java | 3 +-
.../apache/iotdb/commons/conf/IoTDBConstant.java | 20 +-
.../apache/iotdb/commons/path/fa/FAFactory.java | 55 ++
.../iotdb/commons/path/fa/IFATransition.java | 4 +-
.../apache/iotdb/commons/path/fa/IPatternFA.java | 58 ++
.../apache/iotdb/commons/path/fa/dfa/DFAState.java | 44 +-
.../iotdb/commons/path/fa/dfa/PatternDFA.java | 152 ++++
.../iotdb/commons/path/fa/dfa/graph/Closure.java | 46 +-
.../iotdb/commons/path/fa/dfa/graph/DFAGraph.java | 173 ++++
.../iotdb/commons/path/fa/dfa/graph/NFAGraph.java | 126 +++
.../fa/dfa/transition/AbstractDFATransition.java | 34 +-
.../fa/dfa/transition/DFAPreciseTransition.java | 28 +-
.../fa/dfa/transition/DFAWildcardTransition.java | 45 +-
.../iotdb/commons/path/fa/{ => nfa}/SimpleNFA.java | 12 +-
.../commons/schema/tree/AbstractTreeVisitor.java | 32 +-
.../iotdb/commons/client/ClientManagerTest.java | 2 +-
.../apache/iotdb/commons/path/PatternDFATest.java | 153 ++++
.../iotdb/commons/utils/NodeUrlUtilsTest.java | 8 +-
.../commons/utils/ThriftCommonsSerDeUtilsTest.java | 16 +-
.../utils/ThriftConfigNodeSerDeUtilsTest.java | 2 +-
.../resources/conf/iotdb-datanode.properties | 12 +-
.../src/assembly/resources/sbin/start-datanode.bat | 8 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 2 +
.../apache/iotdb/db/client/ConfigNodeClient.java | 22 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 3 +-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 1 +
.../db/engine/cache/TimeSeriesMetadataCache.java | 1 +
.../db/engine/compaction/CompactionScheduler.java | 8 +-
.../compaction/cross/ICrossSpaceSelector.java | 4 +-
.../cross/rewrite/CrossCompactionTaskResource.java | 119 +++
.../rewrite/CrossSpaceCompactionCandidate.java | 259 ++++++
.../rewrite/CrossSpaceCompactionResource.java | 74 --
.../RewriteCrossSpaceCompactionSelector.java | 340 ++------
.../compaction/task/ICompactionSelector.java | 4 +-
.../db/engine/storagegroup/TsFileResource.java | 19 +
.../storagegroup/timeindex/DeviceTimeIndex.java | 4 +
.../apache/iotdb/db/exception/MergeException.java | 2 +-
.../db/mpp/common/header/ColumnHeaderConstant.java | 10 +-
.../db/mpp/common/header/DatasetHeaderFactory.java | 4 +
.../mpp/execution/exchange/LocalSourceHandle.java | 4 +-
.../db/mpp/execution/exchange/SourceHandle.java | 4 +-
.../db/mpp/execution/schedule/DriverScheduler.java | 1 +
.../cache => mpp/metric}/ChunkCacheMetrics.java | 3 +-
.../iotdb/db/mpp/metric/DataExchangeMetricSet.java | 16 +-
.../iotdb/db/mpp/metric/QueryMetricsManager.java | 4 +-
.../db/mpp/metric/QueryResourceMetricSet.java | 4 +-
.../metric}/TimeSeriesMetadataCacheMetrics.java | 3 +-
.../apache/iotdb/db/mpp/plan/TestRPCClient.java | 50 +-
.../plan/execution/config/ConfigTaskVisitor.java | 11 +-
.../config/executor/ClusterConfigTaskExecutor.java | 19 +
.../config/executor/IConfigTaskExecutor.java | 2 +
.../config/metadata/ShowClusterDetailsTask.java | 4 +-
.../config/metadata/ShowClusterParametersTask.java | 136 ++++
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 11 +-
.../scheduler/FragmentInstanceDispatcherImpl.java | 36 +-
.../statement/metadata/ShowClusterStatement.java | 9 +
.../java/org/apache/iotdb/db/service/DataNode.java | 4 +-
.../org/apache/iotdb/db/wal/buffer/WALBuffer.java | 3 +-
.../CrossSpaceCompactionWithFastPerformerTest.java | 21 +-
...eCompactionWithFastPerformerValidationTest.java | 906 ++++++++++-----------
...sSpaceCompactionWithReadPointPerformerTest.java | 21 +-
...actionWithReadPointPerformerValidationTest.java | 906 ++++++++++-----------
.../engine/compaction/cross/MergeUpgradeTest.java | 4 +-
.../cross/RewriteCompactionFileSelectorTest.java | 121 +--
.../common/schematree/ClusterSchemaTreeTest.java | 86 ++
.../mpp/plan/plan/FragmentInstanceSerdeTest.java | 16 +-
.../datanode1conf/iotdb-datanode.properties | 10 +-
.../datanode2conf/iotdb-datanode.properties | 12 +-
.../datanode3conf/iotdb-datanode.properties | 12 +-
server/src/test/resources/logback-test.xml | 1 +
.../src/main/thrift/confignode.thrift | 42 +-
.../read/common/block/column/NullColumn.java | 19 +-
.../iotdb/tsfile/read/common/ColumnTest.java | 12 +
153 files changed, 4031 insertions(+), 2475 deletions(-)
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/manager/RetryFailedTasksThread.java
delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/OperatePipeProcedureRollbackProcessor.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/FAFactory.java
copy server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/read/ShowDevicesPlanImpl.java => node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/DFAState.java (58%)
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/PatternDFA.java
copy server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/read/ShowDevicesPlanImpl.java => node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/graph/Closure.java (56%)
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/graph/DFAGraph.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/graph/NFAGraph.java
copy server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/read/ShowDevicesPlanImpl.java => node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/transition/AbstractDFATransition.java (58%)
copy spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/qp/common/Operator.java => node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/transition/DFAPreciseTransition.java (65%)
mode change 100755 => 100644
copy server/src/main/java/org/apache/iotdb/db/mpp/common/NodeRef.java => node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/transition/DFAWildcardTransition.java (51%)
rename node-commons/src/main/java/org/apache/iotdb/commons/path/fa/{ => nfa}/SimpleNFA.java (97%)
create mode 100644 node-commons/src/test/java/org/apache/iotdb/commons/path/PatternDFATest.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/CrossCompactionTaskResource.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/CrossSpaceCompactionCandidate.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/CrossSpaceCompactionResource.java
rename server/src/main/java/org/apache/iotdb/db/{engine/cache => mpp/metric}/ChunkCacheMetrics.java (95%)
rename server/src/main/java/org/apache/iotdb/db/{engine/cache => mpp/metric}/TimeSeriesMetadataCacheMetrics.java (96%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowClusterParametersTask.java