aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/scala/org
diff options
context:
space:
mode:
authorPrashant Sharma <prashant.s@imaginea.com>2014-10-10 18:39:55 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-10-10 18:39:55 -0700
commit0e8203f4fb721158fb27897680da476174d24c4b (patch)
tree80c783b3a983dc8b25039475e3bfc3efd1c81e9b /core/src/main/scala/org
parent1d72a30874a88bdbab75217f001cf2af409016e7 (diff)
downloadspark-0e8203f4fb721158fb27897680da476174d24c4b.tar.gz
spark-0e8203f4fb721158fb27897680da476174d24c4b.tar.bz2
spark-0e8203f4fb721158fb27897680da476174d24c4b.zip
[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.
Diffstat (limited to 'core/src/main/scala/org')
-rw-r--r--core/src/main/scala/org/apache/spark/util/FileLogger.scala19
1 files changed, 17 insertions, 2 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")
}