This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit f6e5f1cb0b856dc0e3fbe2167358f25b4b042713
Merge: c84581ad20b ea68bc31d49
Author: Christofer Dutz <[email protected]>
AuthorDate: Tue Jan 30 19:26:53 2024 +0100

    Merge remote-tracking branch 'upstream/master'

 .github/workflows/greetings.yml                    |    2 +-
 NOTICE                                             |    2 +-
 NOTICE-binary                                      |    2 +-
 .../org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java  |    9 +
 .../org/apache/iotdb/db/it/IoTDBRepairDataIT.java  |  132 ++
 .../IoTDBOrderByLimitOffsetAlignByDeviceIT.java    |    1 +
 .../apache/iotdb/pipe/it/IoTDBPipeExtractorIT.java |   37 +-
 .../apache/iotdb/pipe/it/IoTDBPipeSyntaxIT.java    |    3 +-
 .../iotdb/pipe/api/event/UserDefinedEvent.java     |   58 +
 .../java/org/apache/iotdb/cli/AbstractCli.java     |  246 ++--
 .../src/main/java/org/apache/iotdb/cli/Cli.java    |  124 +-
 .../apache/iotdb/cli/IoTDBSyntaxHighlighter.java   |    5 +-
 .../java/org/apache/iotdb/cli/type/ExitType.java   |   15 +-
 .../org/apache/iotdb/cli/utils/CliContext.java     |   84 ++
 .../org/apache/iotdb/cli/utils/IoTPrinter.java     |   36 +-
 .../org/apache/iotdb/cli/utils/JlineUtils.java     |   12 +-
 .../org/apache/iotdb/tool/AbstractCsvTool.java     |   10 +-
 .../org/apache/iotdb/tool/AbstractTsFileTool.java  |    6 +-
 .../main/java/org/apache/iotdb/tool/ExportCsv.java |   33 +-
 .../java/org/apache/iotdb/tool/ExportTsFile.java   |   35 +-
 .../main/java/org/apache/iotdb/tool/ImportCsv.java |   48 +-
 .../java/org/apache/iotdb/cli/AbstractCliIT.java   |   37 +-
 .../iotdb/tool/integration/ExportCsvTestIT.java    |    3 +
 .../iotdb/tool/integration/ImportCsvTestIT.java    |    3 +
 .../org/apache/iotdb/isession/SessionConfig.java   |    4 +
 .../java/org/apache/iotdb/session/Session.java     |   27 +-
 .../apache/iotdb/session/SessionConnection.java    |  660 ++++++++--
 .../org/apache/iotdb/session/pool/SessionPool.java | 1295 +++++++++-----------
 .../iotdb/session/SessionConnectionTest.java       |    9 +-
 iotdb-core/antlr/pom.xml                           |   11 +
 .../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 +
 .../confignode/conf/SystemPropertiesUtils.java     |   11 +-
 .../statemachine/ConfigRegionStateMachine.java     |   31 +
 .../iotdb/confignode/manager/ConfigManager.java    |   16 +-
 .../apache/iotdb/confignode/manager/IManager.java  |    3 +
 .../iotdb/confignode/manager/node/NodeManager.java |    9 +
 .../iotdb/confignode/service/ConfigNode.java       |   12 +-
 .../thrift/ConfigNodeRPCServiceProcessor.java      |    5 +
 .../org/apache/iotdb/db/audit/AuditLogger.java     |    1 +
 .../org/apache/iotdb/db/conf/IoTDBStartCheck.java  |    7 +-
 .../db/consensus/DataRegionConsensusImpl.java      |  294 ++---
 .../db/consensus/SchemaRegionConsensusImpl.java    |  239 ++--
 .../IoTConsensusDataRegionStateMachine.java        |    2 +-
 .../schemaregion/SchemaExecutionVisitor.java       |    1 -
 .../apache/iotdb/db/pipe/event/EnrichedEvent.java  |    4 +
 .../db/pipe/event/UserDefinedEnrichedEvent.java    |   86 ++
 .../PipeHistoricalDataRegionTsFileExtractor.java   |   29 +-
 .../realtime/PipeRealtimeDataRegionExtractor.java  |    9 +-
 .../subtask/connector/PipeConnectorSubtask.java    |   21 +-
 .../connector/PipeConnectorSubtaskLifeCycle.java   |   42 +-
 .../subtask/processor/PipeProcessorSubtask.java    |   12 +-
 .../iotdb/db/protocol/client/ConfigNodeClient.java |    6 +
 .../protocol/client/ConfigNodeClientManager.java   |    9 +-
 .../iotdb/db/protocol/client/ConfigNodeInfo.java   |    6 +-
 .../impl/DataNodeInternalRPCServiceImpl.java       |   24 +
 .../db/queryengine/common/MPPQueryContext.java     |   10 +-
 .../execution/fragment/QueryContext.java           |   26 +-
 .../execution/load/LoadTsFileManager.java          |   33 +-
 .../execution/operator/process/TopKOperator.java   |   42 +-
 .../AbstractSeriesAggregationScanOperator.java     |    2 +-
 .../operator/source/AlignedSeriesScanOperator.java |    4 +-
 .../operator/source/SeriesScanOperator.java        |    3 +-
 .../execution/schedule/DriverScheduler.java        |    2 +-
 .../queryengine/load/LoadTsFileMemoryManager.java  |    5 +-
 .../iotdb/db/queryengine/plan/Coordinator.java     |   16 +-
 .../queryengine/plan/analyze/AnalyzeVisitor.java   |    9 +-
 .../plan/analyze/LoadTsfileAnalyzer.java           |    9 +-
 .../plan/analyze/schema/ClusterSchemaFetcher.java  |    6 +-
 .../plan/execution/config/ConfigTaskVisitor.java   |    8 +
 .../config/executor/ClusterConfigTaskExecutor.java |   52 +-
 .../config/executor/IConfigTaskExecutor.java       |    2 +
 .../plan/execution/config/sys/RepairDataTask.java  |   42 +
 .../db/queryengine/plan/parser/ASTVisitor.java     |   24 +-
 .../plan/planner/LocalExecutionPlanner.java        |    4 +-
 .../plan/planner/LogicalPlanBuilder.java           |    6 +-
 .../plan/scheduler/AsyncSendPlanNodeHandler.java   |    4 +-
 .../scheduler/FragmentInstanceDispatcherImpl.java  |   38 +-
 .../plan/scheduler/load/LoadTsFileScheduler.java   |  148 ++-
 .../queryengine/plan/statement/StatementType.java  |    1 +
 .../plan/statement/StatementVisitor.java           |    5 +
 .../plan/statement/sys/RepairDataStatement.java    |   62 +
 .../schemaregion/impl/SchemaRegionMemoryImpl.java  |    1 +
 .../schemaregion/impl/SchemaRegionPBTreeImpl.java  |    1 +
 .../mtree/impl/pbtree/CachedMTreeStore.java        |    2 +-
 .../pbtree/schemafile/pagemgr/PageIOChannel.java   |    2 +-
 .../java/org/apache/iotdb/db/service/DataNode.java |   36 +-
 .../apache/iotdb/db/service/IoTDBShutdownHook.java |    5 +
 .../iotdb/db/storageengine/StorageEngine.java      |   45 +
 .../db/storageengine/dataregion/DataRegion.java    |  174 ++-
 .../dataregion/DeviceLastFlushTime.java}           |   35 +-
 .../dataregion/HashLastFlushTimeMap.java           |   92 +-
 ...onTaskPriorityType.java => ILastFlushTime.java} |   19 +-
 .../dataregion/ILastFlushTimeMap.java              |   12 +-
 .../dataregion/PartitionLastFlushTime.java}        |   29 +-
 .../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 ++++
 .../ReadChunkAlignedSeriesCompactionExecutor.java  |    1 -
 .../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 |  111 ++
 .../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 +-
 .../estimator/AbstractCompactionEstimator.java     |   10 +
 .../estimator/AbstractCrossSpaceEstimator.java     |    3 +
 .../estimator/AbstractInnerSpaceEstimator.java     |   19 +-
 .../RepairUnsortedFileCompactionEstimator.java     |   72 ++
 .../impl/SizeTieredCompactionSelector.java         |   40 +-
 .../selector/utils/TsFileResourceCandidate.java    |    5 +-
 .../compaction/settle/SettleRequestHandler.java    |    4 +-
 .../dataregion/flush/MemTableFlushTask.java        |   23 +-
 .../dataregion/tsfile/TsFileManager.java           |   75 +-
 .../TsFileRepairStatus.java}                       |   14 +-
 .../dataregion/tsfile/TsFileResource.java          |   16 +
 .../tsfile/generator/TsFileNameGenerator.java      |   53 +-
 .../storageengine/dataregion/wal/node/WALNode.java |   43 +-
 .../rescon/memory/TimePartitionInfo.java           |   10 +-
 .../rescon/memory/TimePartitionManager.java        |   31 +-
 .../TsFileOverlapValidationAndRepairTool.java      |    6 -
 .../org/apache/iotdb/db/utils/DateTimeUtils.java   |    8 +
 .../apache/iotdb/db/utils/ErrorHandlingUtils.java  |   32 +-
 .../SchemaRegionSimpleRecoverTest.java             |   98 ++
 .../execution/operator/OperatorMemoryTest.java     |   19 +-
 .../AlignByTimeOrderByLimitOffsetTest.java         |    5 +-
 .../dataregion/LastFlushTimeMapTest.java           |  121 +-
 ...eCompactionWithFastPerformerValidationTest.java |    4 +-
 ...actionWithReadPointPerformerValidationTest.java |    2 +-
 .../compaction/inner/InnerCompactionTest.java      |    1 +
 ...nkCompactionPerformerWithAlignedSeriesTest.java |   53 +
 .../compaction/repair/RepairLoggerTest.java        |  118 ++
 .../repair/RepairUnsortedFileCompactionTest.java   | 1005 +++++++++++++++
 .../utils/MultiTsFileDeviceIteratorTest.java       |   12 +-
 .../rescon/memory/TimePartitionManagerTest.java    |   41 +-
 .../iotdb/commons/auth/role/BasicRoleManager.java  |    1 +
 .../apache/iotdb/commons/conf/CommonConfig.java    |    4 +
 .../commons/pipe/agent/task/PipeTaskAgent.java     |   31 +-
 .../iotdb/commons/service/ThriftService.java       |    2 +-
 .../apache/iotdb/commons/utils/StatusUtils.java    |   52 +
 .../thrift-commons/src/main/thrift/common.thrift   |    1 +
 .../src/main/thrift/confignode.thrift              |    3 +
 .../src/main/thrift/datanode.thrift                |    2 +
 pom.xml                                            |    4 +-
 162 files changed, 6075 insertions(+), 2166 deletions(-)

Reply via email to