You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2025/01/14 09:04:40 UTC

(iotdb) branch test_deletion_ci updated: add log

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

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


The following commit(s) were added to refs/heads/test_deletion_ci by this push:
     new f0541552113 add log
f0541552113 is described below

commit f05415521133f68c3d3ddad1183a6e272721c359
Author: Tian Jiang <jt...@163.com>
AuthorDate: Tue Jan 14 17:04:31 2025 +0800

    add log
---
 .../it/env/cluster/node/AbstractNodeWrapper.java   |  2 ++
 .../iotdb/session/it/IoTDBSessionSimpleIT.java     |  3 +++
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  1 +
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  2 ++
 .../common/schematree/DeviceSchemaInfo.java        | 14 ++++++++++++
 .../common/schematree/MeasurementSchemaInfo.java   |  5 +++++
 .../analyze/schema/ClusterSchemaFetchExecutor.java | 26 ++++++++++++++++++++++
 .../plan/analyze/schema/NormalSchemaFetcher.java   | 11 +++++++++
 8 files changed, 64 insertions(+)

diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AbstractNodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AbstractNodeWrapper.java
index c42db717a93..d1ddf1ead15 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AbstractNodeWrapper.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/node/AbstractNodeWrapper.java
@@ -131,6 +131,7 @@ import static org.apache.iotdb.it.env.cluster.EnvUtils.getValueOfIndex;
 
 public abstract class AbstractNodeWrapper implements BaseNodeWrapper {
   private static final Logger logger = IoTDBTestLogger.logger;
+  public static List<String> customCmdCommands = new ArrayList<>();
 
   protected final String testClassName;
   protected final String testMethodName;
@@ -483,6 +484,7 @@ public abstract class AbstractNodeWrapper implements BaseNodeWrapper {
         startCmd.add("--add-opens=java.base/java.io=ALL-UNNAMED");
         startCmd.add("--add-opens=java.base/java.net=ALL-UNNAMED");
       }
+      startCmd.addAll(customCmdCommands);
 
       String libPath =
           System.getProperty("user.dir")
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java
index 7cfbed9fabe..466df5c29b8 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java
@@ -24,6 +24,7 @@ import org.apache.iotdb.db.protocol.thrift.OperationType;
 import org.apache.iotdb.isession.ISession;
 import org.apache.iotdb.isession.SessionDataSet;
 import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.it.env.cluster.node.AbstractNodeWrapper;
 import org.apache.iotdb.it.framework.IoTDBTestRunner;
 import org.apache.iotdb.itbase.category.ClusterIT;
 import org.apache.iotdb.itbase.category.LocalStandaloneIT;
@@ -81,6 +82,7 @@ public class IoTDBSessionSimpleIT {
 
   @BeforeClass
   public static void setUpClass() throws Exception {
+    AbstractNodeWrapper.customCmdCommands.add("-DisTestMode=True");
     EnvFactory.getEnv().initClusterEnvironment();
   }
 
@@ -97,6 +99,7 @@ public class IoTDBSessionSimpleIT {
 
   @AfterClass
   public static void tearDownClass() throws Exception {
+    AbstractNodeWrapper.customCmdCommands.clear();
     EnvFactory.getEnv().cleanClusterEnvironment();
   }
 
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 08ec1372910..f0bfe50c525 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -76,6 +76,7 @@ import static org.apache.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR;
 
 public class IoTDBConfig {
 
+  public static boolean isTestMode = false;
   /* Names of Watermark methods */
   public static final String WATERMARK_GROUPED_LSB = "GroupBasedLSBMethod";
   public static final String CONFIG_NAME = "iotdb-system.properties";
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index f1e160a16e1..a49bd1f9c38 100755
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -126,6 +126,8 @@ public class IoTDBDescriptor {
   }
 
   protected IoTDBDescriptor() {
+    IoTDBConfig.isTestMode =
+        Boolean.parseBoolean(System.getProperties().getProperty("isTestMode", "false"));
     loadProps();
     ServiceLoader<IPropertiesLoader> propertiesLoaderServiceLoader =
         ServiceLoader.load(IPropertiesLoader.class);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/DeviceSchemaInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/DeviceSchemaInfo.java
index 2c52b6b6770..571ef75315f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/DeviceSchemaInfo.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/DeviceSchemaInfo.java
@@ -138,4 +138,18 @@ public class DeviceSchemaInfo {
     }
     return measurementPaths;
   }
+
+  @Override
+  public String toString() {
+    return "DeviceSchemaInfo{"
+        + "devicePath="
+        + devicePath
+        + ", isAligned="
+        + isAligned
+        + ", measurementSchemaInfoList="
+        + measurementSchemaInfoList
+        + ", templateId="
+        + templateId
+        + '}';
+  }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/MeasurementSchemaInfo.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/MeasurementSchemaInfo.java
index 9db3ebadbfd..560ce6f3ddf 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/MeasurementSchemaInfo.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/MeasurementSchemaInfo.java
@@ -95,4 +95,9 @@ public class MeasurementSchemaInfo implements IMeasurementSchemaInfo {
   public boolean isLogicalView() {
     return this.schema.isLogicalView();
   }
+
+  @Override
+  public String toString() {
+    return "MeasurementSchemaInfo{" + "schema=" + schema + '}';
+  }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java
index 1c61bda425c..9bfb347b65e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetchExecutor.java
@@ -46,9 +46,12 @@ import org.apache.tsfile.block.column.Column;
 import org.apache.tsfile.read.common.block.TsBlock;
 import org.apache.tsfile.utils.Binary;
 import org.apache.tsfile.utils.ReadWriteIOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -59,6 +62,7 @@ import java.util.function.Consumer;
 
 class ClusterSchemaFetchExecutor {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(ClusterSchemaFetchExecutor.class);
   private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
   private final Coordinator coordinator;
   private final ITemplateManager templateManager;
@@ -166,6 +170,12 @@ class ClusterSchemaFetchExecutor {
       String[] measurements,
       List<Integer> indexOfTargetMeasurements,
       MPPQueryContext context) {
+    if (IoTDBConfig.isTestMode
+        && devicePath.toString().equals("root.sg1.d1")
+        && LOGGER.isWarnEnabled()) {
+      LOGGER.warn(
+          "Fetch schema for device {}, measurements {}", devicePath, Arrays.toString(measurements));
+    }
     PathPatternTree patternTree = new PathPatternTree();
     for (int index : indexOfTargetMeasurements) {
       patternTree.appendFullPath(devicePath, measurements[index]);
@@ -224,6 +234,22 @@ class ClusterSchemaFetchExecutor {
                 true,
                 false),
             context);
+    if (IoTDBConfig.isTestMode
+        && patternTree.getAllDevicePaths().stream()
+            .anyMatch(
+                path -> {
+                  try {
+                    return path.matchFullPath(new PartialPath("root.sg1.d1"));
+                  } catch (IllegalPathException e) {
+                    throw new RuntimeException(e);
+                  }
+                })
+        && LOGGER.isWarnEnabled()) {
+      LOGGER.warn(
+          "Fetched schema for device {}, schema tree {}",
+          patternTree.getAllDevicePaths(),
+          schemaTree.getAllDevices());
+    }
     if (!schemaTree.isEmpty()) {
       schemaCacheUpdater.accept(schemaTree);
     }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/NormalSchemaFetcher.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/NormalSchemaFetcher.java
index c9eaa2729e0..b0b58275859 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/NormalSchemaFetcher.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/NormalSchemaFetcher.java
@@ -33,6 +33,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache.Tr
 
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.utils.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,6 +42,7 @@ import java.util.stream.Collectors;
 
 class NormalSchemaFetcher {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(NormalSchemaFetcher.class);
   private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
 
   private final TreeDeviceSchemaCacheManager schemaCache;
@@ -188,6 +191,10 @@ class NormalSchemaFetcher {
           context);
       indexOfMissingMeasurements =
           schemaTree.compute(schemaComputationWithAutoCreation, indexOfMissingMeasurements);
+      if (IoTDBConfig.isTestMode && LOGGER.isWarnEnabled()) {
+        LOGGER.warn(
+            "Auto created schema for {}, result {}", devicePath, schemaTree.getAllDevices());
+      }
     }
 
     return indexOfMissingMeasurements;
@@ -358,6 +365,10 @@ class NormalSchemaFetcher {
               .collect(Collectors.toList()),
           isAlignedPutInList,
           context);
+      if (IoTDBConfig.isTestMode && LOGGER.isWarnEnabled()) {
+        LOGGER.warn(
+            "Auto created schema for {}, result {}", devicePathList, schemaTree.getAllDevices());
+      }
       indexOfDevicesWithMissingMeasurements = new ArrayList<>();
       indexOfMissingMeasurementsList = new ArrayList<>();
       for (int i = 0; i < indexOfDevicesNeedAutoCreateSchema.size(); i++) {