optimize drop table

Author: HTHou

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java

@@ -2766,10 +2766,21 @@ public void deleteByTable(RelationalDeleteDataNode node) throws IOException {
         }
       }
 
-      List<File> matchedObjectDirs =
+      List<File> objectTableDirs =
           TierManager.getInstance().getAllMatchedObjectDirs(dataRegionIdString, tableName);
-      if (!matchedObjectDirs.isEmpty()) {
-        deleteObjectFiles(matchedObjectDirs, modEntries);
+      if (!objectTableDirs.isEmpty()) {
+        boolean droppingTable = false;
+        for (TableDeletionEntry entry : modEntries) {
+          if (entry.isDroppingTable()) {
+            for (File objectTableDir : objectTableDirs) {
+              droppingTable = true;
+              FileUtils.deleteQuietly(objectTableDir);
+            }
+          }
+        }
+        if (!droppingTable) {
+          deleteObjectFiles(objectTableDirs, modEntries);
+        }
       }
 
       List<List<TsFileResource>> sealedTsFileResourceLists = new ArrayList<>(modEntries.size());
@@ -2943,54 +2954,50 @@ private List<WALFlushListener> logDeletionInWAL(
   private void deleteObjectFiles(List<File> matchedObjectDirs, List<TableDeletionEntry> modEntries)
       throws IOException {
     for (File matchedObjectDir : matchedObjectDirs) {
-      try (Stream<Path> paths = Files.walk(matchedObjectDir.toPath())) {
-        paths
-            .filter(Files::isRegularFile)
-            .filter(
-                path -> {
-                  String name = path.getFileName().toString();
-                  return name.endsWith(".bin");
-                })
-            .forEach(
-                path -> {
-                  Path relativePath = matchedObjectDir.getParentFile().toPath().relativize(path);
-                  String[] ideviceIdSegments = new String[relativePath.getNameCount() - 2];
-                  for (int i = 0; i < ideviceIdSegments.length; i++) {
-                    ideviceIdSegments[i] =
-                        config.getRestrictObjectLimit()
-                            ? relativePath.getName(i).toString()
-                            : new String(
-                                BaseEncoding.base32()
-                                    .omitPadding()
-                                    .decode(relativePath.getName(i).toString()),
-                                StandardCharsets.UTF_8);
-                  }
-                  IDeviceID iDeviceID = Factory.DEFAULT_FACTORY.create(ideviceIdSegments);
-                  String measurementId =
-                      config.getRestrictObjectLimit()
-                          ? relativePath.getName(relativePath.getNameCount() - 2).toString()
-                          : new String(
-                              BaseEncoding.base32()
-                                  .omitPadding()
-                                  .decode(
-                                      relativePath
-                                          .getName(relativePath.getNameCount() - 2)
-                                          .toString()),
-                              StandardCharsets.UTF_8);
-                  String fileName = path.getFileName().toString();
-                  long timestamp = Long.parseLong(fileName.substring(0, fileName.lastIndexOf('.')));
-                  logger.info(
-                      "timestamp {}, measurementId {}, ideviceId {}",
-                      timestamp,
-                      measurementId,
-                      iDeviceID);
-                  for (TableDeletionEntry modEntry : modEntries) {
-                    if (modEntry.affects(iDeviceID, timestamp, timestamp)
-                        && modEntry.affects(measurementId)) {
-                      ObjectTypeUtils.deleteObjectPath(path.toFile());
-                    }
-                  }
-                });
+      try (Stream<Path> paths =
+          Files.find(
+              matchedObjectDir.toPath(),
+              Integer.MAX_VALUE,
+              (path, attrs) ->
+                  attrs.isRegularFile() && path.getFileName().toString().endsWith(".bin"))) {
+        paths.forEach(
+            path -> {
+              Path relativePath = matchedObjectDir.getParentFile().toPath().relativize(path);
+              String[] ideviceIdSegments = new String[relativePath.getNameCount() - 2];
+              for (int i = 0; i < ideviceIdSegments.length; i++) {
+                ideviceIdSegments[i] =
+                    config.getRestrictObjectLimit()
+                        ? relativePath.getName(i).toString()
+                        : new String(
+                            BaseEncoding.base32()
+                                .omitPadding()
+                                .decode(relativePath.getName(i).toString()),
+                            StandardCharsets.UTF_8);
+              }
+              IDeviceID iDeviceID = Factory.DEFAULT_FACTORY.create(ideviceIdSegments);
+              String measurementId =
+                  config.getRestrictObjectLimit()
+                      ? relativePath.getName(relativePath.getNameCount() - 2).toString()
+                      : new String(
+                          BaseEncoding.base32()
+                              .omitPadding()
+                              .decode(
+                                  relativePath.getName(relativePath.getNameCount() - 2).toString()),
+                          StandardCharsets.UTF_8);
+              String fileName = path.getFileName().toString();
+              long timestamp = Long.parseLong(fileName.substring(0, fileName.lastIndexOf('.')));
+              logger.info(
+                  "timestamp {}, measurementId {}, ideviceId {}",
+                  timestamp,
+                  measurementId,
+                  iDeviceID);
+              for (TableDeletionEntry modEntry : modEntries) {
+                if (modEntry.affects(iDeviceID, timestamp, timestamp)
+                    && modEntry.affects(measurementId)) {
+                  ObjectTypeUtils.deleteObjectPath(path.toFile());
+                }
+              }
+            });
       }
     }
   }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/DeletionPredicate.java

@@ -72,6 +72,10 @@ public void setIdPredicate(IDPredicate idPredicate) {
     this.idPredicate = idPredicate;
   }
 
+  public IDPredicate getIdPredicate() {
+    return idPredicate;
+  }
+
   public String getTableName() {
     return tableName;
   }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/TableDeletionEntry.java

@@ -21,6 +21,7 @@
 import org.apache.iotdb.commons.conf.IoTDBConstant;
 import org.apache.iotdb.commons.path.PartialPath;
 import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
+import org.apache.iotdb.db.storageengine.dataregion.modification.IDPredicate.IDPredicateType;
 import org.apache.iotdb.db.utils.ModificationUtils;
 
 import org.apache.tsfile.file.metadata.IDeviceID;
@@ -136,6 +137,14 @@ public String getTableName() {
     return predicate.getTableName();
   }
 
+  public boolean isDroppingTable() {
+    IDPredicate idPredicate = predicate.getIdPredicate();
+    return idPredicate.type == IDPredicateType.NOP
+        && predicate.getMeasurementNames().isEmpty()
+        && timeRange.getMin() == Long.MIN_VALUE
+        && timeRange.getMax() == Long.MAX_VALUE;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/disk/TierManager.java

@@ -287,6 +287,17 @@ public Optional<File> getAbsoluteObjectFilePath(String filePath, boolean needTem
 
   public List<File> getAllMatchedObjectDirs(String regionIdStr, String... path) {
     List<File> matchedDirs = new ArrayList<>();
+    boolean hasObjectDir = false;
+    for (String objectDir : objectDirs) {
+      File objectDirPath = FSFactoryProducer.getFSFactory().getFile(objectDir);
+      if (objectDirPath.exists()) {
+        hasObjectDir = true;
+        break;
+      }
+    }
+    if (!hasObjectDir) {
+      return matchedDirs;
+    }
     StringBuilder objectPath = new StringBuilder();
     objectPath.append(regionIdStr);
     for (String str : path) {