Skip to content

Commit 0246535

Browse files
committed
update ExplainIT
Signed-off-by: Kai Huang <[email protected]>
1 parent 5dd664f commit 0246535

13 files changed

+94
-45
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -412,25 +412,25 @@ public void testFilterWithSearchCall() throws IOException {
412412
@Test
413413
public void testExplainWithReverse() throws IOException {
414414
String query = "source=opensearch-sql_test_index_account | reverse | head 5";
415-
var result = explainQueryToString(query);
416-
String expected = loadExpectedPlan("explain_reverse_fallback.json");
417-
assertJsonEqualsIgnoreId(expected, result);
415+
var result = explainQueryYaml(query);
416+
String expected = loadExpectedPlan("explain_reverse_fallback.yaml");
417+
assertYamlEqualsIgnoreId(expected, result);
418418
}
419419

420420
@Test
421421
public void testExplainWithReversePushdown() throws IOException {
422422
String query = "source=opensearch-sql_test_index_account | sort - age | reverse";
423-
var result = explainQueryToString(query);
424-
String expected = loadExpectedPlan("explain_reverse_pushdown_single.json");
425-
assertJsonEqualsIgnoreId(expected, result);
423+
var result = explainQueryYaml(query);
424+
String expected = loadExpectedPlan("explain_reverse_pushdown_single.yaml");
425+
assertYamlEqualsIgnoreId(expected, result);
426426
}
427427

428428
@Test
429429
public void testExplainWithReversePushdownMultipleFields() throws IOException {
430430
String query = "source=opensearch-sql_test_index_account | sort - age, + firstname | reverse";
431-
var result = explainQueryToString(query);
432-
String expected = loadExpectedPlan("explain_reverse_pushdown_multiple.json");
433-
assertJsonEqualsIgnoreId(expected, result);
431+
var result = explainQueryYaml(query);
432+
String expected = loadExpectedPlan("explain_reverse_pushdown_multiple.yaml");
433+
assertYamlEqualsIgnoreId(expected, result);
434434
}
435435

436436
@Test

integ-test/src/test/resources/expectedOutput/calcite/explain_reverse_fallback.json

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
calcite:
2+
logical: |
3+
LogicalSystemLimit(fetch=[10000], type=[QUERY_SIZE_LIMIT])
4+
LogicalProject(account_number=[$0], firstname=[$1], address=[$2], balance=[$3], gender=[$4], city=[$5], employer=[$6], state=[$7], age=[$8], email=[$9], lastname=[$10])
5+
LogicalSort(sort0=[$17], dir0=[DESC], fetch=[5])
6+
LogicalProject(account_number=[$0], firstname=[$1], address=[$2], balance=[$3], gender=[$4], city=[$5], employer=[$6], state=[$7], age=[$8], email=[$9], lastname=[$10], _id=[$11], _index=[$12], _score=[$13], _maxscore=[$14], _sort=[$15], _routing=[$16], __reverse_row_num__=[ROW_NUMBER() OVER ()])
7+
CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]])
8+
physical: |
9+
EnumerableLimit(fetch=[10000])
10+
EnumerableCalc(expr#0..11=[{inputs}], proj#0..10=[{exprs}])
11+
EnumerableLimit(fetch=[5])
12+
EnumerableSort(sort0=[$11], dir0=[DESC])
13+
EnumerableWindow(window#0=[window(rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])
14+
CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]], PushDownContext=[[PROJECT->[account_number, firstname, address, balance, gender, city, employer, state, age, email, lastname]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"timeout":"1m","_source":{"includes":["account_number","firstname","address","balance","gender","city","employer","state","age","email","lastname"],"excludes":[]}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])

