nit

Signed-off-by: Rupal Mahajan <[email protected]>
opensearch-project · Jun 14, 2024 · 3af87c4 · 3af87c4
1 parent 17d1d0e
commit 3af87c4
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticJoinExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticJoinExecutor.java
@@ -268,22 +268,21 @@ public SearchResponse getResponseWithHits(
       SearchResponse previousResponse) {
     // Set Size
     SearchRequestBuilder request = tableRequest.getRequestBuilder().setSize(size);
-
-    // Set sort field for search_after
-    boolean ordered = tableRequest.getOriginalSelect().isOrderdSelect();
-    if (!ordered) {
-      request.addSort(FieldSortBuilder.DOC_FIELD_NAME, SortOrder.ASC);
-    }
-
     SearchResponse responseWithHits;
-    // Set PIT or scroll
     if (LocalClusterState.state().getSettingValue(SQL_PAGINATION_API_SEARCH_AFTER)) {
+      // Set sort field for search_after
+      boolean ordered = tableRequest.getOriginalSelect().isOrderdSelect();
+      if (!ordered) {
+        request.addSort(FieldSortBuilder.DOC_FIELD_NAME, SortOrder.ASC);
+      }
+      // Set PIT
       request.setPointInTime(new PointInTimeBuilder(tableRequest.getPitId()));
       if (previousResponse != null) {
         request.searchAfter(previousResponse.getHits().getSortFields());
       }
       responseWithHits = request.get();
     } else {
+      // Set scroll
       TimeValue keepAlive = LocalClusterState.state().getSettingValue(SQL_CURSOR_KEEP_ALIVE);
       if (previousResponse != null) {
         responseWithHits =