[AMORO-3391] Fix minor optimizing repeated issue (#3392)

* Fix minor optimizing repeated issue * Fix segmentShouldRewritePos issue
apache · Jan 6, 2025 · 0cc0529 · 0cc0529
1 parent 907973e
commit 0cc0529
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/...rmat-iceberg/src/main/java/org/apache/amoro/optimizing/plan/CommonPartitionEvaluator.java b/...rmat-iceberg/src/main/java/org/apache/amoro/optimizing/plan/CommonPartitionEvaluator.java
@@ -235,16 +235,27 @@ public boolean fileShouldRewrite(DataFile dataFile, List<ContentFile<?>> deletes
 
   public boolean segmentShouldRewritePos(DataFile dataFile, List<ContentFile<?>> deletes) {
     Preconditions.checkArgument(!isFragmentFile(dataFile), "Unsupported fragment file.");
-    long posDeleteFileCount =
-        deletes.stream().filter(delete -> delete.content() == FileContent.POSITION_DELETES).count();
-    if (posDeleteFileCount == 1) {
-      return !TableFileUtil.isOptimizingPosDeleteFile(
-          dataFile.path().toString(), deletes.get(0).path().toString());
-    } else if (posDeleteFileCount > 1) {
+    long equalDeleteFileCount = 0;
+    long posDeleteFileCount = 0;
+
+    for (ContentFile<?> delete : deletes) {
+      if (delete.content() == FileContent.EQUALITY_DELETES) {
+        equalDeleteFileCount++;
+      } else if (delete.content() == FileContent.POSITION_DELETES) {
+        posDeleteFileCount++;
+      }
+    }
+    if (posDeleteFileCount > 1) {
       combinePosSegmentFileCount++;
       return true;
+    } else if (equalDeleteFileCount > 0) {
+      return true;
+    } else if (posDeleteFileCount == 1) {
+      return !TableFileUtil.isOptimizingPosDeleteFile(
+          dataFile.path().toString(), deletes.get(0).path().toString());
+    } else {
+      return false;
     }
-    return deletes.stream().anyMatch(delete -> delete.content() == FileContent.EQUALITY_DELETES);
   }
 
   protected boolean isFullOptimizing() {