Skip to content

Commit 7c90fc3

Browse files
LantaoJinLantaoJin
committed
Fix UT
Signed-off-by: Lantao Jin <ltjin@amazon.com>
1 parent 3bbaeee commit 7c90fc3

1 file changed

Lines changed: 16 additions & 22 deletions

File tree

‎ppl/src/test/java/org/opensearch/sql/ppl/calcite/CalcitePPLDedupTest.java‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void testDedup1() {
2525
+ " LogicalFilter(condition=[<=($8, 1)])\n"
2626
+ " LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4],"
2727
+ " SAL=[$5], COMM=[$6], DEPTNO=[$7], _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION"
28-
+ " BY $7 ORDER BY $7)])\n"
28+
+ " BY $7)])\n"
2929
+ " LogicalFilter(condition=[IS NOT NULL($7)])\n"
3030
+ " LogicalTableScan(table=[[scott, EMP]])\n";
3131
verifyLogical(root, expectedLogical);
@@ -39,11 +39,9 @@ public void testDedup1() {
3939
verifyResult(root, expectedResult);
4040

4141
String expectedSparkSql =
42-
""
43-
+ "SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`\n"
42+
"SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`\n"
4443
+ "FROM (SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`,"
45-
+ " ROW_NUMBER() OVER (PARTITION BY `DEPTNO` ORDER BY `DEPTNO` NULLS LAST)"
46-
+ " `_row_number_dedup_`\n"
44+
+ " ROW_NUMBER() OVER (PARTITION BY `DEPTNO`) `_row_number_dedup_`\n"
4745
+ "FROM `scott`.`EMP`\n"
4846
+ "WHERE `DEPTNO` IS NOT NULL) `t0`\n"
4947
+ "WHERE `_row_number_dedup_` <= 1";
@@ -60,7 +58,7 @@ public void testDedup2() {
6058
+ " LogicalFilter(condition=[<=($8, 2)])\n"
6159
+ " LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4],"
6260
+ " SAL=[$5], COMM=[$6], DEPTNO=[$7], _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION"
63-
+ " BY $7 ORDER BY $7)])\n"
61+
+ " BY $7)])\n"
6462
+ " LogicalFilter(condition=[IS NOT NULL($7)])\n"
6563
+ " LogicalTableScan(table=[[scott, EMP]])\n";
6664
verifyLogical(root, expectedLogical);
@@ -80,11 +78,9 @@ public void testDedup2() {
8078
verifyResult(root, expectedResult);
8179

8280
String expectedSparkSql =
83-
""
84-
+ "SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`\n"
81+
"SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`\n"
8582
+ "FROM (SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`,"
86-
+ " ROW_NUMBER() OVER (PARTITION BY `DEPTNO` ORDER BY `DEPTNO` NULLS LAST)"
87-
+ " `_row_number_dedup_`\n"
83+
+ " ROW_NUMBER() OVER (PARTITION BY `DEPTNO`) `_row_number_dedup_`\n"
8884
+ "FROM `scott`.`EMP`\n"
8985
+ "WHERE `DEPTNO` IS NOT NULL) `t0`\n"
9086
+ "WHERE `_row_number_dedup_` <= 2";
@@ -101,7 +97,7 @@ public void testDedupKeepEmpty1() {
10197
+ " LogicalFilter(condition=[OR(IS NULL($7), IS NULL($2), <=($8, 1))])\n"
10298
+ " LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4],"
10399
+ " SAL=[$5], COMM=[$6], DEPTNO=[$7], _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION"
104-
+ " BY $7, $2 ORDER BY $7, $2)])\n"
100+
+ " BY $7, $2)])\n"
105101
+ " LogicalTableScan(table=[[scott, EMP]])\n";
106102
verifyLogical(root, expectedLogical);
107103
String expectedResult =
@@ -128,8 +124,7 @@ public void testDedupKeepEmpty1() {
128124
String expectedSparkSql =
129125
"SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`\n"
130126
+ "FROM (SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`,"
131-
+ " ROW_NUMBER() OVER (PARTITION BY `DEPTNO`, `JOB` ORDER BY `DEPTNO` NULLS LAST, `JOB`"
132-
+ " NULLS LAST) `_row_number_dedup_`\n"
127+
+ " ROW_NUMBER() OVER (PARTITION BY `DEPTNO`, `JOB`) `_row_number_dedup_`\n"
133128
+ "FROM `scott`.`EMP`) `t`\n"
134129
+ "WHERE `DEPTNO` IS NULL OR `JOB` IS NULL OR `_row_number_dedup_` <= 1";
135130
verifyPPLToSparkSQL(root, expectedSparkSql);
@@ -145,7 +140,7 @@ public void testDedupKeepEmpty2() {
145140
+ " LogicalFilter(condition=[OR(IS NULL($7), IS NULL($2), <=($8, 2))])\n"
146141
+ " LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4],"
147142
+ " SAL=[$5], COMM=[$6], DEPTNO=[$7], _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION"
148-
+ " BY $7, $2 ORDER BY $7, $2)])\n"
143+
+ " BY $7, $2)])\n"
149144
+ " LogicalTableScan(table=[[scott, EMP]])\n";
150145
verifyLogical(root, expectedLogical);
151146
String expectedResult =
@@ -178,8 +173,7 @@ public void testDedupKeepEmpty2() {
178173
String expectedSparkSql =
179174
"SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`\n"
180175
+ "FROM (SELECT `EMPNO`, `ENAME`, `JOB`, `MGR`, `HIREDATE`, `SAL`, `COMM`, `DEPTNO`,"
181-
+ " ROW_NUMBER() OVER (PARTITION BY `DEPTNO`, `JOB` ORDER BY `DEPTNO` NULLS LAST, `JOB`"
182-
+ " NULLS LAST) `_row_number_dedup_`\n"
176+
+ " ROW_NUMBER() OVER (PARTITION BY `DEPTNO`, `JOB`) `_row_number_dedup_`\n"
183177
+ "FROM `scott`.`EMP`) `t`\n"
184178
+ "WHERE `DEPTNO` IS NULL OR `JOB` IS NULL OR `_row_number_dedup_` <= 2";
185179
verifyPPLToSparkSQL(root, expectedSparkSql);
@@ -195,7 +189,7 @@ public void testDedupExpr() {
195189
"LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], DEPTNO=[$3], NEW_DEPTNO=[$4])\n"
196190
+ " LogicalFilter(condition=[<=($5, 1)])\n"
197191
+ " LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], DEPTNO=[$3], NEW_DEPTNO=[$4],"
198-
+ " _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION BY $4 ORDER BY $4)])\n"
192+
+ " _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION BY $4)])\n"
199193
+ " LogicalFilter(condition=[IS NOT NULL($4)])\n"
200194
+ " LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], DEPTNO=[$7],"
201195
+ " NEW_DEPTNO=[+($7, 1)])\n"
@@ -214,7 +208,7 @@ public void testDedupExpr() {
214208
"LogicalProject(NEW_DEPTNO=[$0], EMPNO=[$1], ENAME=[$2], JOB=[$3])\n"
215209
+ " LogicalFilter(condition=[<=($4, 1)])\n"
216210
+ " LogicalProject(NEW_DEPTNO=[$0], EMPNO=[$1], ENAME=[$2], JOB=[$3],"
217-
+ " _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION BY $3 ORDER BY $3)])\n"
211+
+ " _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION BY $3)])\n"
218212
+ " LogicalFilter(condition=[IS NOT NULL($3)])\n"
219213
+ " LogicalProject(NEW_DEPTNO=[+($7, 1)], EMPNO=[$0], ENAME=[$1], JOB=[$2])\n"
220214
+ " LogicalTableScan(table=[[scott, EMP]])\n";
@@ -227,7 +221,7 @@ public void testDedupExpr() {
227221
"LogicalProject(NEW_DEPTNO=[$0], EMPNO=[$1], ENAME=[$2], JOB=[$3])\n"
228222
+ " LogicalFilter(condition=[<=($4, 1)])\n"
229223
+ " LogicalProject(NEW_DEPTNO=[$0], EMPNO=[$1], ENAME=[$2], JOB=[$3],"
230-
+ " _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION BY $0 ORDER BY $0)])\n"
224+
+ " _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION BY $0)])\n"
231225
+ " LogicalFilter(condition=[IS NOT NULL($0)])\n"
232226
+ " LogicalSort(sort0=[$0], dir0=[ASC-nulls-first])\n"
233227
+ " LogicalProject(NEW_DEPTNO=[+($7, 1)], EMPNO=[$0], ENAME=[$1], JOB=[$2])\n"
@@ -245,7 +239,7 @@ public void testRenameDedup() {
245239
"LogicalProject(NEW_DEPTNO=[$0], EMPNO=[$1], ENAME=[$2], JOB=[$3])\n"
246240
+ " LogicalFilter(condition=[<=($4, 1)])\n"
247241
+ " LogicalProject(NEW_DEPTNO=[$0], EMPNO=[$1], ENAME=[$2], JOB=[$3],"
248-
+ " _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION BY $0 ORDER BY $0)])\n"
242+
+ " _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION BY $0)])\n"
249243
+ " LogicalFilter(condition=[IS NOT NULL($0)])\n"
250244
+ " LogicalProject(NEW_DEPTNO=[+($7, 1)], EMPNO=[$0], ENAME=[$1], JOB=[$2])\n"
251245
+ " LogicalTableScan(table=[[scott, EMP]])\n";
@@ -258,7 +252,7 @@ public void testRenameDedup() {
258252
"LogicalProject(NEW_DEPTNO=[$0], EMPNO=[$1], ENAME=[$2], JOB=[$3])\n"
259253
+ " LogicalFilter(condition=[<=($4, 1)])\n"
260254
+ " LogicalProject(NEW_DEPTNO=[$0], EMPNO=[$1], ENAME=[$2], JOB=[$3],"
261-
+ " _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION BY $3 ORDER BY $3)])\n"
255+
+ " _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION BY $3)])\n"
262256
+ " LogicalFilter(condition=[IS NOT NULL($3)])\n"
263257
+ " LogicalProject(NEW_DEPTNO=[+($7, 1)], EMPNO=[$0], ENAME=[$1], JOB=[$2])\n"
264258
+ " LogicalTableScan(table=[[scott, EMP]])\n";
@@ -271,7 +265,7 @@ public void testRenameDedup() {
271265
"LogicalProject(NEW_DEPTNO=[$0], EMPNO=[$1], ENAME=[$2], JOB=[$3])\n"
272266
+ " LogicalFilter(condition=[<=($4, 1)])\n"
273267
+ " LogicalProject(NEW_DEPTNO=[$0], EMPNO=[$1], ENAME=[$2], JOB=[$3],"
274-
+ " _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION BY $0 ORDER BY $0)])\n"
268+
+ " _row_number_dedup_=[ROW_NUMBER() OVER (PARTITION BY $0)])\n"
275269
+ " LogicalFilter(condition=[IS NOT NULL($0)])\n"
276270
+ " LogicalSort(sort0=[$0], dir0=[ASC-nulls-first])\n"
277271
+ " LogicalProject(NEW_DEPTNO=[+($7, 1)], EMPNO=[$0], ENAME=[$1], JOB=[$2])\n"

0 commit comments

Comments
 (0)