Skip to content

Commit aa0ce39

Browse files
yuancuyuancu
committed
Fix explain IT
Signed-off-by: Yuanchun Shen <[email protected]>
1 parent 2a52301 commit aa0ce39

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

‎integ-test/src/test/resources/expectedOutput/calcite/chart_use_other.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@ calcite:
66
LogicalProject(flags=[$0], severityText=[CASE(IS NULL($1), 'NULL', <=($5, 2), $1, 'max_among_other')], max(severityNumber)=[$2])
77
LogicalJoin(condition=[=($1, $3)], joinType=[left])
88
LogicalAggregate(group=[{0, 1}], max(severityNumber)=[MAX($2)])
9-
LogicalProject(flags=[$23], severityText=[$7], severityNumber=[$163])
10-
LogicalFilter(condition=[AND(IS NOT NULL($23), IS NOT NULL($163))])
9+
LogicalProject(flags=[$20], severityText=[$25], severityNumber=[$21])
10+
LogicalFilter(condition=[AND(IS NOT NULL($20), IS NOT NULL($21))])
1111
CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_otel_logs]])
1212
LogicalProject(severityText=[$0], __grand_total__=[$1], _row_number_chart_=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
1313
LogicalAggregate(group=[{0}], __grand_total__=[SUM($1)])
1414
LogicalFilter(condition=[IS NOT NULL($0)])
1515
LogicalProject(severityText=[$1], max(severityNumber)=[$2])
1616
LogicalAggregate(group=[{0, 1}], max(severityNumber)=[MAX($2)])
17-
LogicalProject(flags=[$23], severityText=[$7], severityNumber=[$163])
18-
LogicalFilter(condition=[AND(IS NOT NULL($23), IS NOT NULL($163))])
17+
LogicalProject(flags=[$20], severityText=[$25], severityNumber=[$21])
18+
LogicalFilter(condition=[AND(IS NOT NULL($20), IS NOT NULL($21))])
1919
CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_otel_logs]])
2020
physical: |
2121
EnumerableLimit(fetch=[10000])
2222
EnumerableSort(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC])
2323
EnumerableAggregate(group=[{0, 1}], max(severityNumber)=[MAX($2)])
2424
EnumerableCalc(expr#0..4=[{inputs}], expr#5=[IS NULL($t1)], expr#6=['NULL'], expr#7=[2], expr#8=[<=($t4, $t7)], expr#9=['max_among_other'], expr#10=[CASE($t5, $t6, $t8, $t1, $t9)], flags=[$t0], severityText=[$t10], max(severityNumber)=[$t2])
2525
EnumerableMergeJoin(condition=[=($1, $3)], joinType=[left])
26-
CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_otel_logs]], PushDownContext=[[PROJECT->[severityText, flags, severityNumber], FILTER->AND(IS NOT NULL($1), IS NOT NULL($2)), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},max(severityNumber)=MAX($2)), SORT->[1]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"exists":{"field":"flags","boost":1.0}},{"exists":{"field":"severityNumber","boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["severityText","flags","severityNumber"],"excludes":[]},"aggregations":{"composite_buckets":{"composite":{"size":1000,"sources":[{"severityText":{"terms":{"field":"severityText","missing_bucket":true,"missing_order":"last","order":"asc"}}},{"flags":{"terms":{"field":"flags","missing_bucket":true,"missing_order":"first","order":"asc"}}}]},"aggregations":{"max(severityNumber)":{"max":{"field":"severityNumber"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
26+
CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_otel_logs]], PushDownContext=[[PROJECT->[flags, severityNumber, severityText], FILTER->AND(IS NOT NULL($0), IS NOT NULL($1)), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},max(severityNumber)=MAX($2)), SORT->[1]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"exists":{"field":"flags","boost":1.0}},{"exists":{"field":"severityNumber","boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["flags","severityNumber","severityText"],"excludes":[]},"aggregations":{"composite_buckets":{"composite":{"size":1000,"sources":[{"severityText":{"terms":{"field":"severityText","missing_bucket":true,"missing_order":"last","order":"asc"}}},{"flags":{"terms":{"field":"flags","missing_bucket":true,"missing_order":"first","order":"asc"}}}]},"aggregations":{"max(severityNumber)":{"max":{"field":"severityNumber"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
2727
EnumerableSort(sort0=[$0], dir0=[ASC])
2828
EnumerableCalc(expr#0..2=[{inputs}], severityText=[$t0], $1=[$t2])
2929
EnumerableWindow(window#0=[window(order by [1 DESC-nulls-last] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])
3030
EnumerableAggregate(group=[{0}], __grand_total__=[SUM($1)])
31-
CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_otel_logs]], PushDownContext=[[PROJECT->[severityText, flags, severityNumber], FILTER->AND(IS NOT NULL($1), IS NOT NULL($2)), FILTER->IS NOT NULL($0), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},max(severityNumber)=MAX($2)), PROJECT->[severityText, max(severityNumber)]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"filter":[{"bool":{"must":[{"exists":{"field":"flags","boost":1.0}},{"exists":{"field":"severityNumber","boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},{"exists":{"field":"severityText","boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["severityText","flags","severityNumber"],"excludes":[]},"aggregations":{"composite_buckets":{"composite":{"size":1000,"sources":[{"flags":{"terms":{"field":"flags","missing_bucket":true,"missing_order":"first","order":"asc"}}},{"severityText":{"terms":{"field":"severityText","missing_bucket":true,"missing_order":"first","order":"asc"}}}]},"aggregations":{"max(severityNumber)":{"max":{"field":"severityNumber"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
31+
CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_otel_logs]], PushDownContext=[[PROJECT->[flags, severityNumber, severityText], FILTER->AND(IS NOT NULL($0), IS NOT NULL($1)), FILTER->IS NOT NULL($2), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},max(severityNumber)=MAX($2)), PROJECT->[severityText, max(severityNumber)]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"filter":[{"bool":{"must":[{"exists":{"field":"flags","boost":1.0}},{"exists":{"field":"severityNumber","boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},{"exists":{"field":"severityText","boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["flags","severityNumber","severityText"],"excludes":[]},"aggregations":{"composite_buckets":{"composite":{"size":1000,"sources":[{"flags":{"terms":{"field":"flags","missing_bucket":true,"missing_order":"first","order":"asc"}}},{"severityText":{"terms":{"field":"severityText","missing_bucket":true,"missing_order":"first","order":"asc"}}}]},"aggregations":{"max(severityNumber)":{"max":{"field":"severityNumber"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])

‎integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/chart_use_other.yaml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ calcite:
66
LogicalProject(flags=[$0], severityText=[CASE(IS NULL($1), 'NULL', <=($5, 2), $1, 'max_among_other')], max(severityNumber)=[$2])
77
LogicalJoin(condition=[=($1, $3)], joinType=[left])
88
LogicalAggregate(group=[{0, 1}], max(severityNumber)=[MAX($2)])
9-
LogicalProject(flags=[$23], severityText=[$7], severityNumber=[$163])
10-
LogicalFilter(condition=[AND(IS NOT NULL($23), IS NOT NULL($163))])
9+
LogicalProject(flags=[$20], severityText=[$25], severityNumber=[$21])
10+
LogicalFilter(condition=[AND(IS NOT NULL($20), IS NOT NULL($21))])
1111
CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_otel_logs]])
1212
LogicalProject(severityText=[$0], __grand_total__=[$1], _row_number_chart_=[ROW_NUMBER() OVER (ORDER BY $1 DESC NULLS LAST)])
1313
LogicalAggregate(group=[{0}], __grand_total__=[SUM($1)])
1414
LogicalFilter(condition=[IS NOT NULL($0)])
1515
LogicalProject(severityText=[$1], max(severityNumber)=[$2])
1616
LogicalAggregate(group=[{0, 1}], max(severityNumber)=[MAX($2)])
17-
LogicalProject(flags=[$23], severityText=[$7], severityNumber=[$163])
18-
LogicalFilter(condition=[AND(IS NOT NULL($23), IS NOT NULL($163))])
17+
LogicalProject(flags=[$20], severityText=[$25], severityNumber=[$21])
18+
LogicalFilter(condition=[AND(IS NOT NULL($20), IS NOT NULL($21))])
1919
CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_otel_logs]])
2020
physical: |
2121
EnumerableLimit(fetch=[10000])
@@ -24,14 +24,13 @@ calcite:
2424
EnumerableCalc(expr#0..4=[{inputs}], expr#5=[IS NULL($t1)], expr#6=['NULL'], expr#7=[2], expr#8=[<=($t4, $t7)], expr#9=['max_among_other'], expr#10=[CASE($t5, $t6, $t8, $t1, $t9)], flags=[$t0], severityText=[$t10], max(severityNumber)=[$t2])
2525
EnumerableMergeJoin(condition=[=($1, $3)], joinType=[left])
2626
EnumerableSort(sort0=[$1], dir0=[ASC])
27-
EnumerableCalc(expr#0..2=[{inputs}], flags=[$t1], severityText=[$t0], max(severityNumber)=[$t2])
28-
EnumerableAggregate(group=[{7, 23}], max(severityNumber)=[MAX($163)])
29-
EnumerableCalc(expr#0..171=[{inputs}], expr#172=[IS NOT NULL($t23)], expr#173=[IS NOT NULL($t163)], expr#174=[AND($t172, $t173)], proj#0..171=[{exprs}], $condition=[$t174])
30-
CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_otel_logs]])
27+
EnumerableAggregate(group=[{20, 25}], max(severityNumber)=[MAX($21)])
28+
EnumerableCalc(expr#0..171=[{inputs}], expr#172=[IS NOT NULL($t20)], expr#173=[IS NOT NULL($t21)], expr#174=[AND($t172, $t173)], proj#0..171=[{exprs}], $condition=[$t174])
29+
CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_otel_logs]])
3130
EnumerableSort(sort0=[$0], dir0=[ASC])
3231
EnumerableCalc(expr#0..2=[{inputs}], severityText=[$t0], $1=[$t2])
3332
EnumerableWindow(window#0=[window(order by [1 DESC-nulls-last] rows between UNBOUNDED PRECEDING and CURRENT ROW aggs [ROW_NUMBER()])])
34-
EnumerableAggregate(group=[{0}], __grand_total__=[SUM($2)])
35-
EnumerableAggregate(group=[{7, 23}], max(severityNumber)=[MAX($163)])
36-
EnumerableCalc(expr#0..171=[{inputs}], expr#172=[IS NOT NULL($t23)], expr#173=[IS NOT NULL($t163)], expr#174=[IS NOT NULL($t7)], expr#175=[AND($t172, $t173, $t174)], proj#0..171=[{exprs}], $condition=[$t175])
33+
EnumerableAggregate(group=[{1}], __grand_total__=[SUM($2)])
34+
EnumerableAggregate(group=[{20, 25}], max(severityNumber)=[MAX($21)])
35+
EnumerableCalc(expr#0..171=[{inputs}], expr#172=[IS NOT NULL($t20)], expr#173=[IS NOT NULL($t21)], expr#174=[IS NOT NULL($t25)], expr#175=[AND($t172, $t173, $t174)], proj#0..171=[{exprs}], $condition=[$t175])
3736
CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_otel_logs]])

0 commit comments

Comments
 (0)