Merge remote-tracking branch 'upstream/feature/pagination/integ' into feature/pagination/P1

Signed-off-by: Yury-Fridlyand <[email protected]>

Author: Yury-Fridlyand

core/src/test/java/org/opensearch/sql/planner/logical/LogicalPlanNodeVisitorTest.java

@@ -116,6 +116,7 @@ public TableWriteOperator build(PhysicalPlan child) {
     LogicalPlan ad = new LogicalAD(relation, Map.of());
     LogicalPlan ml = new LogicalML(relation, Map.of());
     LogicalPlan paginate = new LogicalPaginate(42, List.of(relation));
+
     List<Map<String, ReferenceExpression>> nestedArgs = List.of(
         Map.of(
             "field", new ReferenceExpression("message.info", STRING),

core/src/test/java/org/opensearch/sql/planner/physical/NestedOperatorTest.java

@@ -336,12 +336,10 @@ public void nested_missing_array_field() {
         Map.of("message", List.of("message.data"));
 
     var nested = new NestedOperator(inputPlan, fields, groupedFieldsByPath);
-    assertTrue(
-        execute(nested)
-            .get(0)
-            .tupleValue()
-            .size() == 0
-    );
+    assertEquals(0, execute(nested)
+        .get(0)
+        .tupleValue()
+        .size());
     assertEquals(1, nested.getTotalHits());
   }
 }

opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java

@@ -44,7 +44,6 @@
 import org.opensearch.sql.ast.expression.Literal;
 import org.opensearch.sql.ast.tree.RareTopN.CommandType;
 import org.opensearch.sql.ast.tree.Sort;
-import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.data.model.ExprBooleanValue;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
@@ -61,7 +60,6 @@
 import org.opensearch.sql.opensearch.planner.physical.ADOperator;
 import org.opensearch.sql.opensearch.planner.physical.MLCommonsOperator;
 import org.opensearch.sql.opensearch.planner.physical.MLOperator;
-import org.opensearch.sql.opensearch.request.OpenSearchRequestBuilder;
 import org.opensearch.sql.opensearch.setting.OpenSearchSettings;
 import org.opensearch.sql.opensearch.storage.scan.OpenSearchIndexScan;
 import org.opensearch.sql.planner.physical.NestedOperator;

opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchScrollRequestTest.java

@@ -155,7 +155,7 @@ void search_withoutIncludes() {
     when(fetchSourceContext.includes()).thenReturn(null);
     when(searchAction.apply(any())).thenReturn(searchResponse);
     when(searchResponse.getHits()).thenReturn(searchHits);
-    when(searchHits.getHits()).thenReturn(new SearchHit[]{searchHit});
+    when(searchHits.getHits()).thenReturn(new SearchHit[] {searchHit});
 
     OpenSearchResponse searchResponse = request.search(searchAction, scrollAction);
     verify(fetchSourceContext, times(1)).includes();