You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2020/10/11 14:48:11 UTC
[zeppelin] branch branch-0.9 updated: [hotfix] Fix spark test
failure
This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/branch-0.9 by this push:
new 55f5178 [hotfix] Fix spark test failure
55f5178 is described below
commit 55f517845dd970d05b3bb1ca6894ead430ced808
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Sun Oct 11 07:54:58 2020 +0800
[hotfix] Fix spark test failure
---
.../src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java | 6 +++++-
.../test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java | 8 +++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
index fc0a2c1..4a1f59e 100644
--- a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
+++ b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -254,7 +254,11 @@ public class SparkInterpreter extends AbstractInterpreter {
}
public boolean isScala212() throws InterpreterException {
- return extractScalaVersion().contains("2.12");
+ return extractScalaVersion().equals("2.12");
+ }
+
+ public boolean isScala210() throws InterpreterException {
+ return extractScalaVersion().equals("2.10");
}
private List<String> getDependencyFiles() throws InterpreterException {
diff --git a/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java b/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java
index 461eeaf..9b42f6a 100644
--- a/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java
+++ b/spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java
@@ -136,9 +136,11 @@ public class SparkInterpreterTest {
result = interpreter.interpret("/*line 1 \n line 2*/print(\"hello world\")", getInterpreterContext());
assertEquals(InterpreterResult.Code.SUCCESS, result.code());
- // test $intp
- result = interpreter.interpret("$intp", getInterpreterContext());
- assertEquals(InterpreterResult.Code.SUCCESS, result.code());
+ // test $intp, only works for scala after 2.11
+ if (!interpreter.isScala210()) {
+ result = interpreter.interpret("$intp", getInterpreterContext());
+ assertEquals(InterpreterResult.Code.SUCCESS, result.code());
+ }
// Companion object with case class
result = interpreter.interpret("import scala.math._\n" +