You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by mm...@apache.org on 2017/10/17 13:28:29 UTC
calcite git commit: [CALCITE-1762] Upgrade to Spark 2.X
Repository: calcite
Updated Branches:
refs/heads/master 6c435a03e -> 9baa96f39
[CALCITE-1762] Upgrade to Spark 2.X
Close apache/calcite#439
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/9baa96f3
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/9baa96f3
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/9baa96f3
Branch: refs/heads/master
Commit: 9baa96f39005a51061a675e245f1975254e37b13
Parents: 6c435a0
Author: Michael Mior <mm...@uwaterloo.ca>
Authored: Tue Oct 17 09:27:09 2017 -0400
Committer: Michael Mior <mm...@uwaterloo.ca>
Committed: Tue Oct 17 09:28:22 2017 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
.../java/org/apache/calcite/adapter/spark/SparkRules.java | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/9baa96f3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1e25c0c..36ad85e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,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>1.6.3</spark.version>
+ <spark.version>2.2.0</spark.version>
<sqlline.version>1.3.0</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/9baa96f3/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 8b355a2..8b313ac 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
@@ -71,6 +71,7 @@ import java.lang.reflect.Type;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Random;
@@ -441,12 +442,12 @@ public abstract class SparkRules {
System.out.println(
file.flatMap(
new FlatMapFunction<String, Pair<String, Integer>>() {
- public List<Pair<String, Integer>> call(String x) {
+ public Iterator<Pair<String, Integer>> call(String x) {
if (!x.startsWith("a")) {
- return Collections.emptyList();
+ return Collections.emptyIterator();
}
return Collections.singletonList(
- Pair.of(x.toUpperCase(Locale.ROOT), x.length()));
+ Pair.of(x.toUpperCase(Locale.ROOT), x.length())).iterator();
}
})
.take(5)