From 20425ea3eca37be91fcdfedee127f118119ad7e7 Mon Sep 17 00:00:00 2001 From: Jeff Zhang Date: Thu, 15 Dec 2016 12:53:23 +0800 Subject: [PATCH] ZEPPELIN-1816. Implement getProgress in SparkRInterpreter --- .../org/apache/zeppelin/spark/SparkRInterpreter.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java index f4152a5fb49..ef8e9fc927e 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java @@ -42,6 +42,7 @@ public class SparkRInterpreter extends Interpreter { private static final Logger logger = LoggerFactory.getLogger(SparkRInterpreter.class); private static String renderOptions; + private SparkInterpreter sparkInterpreter; private ZeppelinR zeppelinR; private SparkContext sc; @@ -70,7 +71,7 @@ public void open() { int port = SparkRBackend.port(); - SparkInterpreter sparkInterpreter = getSparkInterpreter(); + this.sparkInterpreter = getSparkInterpreter(); this.sc = sparkInterpreter.getSparkContext(); SparkVersion sparkVersion = new SparkVersion(sc.version()); ZeppelinRContext.setSparkContext(sc); @@ -185,7 +186,11 @@ public FormType getFormType() { @Override public int getProgress(InterpreterContext context) { - return 0; + if (sparkInterpreter != null) { + return sparkInterpreter.getProgress(context); + } else { + return 0; + } } @Override