This is an automated email from the ASF dual-hosted git repository.
hyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/master by this push:
new f2869e9 [CALCITE-2739] NPE is thrown if the DEFINE statement contains
IN in MATCH_RECOGNIZE
f2869e9 is described below
commit f2869e9ad3864caa4d1678fbefc50389b981f2e6
Author: Dian Fu <[email protected]>
AuthorDate: Wed Dec 12 21:09:23 2018 +0800
[CALCITE-2739] NPE is thrown if the DEFINE statement contains IN in
MATCH_RECOGNIZE
Close #970
---
.../apache/calcite/sql2rel/SqlToRelConverter.java | 1 +
.../calcite/rel/rel2sql/RelToSqlConverterTest.java | 28 ++++++++++++++++++++++
.../apache/calcite/test/SqlToRelConverterTest.java | 13 ++++++++++
.../apache/calcite/test/SqlToRelConverterTest.xml | 20 ++++++++++++++++
4 files changed, 62 insertions(+)
diff --git
a/core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
b/core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
index c015548..6d24bf3 100644
--- a/core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
+++ b/core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
@@ -2276,6 +2276,7 @@ public class SqlToRelConverter {
final ImmutableMap.Builder<String, RexNode> definitionNodes =
ImmutableMap.builder();
for (SqlNode def : matchRecognize.getPatternDefList()) {
+ replaceSubQueries(matchBb, def, RelOptUtil.Logic.UNKNOWN_AS_FALSE);
List<SqlNode> operands = ((SqlCall) def).getOperandList();
String alias = ((SqlIdentifier) operands.get(1)).getSimple();
RexNode rex = matchBb.convertExpression(operands.get(0));
diff --git
a/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java
b/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java
index 604ab66..b82b52c 100644
---
a/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java
+++
b/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java
@@ -2978,6 +2978,34 @@ public class RelToSqlConverterTest {
sql(sql).ok(expected);
}
+ @Test public void testMatchRecognizeIn() {
+ final String sql = "select *\n"
+ + " from \"product\" match_recognize\n"
+ + " (\n"
+ + " partition by \"product_class_id\", \"brand_name\" \n"
+ + " order by \"product_class_id\" asc, \"brand_name\" desc \n"
+ + " pattern (strt down+ up+)\n"
+ + " define\n"
+ + " down as down.\"net_weight\" in (0, 1),\n"
+ + " up as up.\"net_weight\" > prev(up.\"net_weight\")\n"
+ + " ) mr";
+
+ final String expected = "SELECT *\n"
+ + "FROM (SELECT *\n"
+ + "FROM \"foodmart\".\"product\") MATCH_RECOGNIZE(\n"
+ + "PARTITION BY \"product_class_id\", \"brand_name\"\n"
+ + "ORDER BY \"product_class_id\", \"brand_name\" DESC\n"
+ + "ONE ROW PER MATCH\n"
+ + "AFTER MATCH SKIP TO NEXT ROW\n"
+ + "PATTERN (\"STRT\" \"DOWN\" + \"UP\" +)\n"
+ + "DEFINE "
+ + "\"DOWN\" AS PREV(\"DOWN\".\"net_weight\", 0) = "
+ + "0 OR PREV(\"DOWN\".\"net_weight\", 0) = 1, "
+ + "\"UP\" AS PREV(\"UP\".\"net_weight\", 0) > "
+ + "PREV(\"UP\".\"net_weight\", 1))";
+ sql(sql).ok(expected);
+ }
+
@Test public void testValues() {
final String sql = "select \"a\"\n"
+ "from (values (1, 'x'), (2, 'yy')) as t(\"a\", \"b\")";
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 9dcbb4b..d4e2c9b 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
@@ -2972,6 +2972,19 @@ public class SqlToRelConverterTest extends
SqlToRelTestBase {
sql(sql).ok();
}
+ @Test public void testMatchRecognizeIn() {
+ final String sql = "select *\n"
+ + " from emp match_recognize\n"
+ + " (\n"
+ + " partition by job, sal\n"
+ + " order by job asc, sal desc, empno\n"
+ + " pattern (strt down+ up+)\n"
+ + " define\n"
+ + " down as down.mgr in (0, 1),\n"
+ + " up as up.mgr > prev(up.mgr)) as mr";
+ sql(sql).ok();
+ }
+
/** Test case for
* <a
href="https://issues.apache.org/jira/browse/CALCITE-2323";>[CALCITE-2323]
* Validator should allow alternative nullCollations for ORDER BY in
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 6d367b7..466a065 100644
--- a/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml
@@ -3027,6 +3027,26 @@ LogicalAggregate(group=[{0}])
]]>
</Resource>
</TestCase>
+ <TestCase name="testMatchRecognizeIn">
+ <Resource name="sql">
+ <![CDATA[select *
+ from emp match_recognize
+ (
+ partition by job, sal
+ order by job asc, sal desc, empno
+ pattern (strt down+ up+)
+ define
+ down as down.mgr in (0, 1),
+ up as up.mgr > prev(up.mgr)) as mr]]>
+ </Resource>
+ <Resource name="plan">
+ <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4],
SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+ LogicalMatch(partition=[[$2, $5]], order=[[2, 5 DESC, 0]],
outputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]],
allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT',
PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1,
false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]],
patternDefinitions=[[OR(=(PREV(DOWN.$3, 0), 0), =(PREV(DOWN.$3, 0), 1)),
>(PREV(UP.$3, 0), PREV(UP.$3, 1))]], inputFields=[[EMPNO, ENAME, J [...]
+ LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+ </Resource>
+ </TestCase>
<TestCase name="testAggNoDuplicateColumnNames">
<Resource name="sql">
<