This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch ty/HA
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 7a41096e283 Merge remote-tracking branch 'origin/master' into ty/HA
add 092fcb5860a fix npe (#11966)
add 7200e217b09 Repair unsorted file by compaction (#11887)
new b92d34c27d5 Merge remote-tracking branch 'origin/master' into ty/HA
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:
.../org/apache/iotdb/db/it/IoTDBRepairDataIT.java | 130 +++
.../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 1 +
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 7 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 4 +
.../confignode/client/DataNodeRequestType.java | 1 +
.../client/async/AsyncDataNodeClientPool.java | 5 +
.../client/async/handlers/AsyncClientHandler.java | 1 +
.../iotdb/confignode/manager/ConfigManager.java | 8 +
.../apache/iotdb/confignode/manager/IManager.java | 3 +
.../iotdb/confignode/manager/node/NodeManager.java | 9 +
.../thrift/ConfigNodeRPCServiceProcessor.java | 5 +
.../org/apache/iotdb/db/audit/AuditLogger.java | 1 +
.../iotdb/db/protocol/client/ConfigNodeClient.java | 6 +
.../impl/DataNodeInternalRPCServiceImpl.java | 24 +
.../plan/execution/config/ConfigTaskVisitor.java | 8 +
.../config/executor/ClusterConfigTaskExecutor.java | 49 ++
.../config/executor/IConfigTaskExecutor.java | 2 +
.../{KillQueryTask.java => RepairDataTask.java} | 12 +-
.../db/queryengine/plan/parser/ASTVisitor.java | 12 +
.../queryengine/plan/statement/StatementType.java | 1 +
.../plan/statement/StatementVisitor.java | 5 +
...acheStatement.java => RepairDataStatement.java} | 16 +-
.../iotdb/db/storageengine/StorageEngine.java | 45 +
.../db/storageengine/dataregion/DataRegion.java | 10 +-
.../impl/ReadPointCompactionPerformer.java | 14 +-
.../RepairUnsortedFileCompactionPerformer.java | 86 ++
.../execute/task/AbstractCompactionTask.java | 9 +-
.../execute/task/CompactionTaskPriorityType.java | 14 +-
.../execute/task/CrossSpaceCompactionTask.java | 5 +-
.../execute/task/InnerSpaceCompactionTask.java | 35 +-
.../task/InsertionCrossSpaceCompactionTask.java | 7 +-
.../task/RepairUnsortedFileCompactionTask.java | 239 +++++
.../utils/writer/AbstractCompactionWriter.java | 6 +-
.../writer/AbstractCrossCompactionWriter.java | 6 +-
.../writer/AbstractInnerCompactionWriter.java | 6 +-
.../utils/writer/FastCrossCompactionWriter.java | 6 +-
.../utils/writer/FastInnerCompactionWriter.java | 6 +-
.../writer/ReadPointCrossCompactionWriter.java | 7 +-
.../writer/ReadPointInnerCompactionWriter.java | 7 +-
.../writer/RepairUnsortedFileCompactionWriter.java | 109 +++
.../dataregion/compaction/repair/RepairLogger.java | 136 +++
.../repair/RepairTaskRecoverLogParser.java | 115 +++
.../compaction/repair/RepairTimePartition.java | 136 +++
.../repair/UnsortedFileRepairTaskScheduler.java | 350 ++++++++
.../compaction/schedule/CompactionScheduler.java | 22 +-
.../compaction/schedule/CompactionTaskManager.java | 1 -
.../DefaultCompactionTaskComparatorImpl.java | 10 +-
... => RepairUnsortedFileCompactionEstimator.java} | 29 +-
.../impl/SizeTieredCompactionSelector.java | 40 +-
.../selector/utils/TsFileResourceCandidate.java | 5 +-
.../compaction/settle/SettleRequestHandler.java | 4 +-
.../dataregion/tsfile/TsFileManager.java | 39 +-
.../dataregion/tsfile/TsFileRepairStatus.java} | 9 +-
.../dataregion/tsfile/TsFileResource.java | 15 +
.../tsfile/generator/TsFileNameGenerator.java | 53 +-
.../storageengine/dataregion/wal/node/WALNode.java | 11 +-
.../TsFileOverlapValidationAndRepairTool.java | 6 -
...eCompactionWithFastPerformerValidationTest.java | 4 +-
...actionWithReadPointPerformerValidationTest.java | 2 +-
.../compaction/inner/InnerCompactionTest.java | 1 +
.../compaction/repair/RepairLoggerTest.java | 118 +++
.../repair/RepairUnsortedFileCompactionTest.java | 973 +++++++++++++++++++++
.../utils/MultiTsFileDeviceIteratorTest.java | 12 +-
.../src/main/thrift/confignode.thrift | 3 +
.../src/main/thrift/datanode.thrift | 2 +
65 files changed, 2840 insertions(+), 183 deletions(-)
create mode 100644
integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRepairDataIT.java
copy
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/{KillQueryTask.java
=> RepairDataTask.java} (77%)
copy
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/sys/{ClearCacheStatement.java
=> RepairDataStatement.java} (89%)
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/performer/impl/RepairUnsortedFileCompactionPerformer.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/task/RepairUnsortedFileCompactionTask.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/writer/RepairUnsortedFileCompactionWriter.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/repair/RepairLogger.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/repair/RepairTaskRecoverLogParser.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/repair/RepairTimePartition.java
create mode 100644
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/repair/UnsortedFileRepairTaskScheduler.java
copy
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/selector/estimator/{FastCrossSpaceCompactionEstimator.java
=> RepairUnsortedFileCompactionEstimator.java} (74%)
copy
iotdb-core/{confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/maintainer/RegionMaintainType.java
=>
datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileRepairStatus.java}
(85%)
create mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/repair/RepairLoggerTest.java
create mode 100644
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/repair/RepairUnsortedFileCompactionTest.java
