Skip to content

Commit 7168149

Browse files
yuancuyuancu
committed
Update per funciton tests
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
1 parent 8e80e6c commit 7168149

4 files changed

Lines changed: 38 additions & 38 deletions

File tree

‎core/src/test/java/org/opensearch/sql/ast/tree/TimechartTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ void should_transform_per_second_for_different_spans(
5454
let(
5555
"per_second(bytes)",
5656
divide(
57-
multiply("per_second(bytes)", 1.0),
57+
multiply("per_second(bytes)", 1000.0),
5858
timestampdiff(
59-
"SECOND",
59+
"MILLISECOND",
6060
"@timestamp",
6161
timestampadd(expectedIntervalUnit, spanValue, "@timestamp")))),
6262
timechart(span(spanValue, spanUnit), alias("per_second(bytes)", sum("bytes")))));
@@ -73,9 +73,9 @@ void should_transform_per_minute_for_different_spans(
7373
let(
7474
"per_minute(bytes)",
7575
divide(
76-
multiply("per_minute(bytes)", 60.0),
76+
multiply("per_minute(bytes)", 60000.0),
7777
timestampdiff(
78-
"SECOND",
78+
"MILLISECOND",
7979
"@timestamp",
8080
timestampadd(expectedIntervalUnit, spanValue, "@timestamp")))),
8181
timechart(span(spanValue, spanUnit), alias("per_minute(bytes)", sum("bytes")))));
@@ -92,9 +92,9 @@ void should_transform_per_hour_for_different_spans(
9292
let(
9393
"per_hour(bytes)",
9494
divide(
95-
multiply("per_hour(bytes)", 3600.0),
95+
multiply("per_hour(bytes)", 3600000.0),
9696
timestampdiff(
97-
"SECOND",
97+
"MILLISECOND",
9898
"@timestamp",
9999
timestampadd(expectedIntervalUnit, spanValue, "@timestamp")))),
100100
timechart(span(spanValue, spanUnit), alias("per_hour(bytes)", sum("bytes")))));
@@ -111,9 +111,9 @@ void should_transform_per_day_for_different_spans(
111111
let(
112112
"per_day(bytes)",
113113
divide(
114-
multiply("per_day(bytes)", 86400.0),
114+
multiply("per_day(bytes)", 8.64E7),
115115
timestampdiff(
116-
"SECOND",
116+
"MILLISECOND",
117117
"@timestamp",
118118
timestampadd(expectedIntervalUnit, spanValue, "@timestamp")))),
119119
timechart(span(spanValue, spanUnit), alias("per_day(bytes)", sum("bytes")))));
@@ -149,9 +149,9 @@ void should_preserve_all_fields_during_per_function_transformation() {
149149
let(
150150
"per_second(bytes)",
151151
divide(
152-
multiply("per_second(bytes)", 1.0),
152+
multiply("per_second(bytes)", 1000.0),
153153
timestampdiff(
154-
"SECOND", "@timestamp", timestampadd("MINUTE", 5, "@timestamp")))),
154+
"MILLISECOND", "@timestamp", timestampadd("MINUTE", 5, "@timestamp")))),
155155
expected));
156156
}
157157

‎integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteExplainIT.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,8 @@ public void testExplainTimechartPerSecond() throws IOException {
444444
var result = explainQueryToString("source=events | timechart span=2m per_second(cpu_usage)");
445445
assertTrue(
446446
result.contains(
447-
"per_second(cpu_usage)=[DIVIDE(*($1, 1.0E0), "
448-
+ "TIMESTAMPDIFF('SECOND':VARCHAR, $0, TIMESTAMPADD('MINUTE':VARCHAR, 2, $0)))]"));
447+
"per_second(cpu_usage)=[DIVIDE(*($1, 1000.0E0), TIMESTAMPDIFF('MILLISECOND':VARCHAR,"
448+
+ " $0, TIMESTAMPADD('MINUTE':VARCHAR, 2, $0)))]"));
449449
assertTrue(result.contains("per_second(cpu_usage)=[SUM($0)]"));
450450
}
451451

@@ -454,8 +454,8 @@ public void testExplainTimechartPerMinute() throws IOException {
454454
var result = explainQueryToString("source=events | timechart span=2m per_minute(cpu_usage)");
455455
assertTrue(
456456
result.contains(
457-
"per_minute(cpu_usage)=[DIVIDE(*($1, 60.0E0), "
458-
+ "TIMESTAMPDIFF('SECOND':VARCHAR, $0, TIMESTAMPADD('MINUTE':VARCHAR, 2, $0)))]"));
457+
"per_minute(cpu_usage)=[DIVIDE(*($1, 60000.0E0), TIMESTAMPDIFF('MILLISECOND':VARCHAR,"
458+
+ " $0, TIMESTAMPADD('MINUTE':VARCHAR, 2, $0)))]"));
459459
assertTrue(result.contains("per_minute(cpu_usage)=[SUM($0)]"));
460460
}
461461

