diff --git a/spark/pom.xml b/spark/pom.xml index 9b82acbedd5..c0a9958278a 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -15,7 +15,6 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - 4.0.0 diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java index aec6d16d55a..ca954b99b6d 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java @@ -466,17 +466,18 @@ public void open() { intp.interpret("import sqlContext.sql"); intp.interpret("import org.apache.spark.sql.functions._"); } - - /* Temporary disabling DisplayUtils. see https://issues.apache.org/jira/browse/ZEPPELIN-127 - * + // Utility functions for display intp.interpret("import org.apache.zeppelin.spark.utils.DisplayUtils._"); // Scala implicit value for spark.maxResult intp.interpret("import org.apache.zeppelin.spark.utils.SparkMaxResult"); - intp.interpret("implicit val sparkMaxResult = new SparkMaxResult(" + - Integer.parseInt(getProperty("zeppelin.spark.maxResult")) + ")"); - */ + intp.interpret("object MaxResult extends Serializable {" + + "implicit val sparkMaxResult = new SparkMaxResult(" + + Integer.parseInt(getProperty("zeppelin.spark.maxResult")) + ")" + + "}"); + intp.interpret("import MaxResult.sparkMaxResult"); + try { if (sc.version().startsWith("1.1") || sc.version().startsWith("1.2")) {