integ-test/src/test/resources/expectedOutput/calcite/explain_reverse_pushdown_multiple.json

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
calcite:
2+
logical: |
3+
LogicalSystemLimit(sort0=[$8], sort1=[$1], dir0=[ASC-nulls-first], dir1=[DESC-nulls-last], fetch=[10000], type=[QUERY_SIZE_LIMIT])
4+
LogicalProject(account_number=[$0], firstname=[$1], address=[$2], balance=[$3], gender=[$4], city=[$5], employer=[$6], state=[$7], age=[$8], email=[$9], lastname=[$10])
5+
LogicalSort(sort0=[$8], sort1=[$1], dir0=[ASC-nulls-first], dir1=[DESC-nulls-last])
6+
LogicalSort(sort0=[$8], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
7+
CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]])
8+
physical: |
9+
CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]], PushDownContext=[[PROJECT->[account_number, firstname, address, balance, gender, city, employer, state, age, email, lastname], SORT->[{
10+
"age" : {
11+
"order" : "asc",
12+
"missing" : "_first"
13+
}
14+
}, {
15+
"firstname.keyword" : {
16+
"order" : "desc",
17+
"missing" : "_last"
18+
}
19+
}], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":10000,"timeout":"1m","_source":{"includes":["account_number","firstname","address","balance","gender","city","employer","state","age","email","lastname"],"excludes":[]},"sort":[{"age":{"order":"asc","missing":"_first"}},{"firstname.keyword":{"order":"desc","missing":"_last"}}]}, requestedTotalSize=10000, pageSize=null, startFrom=0)])

integ-test/src/test/resources/expectedOutput/calcite/explain_reverse_pushdown_single.json

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
calcite:
2+
logical: |
3+
LogicalSystemLimit(sort0=[$8], dir0=[ASC-nulls-first], fetch=[10000], type=[QUERY_SIZE_LIMIT])
4+
LogicalProject(account_number=[$0], firstname=[$1], address=[$2], balance=[$3], gender=[$4], city=[$5], employer=[$6], state=[$7], age=[$8], email=[$9], lastname=[$10])
5+
LogicalSort(sort0=[$8], dir0=[ASC-nulls-first])
6+
LogicalSort(sort0=[$8], dir0=[DESC-nulls-last])
7+
CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]])
8+
physical: |
9+
CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]], PushDownContext=[[PROJECT->[account_number, firstname, address, balance, gender, city, employer, state, age, email, lastname], SORT->[{
10+
"age" : {
11+
"order" : "asc",
12+
"missing" : "_first"
13+
}
14+
}], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":10000,"timeout":"1m","_source":{"includes":["account_number","firstname","address","balance","gender","city","employer","state","age","email","lastname"],"excludes":[]},"sort":[{"age":{"order":"asc","missing":"_first"}}]}, requestedTotalSize=10000, pageSize=null, startFrom=0)])

integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_reverse_fallback.json

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
calcite:
2+
logical: |
3+
LogicalSystemLimit(fetch=[10000], type=[QUERY_SIZE_LIMIT])
4+
LogicalProject(account_number=[$0], firstname=[$1], address=[$2], balance=[$3], gender=[$4], city=[$5], employer=[$6], state=[$7], age=[$8], email=[$9], lastname=[$10])
5+
LogicalSort(sort0=[$17], dir0=[DESC], fetch=[5])
6+
LogicalProject(account_number=[$0], firstname=[$1], address=[$2], balance=[$3], gender=[$4], city=[$5], employer=[$6], state=[$7], age=[$8], email=[$9], lastname=[$10], _id=[$11], _index=[$12], _score=[$13], _maxscore=[$14], _sort=[$15], _routing=[$16], __reverse_row_num__=[ROW_NUMBER() OVER ()])
7+
CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]])
8+
physical: |
9+
EnumerableLimit(fetch=[10000])
10+
EnumerableCalc(expr#0..17=[{inputs}], proj#0..10=[{exprs}])
11+
EnumerableLimit(fetch=[5])
12+
EnumerableSort(sort0=[$17], dir0=[DESC])
13+
EnumerableWindow(window#0=[window(rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])
14+
CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]])

integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_reverse_pushdown_multiple.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)