Address PR feedback.

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>
opensearch-project · Apr 13, 2023 · 9df41c7 · 9df41c7
1 parent 31315dc
commit 9df41c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...src/main/java/org/opensearch/sql/planner/optimizer/rule/CreatePagingTableScanBuilder.java b/...src/main/java/org/opensearch/sql/planner/optimizer/rule/CreatePagingTableScanBuilder.java
@@ -43,17 +43,19 @@ public CreatePagingTableScanBuilder() {
    */
   private boolean findLogicalRelation(LogicalPaginate logicalPaginate) {
     Deque<LogicalPlan> plans = new ArrayDeque<>();
-    plans.push(logicalPaginate);
+    plans.add(logicalPaginate);
     do {
-      var plan = plans.pop();
-      if (plan.getChild().stream().anyMatch(LogicalRelation.class::isInstance)) {
-        if (plan.getChild().size() > 1) {
-          throw new UnsupportedOperationException();
+      final var plan = plans.removeFirst();
+      final var children = plan.getChild();
+      if (children.stream().anyMatch(LogicalRelation.class::isInstance)) {
+        if (children.size() > 1) {
+          throw new UnsupportedOperationException(
+              "Unsupported plan: relation operator cannot have siblings");
         }
         relationParent = plan;
         return true;
       }
-      plan.getChild().forEach(plans::push);
+      plans.addAll(children);
     } while (!plans.isEmpty());
     return false;
   }

diff --git a/core/src/test/java/org/opensearch/sql/planner/optimizer/LogicalPlanOptimizerTest.java b/core/src/test/java/org/opensearch/sql/planner/optimizer/LogicalPlanOptimizerTest.java
@@ -347,8 +347,6 @@ void pagination_optimizer_simple_query() {
       optimizer.optimize(projectPlan);
       verify(table).createScanBuilder();
       verify(table, never()).createPagedScanBuilder(anyInt());
-      // Assert that createPagedTableScan was not called
-      // Assert that createTableScan was called
     }
   }