[CALCITE-1274] Upgrade Spark adapter to spark-1.6.1
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/d18da01e Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/d18da01e Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/d18da01e Branch: refs/heads/master Commit: d18da01ed88c772f62123e8420cdefc9b5d76daf Parents: ec49a0f Author: Julian Hyde <[email protected]> Authored: Mon Jun 6 19:46:49 2016 -0700 Committer: Julian Hyde <[email protected]> Committed: Wed Jun 8 17:35:03 2016 -0700 ---------------------------------------------------------------------- pom.xml | 2 +- .../java/org/apache/calcite/adapter/spark/SparkRules.java | 7 ++++--- .../java/org/apache/calcite/adapter/spark/SparkRuntime.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/d18da01e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4f8f690..0bcd67c 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ limitations under the License. <scott-data-hsqldb.version>0.1</scott-data-hsqldb.version> <servlet.version>3.0.1</servlet.version> <slf4j.version>1.7.13</slf4j.version> - <spark.version>0.9.0-incubating</spark.version> + <spark.version>1.6.1</spark.version> <sqlline.version>1.1.9</sqlline.version> <xalan.version>2.7.1</xalan.version> <xerces.version>2.9.1</xerces.version> http://git-wip-us.apache.org/repos/asf/calcite/blob/d18da01e/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java b/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java index 2bea47b..3adfcd9 100644 --- a/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java +++ b/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRules.java @@ -63,6 +63,7 @@ import org.apache.spark.api.java.function.FlatMapFunction; import org.apache.spark.api.java.function.Function; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import scala.Tuple2; @@ -409,9 +410,9 @@ public abstract class SparkRules { } //CHECKSTYLE: IGNORE 1 ).map( - new Function<Tuple2<String, List<String>>, Object>() { - @Override public Object call(Tuple2<String, List<String>> pair) { - return pair._1() + ":" + pair._2().size(); + new Function<Tuple2<String, Iterable<String>>, Object>() { + @Override public Object call(Tuple2<String, Iterable<String>> pair) { + return pair._1() + ":" + Iterables.size(pair._2()); } }).collect().toString(); System.out.print(s); http://git-wip-us.apache.org/repos/asf/calcite/blob/d18da01e/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRuntime.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRuntime.java b/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRuntime.java index 0ea1b96..00d9f8d 100644 --- a/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRuntime.java +++ b/spark/src/main/java/org/apache/calcite/adapter/spark/SparkRuntime.java @@ -63,8 +63,8 @@ public abstract class SparkRuntime { /** Combines linq4j {@link org.apache.calcite.linq4j.function.Function} * and Spark {@link org.apache.spark.api.java.function.FlatMapFunction}. */ public abstract static class CalciteFlatMapFunction<T, R> - extends FlatMapFunction<T, R> - implements org.apache.calcite.linq4j.function.Function { + implements FlatMapFunction<T, R>, + org.apache.calcite.linq4j.function.Function { } }
