Skip to content

Commit 78b8127

Browse files
jduojduo
committed
Spotless
Signed-off-by: James Duong <[email protected]>
1 parent 8c8cb3e commit 78b8127

File tree

2 files changed

+93
-46
lines changed

2 files changed

+93
-46
lines changed

‎core/src/test/java/org/opensearch/sql/executor/ExplainTest.java

+28-19
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.values;
3232
import static org.opensearch.sql.planner.physical.PhysicalPlanDSL.window;
3333

34+
import com.google.common.collect.ImmutableMap;
3435
import java.util.Arrays;
3536
import java.util.List;
3637
import java.util.Map;
@@ -57,8 +58,6 @@
5758
import org.opensearch.sql.planner.physical.TrendlineOperator;
5859
import org.opensearch.sql.storage.TableScanOperator;
5960

60-
import com.google.common.collect.ImmutableMap;
61-
6261
@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
6362
class ExplainTest extends ExpressionTestBase {
6463

@@ -263,31 +262,41 @@ void can_explain_nested() {
263262

264263
@Test
265264
void can_explain_trendline() {
266-
PhysicalPlan plan = new TrendlineOperator(tableScan, Arrays.asList(
267-
AstDSL.computation(2, AstDSL.field("distance"), "distance_alias", "sma"),
268-
AstDSL.computation(3, AstDSL.field("time"), "time_alias", "sma")));
265+
PhysicalPlan plan =
266+
new TrendlineOperator(
267+
tableScan,
268+
Arrays.asList(
269+
AstDSL.computation(2, AstDSL.field("distance"), "distance_alias", "sma"),
270+
AstDSL.computation(3, AstDSL.field("time"), "time_alias", "sma")));
269271
assertEquals(
270272
new ExplainResponse(
271273
new ExplainResponseNode(
272274
"TrendlineOperator",
273-
ImmutableMap.of("computations", List.of(
274-
ImmutableMap.of(
275-
"computationType",
276-
"sma",
277-
"numberOfDataPoints", 2,
278-
"dataField", "distance",
279-
"alias", "distance_alias"),
280-
ImmutableMap.of(
281-
"computationType",
282-
"sma",
283-
"numberOfDataPoints", 3,
284-
"dataField", "time",
285-
"alias", "time_alias"))),
275+
ImmutableMap.of(
276+
"computations",
277+
List.of(
278+
ImmutableMap.of(
279+
"computationType",
280+
"sma",
281+
"numberOfDataPoints",
282+
2,
283+
"dataField",
284+
"distance",
285+
"alias",
286+
"distance_alias"),
287+
ImmutableMap.of(
288+
"computationType",
289+
"sma",
290+
"numberOfDataPoints",
291+
3,
292+
"dataField",
293+
"time",
294+
"alias",
295+
"time_alias"))),
286296
singletonList(tableScan.explainNode()))),
287297
explain.apply(plan));
288298
}
289299

290-
291300
private static class FakeTableScan extends TableScanOperator {
292301
@Override
293302
public boolean hasNext() {

‎core/src/test/java/org/opensearch/sql/planner/physical/TrendlineOperatorTest.java

+65-27
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import static org.junit.jupiter.api.Assertions.assertTrue;
1111
import static org.mockito.Mockito.when;
1212

13+
import com.google.common.collect.ImmutableMap;
1314
import java.util.Arrays;
1415
import java.util.Collections;
15-
1616
import org.junit.jupiter.api.DisplayNameGeneration;
1717
import org.junit.jupiter.api.DisplayNameGenerator;
1818
import org.junit.jupiter.api.Test;
@@ -22,8 +22,6 @@
2222
import org.opensearch.sql.ast.dsl.AstDSL;
2323
import org.opensearch.sql.data.model.ExprValueUtils;
2424

25-
import com.google.common.collect.ImmutableMap;
26-
2725
@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
2826
@ExtendWith(MockitoExtension.class)
2927
public class TrendlineOperatorTest {
@@ -35,12 +33,18 @@ public void calculates_simple_moving_average_one_field_one_sample() {
3533
when(inputPlan.next())
3634
.thenReturn(ExprValueUtils.tupleValue(ImmutableMap.of("distance", 100, "time", 10)));
3735

38-
var plan = new TrendlineOperator(inputPlan, Collections.singletonList(AstDSL.computation(
39-
1, AstDSL.field("distance"), "distance_alias", "sma")));
36+
var plan =
37+
new TrendlineOperator(
38+
inputPlan,
39+
Collections.singletonList(
40+
AstDSL.computation(1, AstDSL.field("distance"), "distance_alias", "sma")));
4041

4142
plan.open();
4243
assertTrue(plan.hasNext());
43-
assertEquals(ExprValueUtils.tupleValue(ImmutableMap.of("distance", 100, "time", 10, "distance_alias", 100)), plan.next());
44+
assertEquals(
45+
ExprValueUtils.tupleValue(
46+
ImmutableMap.of("distance", 100, "time", 10, "distance_alias", 100)),
47+
plan.next());
4448
}
4549

4650
@Test
@@ -51,15 +55,21 @@ public void calculates_simple_moving_average_one_field_two_samples() {
5155
ExprValueUtils.tupleValue(ImmutableMap.of("distance", 100, "time", 10)),
5256
ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 10)));
5357

54-
55-
var plan = new TrendlineOperator(inputPlan, Collections.singletonList(AstDSL.computation(
56-
2, AstDSL.field("distance"), "distance_alias", "sma")));
58+
var plan =
59+
new TrendlineOperator(
60+
inputPlan,
61+
Collections.singletonList(
62+
AstDSL.computation(2, AstDSL.field("distance"), "distance_alias", "sma")));
5763

5864
plan.open();
5965
assertTrue(plan.hasNext());
60-
assertEquals(ExprValueUtils.tupleValue(ImmutableMap.of("distance", 100, "time", 10)), plan.next());
66+
assertEquals(
67+
ExprValueUtils.tupleValue(ImmutableMap.of("distance", 100, "time", 10)), plan.next());
6168
assertTrue(plan.hasNext());
62-
assertEquals(plan.next(), ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 10, "distance_alias", 150.0)));
69+
assertEquals(
70+
plan.next(),
71+
ExprValueUtils.tupleValue(
72+
ImmutableMap.of("distance", 200, "time", 10, "distance_alias", 150.0)));
6373
assertFalse(plan.hasNext());
6474
}
6575

