You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2018/01/26 01:57:28 UTC
[3/3] calcite git commit: [CALCITE-2075] Fix and re-enable
SparkAdapterTest
[CALCITE-2075] Fix and re-enable SparkAdapterTest
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/3432c774
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/3432c774
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/3432c774
Branch: refs/heads/master
Commit: 3432c774d017d738dff0b5ee76e6a32f1d87183e
Parents: 6e22245
Author: Julian Hyde <jh...@apache.org>
Authored: Wed Jan 24 18:14:22 2018 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Thu Jan 25 16:45:19 2018 -0800
----------------------------------------------------------------------
spark/pom.xml | 6 +-----
.../apache/calcite/adapter/spark/SparkHandlerImpl.java | 6 +++---
.../java/org/apache/calcite/test/SparkAdapterTest.java | 10 +++++-----
3 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/3432c774/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index fc407cd..e1c2458 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -125,11 +125,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/apache/calcite/**/*.java</exclude>
- </excludes>
- </configuration>
+ <configuration/>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/calcite/blob/3432c774/spark/src/main/java/org/apache/calcite/adapter/spark/SparkHandlerImpl.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/org/apache/calcite/adapter/spark/SparkHandlerImpl.java b/spark/src/main/java/org/apache/calcite/adapter/spark/SparkHandlerImpl.java
index a580912..be328ee 100644
--- a/spark/src/main/java/org/apache/calcite/adapter/spark/SparkHandlerImpl.java
+++ b/spark/src/main/java/org/apache/calcite/adapter/spark/SparkHandlerImpl.java
@@ -50,7 +50,7 @@ public class SparkHandlerImpl implements CalcitePrepare.SparkHandler {
private static SparkHandlerImpl instance;
private static final File SRC_DIR = new File("/tmp");
- private static final File CLASS_DIR = new File("spark/target/classes");
+ private static final File CLASS_DIR = new File("target/classes");
/** Creates a SparkHandlerImpl. */
private SparkHandlerImpl() {
@@ -85,8 +85,8 @@ public class SparkHandlerImpl implements CalcitePrepare.SparkHandler {
boolean restructure) {
RelNode root2 =
planner.changeTraits(rootRel,
- rootRel.getTraitSet().plus(SparkRel.CONVENTION));
- return planner.changeTraits(root2, rootRel.getTraitSet());
+ rootRel.getTraitSet().plus(SparkRel.CONVENTION).simplify());
+ return planner.changeTraits(root2, rootRel.getTraitSet().simplify());
}
public void registerRules(RuleSetBuilder builder) {
http://git-wip-us.apache.org/repos/asf/calcite/blob/3432c774/spark/src/test/java/org/apache/calcite/test/SparkAdapterTest.java
----------------------------------------------------------------------
diff --git a/spark/src/test/java/org/apache/calcite/test/SparkAdapterTest.java b/spark/src/test/java/org/apache/calcite/test/SparkAdapterTest.java
index 8f415fb..db08a7b 100644
--- a/spark/src/test/java/org/apache/calcite/test/SparkAdapterTest.java
+++ b/spark/src/test/java/org/apache/calcite/test/SparkAdapterTest.java
@@ -44,8 +44,8 @@ public class SparkAdapterTest {
+ "from (values (1, 'a'), (2, 'b'))")
.returns("EXPR$0=1; EXPR$1=a\n"
+ "EXPR$0=2; EXPR$1=b\n")
- .explainContains("SparkToEnumerableConverter\n"
- + " SparkValues(tuples=[[{ 1, 'a' }, { 2, 'b' }]])");
+ .explainContains("PLAN="
+ + "EnumerableValues(tuples=[[{ 1, 'a' }, { 2, 'b' }]])");
}
/** Tests values followed by filter, evaluated by Spark. */
@@ -56,9 +56,9 @@ public class SparkAdapterTest {
+ "from (values (1, 'a'), (2, 'b')) as t(x, y)\n"
+ "where x < 2")
.returns("X=1; Y=a\n")
- .explainContains("PLAN=SparkToEnumerableConverter\n"
- + " SparkCalc(expr#0..1=[{inputs}], expr#2=[2], expr#3=[<($t0, $t2)], proj#0..1=[{exprs}], $condition=[$t3])\n"
- + " SparkValues(tuples=[[{ 1, 'a' }, { 2, 'b' }]])\n");
+ .explainContains("PLAN="
+ + "EnumerableCalc(expr#0..1=[{inputs}], expr#2=[2], expr#3=[<($t0, $t2)], proj#0..1=[{exprs}], $condition=[$t3])\n"
+ + " EnumerableValues(tuples=[[{ 1, 'a' }, { 2, 'b' }]])\n");
}
}