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 2015/11/20 21:05:56 UTC

[1/2] calcite git commit: Tests for [CALCITE-974]; can now convert INSERT, UPDATE, DELETE

Repository: calcite
Updated Branches:
  refs/remotes/julianhyde/master [created] 4e61eae56


Tests for [CALCITE-974]; can now convert INSERT, UPDATE, DELETE


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/4e61eae5
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/4e61eae5
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/4e61eae5

Branch: refs/remotes/julianhyde/master
Commit: 4e61eae560f5e2e46ca96a1002522cd1a3317a4e
Parents: 737846e
Author: Julian Hyde <jh...@apache.org>
Authored: Thu Nov 19 15:01:28 2015 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Thu Nov 19 17:08:20 2015 -0800

----------------------------------------------------------------------
 .../calcite/test/SqlToRelConverterTest.java     | 41 +++++++++++
 .../calcite/test/SqlToRelConverterTest.xml      | 74 ++++++++++++++++++++
 2 files changed, 115 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/4e61eae5/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java b/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
index dbd8a63..10cdb4e 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
@@ -1182,6 +1182,47 @@ public class SqlToRelConverterTest extends SqlToRelTestBase {
         .convertsTo("${plan}");
   }
 
+  @Test public void testDelete() {
+    sql("delete from emp")
+        .convertsTo("${plan}");
+  }
+
+  @Test public void testDeleteWhere() {
+    sql("delete from emp where deptno = 10")
+        .convertsTo("${plan}");
+  }
+
+  @Test public void testUpdate() {
+    sql("update emp set empno = empno + 1")
+        .convertsTo("${plan}");
+  }
+
+  @Test public void testUpdateSubQuery() {
+    final String sql = "update emp\n"
+        + "set empno = (\n"
+        + "  select min(empno) from emp as e where e.deptno = emp.deptno)";
+    sql(sql)
+        .convertsTo("${plan}");
+  }
+
+  @Test public void testUpdateWhere() {
+    sql("update emp set empno = empno + 1 where deptno = 10")
+        .convertsTo("${plan}");
+  }
+
+  @Ignore("CALCITE-985")
+  @Test public void testMerge() {
+    final String sql = "merge into emp as target\n"
+        + "using (select * from emp where deptno = 30) as source\n"
+        + "on target.empno = source.empno\n"
+        + "when matched then\n"
+        + "  update set sal = sal + source.sal\n"
+        + "when not matched then\n"
+        + "  insert (empno, deptno, sal)\n"
+        + "  values (source.empno, source.deptno, source.sal)";
+    sql(sql).convertsTo("${plan}");
+  }
+
   @Test public void testSelectView() {
     // translated condition: deptno = 20 and sal > 1000 and empno > 100
     sql("select * from emp_20 where empno > 100")

http://git-wip-us.apache.org/repos/asf/calcite/blob/4e61eae5/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml b/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml
index e145812..4500149 100644
--- a/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml
@@ -2557,4 +2557,78 @@ LogicalProject(A=[$0], *=[$1])
 ]]>
         </Resource>
     </TestCase>
