Skip to content

Commit f25b88d

Browse files
LantaoJinLantaoJin
committed
fix UT
Signed-off-by: Lantao Jin <ltjin@amazon.com>
1 parent a01dfb3 commit f25b88d

File tree

3 files changed

+59
-87
lines changed

3 files changed

+59
-87
lines changed

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

Lines changed: 45 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void testSimpleAvg() {
5959
+ " LogicalProject(SAL=[$5])\n"
6060
+ " LogicalTableScan(table=[[scott, EMP]])\n";
6161
verifyLogical(root, expectedLogical);
62-
String expectedResult = "avg(SAL)=2073.21\n";
62+
String expectedResult = "avg(SAL)=2073.214285\n";
6363
verifyResult(root, expectedResult);
6464

6565
String expectedSparkSql = "" + "SELECT AVG(`SAL`) `avg(SAL)`\n" + "FROM `scott`.`EMP`";
@@ -78,7 +78,7 @@ public void testMultipleAggregatesWithAliases() {
7878
+ " LogicalProject(SAL=[$5])\n"
7979
+ " LogicalTableScan(table=[[scott, EMP]])\n";
8080
verifyLogical(root, expectedLogical);
81-
String expectedResult = "avg_sal=2073.21; max_sal=5000.00; min_sal=800.00; cnt=14\n";
81+
String expectedResult = "avg_sal=2073.214285; max_sal=5000.00; min_sal=800.00; cnt=14\n";
8282
verifyResult(root, expectedResult);
8383

8484
String expectedSparkSql =
@@ -103,9 +103,9 @@ public void testMultipleAggregatesWithAliasesByClause() {
103103
verifyLogical(root, expectedLogical);
104104
String expectedResult =
105105
""
106-
+ "avg_sal=2175.00; max_sal=3000.00; min_sal=800.00; cnt=5; DEPTNO=20\n"
107-
+ "avg_sal=2916.66; max_sal=5000.00; min_sal=1300.00; cnt=3; DEPTNO=10\n"
108-
+ "avg_sal=1566.66; max_sal=2850.00; min_sal=950.00; cnt=6; DEPTNO=30\n";
106+
+ "avg_sal=2175.; max_sal=3000.00; min_sal=800.00; cnt=5; DEPTNO=20\n"
107+
+ "avg_sal=2916.666666; max_sal=5000.00; min_sal=1300.00; cnt=3; DEPTNO=10\n"
108+
+ "avg_sal=1566.666666; max_sal=2850.00; min_sal=950.00; cnt=6; DEPTNO=30\n";
109109
verifyResult(root, expectedResult);
110110

111111
String expectedSparkSql =
@@ -129,9 +129,9 @@ public void testAvgByField() {
129129
verifyLogical(root, expectedLogical);
130130
String expectedResult =
131131
""
132-
+ "avg(SAL)=2175.00; DEPTNO=20\n"
133-
+ "avg(SAL)=2916.66; DEPTNO=10\n"
134-
+ "avg(SAL)=1566.66; DEPTNO=30\n";
132+
+ "avg(SAL)=2175.; DEPTNO=20\n"
133+
+ "avg(SAL)=2916.666666; DEPTNO=10\n"
134+
+ "avg(SAL)=1566.666666; DEPTNO=30\n";
135135
verifyResult(root, expectedResult);
136136

137137
String expectedSparkSql =
@@ -192,13 +192,13 @@ public void testAvgBySpan() {
192192
verifyLogical(root, expectedLogical);
193193
String expectedResult =
194194
""
195-
+ "avg(SAL)=2050.00; empno_span=7600\n"
196-
+ "avg(SAL)=800.00; empno_span=7300\n"
197-
+ "avg(SAL)=2725.00; empno_span=7700\n"
198-
+ "avg(SAL)=1600.00; empno_span=7400\n"
199-
+ "avg(SAL)=2533.33; empno_span=7800\n"
200-
+ "avg(SAL)=2112.50; empno_span=7500\n"
201-
+ "avg(SAL)=1750.00; empno_span=7900\n";
195+
+ "avg(SAL)=2050.; empno_span=7600\n"
196+
+ "avg(SAL)=800.; empno_span=7300\n"
197+
+ "avg(SAL)=2725.; empno_span=7700\n"
198+
+ "avg(SAL)=1600.; empno_span=7400\n"
199+
+ "avg(SAL)=2533.333333; empno_span=7800\n"
200+
+ "avg(SAL)=2112.5; empno_span=7500\n"
201+
+ "avg(SAL)=1750.; empno_span=7900\n";
202202
verifyResult(root, expectedResult);
203203
}
204204

@@ -218,11 +218,11 @@ public void testAvgBySpanAndFields() {
218218
verifyLogical(root, expectedLogical);
219219
String expectedResult =
220220
""
221-
+ "avg(SAL)=2916.66; empno_span=7500; DEPTNO=10\n"
222-
+ "avg(SAL)=800.00; empno_span=7000; DEPTNO=20\n"
223-
+ "avg(SAL)=2518.75; empno_span=7500; DEPTNO=20\n"
224-
+ "avg(SAL)=1600.00; empno_span=7000; DEPTNO=30\n"
225-
+ "avg(SAL)=1560.00; empno_span=7500; DEPTNO=30\n";
221+
+ "avg(SAL)=2916.666666; empno_span=7500; DEPTNO=10\n"
222+
+ "avg(SAL)=800.; empno_span=7000; DEPTNO=20\n"
223+
+ "avg(SAL)=2518.750000; empno_span=7500; DEPTNO=20\n"
224+
+ "avg(SAL)=1600.; empno_span=7000; DEPTNO=30\n"
225+
+ "avg(SAL)=1560.; empno_span=7500; DEPTNO=30\n";
226226
verifyResult(root, expectedResult);
227227

228228
String expectedSparkSql =
@@ -234,7 +234,6 @@ public void testAvgBySpanAndFields() {
234234
verifyPPLToSparkSQL(root, expectedSparkSql);
235235
}
236236

237-
@Ignore("Span doesn't support type of calcite date")
238237
@Test
239238
public void testAvgByTimeSpanAndFields() {
240239
String ppl =
@@ -244,27 +243,15 @@ public void testAvgByTimeSpanAndFields() {
244243
String expectedLogical =
245244
"LogicalSort(sort0=[$2], sort1=[$1], dir0=[ASC], dir1=[ASC])\n"
246245
+ " LogicalProject(avg(SAL)=[$2], hiredate_span=[$1], DEPTNO=[$0])\n"
247-
+ " LogicalAggregate(group=[{1, 2}], avg(SAL)=[AVG($0)])\n"
248-
+ " LogicalProject(SAL=[$5], DEPTNO=[$7], hiredate_span=[SPAN($4, 'DATE', 1,"
249-
+ " 'y')])\n"
246+
+ " LogicalAggregate(group=[{0, 2}], avg(SAL)=[AVG($1)])\n"
247+
+ " LogicalProject(DEPTNO=[$7], SAL=[$5], hiredate_span=[SPAN($4, 1, 'y')])\n"
250248
+ " LogicalTableScan(table=[[scott, EMP]])\n";
251249
verifyLogical(root, expectedLogical);
252250

253-
String expectedResult =
254-
""
255-
+ "avg(SAL)=3725.00; hiredate_span=1981-01-01; DEPTNO=10\n"
256-
+ "avg(SAL)=1300.00; hiredate_span=1982-01-01; DEPTNO=10\n"
257-
+ "avg(SAL)=800.00; hiredate_span=1980-01-01; DEPTNO=20\n"
258-
+ "avg(SAL)=2987.50; hiredate_span=1981-01-01; DEPTNO=20\n"
259-
+ "avg(SAL)=2050.00; hiredate_span=1987-01-01; DEPTNO=20\n"
260-
+ "avg(SAL)=1566.66; hiredate_span=1981-01-01; DEPTNO=30\n";
261-
verifyResult(root, expectedResult);
262-
263251
String expectedSparkSql =
264-
"SELECT AVG(`SAL`) `avg(SAL)`, `SPAN`(`HIREDATE`, 'DATE', 1, 'y') `hiredate_span`,"
265-
+ " `DEPTNO`\n"
252+
"SELECT AVG(`SAL`) `avg(SAL)`, `SPAN`(`HIREDATE`, 1, 'y') `hiredate_span`, `DEPTNO`\n"
266253
+ "FROM `scott`.`EMP`\n"
267-
+ "GROUP BY `DEPTNO`, `SPAN`(`HIREDATE`, 'DATE', 1, 'y')\n"
254+
+ "GROUP BY `DEPTNO`, `SPAN`(`HIREDATE`, 1, 'y')\n"
268255
+ "ORDER BY `DEPTNO` NULLS LAST, 2 NULLS LAST";
269256
verifyPPLToSparkSQL(root, expectedSparkSql);
270257
}
@@ -354,9 +341,9 @@ public void testStddevSampByField() {
354341
verifyLogical(root, expectedLogical);
355342
String expectedResult =
356343
""
357-
+ "stddev_samp(SAL)=1123.33; DEPTNO=20\n"
358-
+ "stddev_samp(SAL)=1893.62; DEPTNO=10\n"
359-
+ "stddev_samp(SAL)=668.33; DEPTNO=30\n";
344+
+ "stddev_samp(SAL)=1123.332096; DEPTNO=20\n"
345+
+ "stddev_samp(SAL)=1893.629671; DEPTNO=10\n"
346+
+ "stddev_samp(SAL)=668.331255; DEPTNO=30\n";
360347
verifyResult(root, expectedResult);
361348

362349
String expectedSparkSql =
@@ -380,13 +367,13 @@ public void testStddevSampByFieldWithAlias() {
380367
verifyLogical(root, expectedLogical);
381368
String expectedResult =
382369
""
383-
+ "samp=1131.37; empno_span=7600\n"
370+
+ "samp=1131.370849; empno_span=7600\n"
384371
+ "samp=null; empno_span=7300\n"
385-
+ "samp=388.90; empno_span=7700\n"
372+
+ "samp=388.908729; empno_span=7700\n"
386373
+ "samp=null; empno_span=7400\n"
387-
+ "samp=2145.53; empno_span=7800\n"
388-
+ "samp=1219.75; empno_span=7500\n"
389-
+ "samp=1096.58; empno_span=7900\n";
374+
+ "samp=2145.538005; empno_span=7800\n"
375+
+ "samp=1219.759197; empno_span=7500\n"
376+
+ "samp=1096.585609; empno_span=7900\n";
390377
verifyResult(root, expectedResult);
391378

392379
String expectedSparkSql =
@@ -410,9 +397,9 @@ public void testStddevPopByField() {
410397
verifyLogical(root, expectedLogical);
411398
String expectedResult =
412399
""
413-
+ "stddev_pop(SAL)=1004.73; DEPTNO=20\n"
414-
+ "stddev_pop(SAL)=1546.14; DEPTNO=10\n"
415-
+ "stddev_pop(SAL)=610.10; DEPTNO=30\n";
400+
+ "stddev_pop(SAL)=1004.738772; DEPTNO=20\n"
401+
+ "stddev_pop(SAL)=1546.142152; DEPTNO=10\n"
402+
+ "stddev_pop(SAL)=610.100173; DEPTNO=30\n";
416403
verifyResult(root, expectedResult);
417404

418405
String expectedSparkSql =
@@ -435,7 +422,7 @@ public void testStddevPopByFieldWithAlias() {
435422
+ " LogicalTableScan(table=[[scott, EMP]])\n";
436423
verifyLogical(root, expectedLogical);
437424
String expectedResult =
438-
"pop=1004.73; DEPTNO=20\npop=1546.14; DEPTNO=10\npop=610.10; DEPTNO=30\n";
425+
"pop=1004.738772; DEPTNO=20\npop=1546.142152; DEPTNO=10\npop=610.100173; DEPTNO=30\n";
439426
verifyResult(root, expectedResult);
440427

441428
String expectedSparkSql =
@@ -492,7 +479,7 @@ public void testAggWithBackticksAlias() {
492479
+ " LogicalProject(SAL=[$5])\n"
493480
+ " LogicalTableScan(table=[[scott, EMP]])\n";
494481
verifyLogical(root, expectedLogical);
495-
String expectedResult = "avg_sal=2073.21\n";
482+
String expectedResult = "avg_sal=2073.214285\n";
496483
verifyResult(root, expectedResult);
497484

498485
String expectedSparkSql = "" + "SELECT AVG(`SAL`) `avg_sal`\n" + "FROM `scott`.`EMP`";
@@ -511,7 +498,7 @@ public void testSimpleTwoLevelStats() {
511498
+ " LogicalTableScan(table=[[scott, EMP]])\n";
512499
verifyLogical(root, expectedLogical);
513500

514-
String expectedResult = "avg_avg_sal=2073.21\n";
501+
String expectedResult = "avg_avg_sal=2073.2142850000\n";
515502
verifyResult(root, expectedResult);
516503

517504
String expectedSparkSql =
@@ -540,13 +527,13 @@ public void testTwoLevelStats() {
540527

541528
String expectedResult =
542529
""
543-
+ "avg_avg_sal=5000.00; MGR=null\n"
544-
+ "avg_avg_sal=1310.00; MGR=7698\n"
545-
+ "avg_avg_sal=1300.00; MGR=7782\n"
546-
+ "avg_avg_sal=1100.00; MGR=7788\n"
547-
+ "avg_avg_sal=800.00; MGR=7902\n"
548-
+ "avg_avg_sal=3000.00; MGR=7566\n"
549-
+ "avg_avg_sal=2758.33; MGR=7839\n";
530+
+ "avg_avg_sal=5000.; MGR=null\n"
531+
+ "avg_avg_sal=1310.; MGR=7698\n"
532+
+ "avg_avg_sal=1300.; MGR=7782\n"
533+
+ "avg_avg_sal=1100.; MGR=7788\n"
534+
+ "avg_avg_sal=800.; MGR=7902\n"
535+
+ "avg_avg_sal=3000.; MGR=7566\n"
536+
+ "avg_avg_sal=2758.3333333333; MGR=7839\n";
550537
verifyResult(root, expectedResult);
551538

552539
String expectedSparkSql =

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

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55

66
package org.opensearch.sql.ppl.calcite;
77

8-
import java.time.LocalDate;
98
import org.apache.calcite.rel.RelNode;
109
import org.apache.calcite.test.CalciteAssert;
11-
import org.junit.Ignore;
1210
import org.junit.Test;
1311

1412
public class CalcitePPLDateTimeFunctionTest extends CalcitePPLAbstractTest {
@@ -17,41 +15,27 @@ public CalcitePPLDateTimeFunctionTest() {
1715
super(CalciteAssert.SchemaSpec.SCOTT_WITH_TEMPORAL);
1816
}
1917

20-
@Ignore("Ignore since we don't have this data source in real environment")
2118
@Test
2219
public void testDateAndCurrentTimestamp() {
23-
String ppl = "source=EMP | eval added = DATE(CURRENT_TIMESTAMP()) | fields added | head 1";
20+
String ppl = "source=EMP | eval added = DATE(CURRENT_TIMESTAMP()) | fields added";
2421
RelNode root = getRelNode(ppl);
2522
String expectedLogical =
26-
"LogicalSort(fetch=[1])\n"
27-
+ " LogicalProject(added=[POSTPROCESS(DATE(PREPROCESS(POSTPROCESS(CURRENT_TIMESTAMP,"
28-
+ " FLAG(TIMESTAMP)), FLAG(TIMESTAMP))), FLAG(DATE))])\n"
29-
+ " LogicalTableScan(table=[[scott, EMP]])\n";
23+
"LogicalProject(added=[DATE(NOW())])\n" + " LogicalTableScan(table=[[scott, EMP]])\n";
3024
verifyLogical(root, expectedLogical);
31-
String expectedResult = "added=" + LocalDate.now() + "\n";
32-
verifyResult(root, expectedResult);
3325

34-
String expectedSparkSql =
35-
"" + "SELECT DATE(CURRENT_TIMESTAMP) `added`\n" + "FROM `scott`.`EMP`\n" + "LIMIT 1";
26+
String expectedSparkSql = "SELECT `DATE`(`NOW`()) `added`\nFROM `scott`.`EMP`";
3627
verifyPPLToSparkSQL(root, expectedSparkSql);
3728
}
3829

39-
@Ignore("Ignore since we don't have this data source in real environment")
4030
@Test
4131
public void testCurrentDate() {
42-
String ppl = "source=EMP | eval added = CURRENT_DATE() | fields added | head 1";
32+
String ppl = "source=EMP | eval added = CURRENT_DATE() | fields added";
4333
RelNode root = getRelNode(ppl);
4434
String expectedLogical =
45-
""
46-
+ "LogicalSort(fetch=[1])\n"
47-
+ " LogicalProject(added=[POSTPROCESS(CURRENT_DATE, FLAG(DATE))])\n"
48-
+ " LogicalTableScan(table=[[scott, EMP]])\n";
35+
"LogicalProject(added=[CURRENT_DATE()])\n" + " LogicalTableScan(table=[[scott, EMP]])\n";
4936
verifyLogical(root, expectedLogical);
50-
String expectedResult = "added=" + LocalDate.now() + "\n";
51-
verifyResult(root, expectedResult);
5237

53-
String expectedSparkSql =
54-
"" + "SELECT CURRENT_DATE `added`\n" + "FROM `scott`.`EMP`\n" + "LIMIT 1";
38+
String expectedSparkSql = "SELECT CURRENT_DATE() `added`\nFROM `scott`.`EMP`";
5539
verifyPPLToSparkSQL(root, expectedSparkSql);
5640
}
5741
}

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,8 @@ public void testEvalWithAggregation() {
291291
+ " LogicalProject(b=[$7], a=[$5])\n"
292292
+ " LogicalTableScan(table=[[scott, EMP]])\n";
293293
verifyLogical(root, expectedLogical);
294-
String expectedResult = "avg(a)=2175.00; b=20\navg(a)=2916.66; b=10\navg(a)=1566.66; b=30\n";
294+
String expectedResult =
295+
"avg(a)=2175.; b=20\navg(a)=2916.666666; b=10\navg(a)=1566.666666; b=30\n";
295296
verifyResult(root, expectedResult);
296297

297298
String expectedSparkSql =
@@ -315,9 +316,9 @@ public void testDependedEval() {
315316
verifyLogical(root, expectedLogical);
316317
String expectedResult =
317318
""
318-
+ "avg(b)=12175.00; DEPTNO=20\n"
319-
+ "avg(b)=12916.66; DEPTNO=10\n"
320-
+ "avg(b)=11566.66; DEPTNO=30\n";
319+
+ "avg(b)=12175.; DEPTNO=20\n"
320+
+ "avg(b)=12916.666666; DEPTNO=10\n"
321+
+ "avg(b)=11566.666666; DEPTNO=30\n";
321322
verifyResult(root, expectedResult);
322323

323324
String expectedSparkSql =
@@ -341,9 +342,9 @@ public void testDependedLateralEval() {
341342
verifyLogical(root, expectedLogical);
342343
String expectedResult =
343344
""
344-
+ "avg(b)=12175.00; DEPTNO=20\n"
345-
+ "avg(b)=12916.66; DEPTNO=10\n"
346-
+ "avg(b)=11566.66; DEPTNO=30\n";
345+
+ "avg(b)=12175.; DEPTNO=20\n"
346+
+ "avg(b)=12916.666666; DEPTNO=10\n"
347+
+ "avg(b)=11566.666666; DEPTNO=30\n";
347348
verifyResult(root, expectedResult);
348349

349350
String expectedSparkSql =

0 commit comments

Comments
 (0)