You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ro...@apache.org on 2023/05/09 16:55:06 UTC

[iotdb] 03/08: Merge branch 'master' of github.com:apache/iotdb into IOTDB-5848

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

rong pushed a commit to branch IOTDB-5848
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 94d13c5a928db21e074f941306d9841a48cff64e
Merge: c353c197a0 299f33c80c
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Mon May 8 22:51:14 2023 +0800

    Merge branch 'master' of github.com:apache/iotdb into IOTDB-5848

 .../iotdb/commons/consensus/DataRegionId.java      |  4 --
 .../pipe/plugin/builtin/BuiltinPipePlugin.java     |  8 ++-
 .../plugin/builtin/collector/DefaultCollector.java | 60 ++++++++++++++++
 .../db/pipe/agent/plugin/PipePluginAgent.java      |  7 ++
 .../db/pipe/config/PipeCollectorConstant.java      | 20 ++----
 .../core/collector/IoTDBDataRegionCollector.java   | 84 ++++++++++++++++++++++
 ...> PipeHistoricalDataRegionTsFileCollector.java} | 39 +++++-----
 .../realtime/PipeRealtimeDataRegionCollector.java  | 21 +++---
 ... => PipeRealtimeDataRegionHybridCollector.java} | 13 ++--
 .../db/pipe/task/stage/PipeTaskCollectorStage.java | 34 +++++----
 .../collector/CachedSchemaPatternMatcherTest.java  | 48 ++++++++++---
 .../core/collector/PipeRealtimeCollectTest.java    | 58 ++++++++++++---
 12 files changed, 303 insertions(+), 93 deletions(-)