adding back LivySparkRInterpreter.java , pyspark

livy/src/main/java/org/apache/zeppelin/livy/LivyPySparkInterpreter.java

@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.zeppelin.livy;
+
+import org.apache.zeppelin.interpreter.*;
+import org.apache.zeppelin.scheduler.Scheduler;
+import org.apache.zeppelin.scheduler.SchedulerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+
+/**
+ * Livy PySpark interpreter for Zeppelin.
+ */
+public class LivyPySparkInterpreter extends Interpreter {
+
+  Logger LOGGER = LoggerFactory.getLogger(LivyPySparkInterpreter.class);
+
+  static {
+    Interpreter.register(
+        "pyspark",
+        "lspark",
+        LivyPySparkInterpreter.class.getName(),
+        new InterpreterPropertyBuilder()
+            .build()
+    );
+  }
+
+  private Map<String, Integer> userSessionMap;
+  private LivyHelper livyHelper;
+
+  public LivyPySparkInterpreter(Properties property) {
+    super(property);
+    userSessionMap = new HashMap<>();
+    livyHelper = new LivyHelper(property);
+  }
+
+  @Override
+  public void open() {
+  }
+
+  @Override
+  public void close() {
+  }
+
+  @Override
+  public InterpreterResult interpret(String line, InterpreterContext interpreterContext) {
+    try {
+      if (userSessionMap.get(interpreterContext.getAuthenticationInfo().getUser()) == null) {
+        try {
+          userSessionMap.put(
+              interpreterContext.getAuthenticationInfo().getUser(),
+              livyHelper.createSession(
+                  interpreterContext.getAuthenticationInfo().getUser(),
+                  "pyspark")
+          );
+        } catch (Exception e) {
+          return new InterpreterResult(InterpreterResult.Code.ERROR, e.getMessage());
+        }
+      }
+
+      if (line == null || line.trim().length() == 0) {
+        return new InterpreterResult(InterpreterResult.Code.SUCCESS, "");
+      }
+
+      return livyHelper.interpret(line, interpreterContext, userSessionMap);
+    } catch (Exception e) {
+      LOGGER.error("Exception in LivyPySparkInterpreter while interpret ", e);
+      return new InterpreterResult(InterpreterResult.Code.ERROR,
+          InterpreterUtils.getMostRelevantMessage(e));
+    }
+  }
+
+  @Override
+  public void cancel(InterpreterContext context) {
+  }
+
+  @Override
+  public FormType getFormType() {
+    return FormType.SIMPLE;
+  }
+
+  @Override
+  public int getProgress(InterpreterContext context) {
+    return 0;
+  }
+
+  @Override
+  public Scheduler getScheduler() {
+    return SchedulerFactory.singleton().createOrGetFIFOScheduler(
+        LivyPySparkInterpreter.class.getName() + this.hashCode());
+  }
+
+  @Override
+  public List<String> completion(String buf, int cursor) {
+    return null;
+  }
+
+}

livy/src/main/java/org/apache/zeppelin/livy/LivySparkInterpreter.java

@@ -34,7 +34,7 @@ import java.util.Properties;
 public class LivySparkInterpreter extends Interpreter {
 
   static String DEFAULT_URL = "http://localhost:8998";
-  Logger LOGGER = LoggerFactory.getLogger(LivyPySparkInterpreter.class);
+  Logger LOGGER = LoggerFactory.getLogger(LivySparkInterpreter.class);
   private LivyOutputStream out;
 
   static {

livy/src/main/java/org/apache/zeppelin/livy/LivySparkRInterpreter.java

@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.zeppelin.livy;
+
+import org.apache.zeppelin.interpreter.*;
+import org.apache.zeppelin.scheduler.Scheduler;
+import org.apache.zeppelin.scheduler.SchedulerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+
+/**
+ * Livy PySpark interpreter for Zeppelin.
+ */
+public class LivySparkRInterpreter extends Interpreter {
+
+  Logger LOGGER = LoggerFactory.getLogger(LivySparkRInterpreter.class);
+
+  static {
+    Interpreter.register(
+        "r",
+        "lspark",
+        LivySparkRInterpreter.class.getName(),
+        new InterpreterPropertyBuilder()
+            .build()
+    );
+  }
+
+  private Map<String, Integer> userSessionMap;
+  private LivyHelper livyHelper;
+
+  public LivySparkRInterpreter(Properties property) {
+    super(property);
+    userSessionMap = new HashMap<>();
+    livyHelper = new LivyHelper(property);
+  }
+
+  @Override
+  public void open() {
+  }
+
+  @Override
+  public void close() {
+  }
+
+  @Override
+  public InterpreterResult interpret(String line, InterpreterContext interpreterContext) {
+    try {
+      if (userSessionMap.get(interpreterContext.getAuthenticationInfo().getUser()) == null) {
+        try {
+          userSessionMap.put(
+              interpreterContext.getAuthenticationInfo().getUser(),
+              livyHelper.createSession(
+                  interpreterContext.getAuthenticationInfo().getUser(),
+                  "sparkr")
+          );
+        } catch (Exception e) {
+          return new InterpreterResult(InterpreterResult.Code.ERROR, e.getMessage());
+        }
+      }
+
+      if (line == null || line.trim().length() == 0) {
+        return new InterpreterResult(InterpreterResult.Code.SUCCESS, "");
+      }
+
+      return livyHelper.interpret(line, interpreterContext, userSessionMap);
+    } catch (Exception e) {
+      LOGGER.error("Exception in LivySparkRInterpreter while interpret ", e);
+      return new InterpreterResult(InterpreterResult.Code.ERROR,
+          InterpreterUtils.getMostRelevantMessage(e));
+    }
+  }
+
+  @Override
+  public void cancel(InterpreterContext context) {
+  }
+
+  @Override
+  public FormType getFormType() {
+    return FormType.SIMPLE;
+  }
+
+  @Override
+  public int getProgress(InterpreterContext context) {
+    return 0;
+  }
+
+  @Override
+  public Scheduler getScheduler() {
+    return SchedulerFactory.singleton().createOrGetFIFOScheduler(
+        LivySparkRInterpreter.class.getName() + this.hashCode());
+  }
+
+  @Override
+  public List<String> completion(String buf, int cursor) {
+    return null;
+  }
+
+}