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

caogaofei pushed a commit to branch beyyes/align_by_time_topk
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit c22fd623511098833301ac50fedee98639740419
Merge: c561d8d5dcd d1fc9b0cd79
Author: Beyyes <[email protected]>
AuthorDate: Fri Jan 12 14:42:36 2024 +0800

    merge master

 .../IoTDBOrderByLimitOffsetAlignByDeviceIT.java    |   2 +-
 .../IoTDBAlignedSeriesQueryWithMisMatchIT.java     | 114 ++++++++
 .../manager/consensus/ConsensusManager.java        |   4 +
 .../persistence/partition/PartitionInfo.java       |   3 +-
 .../iotdb/confignode/service/ConfigNode.java       |   2 +-
 .../apache/iotdb/consensus/config/RatisConfig.java |  23 +-
 .../apache/iotdb/consensus/ratis/utils/Utils.java  |   1 +
 .../iotdb/consensus/ratis/RatisConsensusTest.java  |  46 +++-
 .../db/consensus/DataRegionConsensusImpl.java      |   4 +
 .../db/consensus/SchemaRegionConsensusImpl.java    |   4 +
 .../builder/PipeTransferBatchReqBuilder.java       |  75 +++---
 .../request/PipeTransferTabletBatchReq.java        |  60 +++--
 .../protocol/airgap/IoTDBAirGapConnector.java      |   9 +-
 .../thrift/async/IoTDBThriftAsyncConnector.java    |   9 +-
 .../PipeTransferTabletBatchEventHandler.java       |   3 +-
 .../thrift/sync/IoTDBThriftSyncConnector.java      |   8 +-
 .../protocol/writeback/WriteBackConnector.java     |  11 +-
 .../process/join/LeftOuterTimeJoinOperator.java    |  11 +-
 .../execution/schedule/DriverScheduler.java        |   7 +-
 .../plan/planner/LogicalPlanBuilder.java           |   3 +-
 .../plan/planner/distribution/SourceRewriter.java  |   8 +-
 .../scheduler/FixedRateFragInsStateTracker.java    |   8 +-
 .../mtree/impl/pbtree/MTreeBelowSGCachedImpl.java  |   2 +-
 .../mtree/impl/pbtree/flush/Scheduler.java         | 110 ++++----
 .../impl/pbtree/memory/ReleaseFlushMonitor.java    |   3 +-
 .../mtree/impl/pbtree/schemafile/SchemaFile.java   |   7 +-
 .../schemafile/pagemgr/BTreePageManager.java       |  10 +-
 .../pbtree/schemafile/pagemgr/IPageManager.java    |   3 +
 .../pbtree/schemafile/pagemgr/PageManager.java     |  16 +-
 .../db/service/metrics/DataNodeMetricsHelper.java  |   2 +-
 .../iotdb/db/service/metrics/WritingMetrics.java   |  33 +--
 .../iotdb/db/storageengine/StorageEngine.java      |   4 +
 .../db/storageengine/dataregion/DataRegion.java    |  50 +++-
 .../execute/task/CrossSpaceCompactionTask.java     |   6 +-
 .../execute/task/InnerSpaceCompactionTask.java     |   5 +-
 .../estimator/CompactionEstimateUtils.java         |  43 ++-
 .../schemaRegion/SchemaStatisticsTest.java         |   2 +-
 .../connector/PipeDataNodeThriftRequestTest.java   |  69 +++++
 .../join/LeftOuterTimeJoinOperatorTest.java        | 290 ++++++++++++++++++++-
 .../distribution/AggregationDistributionTest.java  |  33 ++-
 .../storageengine/dataregion/DataRegionTest.java   |  38 +++
 .../service/metric/JvmGcMonitorMetrics.java        |  10 +-
 .../service/metric}/cpu/CpuUsageMetrics.java       |  23 +-
 .../file/metadata/AlignedTimeSeriesMetadata.java   |   5 +-
 .../apache/iotdb/tsfile/write/record/Tablet.java   |  26 +-
 45 files changed, 948 insertions(+), 257 deletions(-)


Reply via email to