Skip to content

Commit 1c385f9

Browse files
committed
Fix PPL unit test assertions to match updated plan output
1 parent 895e993 commit 1c385f9

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

ppl/src/test/java/org/opensearch/sql/ppl/calcite/CalcitePPLStreamstatsTest.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public void testStreamstatsBy() {
3333

3434
String expectedSparkSql =
3535
"SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`, MAX(`SAL`)"
36-
+ " OVER (PARTITION BY `DEPTNO` ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)"
37-
+ " `max(SAL)`\n"
36+
+ " OVER (PARTITION BY `DEPTNO` ROWS BETWEEN UNBOUNDED"
37+
+ " PRECEDING AND CURRENT ROW) `max(SAL)`\n"
3838
+ "FROM (SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`,"
3939
+ " ROW_NUMBER() OVER () `__stream_seq__`\n"
4040
+ "FROM `scott`.`EMP`) `t`\n"
@@ -52,8 +52,8 @@ public void testStreamstatsByNullBucket() {
5252
+ " LogicalSort(sort0=[$8], dir0=[ASC])\n"
5353
+ " LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4],"
5454
+ " SAL=[$5], COMM=[$6], DEPTNO=[$7], __stream_seq__=[$8], max(SAL)=[CASE(IS NOT"
55-
+ " NULL($7), MAX($5) OVER (PARTITION BY $7 ROWS UNBOUNDED PRECEDING), null:DECIMAL(7,"
56-
+ " 2))])\n"
55+
+ " NULL($7), MAX($5) OVER (PARTITION BY $7 ROWS UNBOUNDED"
56+
+ " PRECEDING), null:DECIMAL(7, 2))])\n"
5757
+ " LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4],"
5858
+ " SAL=[$5], COMM=[$6], DEPTNO=[$7], __stream_seq__=[ROW_NUMBER() OVER ()])\n"
5959
+ " LogicalTableScan(table=[[scott, EMP]])\n";
@@ -76,14 +76,15 @@ public void testStreamstatsCurrent() {
7676
RelNode root = getRelNode(ppl);
7777
String expectedLogical =
7878
"LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5],"
79-
+ " COMM=[$6], DEPTNO=[$7], max(SAL)=[MAX($5) OVER (ROWS BETWEEN UNBOUNDED PRECEDING"
80-
+ " AND 1 PRECEDING)])\n"
79+
+ " COMM=[$6], DEPTNO=[$7], max(SAL)=[MAX($5) OVER (ROWS BETWEEN"
80+
+ " UNBOUNDED PRECEDING AND 1 PRECEDING)])\n"
8181
+ " LogicalTableScan(table=[[scott, EMP]])\n";
8282
verifyLogical(root, expectedLogical);
8383

8484
String expectedSparkSql =
8585
"SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`, MAX(`SAL`)"
86-
+ " OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING) `max(SAL)`\n"
86+
+ " OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING)"
87+
+ " `max(SAL)`\n"
8788
+ "FROM `scott`.`EMP`";
8889
verifyPPLToSparkSQL(root, expectedSparkSql);
8990
}
@@ -147,7 +148,8 @@ public void testStreamstatsGlobal() {
147148

148149
String expectedSparkSql =
149150
"SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`, MAX(`SAL`)"
150-
+ " OVER (PARTITION BY `DEPTNO` ROWS BETWEEN 4 PRECEDING AND CURRENT ROW) `max(SAL)`\n"
151+
+ " OVER (PARTITION BY `DEPTNO` ROWS BETWEEN 4 PRECEDING"
152+
+ " AND CURRENT ROW) `max(SAL)`\n"
151153
+ "FROM (SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`,"
152154
+ " ROW_NUMBER() OVER () `__stream_seq__`\n"
153155
+ "FROM `scott`.`EMP`) `t`\n"

ppl/src/test/java/org/opensearch/sql/ppl/calcite/CalcitePPLTransposeTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ public void testMultipleAggregatesWithAliasesTranspose() {
105105
+ " `t1`.`_row_number_transpose_`, `t2`.`column`, CASE WHEN `t2`.`column` = 'avg_sal'"
106106
+ " THEN NUMBER_TO_STRING(`t1`.`avg_sal`) WHEN `t2`.`column` = 'max_sal' THEN"
107107
+ " NUMBER_TO_STRING(`t1`.`max_sal`) WHEN `t2`.`column` = 'min_sal' THEN"
108-
+ " NUMBER_TO_STRING(`t1`.`min_sal`) WHEN `t2`.`column` = 'cnt' THEN CAST(`t1`.`cnt` AS"
109-
+ " STRING) ELSE NULL END `value`\n"
108+
+ " NUMBER_TO_STRING(`t1`.`min_sal`) WHEN `t2`.`column` = 'cnt' THEN"
109+
+ " CAST(`t1`.`cnt` AS STRING) ELSE NULL END `value`\n"
110110
+ "FROM (SELECT AVG(`SAL`) `avg_sal`, MAX(`SAL`) `max_sal`, MIN(`SAL`) `min_sal`,"
111111
+ " COUNT(*) `cnt`, ROW_NUMBER() OVER () `_row_number_transpose_`\n"
112112
+ "FROM `scott`.`EMP`) `t1`\n"
@@ -238,9 +238,9 @@ public void testTransposeWithLimitColumnName() {
238238
+ "FROM (SELECT `t`.`ENAME`, `t`.`COMM`, `t`.`JOB`, `t`.`SAL`,"
239239
+ " `t`.`_row_number_transpose_`, `t0`.`column_names`, CASE WHEN `t0`.`column_names` ="
240240
+ " 'ENAME' THEN CAST(`t`.`ENAME` AS STRING) WHEN `t0`.`column_names` = 'COMM' THEN"
241-
+ " NUMBER_TO_STRING(`t`.`COMM`) WHEN `t0`.`column_names` = 'JOB' THEN CAST(`t`.`JOB`"
242-
+ " AS STRING) WHEN `t0`.`column_names` = 'SAL' THEN NUMBER_TO_STRING(`t`.`SAL`) ELSE"
243-
+ " NULL END `value`\n"
241+
+ " NUMBER_TO_STRING(`t`.`COMM`) WHEN `t0`.`column_names` = 'JOB' THEN"
242+
+ " CAST(`t`.`JOB` AS STRING) WHEN `t0`.`column_names` = 'SAL' THEN"
243+
+ " NUMBER_TO_STRING(`t`.`SAL`) ELSE NULL END `value`\n"
244244
+ "FROM (SELECT `ENAME`, `COMM`, `JOB`, `SAL`, ROW_NUMBER() OVER ()"
245245
+ " `_row_number_transpose_`\n"
246246
+ "FROM `scott`.`EMP`) `t`\n"

0 commit comments

Comments
 (0)