(iotdb) branch master updated: Export Data And Schema: filter out databases whose name starts with root.__system. (#12963)

[haonan]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 6d513a75da0 Export Data And Schema: filter out databases whose name 
starts with root.__system. (#12963)
6d513a75da0 is described below

commit 6d513a75da01de052be2fd53895592dbf7fd22e0
Author: Summer <43237967+2b3c...@users.noreply.github.com>
AuthorDate: Thu Jul 18 18:41:39 2024 +0800

    Export Data And Schema: filter out databases whose name starts with 
root.__system. (#12963)
    
    Co-authored-by: 2b3c511 <rong...@timecho.com>
---
 .../cli/src/main/java/org/apache/iotdb/tool/ExportData.java         | 6 ++++--
 .../cli/src/main/java/org/apache/iotdb/tool/ExportSchema.java       | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportData.java 
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportData.java
index e67d8584792..6600780ff87 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportData.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportData.java
@@ -60,6 +60,8 @@ import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static org.apache.iotdb.commons.schema.SchemaConstant.SYSTEM_DATABASE;
+
 /**
  * Export CSV file.
  *
@@ -517,14 +519,14 @@ public class ExportData extends AbstractDataTool {
           List<String> timeseries = new ArrayList<>();
           if (headers.contains("Device")) {
             deviceName = fields.get(0).toString();
-            if (deviceName.startsWith("root.__system")) {
+            if (deviceName.startsWith(SYSTEM_DATABASE + ".")) {
               continue;
             }
             for (String header : headersTemp) {
               timeseries.add(deviceName + "." + header);
             }
           } else {
-            if (headers.get(1).startsWith("root.__system")) {
+            if (headers.get(1).startsWith(SYSTEM_DATABASE + ".")) {
               continue;
             }
             timeseries.addAll(headers);
diff --git 
a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportSchema.java 
b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportSchema.java
index 6693336e1f9..9892da625e7 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportSchema.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ExportSchema.java
@@ -311,7 +311,7 @@ public class ExportSchema extends AbstractSchemaTool {
           }
           RowRecord rowRecord = sessionDataSet.next();
           List<Field> fields = rowRecord.getFields();
-          if 
(fields.get(timeseriesIndex).getStringValue().startsWith(SYSTEM_DATABASE)
+          if 
(fields.get(timeseriesIndex).getStringValue().startsWith(SYSTEM_DATABASE + ".")
               || 
!fields.get(viewTypeIndex).getStringValue().equals(BASE_VIEW_TYPE)) {
             continue;
           }