[iotdb] 01/01: merge master and fix conflicts

[ro...@apache.org]

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

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

commit 9e6a6e6ea4e7ef50a7e3b6bc60448d2c3c7622c4
Merge: 2b957638624 b833e3b66d1
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Mon May 22 01:39:38 2023 +0800

    merge master and fix conflicts

 .../apache/iotdb/consensus/ratis/RatisClient.java  |  18 +-
 .../org/apache/iotdb/it/utils/TsFileGenerator.java |  42 +++
 .../org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java  |  18 ++
 .../resources/conf/iotdb-common.properties         |   6 -
 .../apache/iotdb/commons/conf/CommonConfig.java    |   6 +-
 .../iotdb/commons/conf/CommonDescriptor.java       |   8 -
 .../apache/iotdb/commons/path/PathPatternTree.java |  34 +-
 .../apache/iotdb/commons/service/ServiceType.java  |   1 +
 .../iotdb/commons/path/PathPatternTreeTest.java    |  61 +++-
 .../iotdb/db/engine/storagegroup/DataRegion.java   | 268 ++--------------
 .../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java  |   2 +-
 .../iotdb/db/mpp/plan/parser/ASTVisitor.java       |   6 +
 .../plan/node/load/LoadSingleTsFileNode.java       |   4 +
 .../plan/scheduler/load/LoadTsFileScheduler.java   |   8 +-
 .../db/mpp/plan/statement/crud/QueryStatement.java |  10 +
 .../iotdb/db/pipe/agent/runtime/PipeLauncher.java  |  18 +-
 .../db/pipe/agent/runtime/PipeRuntimeAgent.java    |  43 ++-
 .../iotdb/db/pipe/agent/task/PipeTaskAgent.java    | 350 +++++++++++----------
 .../execution/executor/PipeSubtaskExecutor.java    |   2 +-
 .../java/org/apache/iotdb/db/service/DataNode.java |  10 +-
 .../impl/DataNodeInternalRPCServiceImpl.java       |   6 +-
 21 files changed, 453 insertions(+), 468 deletions(-)

diff --cc server/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeLauncher.java
index f09ceeaf414,30ab6aee862..617b95008e6
--- a/server/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeLauncher.java
+++ b/server/src/main/java/org/apache/iotdb/db/pipe/agent/runtime/PipeLauncher.java
@@@ -48,14 -46,16 +48,18 @@@ import java.util.ArrayList
  import java.util.List;
  import java.util.stream.Collectors;
  
- public class PipeLauncher {
+ class PipeLauncher {
  
 +  private static final Logger LOGGER = LoggerFactory.getLogger(PipeLauncher.class);
 +
    private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConfig();
  
-   public void launchPipePluginAgent(ResourcesInformationHolder resourcesInformationHolder)
-       throws StartupException {
+   private PipeLauncher() {
+     // forbidding instantiation
+   }
+ 
+   public static synchronized void launchPipePluginAgent(
+       ResourcesInformationHolder resourcesInformationHolder) throws StartupException {
      initPipePluginRelatedInstances();
  
      if (resourcesInformationHolder.getPipePluginMetaList() == null
@@@ -147,7 -147,7 +151,7 @@@
      }
    }
  
-   public void launchPipeTaskAgent() {
 -  public static synchronized void launchPipeTaskAgent() throws StartupException {
++  public static synchronized void launchPipeTaskAgent() {
      try (final ConfigNodeClient configNodeClient =
          ConfigNodeClientManager.getInstance().borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
        final TGetAllPipeInfoResp getAllPipeInfoResp = configNodeClient.getAllPipeInfo();