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 2018/07/18 11:17:25 UTC
spark git commit: [SPARK-24386][SPARK-24768][BUILD][FOLLOWUP] Fix
lint-java and Scala 2.12 build.
Repository: spark
Updated Branches:
refs/heads/master 3b59d326c -> 34cb3b54e
[SPARK-24386][SPARK-24768][BUILD][FOLLOWUP] Fix lint-java and Scala 2.12 build.
## What changes were proposed in this pull request?
This pr fixes lint-java and Scala 2.12 build.
lint-java:
```
[ERROR] src/test/resources/log4j.properties:[0] (misc) NewlineAtEndOfFile: File does not end with a newline.
```
Scala 2.12 build:
```
[error] /.../sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/continuous/ContinuousCoalesceRDD.scala:121: overloaded method value addTaskCompletionListener with alternatives:
[error] (f: org.apache.spark.TaskContext => Unit)org.apache.spark.TaskContext <and>
[error] (listener: org.apache.spark.util.TaskCompletionListener)org.apache.spark.TaskContext
[error] cannot be applied to (org.apache.spark.TaskContext => java.util.List[Runnable])
[error] context.addTaskCompletionListener { ctx =>
[error] ^
```
## How was this patch tested?
Manually executed lint-java and Scala 2.12 build in my local environment.
Author: Takuya UESHIN <ue...@databricks.com>
Closes #21801 from ueshin/issues/SPARK-24386_24768/fix_build.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/34cb3b54
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/34cb3b54
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/34cb3b54
Branch: refs/heads/master
Commit: 34cb3b54e9b7d4c5739cd446a9a66ec3fe59516b
Parents: 3b59d32
Author: Takuya UESHIN <ue...@databricks.com>
Authored: Wed Jul 18 19:17:18 2018 +0800
Committer: hyukjinkwon <gu...@apache.org>
Committed: Wed Jul 18 19:17:18 2018 +0800
----------------------------------------------------------------------
external/avro/src/test/resources/log4j.properties | 2 +-
.../sql/execution/streaming/continuous/ContinuousCoalesceRDD.scala | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/34cb3b54/external/avro/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/external/avro/src/test/resources/log4j.properties b/external/avro/src/test/resources/log4j.properties
index c18a724..f80a529 100644
--- a/external/avro/src/test/resources/log4j.properties
+++ b/external/avro/src/test/resources/log4j.properties
@@ -46,4 +46,4 @@ log4j.additivity.org.apache.hadoop.hive.metastore.RetryingHMSHandler=false
log4j.logger.org.apache.hadoop.hive.metastore.RetryingHMSHandler=OFF
log4j.additivity.hive.ql.metadata.Hive=false
-log4j.logger.hive.ql.metadata.Hive=OFF
\ No newline at end of file
+log4j.logger.hive.ql.metadata.Hive=OFF
http://git-wip-us.apache.org/repos/asf/spark/blob/34cb3b54/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/continuous/ContinuousCoalesceRDD.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/continuous/ContinuousCoalesceRDD.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/continuous/ContinuousCoalesceRDD.scala
index ba85b35..10d8fc5 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/continuous/ContinuousCoalesceRDD.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/continuous/ContinuousCoalesceRDD.scala
@@ -120,6 +120,7 @@ class ContinuousCoalesceRDD(
context.addTaskCompletionListener { ctx =>
threadPool.shutdownNow()
+ ()
}
part.writersInitialized = true
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org