[spark] branch master updated: [SPARK-39261][CORE][FOLLOWUP] Improve newline formatting for error messages

[yumwang]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 00277f5370c [SPARK-39261][CORE][FOLLOWUP] Improve newline formatting 
for error messages
00277f5370c is described below

commit 00277f5370c56d207aae437293958d1b5e4470d9
Author: sychen <syc...@ctrip.com>
AuthorDate: Sun May 29 09:38:34 2022 +0800

    [SPARK-39261][CORE][FOLLOWUP] Improve newline formatting for error messages
    
    ### What changes were proposed in this pull request?
    Use `java.nio.file.Files.delete` instead of 
`org.apache.commons.io.FileUtils#delete`
    
    ### Why are the changes needed?
    `org.apache.commons.io.FileUtils#delete` is a method only available in 
version 2.9, hadoop2 uses version 2.4 of commons-io.
    
    Build failed
    ```
    ./dev/make-distribution.sh --tgz -Pyarn -Phive -Phive-thriftserver 
-Phadoop-2 -DskipTests -Dmaven.javadoc.skip=true
    ```
    ```
    spark/core/src/test/scala/org/apache/spark/SparkThrowableSuite.scala:92: 
value delete is not a member of object org.apache.commons.io.FileUtils
    ```
    
    ### Does this PR introduce _any_ user-facing change?
    No
    
    ### How was this patch tested?
    exist UT
    
    Closes #36710 from cxzl25/SPARK-39261-FOLLOWUP.
    
    Authored-by: sychen <syc...@ctrip.com>
    Signed-off-by: Yuming Wang <yumw...@ebay.com>
---
 core/src/test/scala/org/apache/spark/SparkThrowableSuite.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/test/scala/org/apache/spark/SparkThrowableSuite.scala 
b/core/src/test/scala/org/apache/spark/SparkThrowableSuite.scala
index 6ad80950931..9092571b9b9 100644
--- a/core/src/test/scala/org/apache/spark/SparkThrowableSuite.scala
+++ b/core/src/test/scala/org/apache/spark/SparkThrowableSuite.scala
@@ -19,6 +19,7 @@ package org.apache.spark
 
 import java.io.File
 import java.nio.charset.StandardCharsets
+import java.nio.file.Files
 import java.util.IllegalFormatException
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include
@@ -89,7 +90,7 @@ class SparkThrowableSuite extends SparkFunSuite {
       if (rewrittenString.trim != errorClassFileContents.trim) {
         val errorClassesFile = new File(errorClassDir, new 
File(errorClassesUrl.getPath).getName)
         logInfo(s"Regenerating error class file $errorClassesFile")
-        FileUtils.delete(errorClassesFile)
+        Files.delete(errorClassesFile.toPath)
         FileUtils.writeStringToFile(errorClassesFile, rewrittenString, 
StandardCharsets.UTF_8)
       }
     } else {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org