Skip to content

Remove paginate operator during logical plan optimization. #1528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MaxKsyunz merged 3 commits into from
Apr 17, 2023
Merged

Remove paginate operator during logical plan optimization. #1528

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
487060f
Remove paginate operator during logical plan optimization.
Apr 17, 2023
245a958
Fix checkstyle issue.
Apr 17, 2023
f8c2fd8
Remove PaginateOperator class since it is no longer used.
Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...src/main/java/org/opensearch/sql/planner/optimizer/rule/CreatePagingTableScanBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ public LogicalPlan apply(LogicalPaginate plan, Captures captures) {
var scan = logicalRelation.getTable().createPagedScanBuilder(plan.getPageSize());
relationParent.replaceChildPlans(List.of(scan));

return plan;
return plan.getChild().get(0);
}
}
7 changes: 3 additions & 4 deletions core/src/test/java/org/opensearch/sql/planner/optimizer/LogicalPlanOptimizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,13 +342,13 @@ public PhysicalPlan implement(LogicalPlan plan) {
() -> table.createWriteBuilder(null));
}

@Test
@Test
void paged_table_scan_builder_support_project_push_down_can_apply_its_rule() {

var relation = relation("schema", table);

assertEquals(
paginate(project(pagedTableScanBuilder), 4),
project(pagedTableScanBuilder),
LogicalPlanOptimizer.create().optimize(paginate(project(relation), 4)));
}

Expand Down Expand Up @@ -391,7 +391,6 @@ void push_page_size_noop_if_no_sub_plans() {
assertEquals(paginate,
LogicalPlanOptimizer.create().optimize(paginate));
}

@Test
void table_scan_builder_support_offset_push_down_can_apply_its_rule() {
when(table.createPagedScanBuilder(anyInt())).thenReturn(pagedTableScanBuilder);
Expand All @@ -401,7 +400,7 @@ void table_scan_builder_support_offset_push_down_can_apply_its_rule() {
.optimize(new LogicalPaginate(42, List.of(project(relation))));
// `optimized` structure: LogicalPaginate -> LogicalProject -> TableScanBuilder
// LogicalRelation replaced by a TableScanBuilder instance
assertEquals(paginate(project(pagedTableScanBuilder), 42), optimized);
assertEquals(project(pagedTableScanBuilder), optimized);
}

private LogicalPlan optimize(LogicalPlan plan) {
Expand Down