You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/07/18 06:38:56 UTC
[iotdb] branch QueryException updated (438fbd5516 -> b5370210b0)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch QueryException
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 438fbd5516 Merge remote-tracking branch 'origin/master' into QueryException
add 8cd42fa076 [IOTDB-3714] Refactor operators related to aggregate query to support batch processing (#6622)
add b84ac57ef7 [IOTDB-3618] StorageEngine failed to recover: / by zero (#6677)
add 2bf38a0b69 [IOTDB-3833] fixed Grafana 9 connects to iotdb and reports expression should not be null (#6682)
add 134963f9b0 Fix remove config node bug (#6679)
add c379c51043 [IOTDB-3800]Add Node Type Column to 'SHOW CHILD PATHS' query (#6654)
add dcadc62f53 [IOTDB-3834] fixed [0.14]grafana-plugin display data error (#6683)
add ba8bfad35c Add weak read consistency policy for MPP (#6681)
add b309f71b95 [IOTDB-3836] REST API for data type in a case-insensitive (#6684)
add 70772cb868 [IOTDB-3778] Use SeriesScanUtil in compaction for point reader (#6668)
add d0d298e986 [IOTDB-3720] Unify retry logic of AsyncClientPool in ConfigNode (#6670)
add e0453b7d8f [IOTDB-3840] deserialize RemoveDataNodePlan exception (#6686)
add 8d77e78491 [IOTDB-3765] Reinforce DataNode startup process (#6643)
add f7cfd32a35 [To rel/0.13] [IOTDB-3813] Ignore the ClosedByInterruptException log when shutdown IoTDB (#6689)
add 9eaa804235 [IOTDB-3839] Fix genRealTimeRegionRoutingMap bug (#6685)
add b5370210b0 fix conflicts
No new revisions were added by this update.
Summary of changes:
.../confignode/client/AsyncDataNodeClientPool.java | 343 ----
.../confignode/client/ConfigNodeRequestType.java | 10 +-
.../confignode/client/DataNodeRequestType.java | 21 +-
.../confignode}/AsyncConfigNodeClientPool.java | 4 +-
.../async/datanode/AsyncDataNodeClientPool.java | 283 ++++
.../async/handlers/AbstractRetryHandler.java | 75 +
.../handlers/ConfigNodeHeartbeatHandler.java | 2 +-
.../{ => async}/handlers/CreateRegionHandler.java | 43 +-
.../handlers/DataNodeHeartbeatHandler.java | 2 +-
.../client/{ => async}/handlers/FlushHandler.java | 34 +-
.../handlers/FunctionManagementHandler.java | 37 +-
.../client/{ => async}/handlers/SetTTLHandler.java | 34 +-
.../handlers/UpdateRegionRouteMapHandler.java | 31 +-
.../confignode}/SyncConfigNodeClientPool.java | 15 +-
.../datanode}/SyncDataNodeClientPool.java | 23 +-
.../confignode/conf/ConfigNodeRemoveCheck.java | 14 +-
.../consensus/request/ConfigPhysicalPlan.java | 4 -
.../consensus/request/ConfigPhysicalPlanType.java | 1 -
.../request/write/ActivateDataNodePlan.java | 71 -
.../request/write/RemoveDataNodePlan.java | 1 -
.../response/SchemaNodeManagementResp.java | 5 +-
.../confignode/manager/ClusterSchemaManager.java | 41 +-
.../iotdb/confignode/manager/ConfigManager.java | 24 +-
.../confignode/manager/DataNodeRemoveManager.java | 15 +-
.../apache/iotdb/confignode/manager/IManager.java | 9 -
.../iotdb/confignode/manager/NodeManager.java | 62 +-
.../iotdb/confignode/manager/PartitionManager.java | 2 +-
.../confignode/manager/PermissionManager.java | 6 +-
.../iotdb/confignode/manager/UDFManager.java | 74 +-
.../iotdb/confignode/manager/load/LoadManager.java | 55 +-
.../manager/load/balancer/RouteBalancer.java | 4 +-
.../manager/load/balancer/router/IRouter.java | 2 +-
.../manager/load/balancer/router/LeaderRouter.java | 8 +-
.../balancer/router/LoadScoreGreedyRouter.java | 8 +-
.../load/heartbeat/ConfigNodeHeartbeatCache.java | 4 +-
.../load/heartbeat/DataNodeHeartbeatCache.java | 6 +-
.../manager/load/heartbeat/INodeCache.java | 8 +-
.../confignode/persistence/ClusterSchemaInfo.java | 6 +-
.../iotdb/confignode/persistence/NodeInfo.java | 25 +-
.../persistence/executor/ConfigPlanExecutor.java | 11 +-
.../procedure/env/ConfigNodeProcedureEnv.java | 20 +-
.../iotdb/confignode/service/ConfigNode.java | 6 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 20 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 22 -
.../request/write/RemoveDataNodePlanTest.java | 35 +-
.../load/balancer/router/LeaderRouterTest.java | 119 +-
.../balancer/router/LoadScoreGreedyRouterTest.java | 110 +-
.../thrift/ConfigNodeRPCServiceProcessorTest.java | 48 +-
docs/UserGuide/Operate-Metadata/Node.md | 17 +-
docs/UserGuide/Reference/DataNode-Config-Manual.md | 28 +-
docs/zh/UserGuide/Operate-Metadata/Node.md | 18 +-
.../UserGuide/Reference/DataNode-Config-Manual.md | 28 +-
.../util/TSFileConfigUtilCompletenessTest.java | 4 +-
grafana-plugin/pkg/plugin/plugin.go | 4 +-
.../java/org/apache/iotdb/it/env/MppConfig.java | 6 +
.../org/apache/iotdb/itbase/env/BaseConfig.java | 8 +
.../aligned/IoTDBAggregationWithDeletion2IT.java | 3 +
.../it/aligned/IoTDBAggregationWithDeletionIT.java | 4 +
.../db/it/aligned/IoTDBAlignedSeriesQuery2IT.java | 3 +
.../db/it/aligned/IoTDBAlignedSeriesQuery3IT.java | 4 +-
.../db/it/aligned/IoTDBAlignedSeriesQueryIT.java | 4 +
.../db/it/aligned/IoTDBGroupByLevelQueryIT.java | 5 +
...GroupByQueryWithValueFilterWithDeletion2IT.java | 3 +
...BGroupByQueryWithValueFilterWithDeletionIT.java | 4 +
...upByQueryWithoutValueFilterWithDeletion2IT.java | 3 +
...oupByQueryWithoutValueFilterWithDeletionIT.java | 4 +
.../iotdb/db/it/env/StandaloneEnvConfig.java | 11 +
.../iotdb/db/it/schema/IoTDBMetadataFetchIT.java | 2 +-
.../iotdb/db/integration/IoTDBRestartIT.java | 22 +-
.../versionadaption/IoTDBDDLVersionAdaptionIT.java | 3 +-
.../apache/iotdb/commons/conf/IoTDBConstant.java | 1 +
.../partition/SchemaNodeManagementPartition.java | 9 +-
.../commons/utils/ThriftCommonsSerDeUtils.java | 33 +
.../schemaregion/rocksdb/RSchemaRegion.java | 17 +-
.../schemaregion/rocksdb/mnode/REntityMNode.java | 6 +
.../schemaregion/rocksdb/mnode/RInternalMNode.java | 6 +
.../rocksdb/mnode/RMeasurementMNode.java | 6 +
.../rocksdb/mnode/RStorageGroupMNode.java | 6 +
.../resources/conf/iotdb-datanode.properties | 12 +
.../apache/iotdb/db/client/ConfigNodeClient.java | 17 -
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 12 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 22 +
.../rewrite/task/ReadPointPerformerSubTask.java | 19 +-
.../impl/ReadPointCompactionPerformer.java | 56 +-
.../engine/compaction/reader/IDataBlockReader.java | 9 +-
.../compaction/reader/SeriesDataBlockReader.java | 156 ++
.../iotdb/db/engine/flush/MemTableFlushTask.java | 10 +-
.../iotdb/db/localconfignode/LocalConfigNode.java | 5 +-
.../iotdb/db/metadata/LocalSchemaProcessor.java | 8 +-
.../idtable/entry/InsertMeasurementMNode.java | 6 +
.../iotdb/db/metadata/mnode/EntityMNode.java | 5 +
.../org/apache/iotdb/db/metadata/mnode/IMNode.java | 2 +
.../iotdb/db/metadata/mnode/InternalMNode.java | 5 +
.../apache/iotdb/db/metadata/mnode/MNodeType.java | 82 +
.../iotdb/db/metadata/mnode/MeasurementMNode.java | 5 +
.../db/metadata/mnode/StorageGroupEntityMNode.java | 5 +
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 5 +
.../iotdb/db/metadata/mtree/ConfigMTree.java | 14 +-
.../iotdb/db/metadata/mtree/IMTreeBelowSG.java | 5 +-
.../db/metadata/mtree/MTreeBelowSGCachedImpl.java | 13 +-
.../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 13 +-
.../db/metadata/schemaregion/ISchemaRegion.java | 3 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 4 +-
.../schemaregion/SchemaRegionSchemaFileImpl.java | 4 +-
.../storagegroup/IStorageGroupSchemaManager.java | 3 +-
.../storagegroup/StorageGroupSchemaManager.java | 5 +-
.../iotdb/db/mpp/aggregation/Aggregator.java | 13 +-
.../EmptyQueueSlidingWindowAggregator.java | 1 -
.../MonotonicQueueSlidingWindowAggregator.java | 5 +-
.../NormalQueueSlidingWindowAggregator.java | 1 -
.../slidingwindow/SlidingWindowAggregator.java | 2 +-
.../iotdb/db/mpp/common/MPPQueryContext.java | 4 +
.../apache/iotdb/db/mpp/common/SessionInfo.java | 25 +-
.../iotdb/db/mpp/common/header/HeaderConstant.java | 6 +-
.../fragment/FragmentInstanceContext.java | 11 +
.../db/mpp/execution/operator/AggregationUtil.java | 161 ++
.../db/mpp/execution/operator/OperatorContext.java | 35 +
.../operator/process/AggregationOperator.java | 144 +-
.../process/RawDataAggregationOperator.java | 187 +--
.../process/SingleInputAggregationOperator.java | 149 ++
.../process/SlidingWindowAggregationOperator.java | 155 +-
.../schema/NodeManageMemoryMergeOperator.java | 47 +-
.../schema/NodePathsSchemaScanOperator.java | 39 +-
.../AbstractSeriesAggregationScanOperator.java | 350 ++++
.../AlignedSeriesAggregationScanOperator.java | 377 +----
.../operator/source/AlignedSeriesScanUtil.java | 38 +
.../source/SeriesAggregationScanOperator.java | 386 +----
.../execution/operator/source/SeriesScanUtil.java | 74 +-
.../mpp/execution/schedule/DriverTaskThread.java | 6 +-
.../mpp/execution/timer/ITimeSliceAllocator.java | 11 +-
.../timer/RuleBasedTimeSliceAllocator.java | 66 +
.../apache/iotdb/db/mpp/plan/analyze/Analysis.java | 7 +-
.../plan/analyze/StandalonePartitionFetcher.java | 12 +-
.../memory/StatementMemorySourceVisitor.java | 37 +-
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 184 ++-
.../db/mpp/plan/planner/LogicalPlanBuilder.java | 3 +-
.../SimpleFragmentParallelPlanner.java | 28 +
.../db/mpp/plan/planner/plan/FragmentInstance.java | 6 +
.../read/NodeManagementMemoryMergeNode.java | 18 +-
.../plan/planner/plan/node/write/InsertNode.java | 9 +
.../mpprest/handler/QueryDataSetHandler.java | 32 +-
.../handler/StatementConstructionHandler.java | 3 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 32 +-
.../iotdb/db/qp/physical/crud/InsertPlan.java | 9 +
.../iotdb/db/query/context/QueryContext.java | 2 +-
.../iotdb/db/query/control/SessionManager.java | 1 +
.../java/org/apache/iotdb/db/service/DataNode.java | 62 +-
.../db/wal/recover/file/TsFilePlanRedoer.java | 6 +
.../file/UnsealedTsFileRecoverPerformer.java | 2 +-
.../ReadPointCompactionPerformerTest.java | 1689 ++++++++++----------
.../apache/iotdb/db/metadata/SchemaBasicTest.java | 16 +-
.../operator/AggregationOperatorTest.java | 42 +-
.../AlignedSeriesAggregationScanOperatorTest.java | 92 +-
.../operator/LastQueryMergeOperatorTest.java | 15 +
.../operator/RawDataAggregationOperatorTest.java | 8 +
.../SeriesAggregationScanOperatorTest.java | 88 +-
.../SlidingWindowAggregationOperatorTest.java | 46 +-
.../operator/UpdateLastCacheOperatorTest.java | 8 +
.../iotdb/db/mpp/plan/plan/QueryPlannerTest.java | 2 +-
.../NodeManagementMemoryMergeNodeSerdeTest.java | 8 +-
.../plan/scheduler/StandaloneSchedulerTest.java | 30 +-
.../db/protocol/rest/IoTDBRestServiceTest.java | 1 +
.../iotdb/db/query/dataset/ListDataSetTest.java | 7 +-
.../file/UnsealedTsFileRecoverPerformerTest.java | 62 +
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 17 +-
thrift-commons/src/main/thrift/common.thrift | 6 +
.../src/main/thrift/confignode.thrift | 8 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 22 +
.../file/metadata/statistics/Statistics.java | 5 +
.../iotdb/tsfile/read/TsFileSequenceReader.java | 12 +-
.../iotdb/tsfile/read/common/block/TsBlock.java | 4 +
.../tsfile/read/common/block/TsBlockBuilder.java | 6 +-
.../read/common/block/TsBlockBuilderStatus.java | 4 +-
.../tsfile/read/common/block/TsBlockUtil.java | 59 +
174 files changed, 4237 insertions(+), 3346 deletions(-)
delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/client/AsyncDataNodeClientPool.java
rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async/confignode}/AsyncConfigNodeClientPool.java (94%)
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/client/async/datanode/AsyncDataNodeClientPool.java
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/client/async/handlers/AbstractRetryHandler.java
rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/ConfigNodeHeartbeatHandler.java (97%)
rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/CreateRegionHandler.java (75%)
rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/DataNodeHeartbeatHandler.java (98%)
rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/FlushHandler.java (61%)
rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/FunctionManagementHandler.java (53%)
rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/SetTTLHandler.java (56%)
rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => async}/handlers/UpdateRegionRouteMapHandler.java (68%)
rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => sync/confignode}/SyncConfigNodeClientPool.java (94%)
rename confignode/src/main/java/org/apache/iotdb/confignode/client/{ => sync/datanode}/SyncDataNodeClientPool.java (93%)
delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/consensus/request/write/ActivateDataNodePlan.java
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IBatchReader.java => server/src/main/java/org/apache/iotdb/db/engine/compaction/reader/IDataBlockReader.java (82%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/reader/SeriesDataBlockReader.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/metadata/mnode/MNodeType.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/AggregationUtil.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/SingleInputAggregationOperator.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java
copy tsfile/src/main/java/org/apache/iotdb/tsfile/common/cache/Cache.java => server/src/main/java/org/apache/iotdb/db/mpp/execution/timer/ITimeSliceAllocator.java (76%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/execution/timer/RuleBasedTimeSliceAllocator.java
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockUtil.java