You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2022/08/27 04:55:31 UTC

[spark] 01/02: Revert "[SPARK-40039][SS][FOLLOWUP] Fixes scala style check issue"

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

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

commit 8fb853218bed792b3f66c8401691dd16262e1f9e
Author: Hyukjin Kwon <gu...@apache.org>
AuthorDate: Sat Aug 27 13:55:04 2022 +0900

    Revert "[SPARK-40039][SS][FOLLOWUP] Fixes scala style check issue"
    
    This reverts commit 4f4a080a78c3979961e8483aace663bdc45f489d.
---
 .../internal/io/cloud/AbortableStreamBasedCheckpointFileManager.scala  | 3 +--
 .../apache/spark/internal/io/cloud/abortable/AbortableFileSystem.java  | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hadoop-cloud/src/hadoop-3/main/scala/org/apache/spark/internal/io/cloud/AbortableStreamBasedCheckpointFileManager.scala b/hadoop-cloud/src/hadoop-3/main/scala/org/apache/spark/internal/io/cloud/AbortableStreamBasedCheckpointFileManager.scala
index 2afab01ec7b..71a2c1d896e 100644
--- a/hadoop-cloud/src/hadoop-3/main/scala/org/apache/spark/internal/io/cloud/AbortableStreamBasedCheckpointFileManager.scala
+++ b/hadoop-cloud/src/hadoop-3/main/scala/org/apache/spark/internal/io/cloud/AbortableStreamBasedCheckpointFileManager.scala
@@ -65,8 +65,7 @@ class AbortableStreamBasedCheckpointFileManager(path: Path, hadoopConf: Configur
         if (!overwriteIfPossible && fc.util().exists(path)) {
           fsDataOutputStream.abort()
           throw new FileAlreadyExistsException(
-            s"Failed to close atomic stream $path (stream: " +
-            s"$fsDataOutputStream) as destination already exists")
+            s"Failed to close atomic stream $path (stream: $fsDataOutputStream) as destination already exists")
         }
         fsDataOutputStream.close()
       } catch {
diff --git a/hadoop-cloud/src/test/java/org/apache/spark/internal/io/cloud/abortable/AbortableFileSystem.java b/hadoop-cloud/src/test/java/org/apache/spark/internal/io/cloud/abortable/AbortableFileSystem.java
index 5c7f68f4378..65a735e7dae 100644
--- a/hadoop-cloud/src/test/java/org/apache/spark/internal/io/cloud/abortable/AbortableFileSystem.java
+++ b/hadoop-cloud/src/test/java/org/apache/spark/internal/io/cloud/abortable/AbortableFileSystem.java
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.hadoop.fs.*;
 import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.fs.statistics.BufferedIOStatisticsOutputStream;
 import org.apache.hadoop.util.Progressable;
 
 public class AbortableFileSystem extends RawLocalFileSystem {


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