@@ -464,8 +464,8 @@ public void testExplainTimechartPerHour() throws IOException {
464464
var result = explainQueryToString("source=events | timechart span=2m per_hour(cpu_usage)");
465465
assertTrue(
466466
result.contains(
467-
"per_hour(cpu_usage)=[DIVIDE(*($1, 3600.0E0), "
468-
+ "TIMESTAMPDIFF('SECOND':VARCHAR, $0, TIMESTAMPADD('MINUTE':VARCHAR, 2, $0)))]"));
467+
"per_hour(cpu_usage)=[DIVIDE(*($1, 3600000.0E0), TIMESTAMPDIFF('MILLISECOND':VARCHAR,"
468+
+ " $0, TIMESTAMPADD('MINUTE':VARCHAR, 2, $0)))]"));
469469
assertTrue(result.contains("per_hour(cpu_usage)=[SUM($0)]"));
470470
}
471471

@@ -474,8 +474,8 @@ public void testExplainTimechartPerDay() throws IOException {
474474
var result = explainQueryToString("source=events | timechart span=2m per_day(cpu_usage)");
475475
assertTrue(
476476
result.contains(
477-
"per_day(cpu_usage)=[DIVIDE(*($1, 86400.0E0), "
478-
+ "TIMESTAMPDIFF('SECOND':VARCHAR, $0, TIMESTAMPADD('MINUTE':VARCHAR, 2, $0)))]"));
477+
"per_day(cpu_usage)=[DIVIDE(*($1, 8.64E7), TIMESTAMPDIFF('MILLISECOND':VARCHAR, $0,"
478+
+ " TIMESTAMPADD('MINUTE':VARCHAR, 2, $0)))]"));
479479
assertTrue(result.contains("per_day(cpu_usage)=[SUM($0)]"));
480480
}
481481

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ public void testTimechartBasic() {
8686
public void testTimechartPerSecond() {
8787
withPPLQuery("source=events | timechart per_second(cpu_usage)")
8888
.expectSparkSQL(
89-
"SELECT `@timestamp`, `DIVIDE`(`per_second(cpu_usage)` * 1.0E0, TIMESTAMPDIFF('SECOND',"
90-
+ " `@timestamp`, TIMESTAMPADD('MINUTE', 1, `@timestamp`)))"
91-
+ " `per_second(cpu_usage)`\n"
89+
"SELECT `@timestamp`, `DIVIDE`(`per_second(cpu_usage)` * 1.0000E3,"
90+
+ " TIMESTAMPDIFF('MILLISECOND', `@timestamp`, TIMESTAMPADD('MINUTE', 1,"
91+
+ " `@timestamp`))) `per_second(cpu_usage)`\n"
9292
+ "FROM (SELECT `SPAN`(`@timestamp`, 1, 'm') `@timestamp`, SUM(`cpu_usage`)"
9393
+ " `per_second(cpu_usage)`\n"
9494
+ "FROM `scott`.`events`\n"
@@ -100,9 +100,9 @@ public void testTimechartPerSecond() {
100100
public void testTimechartPerMinute() {
101101
withPPLQuery("source=events | timechart per_minute(cpu_usage)")
102102
.expectSparkSQL(
103-
"SELECT `@timestamp`, `DIVIDE`(`per_minute(cpu_usage)` * 6.00E1,"
104-
+ " TIMESTAMPDIFF('SECOND', `@timestamp`, TIMESTAMPADD('MINUTE', 1, `@timestamp`)))"
105-
+ " `per_minute(cpu_usage)`\n"
103+
"SELECT `@timestamp`, `DIVIDE`(`per_minute(cpu_usage)` * 6.00000E4,"
104+
+ " TIMESTAMPDIFF('MILLISECOND', `@timestamp`, TIMESTAMPADD('MINUTE', 1,"
105+
+ " `@timestamp`))) `per_minute(cpu_usage)`\n"
106106
+ "FROM (SELECT `SPAN`(`@timestamp`, 1, 'm') `@timestamp`, SUM(`cpu_usage`)"
107107
+ " `per_minute(cpu_usage)`\n"
108108
+ "FROM `scott`.`events`\n"
@@ -114,9 +114,9 @@ public void testTimechartPerMinute() {
114114
public void testTimechartPerHour() {
115115
withPPLQuery("source=events | timechart per_hour(cpu_usage)")
116116
.expectSparkSQL(
117-
"SELECT `@timestamp`, `DIVIDE`(`per_hour(cpu_usage)` * 3.6000E3,"
118-
+ " TIMESTAMPDIFF('SECOND', `@timestamp`, TIMESTAMPADD('MINUTE', 1, `@timestamp`)))"
119-
+ " `per_hour(cpu_usage)`\n"
117+
"SELECT `@timestamp`, `DIVIDE`(`per_hour(cpu_usage)` * 3.6000000E6,"
118+
+ " TIMESTAMPDIFF('MILLISECOND', `@timestamp`, TIMESTAMPADD('MINUTE', 1,"
119+
+ " `@timestamp`))) `per_hour(cpu_usage)`\n"
120120
+ "FROM (SELECT `SPAN`(`@timestamp`, 1, 'm') `@timestamp`, SUM(`cpu_usage`)"
121121
+ " `per_hour(cpu_usage)`\n"
122122
+ "FROM `scott`.`events`\n"
@@ -128,9 +128,9 @@ public void testTimechartPerHour() {
128128
public void testTimechartPerDay() {
129129
withPPLQuery("source=events | timechart per_day(cpu_usage)")
130130
.expectSparkSQL(
131-
"SELECT `@timestamp`, `DIVIDE`(`per_day(cpu_usage)` * 8.64000E4,"
132-
+ " TIMESTAMPDIFF('SECOND', `@timestamp`, TIMESTAMPADD('MINUTE', 1, `@timestamp`)))"
133-
+ " `per_day(cpu_usage)`\n"
131+
"SELECT `@timestamp`, `DIVIDE`(`per_day(cpu_usage)` * 8.64E7,"
132+
+ " TIMESTAMPDIFF('MILLISECOND', `@timestamp`, TIMESTAMPADD('MINUTE', 1,"
133+
+ " `@timestamp`))) `per_day(cpu_usage)`\n"
134134
+ "FROM (SELECT `SPAN`(`@timestamp`, 1, 'm') `@timestamp`, SUM(`cpu_usage`)"
135135
+ " `per_day(cpu_usage)`\n"
136136
+ "FROM `scott`.`events`\n"

‎ppl/src/test/java/org/opensearch/sql/ppl/parser/AstBuilderTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,10 +1104,10 @@ public void testTimechartWithPerSecondFunction() {
11041104
field("per_second(a)"),
11051105
function(
11061106
"/",
1107-
function("*", field("per_second(a)"), doubleLiteral(1.0)),
1107+
function("*", field("per_second(a)"), doubleLiteral(1000.0)),
11081108
function(
11091109
"timestampdiff",
1110-
stringLiteral("SECOND"),
1110+
stringLiteral("MILLISECOND"),
11111111
field("@timestamp"),
11121112
function(
11131113
"timestampadd",
@@ -1129,10 +1129,10 @@ public void testTimechartWithPerMinuteFunction() {
11291129
field("per_minute(a)"),
11301130
function(
11311131
"/",
1132-
function("*", field("per_minute(a)"), doubleLiteral(60.0)),
1132+
function("*", field("per_minute(a)"), doubleLiteral(60000.0)),
11331133
function(
11341134
"timestampdiff",
1135-
stringLiteral("SECOND"),
1135+
stringLiteral("MILLISECOND"),
11361136
field("@timestamp"),
11371137
function(
11381138
"timestampadd",
@@ -1154,10 +1154,10 @@ public void testTimechartWithPerHourFunction() {
11541154
field("per_hour(a)"),
11551155
function(
11561156
"/",
1157-
function("*", field("per_hour(a)"), doubleLiteral(3600.0)),
1157+
function("*", field("per_hour(a)"), doubleLiteral(3600000.0)),
11581158
function(
11591159
"timestampdiff",
1160-
stringLiteral("SECOND"),
1160+
stringLiteral("MILLISECOND"),
11611161
field("@timestamp"),
11621162
function(
11631163
"timestampadd",
@@ -1179,10 +1179,10 @@ public void testTimechartWithPerDayFunction() {
11791179
field("per_day(a)"),
11801180
function(
11811181
"/",
1182-
function("*", field("per_day(a)"), doubleLiteral(86400.0)),
1182+
function("*", field("per_day(a)"), doubleLiteral(8.64E7)),
11831183
function(
11841184
"timestampdiff",
1185-
stringLiteral("SECOND"),
1185+
stringLiteral("MILLISECOND"),
11861186
field("@timestamp"),
11871187
function(
11881188
"timestampadd",

0 commit comments

Comments
 (0)