update

Signed-off-by: Kai Huang <ahkcs@amazon.com>

Author: ahkcs

core/src/main/java/org/opensearch/sql/ast/statement/Query.java

@@ -7,6 +7,7 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
@@ -18,18 +19,13 @@
 @Setter
 @ToString
 @EqualsAndHashCode(callSuper = false)
+@RequiredArgsConstructor
 public class Query extends Statement {
 
   protected final UnresolvedPlan plan;
   protected final int fetchSize;
   private final QueryType queryType;
 
-  public Query(UnresolvedPlan plan, int fetchSize, QueryType queryType) {
-    this.plan = plan;
-    this.fetchSize = fetchSize;
-    this.queryType = queryType;
-  }
-
   @Override
   public <R, C> R accept(AbstractNodeVisitor<R, C> visitor, C context) {
     return visitor.visitQuery(this, context);

core/src/main/java/org/opensearch/sql/executor/QueryService.java

@@ -100,9 +100,9 @@ public void executeWithCalcite(
                 QueryProfiling.activate(QueryContext.isProfileEnabled());
             ProfileMetric analyzeMetric = profileContext.getOrCreateMetric(MetricName.ANALYZE);
             long analyzeStart = System.nanoTime();
-            SysLimit sysLimit = SysLimit.fromSettings(settings);
             CalcitePlanContext context =
-                CalcitePlanContext.create(buildFrameworkConfig(), sysLimit, queryType);
+                CalcitePlanContext.create(
+                    buildFrameworkConfig(), SysLimit.fromSettings(settings), queryType);
             RelNode relNode = analyze(plan, context);
             RelNode calcitePlan = convertToCalcitePlan(relNode, context);
             analyzeMetric.set(System.nanoTime() - analyzeStart);
@@ -236,18 +236,16 @@ public void executePlan(
           .getSplit()
           .ifPresentOrElse(
               split -> executionEngine.execute(plan(plan), new ExecutionContext(split), listener),
-              () -> {
-                Integer effectiveLimit;
-                if (plan instanceof LogicalPaginate) {
-                  // For pagination, querySizeLimit shouldn't take effect.
-                  // See {@link PaginationWindowIT::testQuerySizeLimitDoesNotEffectPageSize}
-                  effectiveLimit = null;
-                } else {
-                  effectiveLimit = SysLimit.fromSettings(settings).querySizeLimit();
-                }
-                executionEngine.execute(
-                    plan(plan), ExecutionContext.querySizeLimit(effectiveLimit), listener);
-              });
+              () ->
+                  executionEngine.execute(
+                      plan(plan),
+                      ExecutionContext.querySizeLimit(
+                          // For pagination, querySizeLimit shouldn't take effect.
+                          // See {@link PaginationWindowIT::testQuerySizeLimitDoesNotEffectPageSize}
+                          plan instanceof LogicalPaginate
+                              ? null
+                              : SysLimit.fromSettings(settings).querySizeLimit()),
+                      listener));
     } catch (Exception e) {
       listener.onFailure(e);
     }

core/src/main/java/org/opensearch/sql/executor/execution/QueryPlan.java

@@ -29,7 +29,7 @@ public class QueryPlan extends AbstractPlan {
 
   protected final Optional<Integer> pageSize;
 
-  /** Constructor without page size. */
+  /** Constructor. */
   public QueryPlan(
       QueryId queryId,
       QueryType queryType,
@@ -43,7 +43,7 @@ public QueryPlan(
     this.pageSize = Optional.empty();
   }
 
-  /** Constructor with page size (for pagination). */
+  /** Constructor with page size. */
   public QueryPlan(
       QueryId queryId,
       QueryType queryType,