Do not add the source path of a view when it can be matched by the de…

…letion pattern

(cherry picked from commit 6ca6a432e798c8fa313b9bf71e58ffae54f9e9a4)

integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBDeletionIT.java

@@ -19,7 +19,11 @@
 
 package org.apache.iotdb.db.it;
 
+import org.apache.iotdb.commons.utils.FileUtils;
+import org.apache.iotdb.db.storageengine.dataregion.modification.ModEntry;
+import org.apache.iotdb.db.storageengine.dataregion.modification.ModificationFile;
 import org.apache.iotdb.it.env.EnvFactory;
+import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper;
 import org.apache.iotdb.it.framework.IoTDBTestRunner;
 import org.apache.iotdb.itbase.category.ClusterIT;
 import org.apache.iotdb.itbase.category.LocalStandaloneIT;
@@ -32,10 +36,13 @@
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import java.io.File;
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.List;
 import java.util.Locale;
 
 import static org.junit.Assert.assertEquals;
@@ -467,6 +474,66 @@ public void testDelAfterUpdate() throws SQLException {
     }
   }
 
+  @Test
+  public void testDeleteWithView() throws SQLException, IOException {
+    try (Connection connection = EnvFactory.getEnv().getConnection();
+        Statement statement = connection.createStatement()) {
+      statement.execute("INSERT INTO root.del_with_view.d1(timestamp, status) VALUES(1, 1)");
+      statement.execute("INSERT INTO root.del_with_view.d2(timestamp, status) VALUES(2, 2)");
+      statement.execute("INSERT INTO root.del_with_view.d3(timestamp, status) VALUES(3, 3)");
+      statement.execute("INSERT INTO root.del_with_view.d4(timestamp, status) VALUES(4, 4)");
+
+      statement.execute(
+          "CREATE VIEW root.del_with_view.d1_view.status as root.del_with_view.d1.status");
+      statement.execute(
+          "CREATE VIEW root.del_with_view.d2_view.status as root.del_with_view.d2.status");
+      statement.execute(
+          "CREATE VIEW root.del_with_view.d3_view.status as root.del_with_view.d3.status");
+      statement.execute(
+          "CREATE VIEW root.del_with_view.d4_view.status as root.del_with_view.d4.status");
+
+      statement.execute("FLUSH");
+
+      try (ResultSet resultSet =
+          statement.executeQuery("select status from root.del_with_view.*")) {
+        int cnt = 0;
+        while (resultSet.next()) {
+          cnt++;
+        }
+        Assert.assertEquals(4, cnt);
+      }
+
+      statement.execute("DELETE FROM root.del_with_view.*.status");
+
+      for (DataNodeWrapper dataNodeWrapper : EnvFactory.getEnv().getDataNodeWrapperList()) {
+        String nodePropPath = dataNodeWrapper.getSystemPropertiesPath();
+        String nodeDatabasePath = nodePropPath + "../../../data/sequence/root.del_with_view";
+        File nodeDatabaseFile = new File(nodeDatabasePath);
+        List<File> modFiles =
+            FileUtils.listFilesRecursively(
+                nodeDatabaseFile, f -> f.getName().endsWith(ModificationFile.FILE_SUFFIX));
+        for (File modFile : modFiles) {
+          List<ModEntry> allMods;
+          try (ModificationFile modificationFile = new ModificationFile(modFile)) {
+            allMods = modificationFile.getAllMods();
+          }
+          // the source paths of the views can be matched by the pattern, so they should not appear
+          // in the mod file
+          assertEquals(1, allMods.size());
+        }
+      }
+
+      try (ResultSet resultSet =
+          statement.executeQuery("select status from root.del_with_view.*")) {
+        int cnt = 0;
+        while (resultSet.next()) {
+          cnt++;
+        }
+        Assert.assertEquals(0, cnt);
+      }
+    }
+  }
+
   private static void prepareSeries() {
     try (Connection connection = EnvFactory.getEnv().getConnection();
         Statement statement = connection.createStatement()) {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java

@@ -3521,6 +3521,18 @@ public Analysis visitDeleteData(
           logicalViewSchema = (LogicalViewSchema) measurementSchema;
           if (logicalViewSchema.isWritable()) {
             sourcePathOfAliasSeries = logicalViewSchema.getSourcePathIfWritable();
+            // if the source path can be matched by any of the deletion pattern, do not add it
+            boolean pathMatched = false;
+            for (MeasurementPath deletionPattern : deleteDataStatement.getPathList()) {
+              if (deletionPattern.matchFullPath(sourcePathOfAliasSeries)) {
+                pathMatched = true;
+                break;
+              }
+            }
+            if (pathMatched) {
+              continue;
+            }
+
             deletePatternSet.add(new MeasurementPath(sourcePathOfAliasSeries.getNodes()));
             deduplicatedDeviceIDs.add(sourcePathOfAliasSeries.getIDeviceID());
           }

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/FileUtils.java

@@ -29,6 +29,7 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -41,7 +42,10 @@
 import java.nio.file.StandardCopyOption;
 import java.text.CharacterIterator;
 import java.text.StringCharacterIterator;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
+import java.util.Stack;
 
 public class FileUtils {
   private static final Logger LOGGER = LoggerFactory.getLogger(FileUtils.class);
@@ -50,6 +54,29 @@ public class FileUtils {
 
   private FileUtils() {}
 
+  public static List<File> listFilesRecursively(File dir, FileFilter fileFilter) {
+    List<File> result = new ArrayList<>();
+    Stack<File> stack = new Stack<>();
+    if (dir.exists()) {
+      stack.push(dir);
+    }
+    while (!stack.isEmpty()) {
+      File file = stack.pop();
+      if (file.isDirectory()) {
+        File[] files = file.listFiles();
+        if (files != null) {
+          for (File f : files) {
+            stack.push(f);
+          }
+        }
+      }
+      if (fileFilter.accept(file)) {
+        result.add(file);
+      }
+    }
+    return result;
+  }
+
   public static boolean deleteFileIfExist(File file) {
     try {
       Files.deleteIfExists(file.toPath());