+    <TestCase name="testDeleteWhere">
+        <Resource name="sql">
+            <![CDATA[delete from emp where deptno = 10]]>
+        </Resource>
+        <Resource name="plan">
+            <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[DELETE], updateColumnList=[[]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+        </Resource>
+    </TestCase>
+    <TestCase name="testUpdateWhere">
+        <Resource name="sql">
+            <![CDATA[update emp set empno = empno + 1 where deptno = 10]]>
+        </Resource>
+        <Resource name="plan">
+            <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[+($0, 1)])
+    LogicalFilter(condition=[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+        </Resource>
+    </TestCase>
+    <TestCase name="testDelete">
+        <Resource name="sql">
+            <![CDATA[delete from emp]]>
+        </Resource>
+        <Resource name="plan">
+            <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[DELETE], updateColumnList=[[]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+        </Resource>
+    </TestCase>
+    <TestCase name="testUpdate">
+        <Resource name="sql">
+            <![CDATA[update emp set empno = empno + 1]]>
+        </Resource>
+        <Resource name="plan">
+            <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[+($0, 1)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+        </Resource>
+    </TestCase>
+    <TestCase name="testUpdateSubQuery">
+        <Resource name="sql">
+            <![CDATA[update emp
+set empno = (
+  select min(empno) from emp as e where e.deptno = emp.deptno)]]>
+        </Resource>
+        <Resource name="plan">
+            <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[$9])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[$10])
+      LogicalJoin(condition=[=($7, $9)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{0}], EXPR$0=[MIN($1)])
+          LogicalProject(DEPTNO0=[$1], EMPNO=[$0])
+            LogicalProject(EMPNO=[$0], DEPTNO0=[$9])
+              LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+                LogicalAggregate(group=[{0}])
+                  LogicalProject(DEPTNO=[$7])
+                    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+        </Resource>
+    </TestCase>
 </Root>


[2/2] calcite git commit: [CALCITE-974] Exception while validating DELETE (Yuri Au Yong)

Posted by jh...@apache.org.
[CALCITE-974] Exception while validating DELETE (Yuri Au Yong)


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/737846ee
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/737846ee
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/737846ee

Branch: refs/remotes/julianhyde/master
Commit: 737846ee992cbeb6513075fdda5d99b42b6cf515
Parents: 8cd8ad9
Author: Yuri Au Yong <yu...@persistent.co.in>
Authored: Thu Nov 19 14:59:46 2015 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Thu Nov 19 17:08:20 2015 -0800

----------------------------------------------------------------------
 .../apache/calcite/sql/validate/SqlValidatorImpl.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/737846ee/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java
index cac83c1..0390c07 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java
@@ -1021,7 +1021,7 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
       } else {
         final SqlNodeList selectList =
             new SqlNodeList(SqlParserPos.ZERO);
-        selectList.add(new SqlIdentifier("*", SqlParserPos.ZERO));
+        selectList.add(SqlIdentifier.star(SqlParserPos.ZERO));
         return new SqlSelect(node.getParserPosition(), null, selectList, node,
             null, null, null, null, null, null, null);
       }
@@ -1156,7 +1156,7 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
     } else {
       // otherwise, just use select *
       selectList = new SqlNodeList(SqlParserPos.ZERO);
-      selectList.add(new SqlIdentifier("*", SqlParserPos.ZERO));
+      selectList.add(SqlIdentifier.star(SqlParserPos.ZERO));
     }
     SqlNode targetTable = call.getTargetTable();
     if (call.getAlias() != null) {
@@ -1194,8 +1194,7 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
     // select on the values row constructor; so we need to extract
     // that via the from clause on the select
     if (insertCall != null) {
-      SqlSelect valuesSelect = (SqlSelect) insertCall.getSource();
-      SqlCall valuesCall = (SqlCall) valuesSelect.getFrom();
+      SqlCall valuesCall = (SqlCall) insertCall.getSource();
       SqlCall rowCall = valuesCall.operand(0);
       selectList =
           new SqlNodeList(
@@ -1307,7 +1306,7 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
    */
   protected SqlSelect createSourceSelectForUpdate(SqlUpdate call) {
     final SqlNodeList selectList = new SqlNodeList(SqlParserPos.ZERO);
-    selectList.add(new SqlIdentifier("*", SqlParserPos.ZERO));
+    selectList.add(SqlIdentifier.star(SqlParserPos.ZERO));
     int ordinal = 0;
     for (SqlNode exp : call.getSourceExpressionList()) {
       // Force unique aliases to avoid a duplicate for Y with
@@ -1336,7 +1335,7 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
    */
   protected SqlSelect createSourceSelectForDelete(SqlDelete call) {
     final SqlNodeList selectList = new SqlNodeList(SqlParserPos.ZERO);
-    selectList.add(new SqlIdentifier("*", SqlParserPos.ZERO));
+    selectList.add(SqlIdentifier.star(SqlParserPos.ZERO));
     SqlNode sourceTable = call.getTargetTable();
     if (call.getAlias() != null) {
       sourceTable =