Fix reflection getMethod parameter type
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/be477990 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/be477990 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/be477990 Branch: refs/heads/master Commit: be477990d82cfe1544466112896a58cf56ee485c Parents: f3dcec7 Author: Lee moon soo <[email protected]> Authored: Sat Mar 14 11:05:48 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Sat Mar 14 11:05:48 2015 +0900 ---------------------------------------------------------------------- pom.xml | 14 +++++++------- .../com/nflabs/zeppelin/spark/SparkInterpreter.java | 10 ++++++---- .../nflabs/zeppelin/spark/SparkSqlInterpreter.java | 6 +++--- 3 files changed, 16 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/be477990/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8cf8b1a..2017616 100644 --- a/pom.xml +++ b/pom.xml @@ -1261,15 +1261,15 @@ <properties> <akka.version>2.3.4-spark</akka.version> <spark.version>1.3.0</spark.version> - <mesos.version>0.21.0</mesos.version> - <hbase.version>0.98.7</hbase.version> - <hbase.artifact>hbase</hbase.artifact> - <hive.group>org.spark-project.hive</hive.group> - <hive.version>0.13.1a</hive.version> + <mesos.version>0.21.0</mesos.version> + <hbase.version>0.98.7</hbase.version> + <hbase.artifact>hbase</hbase.artifact> + <hive.group>org.spark-project.hive</hive.group> + <hive.version>0.13.1a</hive.version> <derby.version>10.10.1.1</derby.version> <orbit.version>3.0.0.v201112011016</orbit.version> - <parquet.version>1.6.0rc3</parquet.version> - <chill.version>0.5.0</chill.version> + <parquet.version>1.6.0rc3</parquet.version> + <chill.version>0.5.0</chill.version> <ivy.version>2.4.0</ivy.version> <oro.version>2.0.8</oro.version> <avro.mapred.classifier></avro.mapred.classifier> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/be477990/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java index 47d5be0..eb3b9ec 100644 --- a/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java @@ -397,17 +397,19 @@ public class SparkInterpreter extends Interpreter { + "_binder.get(\"sc\").asInstanceOf[org.apache.spark.SparkContext]"); intp.interpret("@transient val sqlc = " + "_binder.get(\"sqlc\").asInstanceOf[org.apache.spark.sql.SQLContext]"); + intp.interpret("@transient val sqlContext = " + + "_binder.get(\"sqlc\").asInstanceOf[org.apache.spark.sql.SQLContext]"); intp.interpret("@transient val hiveContext = " + "_binder.get(\"hiveContext\").asInstanceOf[org.apache.spark.sql.hive.HiveContext]"); intp.interpret("import org.apache.spark.SparkContext._"); if (sc.version().startsWith("1.1")) { - intp.interpret("import sqlc._"); + intp.interpret("import sqlContext._"); } else if (sc.version().startsWith("1.2")) { - intp.interpret("import sqlc._"); + intp.interpret("import sqlContext._"); } else if (sc.version().startsWith("1.3")) { - intp.interpret("import sqlc.implicits._"); - intp.interpret("import sqlc.sql"); + intp.interpret("import sqlContext.implicits._"); + intp.interpret("import sqlContext.sql"); intp.interpret("import org.apache.spark.sql.functions._"); } http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/be477990/spark/src/main/java/com/nflabs/zeppelin/spark/SparkSqlInterpreter.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/com/nflabs/zeppelin/spark/SparkSqlInterpreter.java b/spark/src/main/java/com/nflabs/zeppelin/spark/SparkSqlInterpreter.java index 6df4eec..53f4037 100644 --- a/spark/src/main/java/com/nflabs/zeppelin/spark/SparkSqlInterpreter.java +++ b/spark/src/main/java/com/nflabs/zeppelin/spark/SparkSqlInterpreter.java @@ -129,7 +129,7 @@ public class SparkSqlInterpreter extends Interpreter { try { rdd = sqlc.sql(st); - Method take = rdd.getClass().getMethod("take", Integer.class); + Method take = rdd.getClass().getMethod("take", int.class); rows = (Object[]) take.invoke(rdd, maxResult + 1); } catch (Exception e) { logger.error("Error", e); @@ -171,8 +171,8 @@ public class SparkSqlInterpreter extends Interpreter { try { for (int r = 0; r < maxResult && r < rows.length; r++) { Object row = rows[r]; - Method isNullAt = row.getClass().getMethod("isNullAt", Integer.class); - Method apply = row.getClass().getMethod("apply", Integer.class); + Method isNullAt = row.getClass().getMethod("isNullAt", int.class); + Method apply = row.getClass().getMethod("apply", int.class); for (int i = 0; i < columns.size(); i++) { if (!(Boolean) isNullAt.invoke(row, i)) {
