fix mridulm comments

LuciferYang · LuciferYang · commit 25828f248944 · 2021-08-04T17:19:48.000+08:00
diff --git a/core/src/main/java/org/apache/spark/shuffle/sort/BypassMergeSortShuffleWriter.java b/core/src/main/java/org/apache/spark/shuffle/sort/BypassMergeSortShuffleWriter.java
@@ -289,7 +289,7 @@ public Option<MapStatus> stop(boolean success) {
           try {
             for (DiskBlockObjectWriter writer : partitionWriters) {
               // This method explicitly does _not_ throw exceptions:
-              writer.deleteHeldFile();
+              writer.closeAndDelete();
             }
           } finally {
             partitionWriters = null;
diff --git a/core/src/main/scala/org/apache/spark/storage/DiskBlockObjectWriter.scala b/core/src/main/scala/org/apache/spark/storage/DiskBlockObjectWriter.scala
@@ -19,6 +19,7 @@ package org.apache.spark.storage
 
 import java.io.{BufferedOutputStream, File, FileOutputStream, OutputStream}
 import java.nio.channels.{ClosedByInterruptException, FileChannel}
+import java.nio.file.Files
 import java.util.zip.Checksum
 
 import org.apache.spark.internal.Logging
@@ -28,6 +29,7 @@ import org.apache.spark.shuffle.ShuffleWriteMetricsReporter
 import org.apache.spark.util.Utils
 import org.apache.spark.util.collection.PairsWriter
 
+
 /**
  * A class for writing JVM objects directly to a file on disk. This class allows data to be appended
  * to an existing block. For efficiency, it retains the underlying file channel across
@@ -267,18 +269,16 @@ private[spark] class DiskBlockObjectWriter(
    * by current `DiskBlockObjectWriter`. Callers should invoke this function when there
    * are runtime exceptions in file writing process and the file is no longer needed.
    */
-  def deleteHeldFile(): Unit = {
+  def closeAndDelete(): Unit = {
     Utils.tryWithSafeFinally {
       if (initialized) {
         writeMetrics.decBytesWritten(reportedPosition - committedPosition)
         writeMetrics.decRecordsWritten(numRecordsWritten)
         closeResources()
       }
     } {
-      if (file.exists()) {
-        if (!file.delete()) {
-          logWarning(s"Error deleting $file")
-        }
+      if (!Files.deleteIfExists(file.toPath)) {
+        logWarning(s"Error deleting $file")
       }
     }
   }
diff --git a/core/src/main/scala/org/apache/spark/util/collection/ExternalAppendOnlyMap.scala b/core/src/main/scala/org/apache/spark/util/collection/ExternalAppendOnlyMap.scala
@@ -250,7 +250,7 @@ class ExternalAppendOnlyMap[K, V, C](
       if (!success) {
         // This code path only happens if an exception was thrown above before we set success;
         // close our stuff and let the exception be thrown further
-        writer.deleteHeldFile()
+        writer.closeAndDelete()
       }
     }
 
diff --git a/core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala b/core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala
@@ -321,7 +321,7 @@ private[spark] class ExternalSorter[K, V, C](
       if (!success) {
         // This code path only happens if an exception was thrown above before we set success;
         // close our stuff and let the exception be thrown further
-        writer.deleteHeldFile()
+        writer.closeAndDelete()
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public Option<MapStatus> stop(boolean success) {`
`289`	`289`	`try {`
`290`	`290`	`for (DiskBlockObjectWriter writer : partitionWriters) {`
`291`	`291`	`// This method explicitly does _not_ throw exceptions:`
`292`		`- writer.deleteHeldFile();`
	`292`	`+ writer.closeAndDelete();`
`293`	`293`	`}`
`294`	`294`	`} finally {`
`295`	`295`	`partitionWriters = null;`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ class ExternalAppendOnlyMap[K, V, C](`
`250`	`250`	`if (!success) {`
`251`	`251`	`// This code path only happens if an exception was thrown above before we set success;`
`252`	`252`	`// close our stuff and let the exception be thrown further`
`253`		`- writer.deleteHeldFile()`
	`253`	`+ writer.closeAndDelete()`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ private[spark] class ExternalSorter[K, V, C](`
`321`	`321`	`if (!success) {`
`322`	`322`	`// This code path only happens if an exception was thrown above before we set success;`
`323`	`323`	`// close our stuff and let the exception be thrown further`
`324`		`- writer.deleteHeldFile()`
	`324`	`+ writer.closeAndDelete()`
`325`	`325`	`}`
`326`	`326`	`}`
`327`	`327`