Skip to content

[ZEPPELIN-127] Fix issue raised by ZEPPELIN-127 related to DisplayUtils #133

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
doanduyhai wants to merge 2 commits into from
Closed

[ZEPPELIN-127] Fix issue raised by ZEPPELIN-127 related to DisplayUtils #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6826ebd
Fix issue raised by ZEPPELIN-127 related to DisplayUtils
doanduyhai Jun 30, 2015
0f88e2d
Make MaxResult object serializable to avoid any potential ser/deser i…
doanduyhai Jul 31, 2015
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
1 change: 0 additions & 1 deletion spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

Expand Down
13 changes: 7 additions & 6 deletions spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
Expand Down