Skip to content

[SPARK-7092] Update spark scala version to 2.11.6 #5662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[SPARK-7092] Update spark scala version to 2.11.6 #5662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1735,9 +1735,9 @@
<property><name>scala-2.11</name></property>
</activation>
<properties>
<scala.version>2.11.2</scala.version>
<scala.version>2.11.6</scala.version>
<scala.binary.version>2.11</scala.binary.version>
<jline.version>2.12</jline.version>
<jline.version>2.12.1</jline.version>
<jline.groupid>jline</jline.groupid>
</properties>
</profile>
Expand Down
2 changes: 1 addition & 1 deletion repl/scala-2.11/src/main/scala/org/apache/spark/repl/SparkIMain.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@ class SparkIMain(@BeanProperty val factory: ScriptEngineFactory, initialSettings

def apply(line: String): Result = debugging(s"""parse("$line")""") {
var isIncomplete = false
currentRun.reporting.withIncompleteHandler((_, _) => isIncomplete = true) {
currentRun.parsing.withIncompleteHandler((_, _) => isIncomplete = true) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious, was this a break across maintenance releases? or is this basically not a public Scala API anyway?

Are there any potential gotchas in updating? You know more than I would. I tend to favor updating as well to get fixes.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the change, it corresponds to scala/scala@64ebac2

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is harmless, if not beneficial. But this can be a stepping stone towards enabling add jars, because then we have two options 1) back port scala's version of add jars 2) port spark scala 2.10 repl's version of add jars on the fly.

Without this patch such a option does not exist. I agree best thing is to patch scala/scala so that we do not have to maintain repl(s). So I am working on it, with whatever time I have.

reporter.reset()
val trees = newUnitParser(line).parseStats()
if (reporter.hasErrors) Error
Expand Down