add tests for desc

Signed-off-by: Ritvi Bhatt <ribhatt@amazon.com>

Author: ritvibhatt

core/src/main/java/org/opensearch/sql/ast/tree/Sort.java

@@ -31,12 +31,10 @@ public class Sort extends UnresolvedPlan {
 
   private final List<Field> sortList;
 
-  /** Sort Constructor without count. */
   public Sort(List<Field> sortList) {
     this(null, sortList);
   }
 
-  /** Sort Constructor. */
   public Sort(Integer count, List<Field> sortList) {
     this.count = count;
     this.sortList = sortList;

docs/user/ppl/cmd/sort.rst

@@ -19,7 +19,7 @@ Syntax
 sort [count] <[+|-] sort-field>... [desc|d]
 
 
-* count: optional. The number of results to return. **Default:** returns all results. Specifying a count of 0 also returns all results.
+* count: optional. The number of results to return. **Default:** returns all results. Specifying a count of 0 or less than 0 also returns all results.
 * [+|-]: optional. The plus [+] stands for ascending order and NULL/MISSING first and a minus [-] stands for descending order and NULL/MISSING last. **Default:** ascending order and NULL/MISSING first.
 * sort-field: mandatory. The field used to sort. Can use ``auto(field)``, ``str(field)``, ``ip(field)``, or ``num(field)`` to specify how to interpret field values.
 * [desc|d]: optional. Reverses the sort results. If multiple fields are specified, reverses order of the first field then for all duplicate values of the first field, reverses the order of the values of the second field and so on.

integ-test/src/test/java/org/opensearch/sql/ppl/SortCommandIT.java

@@ -177,19 +177,28 @@ public void testSortWithCountZero() throws IOException {
     JSONObject result =
         executeQuery(
             String.format(
-                "source=%s | sort 0 - account_number | fields account_number", TEST_INDEX_BANK));
-    verifyOrder(result, rows(32), rows(25), rows(20), rows(18), rows(13), rows(6), rows(1));
+                "source=%s | sort 0 account_number | fields account_number", TEST_INDEX_BANK));
+    verifyOrder(result, rows(1), rows(6), rows(13), rows(18), rows(20), rows(25), rows(32));
   }
 
   @Test
-  public void testSortWithDescSuffix() throws IOException {
+  public void testSortWithDesc() throws IOException {
     JSONObject result =
         executeQuery(
             String.format(
                 "source=%s | sort account_number desc | fields account_number", TEST_INDEX_BANK));
     verifyOrder(result, rows(32), rows(25), rows(20), rows(18), rows(13), rows(6), rows(1));
   }
 
+  @Test
+  public void testSortWithDescMultipleFields() throws IOException {
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | sort 4 age, - account_number desc | fields age, account_number", TEST_INDEX_BANK));
+    verifyOrder(result, rows(39, 25), rows(36, 6), rows(36, 20), rows(34, 32));
+  }
+
   @Test
   public void testSortWithStrCast() throws IOException {
     JSONObject result =

integ-test/src/test/resources/expectedOutput/calcite/explain_sort_type_push.json

@@ -0,0 +1,6 @@
+{
+  "calcite": {
+    "logical": "LogicalSystemLimit(fetch=[10000], type=[QUERY_SIZE_LIMIT])\n  LogicalProject(age=[$8])\n    LogicalSort(sort0=[$17], dir0=[ASC-nulls-first])\n      LogicalProject(account_number=[$0], firstname=[$1], address=[$2], balance=[$3], gender=[$4], city=[$5], employer=[$6], state=[$7], age=[$8], email=[$9], lastname=[$10], _id=[$11], _index=[$12], _score=[$13], _maxscore=[$14], _sort=[$15], _routing=[$16], $f17=[SAFE_CAST($8)])\n        CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]])\n",
+    "physical": "EnumerableCalc(expr#0..1=[{inputs}], age=[$t0])\n  EnumerableLimit(fetch=[10000])\n    EnumerableSort(sort0=[$1], dir0=[ASC-nulls-first])\n      EnumerableCalc(expr#0=[{inputs}], expr#1=[SAFE_CAST($t0)], proj#0..1=[{exprs}])\n        CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]], PushDownContext=[[PROJECT->[age]], OpenSearchRequestBuilder(sourceBuilder={\"from\":0,\"timeout\":\"1m\",\"_source\":{\"includes\":[\"age\"],\"excludes\":[]}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])\n"
+  }
+}

integ-test/src/test/resources/expectedOutput/ppl/explain_sort_desc_push.json

@@ -8,7 +8,7 @@
       {
         "name": "OpenSearchIndexScan",
         "description": {
-          "request": "OpenSearchQueryRequest(indexName=opensearch-sql_test_index_account, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"_source\":{\"includes\":[\"age\"],\"excludes\":[]},\"sort\":[{\"age\":{\"order\":\"desc\",\"missing\":\"_last\"}}, {\"firstname.keyword\":{\"order\":\"asc\",\"missing\":\"_first\"}}]}, needClean=true, searchDone=false, pitId=null, cursorKeepAlive=null, searchAfter=null, searchResponse=null)"
+          "request": "OpenSearchQueryRequest(indexName=opensearch-sql_test_index_account, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"_source\":{\"includes\":[\"age\",\"firstname\"],\"excludes\":[]},\"sort\":[{\"age\":{\"order\":\"desc\",\"missing\":\"_last\"}},{\"firstname.keyword\":{\"order\":\"asc\",\"missing\":\"_first\"}}]}, needClean=true, searchDone=false, pitId=*, cursorKeepAlive=1m, searchAfter=null, searchResponse=null)"
         },
         "children": []
       }

integ-test/src/test/resources/expectedOutput/ppl/explain_sort_type_push.json

@@ -0,0 +1,30 @@
+{
+  "root": {
+    "name": "ProjectOperator",
+    "description": {
+      "fields": "[age]"
+    },
+    "children": [
+      {
+        "name": "SortOperator",
+        "description": {
+          "sortList": {
+            "cast_to_double(age)": {
+              "sortOrder": "ASC",
+              "nullOrder": "NULL_FIRST"
+            }
+          }
+        },
+        "children": [
+          {
+            "name": "OpenSearchIndexScan",
+            "description": {
+              "request": "OpenSearchQueryRequest(indexName=opensearch-sql_test_index_account, sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\"}, needClean=true, searchDone=false, pitId=*, cursorKeepAlive=1m, searchAfter=null, searchResponse=null)"
+            },
+            "children": []
+          }
+        ]
+      }
+    ]
+  }
+}

ppl/src/test/java/org/opensearch/sql/ppl/utils/PPLQueryDataAnonymizerTest.java

@@ -142,6 +142,11 @@ public void testSortCommandWithCount() {
     assertEquals("source=t | sort 5 f1", anonymize("source=t | sort 5 f1"));
   }
 
+  @Test
+  public void testSortCommandWithDesc() {
+    assertEquals("source=t | sort f1", anonymize("source=t | sort f1 desc"));
+  }
+
   @Test
   public void testEvalCommand() {
     assertEquals("source=t | eval r=abs(f)", anonymize("source=t | eval r=abs(f)"));