Skip to content

Commit a5b3df8

Browse files
author
Selina Song
committed
spotless
Signed-off-by: Selina Song <[email protected]>
1 parent 6cc5a69 commit a5b3df8

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

core/src/main/java/org/opensearch/sql/calcite/CalciteRelNodeVisitor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ public RelNode visitHead(Head node, CalcitePlanContext context) {
569569
public RelNode visitReverse(
570570
org.opensearch.sql.ast.tree.Reverse node, CalcitePlanContext context) {
571571
visitChildren(node, context);
572-
572+
573573
RelCollation collation = context.relBuilder.peek().getTraitSet().getCollation();
574574
if (collation == null || collation == RelCollations.EMPTY) {
575575
// If no collation exists, use the traditional row_number approach
@@ -591,7 +591,7 @@ public RelNode visitReverse(
591591
RelCollation reversedCollation = PlanUtils.reverseCollation(collation);
592592
context.relBuilder.sort(reversedCollation);
593593
}
594-
594+
595595
return context.relBuilder.peek();
596596
}
597597

core/src/main/java/org/opensearch/sql/calcite/utils/PlanUtils.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -372,12 +372,9 @@ public static RelCollation reverseCollation(RelCollation original) {
372372
List<RelFieldCollation> reversedFields = new ArrayList<>();
373373
for (RelFieldCollation field : original.getFieldCollations()) {
374374
RelFieldCollation.Direction reversedDirection = field.direction.reverse();
375-
376-
RelFieldCollation reversedField = new RelFieldCollation(
377-
field.getFieldIndex(),
378-
reversedDirection,
379-
field.nullDirection
380-
);
375+
376+
RelFieldCollation reversedField =
377+
new RelFieldCollation(field.getFieldIndex(), reversedDirection, field.nullDirection);
381378
reversedFields.add(reversedField);
382379
}
383380

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,7 @@ public void testFilterFunctionScriptPushDownExplain() throws Exception {
206206
@Test
207207
public void testExplainWithReverse() throws IOException {
208208
String result =
209-
executeWithReplace(
210-
"explain source=opensearch-sql_test_index_account | reverse | head 5");
209+
executeWithReplace("explain source=opensearch-sql_test_index_account | reverse | head 5");
211210

212211
// Verify that the plan contains a LogicalSort with fetch (from head 5)
213212
assertTrue(result.contains("LogicalSort") && result.contains("fetch=[5]"));
@@ -216,15 +215,15 @@ public void testExplainWithReverse() throws IOException {
216215
assertTrue(result.contains("ROW_NUMBER()"));
217216
assertTrue(result.contains("dir0=[DESC]"));
218217
}
219-
218+
220219
@Test
221220
public void testExplainWithReversePushdown() throws IOException {
222221
String query = "source=opensearch-sql_test_index_account | sort - age | reverse";
223222
var result = explainQueryToString(query);
224223
String expected = loadFromFile("expectedOutput/calcite/explain_reverse_pushdown_single.json");
225224
assertJsonEqualsIgnoreId(expected, result);
226225
}
227-
226+
228227
@Test
229228
public void testExplainWithReversePushdownMultipleFields() throws IOException {
230229
String query = "source=opensearch-sql_test_index_account | sort - age, + firstname | reverse";

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ public void testReverseWithMixedSortDirections() throws IOException {
115115
JSONObject result =
116116
executeQuery(
117117
String.format(
118-
"source=%s | sort - account_number, + firstname | fields account_number, firstname | reverse",
118+
"source=%s | sort - account_number, + firstname | fields account_number, firstname"
119+
+ " | reverse",
119120
TEST_INDEX_BANK));
120121
verifySchema(result, schema("account_number", "bigint"), schema("firstname", "string"));
121122
verifyDataRowsInOrder(
@@ -148,7 +149,8 @@ public void testDoubleReverseWithMixedSortDirections() throws IOException {
148149
JSONObject result =
149150
executeQuery(
150151
String.format(
151-
"source=%s | sort - account_number, + firstname | fields account_number, firstname | reverse | reverse",
152+
"source=%s | sort - account_number, + firstname | fields account_number, firstname"
153+
+ " | reverse | reverse",
152154
TEST_INDEX_BANK));
153155
verifySchema(result, schema("account_number", "bigint"), schema("firstname", "string"));
154156
verifyDataRowsInOrder(

0 commit comments

Comments
 (0)