Skip to content

Conversation

@srowen
Copy link
Member

@srowen srowen commented Oct 30, 2017

What changes were proposed in this pull request?

Spark REPL changes for Scala 2.12.4: use command(), not processLine() in ILoop; remove direct dependence on older jline. Not sure whether this became needed in 2.12.4 or just missed this before. This makes spark-shell work in 2.12.

How was this patch tested?

Existing tests; manual run of spark-shell in 2.11, 2.12 builds

… in ILoop; remove direct dependence on older jline
<artifactId>antlr4-runtime</artifactId>
<version>${antlr4.version}</version>
</dependency>
<dependency>
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 caused a problem in Scala 2.12, but, doesn't seem like we have any direct dependency on jline anyway

processLine("import spark.implicits._")
processLine("import spark.sql")
processLine("import org.apache.spark.sql.functions._")
command("import org.apache.spark.SparkContext._")
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 real change. Also part of the reason Spark didn't work in 2.11.11. This avoids waiting on ILoop.globalFuture which isn't initialized when processLine gets called anymore

@srowen
Copy link
Member Author

srowen commented Oct 30, 2017

(Note this is a follow-up to #19307)

@SparkQA
Copy link

SparkQA commented Oct 30, 2017

Test build #83227 has finished for PR 19612 at commit a2ccbf2.

  • This patch fails build dependency tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Oct 30, 2017

Test build #83228 has started for PR 19612 at commit e4f5282.

@SparkQA
Copy link

SparkQA commented Oct 31, 2017

Test build #3969 has finished for PR 19612 at commit e4f5282.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@srowen
Copy link
Member Author

srowen commented Nov 2, 2017

Merged to master

@srowen srowen closed this Nov 2, 2017
@srowen srowen deleted the SPARK-14650.2 branch November 2, 2017 09:46
zzcclp pushed a commit to zzcclp/spark that referenced this pull request Nov 2, 2017
## What changes were proposed in this pull request?

Spark REPL changes for Scala 2.12.4: use command(), not processLine() in ILoop; remove direct dependence on older jline. Not sure whether this became needed in 2.12.4 or just missed this before. This makes spark-shell work in 2.12.

## How was this patch tested?

Existing tests; manual run of spark-shell in 2.11, 2.12 builds

Author: Sean Owen <[email protected]>

Closes apache#19612 from srowen/SPARK-14650.2.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants