From 0e8203f4fb721158fb27897680da476174d24c4b Mon Sep 17 00:00:00 2001
From: Prashant Sharma <prashant.s@imaginea.com>
Date: Fri, 10 Oct 2014 18:39:55 -0700
Subject: [PATCH] [SPARK-2924] Required by scala 2.11, only one fun/ctor
amongst overriden alternatives, can have default argument(s).
...riden alternatives, can have default argument.
Author: Prashant Sharma <prashant.s@imaginea.com>
Closes #2750 from ScrapCodes/SPARK-2924/default-args-removed and squashes the following commits:
d9785c3 [Prashant Sharma] [SPARK-2924] Required by scala 2.11, only one function/ctor amongst overriden alternatives, can have default argument.
---
.../org/apache/spark/util/FileLogger.scala | 19 +++++++++++++++++--
.../apache/spark/util/FileLoggerSuite.scala | 8 ++++----
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/core/src/main/scala/org/apache/spark/util/FileLogger.scala b/core/src/main/scala/org/apache/spark/util/FileLogger.scala
index 6d1fc05a15..fdc73f0826 100644
--- a/core/src/main/scala/org/apache/spark/util/FileLogger.scala
+++ b/core/src/main/scala/org/apache/spark/util/FileLogger.scala
@@ -51,12 +51,27 @@ private[spark] class FileLogger(
def this(
logDir: String,
sparkConf: SparkConf,
- compress: Boolean = false,
- overwrite: Boolean = true) = {
+ compress: Boolean,
+ overwrite: Boolean) = {
this(logDir, sparkConf, SparkHadoopUtil.get.newConfiguration(sparkConf), compress = compress,
overwrite = overwrite)
}
+ def this(
+ logDir: String,
+ sparkConf: SparkConf,
+ compress: Boolean) = {
+ this(logDir, sparkConf, SparkHadoopUtil.get.newConfiguration(sparkConf), compress = compress,
+ overwrite = true)
+ }
+
+ def this(
+ logDir: String,
+ sparkConf: SparkConf) = {
+ this(logDir, sparkConf, SparkHadoopUtil.get.newConfiguration(sparkConf), compress = false,
+ overwrite = true)
+ }
+
private val dateFormat = new ThreadLocal[SimpleDateFormat]() {
override def initialValue(): SimpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss")
}
diff --git a/core/src/test/scala/org/apache/spark/util/FileLoggerSuite.scala b/core/src/test/scala/org/apache/spark/util/FileLoggerSuite.scala
index dc2a05631d..72466a3aa1 100644
--- a/core/src/test/scala/org/apache/spark/util/FileLoggerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/util/FileLoggerSuite.scala
@@ -74,13 +74,13 @@ class FileLoggerSuite extends FunSuite with BeforeAndAfter {
test("Logging when directory already exists") {
// Create the logging directory multiple times
- new FileLogger(logDirPathString, new SparkConf, overwrite = true).start()
- new FileLogger(logDirPathString, new SparkConf, overwrite = true).start()
- new FileLogger(logDirPathString, new SparkConf, overwrite = true).start()
+ new FileLogger(logDirPathString, new SparkConf, compress = false, overwrite = true).start()
+ new FileLogger(logDirPathString, new SparkConf, compress = false, overwrite = true).start()
+ new FileLogger(logDirPathString, new SparkConf, compress = false, overwrite = true).start()
// If overwrite is not enabled, an exception should be thrown
intercept[IOException] {
- new FileLogger(logDirPathString, new SparkConf, overwrite = false).start()
+ new FileLogger(logDirPathString, new SparkConf, compress = false, overwrite = false).start()
}
}
--
GitLab