@@ -72,16 +82,26 @@ public void calculates_simple_moving_average_one_field_two_samples_three_rows()
7282
ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 10)),
7383
ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 10)));
7484

75-
var plan = new TrendlineOperator(inputPlan, Collections.singletonList(AstDSL.computation(
76-
2, AstDSL.field("distance"), "distance_alias", "sma")));
85+
var plan =
86+
new TrendlineOperator(
87+
inputPlan,
88+
Collections.singletonList(
89+
AstDSL.computation(2, AstDSL.field("distance"), "distance_alias", "sma")));
7790

7891
plan.open();
7992
assertTrue(plan.hasNext());
80-
assertEquals(ExprValueUtils.tupleValue(ImmutableMap.of("distance", 100, "time", 10)), plan.next());
93+
assertEquals(
94+
ExprValueUtils.tupleValue(ImmutableMap.of("distance", 100, "time", 10)), plan.next());
8195
assertTrue(plan.hasNext());
82-
assertEquals(plan.next(), ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 10, "distance_alias", 150.0)));
96+
assertEquals(
97+
plan.next(),
98+
ExprValueUtils.tupleValue(
99+
ImmutableMap.of("distance", 200, "time", 10, "distance_alias", 150.0)));
83100
assertTrue(plan.hasNext());
84-
assertEquals(plan.next(), ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 10, "distance_alias", 200.0)));
101+
assertEquals(
102+
plan.next(),
103+
ExprValueUtils.tupleValue(
104+
ImmutableMap.of("distance", 200, "time", 10, "distance_alias", 200.0)));
85105
assertFalse(plan.hasNext());
86106
}
87107

@@ -94,17 +114,29 @@ public void calculates_simple_moving_average_multiple_computations() {
94114
ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 20)),
95115
ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 20)));
96116

97-
var plan = new TrendlineOperator(inputPlan, Arrays.asList(
98-
AstDSL.computation(2, AstDSL.field("distance"), "distance_alias", "sma"),
99-
AstDSL.computation(2, AstDSL.field("time"), "time_alias", "sma")));
117+
var plan =
118+
new TrendlineOperator(
119+
inputPlan,
120+
Arrays.asList(
121+
AstDSL.computation(2, AstDSL.field("distance"), "distance_alias", "sma"),
122+
AstDSL.computation(2, AstDSL.field("time"), "time_alias", "sma")));
100123

101124
plan.open();
102125
assertTrue(plan.hasNext());
103-
assertEquals(ExprValueUtils.tupleValue(ImmutableMap.of("distance", 100, "time", 10)), plan.next());
126+
assertEquals(
127+
ExprValueUtils.tupleValue(ImmutableMap.of("distance", 100, "time", 10)), plan.next());
104128
assertTrue(plan.hasNext());
105-
assertEquals(plan.next(), ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 20, "distance_alias", 150.0, "time_alias", 15.0)));
129+
assertEquals(
130+
plan.next(),
131+
ExprValueUtils.tupleValue(
132+
ImmutableMap.of(
133+
"distance", 200, "time", 20, "distance_alias", 150.0, "time_alias", 15.0)));
106134
assertTrue(plan.hasNext());
107-
assertEquals(plan.next(), ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 20, "distance_alias", 200.0, "time_alias", 20.0)));
135+
assertEquals(
136+
plan.next(),
137+
ExprValueUtils.tupleValue(
138+
ImmutableMap.of(
139+
"distance", 200, "time", 20, "distance_alias", 200.0, "time_alias", 20.0)));
108140
assertFalse(plan.hasNext());
109141
}
110142

@@ -116,16 +148,22 @@ public void alias_overwrites_input_field() {
116148
ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 10)),
117149
ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 10)));
118150

119-
var plan = new TrendlineOperator(inputPlan, Collections.singletonList(AstDSL.computation(
120-
2, AstDSL.field("distance"), "time", "sma")));
151+
var plan =
152+
new TrendlineOperator(
153+
inputPlan,
154+
Collections.singletonList(
155+
AstDSL.computation(2, AstDSL.field("distance"), "time", "sma")));
121156

122157
plan.open();
123158
assertTrue(plan.hasNext());
124-
assertEquals(ExprValueUtils.tupleValue(ImmutableMap.of("distance", 100, "time", 100)), plan.next());
159+
assertEquals(
160+
ExprValueUtils.tupleValue(ImmutableMap.of("distance", 100, "time", 100)), plan.next());
125161
assertTrue(plan.hasNext());
126-
assertEquals(plan.next(), ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 150.0)));
162+
assertEquals(
163+
plan.next(), ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 150.0)));
127164
assertTrue(plan.hasNext());
128-
assertEquals(plan.next(), ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 200.0)));
165+
assertEquals(
166+
plan.next(), ExprValueUtils.tupleValue(ImmutableMap.of("distance", 200, "time", 200.0)));
129167
assertFalse(plan.hasNext());
130168
}
131169
}

0 commit comments

Comments
 (0)