You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2022/08/02 12:41:46 UTC
[iotdb] branch beyyes/confignode_develop updated (b806fe4bfc -> 841a771c53)
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a change to branch beyyes/confignode_develop
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from b806fe4bfc using only one genHeartbeatReq for pingDataNodes
add 54f9452888 Load ConfigNode after registering the internal server (#6832)
add 903a9d6ac0 Extract ISchemaTree interface (#6830)
add 6e7e7e22e3 [IOTDB-3961] Fix bug of Tsfile compact (#6770)
add 4789a5e368 [IOTDB-3999] Avoid using PlanNodeType.ordinal() (#6835)
add e52b8c23c6 [IOTDB-3986] Unified ConfigNode heartbeat request
add def138b590 [IOTDB-3971] Improve the process of writing chunks in compaction for aligned series (#6786)
add 991cbe7e1e [IOTDB-3940] Using bitmap in PageHeader to optimize ValuePageReader from row-base scanning to columnar-style scanning (#6806)
add 22af8d479f remove useless log in cross space compaction (#6837)
add 8ddb8da5f5 Optimize CI workflow (#6841)
add d7627c8751 [IOTDB-4003] del duplicated dependency defination in pom.xml (#6843)
add 55b5b17af2 [IOTDB-3983] Recover wal file's metadata (#6838)
add 2de0dd8731 fix template api in SessionPool for master (#6810)
add 5f118301f6 fix NullPointerException (#6852)
add 8e39a52e23 [IOTDB-3844] Clear up Non-Seed-ConfigNode register process (#6831)
add 1140cf2da6 Influxdb service adapts to distributed MPP framework and fixes some bugs in InfluxFunction and TagInfoRecord (#6828)
add df9c629453 Improve the performance of Raw Query Without ValueFilter for nonAligned (#6853)
add 47d4b06db3 Add the CPU load status, memory status, disk status in DashBoard (#6834)
add ef0e514ca6 [IOTDB-3955] Improved node information metrics to push more detailed node information, online and offline total and survival information of each node (#6801)
add c7b5eeb8cf [IOTDB-3814] Fix insert rows by sql with wrong data type NPE (#6859)
add 21c530abf7 [IOTDB-4007]Support multiple paths in privilege control (#6854)
add 73d5b80f34 [IOTDB-3847] Clear up interfaces in NodeManager(#6862)
add 32fefe24bd [IOTDB-3847] Clear up interfaces in NodeManager (#6862)
add ceae065482 Fix ConfigNode startup bug (#6867)
new 841a771c53 merge with master
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/client-cpp.yml | 4 +-
.github/workflows/influxdb-protocol.yml | 2 +-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 12 +-
checkstyle.xml | 7 +
.../sync/confignode/SyncConfigNodeClientPool.java | 21 +-
.../consensus/request/auth/AuthorPlan.java | 25 +-
...eption.java => AddConsensusGroupException.java} | 6 +-
.../iotdb/confignode/manager/ConfigManager.java | 89 +---
.../apache/iotdb/confignode/manager/IManager.java | 5 +-
.../iotdb/confignode/manager/NodeManager.java | 113 +----
.../iotdb/confignode/manager/load/LoadManager.java | 251 +++++++++-
.../iotdb/confignode/persistence/AuthorInfo.java | 68 ++-
.../iotdb/confignode/persistence/NodeInfo.java | 10 +-
.../procedure/env/ConfigNodeProcedureEnv.java | 20 +-
.../iotdb/confignode/service/ConfigNode.java | 26 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 20 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 121 ++++-
.../confignode/persistence/AuthorInfoTest.java | 305 +++++++++++-
.../thrift/ConfigNodeRPCServiceProcessorTest.java | 74 ++-
docker/src/main/Dockerfile-single-influxdb | 4 +-
.../Administration-Management/Administration.md | 38 +-
docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 10 +-
.../Administration-Management/Administration.md | 38 +-
docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 22 +-
.../Apache IoTDB ConfigNode Dashboard v0.14.0.json | 275 ++++++++++-
.../Apache IoTDB DataNode Dashboard v0.14.0.json | 289 +++++++++++-
... => IoTDBAlignedSeriesQueryWithDeletionIT.java} | 82 +++-
.../db/it/aligned/IoTDBInsertAlignedValuesIT.java | 12 +
library-udf/pom.xml | 6 -
.../micrometer/MicrometerMetricManagerTest.java | 11 +
.../apache/iotdb/commons/cluster/NodeStatus.java | 4 +
.../commons/utils/BasicStructureSerDeUtil.java | 31 ++
pom.xml | 6 -
.../iotdb/db/auth/ClusterAuthorityFetcher.java | 9 +-
.../apache/iotdb/db/client/ConfigNodeClient.java | 6 +-
.../db/engine/compaction/CompactionWorker.java | 34 +-
.../RewriteCrossSpaceCompactionSelector.java | 7 -
.../impl/ReadPointCompactionPerformer.java | 18 +-
.../writer/AbstractCompactionWriter.java | 7 +-
.../writer/CrossSpaceCompactionWriter.java | 19 +-
.../writer/InnerSpaceCompactionWriter.java | 15 +-
.../iotdb/db/localconfignode/LocalConfigNode.java | 73 ++-
.../db/metadata/cache/DataNodeSchemaCache.java | 9 +-
.../{SchemaTree.java => ClusterSchemaTree.java} | 22 +-
.../db/mpp/common/schematree/ISchemaTree.java | 70 +++
.../operator/process/DeviceMergeOperator.java | 2 +-
.../operator/process/FilterAndProjectOperator.java | 2 +-
.../RowBasedTimeJoinOperator.java} | 62 +--
.../process/{ => join}/TimeJoinOperator.java | 7 +-
.../{ => join}/merge/AscTimeComparator.java | 2 +-
.../process/{ => join}/merge/ColumnMerger.java | 24 +-
.../{ => join}/merge/DescTimeComparator.java | 2 +-
.../{ => join}/merge/MultiColumnMerger.java | 56 ++-
.../merge/NonOverlappedMultiColumnMerger.java | 25 +-
.../{ => join}/merge/SingleColumnMerger.java | 44 +-
.../process/{ => join}/merge/TimeComparator.java | 2 +-
.../operator/schema/SchemaFetchScanOperator.java | 4 +-
.../apache/iotdb/db/mpp/plan/analyze/Analysis.java | 8 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 51 +-
.../db/mpp/plan/analyze/ClusterSchemaFetcher.java | 41 +-
.../db/mpp/plan/analyze/ExpressionAnalyzer.java | 10 +-
.../db/mpp/plan/analyze/FakeSchemaFetcherImpl.java | 11 +-
.../iotdb/db/mpp/plan/analyze/ISchemaFetcher.java | 8 +-
.../iotdb/db/mpp/plan/analyze/SchemaValidator.java | 6 +-
.../mpp/plan/analyze/StandaloneSchemaFetcher.java | 33 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 48 +-
.../db/mpp/plan/planner/LogicalPlanVisitor.java | 9 -
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 19 +-
.../mpp/plan/planner/plan/node/PlanNodeType.java | 4 +
.../planner/plan/node/write/DeleteDataNode.java | 6 +-
.../plan/node/write/InsertMultiTabletsNode.java | 7 +-
.../plan/planner/plan/node/write/InsertNode.java | 4 +-
.../planner/plan/node/write/InsertRowNode.java | 20 +-
.../planner/plan/node/write/InsertRowsNode.java | 7 +-
.../plan/node/write/InsertRowsOfOneDeviceNode.java | 7 +-
.../planner/plan/node/write/InsertTabletNode.java | 6 +-
.../db/mpp/plan/statement/StatementVisitor.java | 5 -
.../internal/LastPointFetchStatement.java | 58 ---
.../db/mpp/plan/statement/sys/AuthorStatement.java | 12 +-
.../iotdb/db/protocol/influxdb/dto/IoTDBPoint.java | 40 +-
.../function/aggregator/InfluxMeanFunction.java | 4 +-
.../function/selector/InfluxFirstFunction.java | 5 +-
.../function/selector/InfluxLastFunction.java | 5 +-
.../influxdb/handler/AbstractQueryHandler.java | 511 +++++++++++++++++++++
.../protocol/influxdb/handler/NewQueryHandler.java | 200 ++++++++
.../db/protocol/influxdb/handler/QueryHandler.java | 468 +------------------
.../influxdb/meta/AbstractInfluxDBMetaManager.java | 114 +++++
.../influxdb/meta/InfluxDBMetaManager.java | 96 +---
.../influxdb/meta/NewInfluxDBMetaManager.java | 129 ++++++
.../db/protocol/influxdb/meta/TagInfoRecords.java | 28 +-
.../influxdb/util/InfluxReqAndRespUtils.java | 55 +++
.../protocol/influxdb/util/QueryResultUtils.java | 153 ++++++
.../db/protocol/influxdb/util/StringUtils.java | 11 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 74 ++-
.../iotdb/db/qp/logical/sys/AuthorOperator.java | 14 +-
.../iotdb/db/qp/physical/sys/AuthorPlan.java | 54 ++-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 44 +-
.../iotdb/db/service/InfluxDBRPCService.java | 26 +-
.../recorder/CompactionMetricsRecorder.java | 2 +-
.../handler/InfluxDBServiceThriftHandler.java | 10 +-
...ndler.java => IInfluxDBServiceWithHandler.java} | 4 +-
.../service/thrift/impl/InfluxDBServiceImpl.java | 20 +-
.../thrift/impl/NewInfluxDBServiceImpl.java | 128 ++++++
.../iotdb/db/wal/recover/WALNodeRecoverTask.java | 3 +-
.../iotdb/db/wal/recover/WALRecoverWriter.java | 26 +-
.../db/metadata/cache/DataNodeSchemaCacheTest.java | 11 +-
...emaTreeTest.java => ClusterSchemaTreeTest.java} | 28 +-
.../iotdb/db/mpp/execution/DataDriverTest.java | 6 +-
.../operator/AlignedSeriesScanOperatorTest.java | 8 +-
.../operator/DeviceMergeOperatorTest.java | 2 +-
.../mpp/execution/operator/LimitOperatorTest.java | 6 +-
.../execution/operator/MultiColumnMergerTest.java | 2 +-
.../NonOverlappedMultiColumnMergerTest.java | 4 +-
.../mpp/execution/operator/OffsetOperatorTest.java | 6 +-
.../operator/RawDataAggregationOperatorTest.java | 6 +-
.../execution/operator/SingleColumnMergerTest.java | 6 +-
.../execution/operator/TimeJoinOperatorTest.java | 8 +-
.../schema/SchemaFetchScanOperatorTest.java | 5 +-
.../write/InsertMultiTabletsNodeSerdeTest.java | 2 +-
.../plan/node/write/InsertRowNodeSerdeTest.java | 8 +-
.../plan/node/write/InsertRowsNodeSerdeTest.java | 2 +-
.../write/InsertRowsOfOneDeviceNodeSerdeTest.java | 3 +-
.../plan/node/write/InsertTabletNodeSerdeTest.java | 6 +-
.../iotdb/db/qp/physical/PhysicalPlanTest.java | 2 +-
.../iotdb/db/wal/recover/WALRecoverWriterTest.java | 198 ++++++++
.../org/apache/iotdb/session/pool/SessionPool.java | 3 +
.../src/main/thrift/confignode.thrift | 12 +-
.../file/metadata/statistics/Statistics.java | 10 +
.../file/metadata/statistics/TimeStatistics.java | 8 +
.../iotdb/tsfile/read/common/block/TsBlock.java | 4 +
.../read/common/block/column/BinaryColumn.java | 16 +
.../read/common/block/column/BooleanColumn.java | 16 +
.../tsfile/read/common/block/column/Column.java | 38 ++
.../read/common/block/column/DoubleColumn.java | 16 +
.../read/common/block/column/FloatColumn.java | 16 +
.../tsfile/read/common/block/column/IntColumn.java | 16 +
.../read/common/block/column/LongColumn.java | 16 +
.../block/column/RunLengthEncodedColumn.java | 58 +++
.../read/common/block/column/TimeColumn.java | 11 +
.../tsfile/read/reader/page/AlignedPageReader.java | 98 +++-
.../tsfile/read/reader/page/ValuePageReader.java | 99 ++++
.../tsfile/write/chunk/AlignedChunkWriterImpl.java | 63 +++
.../iotdb/tsfile/write/chunk/TimeChunkWriter.java | 10 +-
.../iotdb/tsfile/write/chunk/ValueChunkWriter.java | 24 +-
.../iotdb/tsfile/write/page/TimePageWriter.java | 6 +-
.../iotdb/tsfile/write/page/ValuePageWriter.java | 72 ++-
146 files changed, 4527 insertions(+), 1536 deletions(-)
copy confignode/src/main/java/org/apache/iotdb/confignode/exception/{AddPeerException.java => AddConsensusGroupException.java} (79%)
copy integration-test/src/test/java/org/apache/iotdb/db/it/aligned/{IoTDBAggregationWithDeletion2IT.java => IoTDBAlignedSeriesQueryWithDeletionIT.java} (51%)
rename server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/{SchemaTree.java => ClusterSchemaTree.java} (95%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/ISchemaTree.java
copy server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/{TimeJoinOperator.java => join/RowBasedTimeJoinOperator.java} (85%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/{ => join}/TimeJoinOperator.java (96%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/{ => join}/merge/AscTimeComparator.java (94%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/{ => join}/merge/ColumnMerger.java (70%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/{ => join}/merge/DescTimeComparator.java (94%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/{ => join}/merge/MultiColumnMerger.java (63%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/{ => join}/merge/NonOverlappedMultiColumnMerger.java (82%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/{ => join}/merge/SingleColumnMerger.java (74%)
rename server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/{ => join}/merge/TimeComparator.java (94%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/internal/LastPointFetchStatement.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/AbstractQueryHandler.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/NewQueryHandler.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/AbstractInfluxDBMetaManager.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/NewInfluxDBMetaManager.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/influxdb/util/InfluxReqAndRespUtils.java
copy server/src/main/java/org/apache/iotdb/db/service/thrift/impl/{IClientRPCServiceWithHandler.java => IInfluxDBServiceWithHandler.java} (85%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/service/thrift/impl/NewInfluxDBServiceImpl.java
rename server/src/test/java/org/apache/iotdb/db/mpp/common/schematree/{SchemaTreeTest.java => ClusterSchemaTreeTest.java} (95%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/wal/recover/WALRecoverWriterTest.java
[iotdb] 01/01: merge with master
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch beyyes/confignode_develop
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 841a771c537efb632207e904a2937f17c4de9a95
Merge: b806fe4bfc ceae065482
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Tue Aug 2 20:41:24 2022 +0800
merge with master
.github/workflows/client-cpp.yml | 4 +-
.github/workflows/influxdb-protocol.yml | 2 +-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 12 +-
checkstyle.xml | 7 +
.../sync/confignode/SyncConfigNodeClientPool.java | 21 +-
.../consensus/request/auth/AuthorPlan.java | 25 +-
.../exception/AddConsensusGroupException.java | 19 +-
.../iotdb/confignode/manager/ConfigManager.java | 89 +---
.../apache/iotdb/confignode/manager/IManager.java | 5 +-
.../iotdb/confignode/manager/NodeManager.java | 113 +----
.../iotdb/confignode/manager/load/LoadManager.java | 251 +++++++++-
.../iotdb/confignode/persistence/AuthorInfo.java | 68 ++-
.../iotdb/confignode/persistence/NodeInfo.java | 10 +-
.../procedure/env/ConfigNodeProcedureEnv.java | 20 +-
.../iotdb/confignode/service/ConfigNode.java | 26 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 20 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 121 ++++-
.../confignode/persistence/AuthorInfoTest.java | 305 +++++++++++-
.../thrift/ConfigNodeRPCServiceProcessorTest.java | 74 ++-
docker/src/main/Dockerfile-single-influxdb | 4 +-
.../Administration-Management/Administration.md | 38 +-
docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 10 +-
.../Administration-Management/Administration.md | 38 +-
docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 22 +-
.../Apache IoTDB ConfigNode Dashboard v0.14.0.json | 275 ++++++++++-
.../Apache IoTDB DataNode Dashboard v0.14.0.json | 289 +++++++++++-
.../IoTDBAlignedSeriesQueryWithDeletionIT.java | 139 ++++++
.../db/it/aligned/IoTDBInsertAlignedValuesIT.java | 12 +
library-udf/pom.xml | 6 -
.../micrometer/MicrometerMetricManagerTest.java | 11 +
.../apache/iotdb/commons/cluster/NodeStatus.java | 4 +
.../commons/utils/BasicStructureSerDeUtil.java | 31 ++
pom.xml | 6 -
.../iotdb/db/auth/ClusterAuthorityFetcher.java | 9 +-
.../apache/iotdb/db/client/ConfigNodeClient.java | 6 +-
.../db/engine/compaction/CompactionWorker.java | 34 +-
.../RewriteCrossSpaceCompactionSelector.java | 7 -
.../impl/ReadPointCompactionPerformer.java | 18 +-
.../writer/AbstractCompactionWriter.java | 7 +-
.../writer/CrossSpaceCompactionWriter.java | 19 +-
.../writer/InnerSpaceCompactionWriter.java | 15 +-
.../iotdb/db/localconfignode/LocalConfigNode.java | 73 ++-
.../db/metadata/cache/DataNodeSchemaCache.java | 9 +-
.../{SchemaTree.java => ClusterSchemaTree.java} | 22 +-
.../db/mpp/common/schematree/ISchemaTree.java | 70 +++
.../operator/process/DeviceMergeOperator.java | 2 +-
.../operator/process/FilterAndProjectOperator.java | 2 +-
.../RowBasedTimeJoinOperator.java} | 62 +--
.../process/{ => join}/TimeJoinOperator.java | 7 +-
.../{ => join}/merge/AscTimeComparator.java | 2 +-
.../process/{ => join}/merge/ColumnMerger.java | 24 +-
.../{ => join}/merge/DescTimeComparator.java | 2 +-
.../{ => join}/merge/MultiColumnMerger.java | 56 ++-
.../merge/NonOverlappedMultiColumnMerger.java | 25 +-
.../{ => join}/merge/SingleColumnMerger.java | 44 +-
.../process/{ => join}/merge/TimeComparator.java | 2 +-
.../operator/schema/SchemaFetchScanOperator.java | 4 +-
.../apache/iotdb/db/mpp/plan/analyze/Analysis.java | 8 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 51 +-
.../db/mpp/plan/analyze/ClusterSchemaFetcher.java | 41 +-
.../db/mpp/plan/analyze/ExpressionAnalyzer.java | 10 +-
.../db/mpp/plan/analyze/FakeSchemaFetcherImpl.java | 11 +-
.../iotdb/db/mpp/plan/analyze/ISchemaFetcher.java | 8 +-
.../iotdb/db/mpp/plan/analyze/SchemaValidator.java | 6 +-
.../mpp/plan/analyze/StandaloneSchemaFetcher.java | 33 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 48 +-
.../db/mpp/plan/planner/LogicalPlanVisitor.java | 9 -
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 19 +-
.../mpp/plan/planner/plan/node/PlanNodeType.java | 4 +
.../planner/plan/node/write/DeleteDataNode.java | 6 +-
.../plan/node/write/InsertMultiTabletsNode.java | 7 +-
.../plan/planner/plan/node/write/InsertNode.java | 4 +-
.../planner/plan/node/write/InsertRowNode.java | 20 +-
.../planner/plan/node/write/InsertRowsNode.java | 7 +-
.../plan/node/write/InsertRowsOfOneDeviceNode.java | 7 +-
.../planner/plan/node/write/InsertTabletNode.java | 6 +-
.../db/mpp/plan/statement/StatementVisitor.java | 5 -
.../internal/LastPointFetchStatement.java | 58 ---
.../db/mpp/plan/statement/sys/AuthorStatement.java | 12 +-
.../iotdb/db/protocol/influxdb/dto/IoTDBPoint.java | 40 +-
.../function/aggregator/InfluxMeanFunction.java | 4 +-
.../function/selector/InfluxFirstFunction.java | 5 +-
.../function/selector/InfluxLastFunction.java | 5 +-
.../influxdb/handler/AbstractQueryHandler.java | 511 +++++++++++++++++++++
.../protocol/influxdb/handler/NewQueryHandler.java | 200 ++++++++
.../db/protocol/influxdb/handler/QueryHandler.java | 468 +------------------
.../influxdb/meta/AbstractInfluxDBMetaManager.java | 114 +++++
.../influxdb/meta/InfluxDBMetaManager.java | 96 +---
.../influxdb/meta/NewInfluxDBMetaManager.java | 129 ++++++
.../db/protocol/influxdb/meta/TagInfoRecords.java | 28 +-
.../influxdb/util/InfluxReqAndRespUtils.java | 55 +++
.../protocol/influxdb/util/QueryResultUtils.java | 153 ++++++
.../db/protocol/influxdb/util/StringUtils.java | 11 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 74 ++-
.../iotdb/db/qp/logical/sys/AuthorOperator.java | 14 +-
.../iotdb/db/qp/physical/sys/AuthorPlan.java | 54 ++-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 44 +-
.../iotdb/db/service/InfluxDBRPCService.java | 26 +-
.../recorder/CompactionMetricsRecorder.java | 2 +-
.../handler/InfluxDBServiceThriftHandler.java | 10 +-
.../thrift/impl/IInfluxDBServiceWithHandler.java | 20 +-
.../service/thrift/impl/InfluxDBServiceImpl.java | 20 +-
.../thrift/impl/NewInfluxDBServiceImpl.java | 128 ++++++
.../iotdb/db/wal/recover/WALNodeRecoverTask.java | 3 +-
.../iotdb/db/wal/recover/WALRecoverWriter.java | 26 +-
.../db/metadata/cache/DataNodeSchemaCacheTest.java | 11 +-
...emaTreeTest.java => ClusterSchemaTreeTest.java} | 28 +-
.../iotdb/db/mpp/execution/DataDriverTest.java | 6 +-
.../operator/AlignedSeriesScanOperatorTest.java | 8 +-
.../operator/DeviceMergeOperatorTest.java | 2 +-
.../mpp/execution/operator/LimitOperatorTest.java | 6 +-
.../execution/operator/MultiColumnMergerTest.java | 2 +-
.../NonOverlappedMultiColumnMergerTest.java | 4 +-
.../mpp/execution/operator/OffsetOperatorTest.java | 6 +-
.../operator/RawDataAggregationOperatorTest.java | 6 +-
.../execution/operator/SingleColumnMergerTest.java | 6 +-
.../execution/operator/TimeJoinOperatorTest.java | 8 +-
.../schema/SchemaFetchScanOperatorTest.java | 5 +-
.../write/InsertMultiTabletsNodeSerdeTest.java | 2 +-
.../plan/node/write/InsertRowNodeSerdeTest.java | 8 +-
.../plan/node/write/InsertRowsNodeSerdeTest.java | 2 +-
.../write/InsertRowsOfOneDeviceNodeSerdeTest.java | 3 +-
.../plan/node/write/InsertTabletNodeSerdeTest.java | 6 +-
.../iotdb/db/qp/physical/PhysicalPlanTest.java | 2 +-
.../iotdb/db/wal/recover/WALRecoverWriterTest.java | 198 ++++++++
.../org/apache/iotdb/session/pool/SessionPool.java | 3 +
.../src/main/thrift/confignode.thrift | 12 +-
.../file/metadata/statistics/Statistics.java | 10 +
.../file/metadata/statistics/TimeStatistics.java | 8 +
.../iotdb/tsfile/read/common/block/TsBlock.java | 4 +
.../read/common/block/column/BinaryColumn.java | 16 +
.../read/common/block/column/BooleanColumn.java | 16 +
.../tsfile/read/common/block/column/Column.java | 38 ++
.../read/common/block/column/DoubleColumn.java | 16 +
.../read/common/block/column/FloatColumn.java | 16 +
.../tsfile/read/common/block/column/IntColumn.java | 16 +
.../read/common/block/column/LongColumn.java | 16 +
.../block/column/RunLengthEncodedColumn.java | 58 +++
.../read/common/block/column/TimeColumn.java | 11 +
.../tsfile/read/reader/page/AlignedPageReader.java | 98 +++-
.../tsfile/read/reader/page/ValuePageReader.java | 99 ++++
.../tsfile/write/chunk/AlignedChunkWriterImpl.java | 63 +++
.../iotdb/tsfile/write/chunk/TimeChunkWriter.java | 10 +-
.../iotdb/tsfile/write/chunk/ValueChunkWriter.java | 24 +-
.../iotdb/tsfile/write/page/TimePageWriter.java | 6 +-
.../iotdb/tsfile/write/page/ValuePageWriter.java | 72 ++-
146 files changed, 4600 insertions(+), 1549 deletions(-)
diff --cc confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java
index aac9da0bc6,6c0a21cfd9..bb5bbc163e
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java
@@@ -336,12 -345,10 +345,11 @@@ public class LoadManager
/**
* Send heartbeat requests to all the Registered DataNodes
*
++ * @param heartbeatReq same heartbeatReq
* @param registeredDataNodes DataNodes that registered in cluster
*/
- private void pingRegisteredDataNodes(List<TDataNodeConfiguration> registeredDataNodes) {
- // Generate heartbeat request
- THeartbeatReq heartbeatReq = genHeartbeatReq();
-
+ private void pingRegisteredDataNodes(
+ THeartbeatReq heartbeatReq, List<TDataNodeConfiguration> registeredDataNodes) {
// Send heartbeat requests
for (TDataNodeConfiguration dataNodeInfo : registeredDataNodes) {
DataNodeHeartbeatHandler handler =
@@@ -362,13 -368,13 +370,14 @@@
/**
* Send heartbeat requests to all the Registered ConfigNodes
*
++ * @param heartbeatReq same heartbeatReq
* @param registeredConfigNodes ConfigNodes that registered in cluster
*/
- private void pingRegisteredConfigNodes(List<TConfigNodeLocation> registeredConfigNodes) {
-
+ private void pingRegisteredConfigNodes(
+ THeartbeatReq heartbeatReq, List<TConfigNodeLocation> registeredConfigNodes) {
// Send heartbeat requests
for (TConfigNodeLocation configNodeLocation : registeredConfigNodes) {
- if (configNodeLocation.getInternalEndPoint().equals(currentNode)) {
+ if (configNodeLocation.getInternalEndPoint().equals(CURRENT_NODE)) {
// Skip itself
nodeCacheMap.putIfAbsent(
configNodeLocation.getConfigNodeId(), new ConfigNodeHeartbeatCache(configNodeLocation));
diff --cc confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index 91054346e7,e0cfbfbd79..44bbcf6cbc
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
@@@ -57,7 -57,9 +57,8 @@@ import org.apache.iotdb.confignode.cons
import org.apache.iotdb.confignode.consensus.response.StorageGroupSchemaResp;
import org.apache.iotdb.confignode.manager.ConfigManager;
import org.apache.iotdb.confignode.manager.ConsensusManager;
-import org.apache.iotdb.confignode.manager.load.LoadManager;
import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
+ import org.apache.iotdb.confignode.rpc.thrift.TAddConsensusGroupReq;
import org.apache.iotdb.confignode.rpc.thrift.TAuthorizerReq;
import org.apache.iotdb.confignode.rpc.thrift.TAuthorizerResp;
import org.apache.iotdb.confignode.rpc.thrift.TCheckUserPrivilegesReq;
@@@ -546,7 -545,9 +546,9 @@@ public class ConfigNodeRPCServiceProces
@Override
public TRegionRouteMapResp getLatestRegionRouteMap() throws TException {
TRegionRouteMapResp resp = configManager.getLatestRegionRouteMap();
- printRegionRouteMap(resp.getTimestamp(), resp.getRegionRouteMap());
+ if (resp.getStatus().getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
- LoadManager.printRegionRouteMap(resp.getTimestamp(), resp.getRegionRouteMap());
++ printRegionRouteMap(resp.getTimestamp(), resp.getRegionRouteMap());
+ }
return resp;
}