Use PPL_SPEC in standalone ITs

Additionally:
- Migrate CalcitePPLBasicIT to remote ITs
- Delete CalcitePPLBasicPushdownIT since the remote ITs enable pushdown by default

Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>

Author: yuancu

…alcite/standalone/CalcitePPLBasicIT.java …ql/calcite/remote/CalcitePPLBasicIT.javainteg-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLBasicIT.java renamed to integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBasicIT.java integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLBasicIT.java renamed to integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBasicIT.java

@@ -72,7 +72,7 @@ public void testArrayLength() {
                     + " array_length(array) | head 1 | fields length",
                 TEST_INDEX_BANK));
 
-    verifySchema(actual, schema("length", "integer"));
+    verifySchema(actual, schema("length", "int"));
 
     verifyDataRows(actual, rows(4));
   }
@@ -189,10 +189,7 @@ public void testReduce() {
                 TEST_INDEX_BANK));
 
     verifySchema(
-        actual,
-        schema("result", "integer"),
-        schema("result2", "integer"),
-        schema("result3", "double"));
+        actual, schema("result", "int"), schema("result2", "int"), schema("result3", "double"));
 
     verifyDataRows(actual, rows(6, 16, 60));
   }

integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalciteArrayFunctionIT.java

@@ -36,8 +36,8 @@ public void testAppendCol() {
         actual,
         schema("gender", "string"),
         schema("state", "string"),
-        schema("sum", "long"),
-        schema("cnt", "long"));
+        schema("sum", "bigint"),
+        schema("cnt", "bigint"));
     verifyDataRows(
         actual,
         rows("F", "AK", 317, 493),
@@ -65,8 +65,8 @@ public void testAppendColOverride() {
         actual,
         schema("gender", "string"),
         schema("state", "string"),
-        schema("sum", "long"),
-        schema("cnt", "long"));
+        schema("sum", "bigint"),
+        schema("cnt", "bigint"));
     verifyDataRows(
         actual,
         rows("F", "AK", 317, 493),

integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLAggregationIT.java

@@ -40,8 +40,7 @@ public void testSqrtAndCbrtAndPow() {
                     + " name, age, month",
                 TEST_INDEX_STATE_COUNTRY));
 
-    verifySchema(
-        actual, schema("name", "string"), schema("age", "integer"), schema("month", "integer"));
+    verifySchema(actual, schema("name", "string"), schema("age", "int"), schema("month", "int"));
     verifyDataRows(actual, rows("Hello", 30, 4));
   }
 
@@ -90,8 +89,7 @@ public void testAtanAndAtan2WithSort() {
                     + " fields name, age, month",
                 TEST_INDEX_STATE_COUNTRY));
 
-    verifySchema(
-        actual, schema("name", "string"), schema("age", "integer"), schema("month", "integer"));
+    verifySchema(actual, schema("name", "string"), schema("age", "int"), schema("month", "int"));
     verifyDataRowsInOrder(actual, rows("Hello", 30, 4), rows("Jake", 70, 4));
   }
 
@@ -139,7 +137,7 @@ public void testCeilingAndFloor() {
                 "source=%s | where age = ceiling(29.7) and month = floor(4.9) | fields name, age",
                 TEST_INDEX_STATE_COUNTRY));
 
-    verifySchema(actual, schema("name", "string"), schema("age", "integer"));
+    verifySchema(actual, schema("name", "string"), schema("age", "int"));
     verifyDataRows(actual, rows("Hello", 30));
   }
 
@@ -206,7 +204,7 @@ public void testCrc32AndAbs() {
                     + " | fields crc_name, name",
                 TEST_INDEX_STATE_COUNTRY));
 
-    verifySchema(actual, schema("crc_name", "long"), schema("name", "string"));
+    verifySchema(actual, schema("crc_name", "bigint"), schema("name", "string"));
     verifyDataRows(actual, rows(1516115372L, "Jane"));
   }
 
@@ -230,7 +228,7 @@ public void testExpAndFloor() {
                 "source=%s | where age = floor(exp(3.41)) | fields name, age",
                 TEST_INDEX_STATE_COUNTRY));
 
-    verifySchema(actual, schema("name", "string"), schema("age", "integer"));
+    verifySchema(actual, schema("name", "string"), schema("age", "int"));
     verifyDataRows(actual, rows("Hello", 30));
   }
 
@@ -256,7 +254,7 @@ public void testModWithSortAndFields() {
                 "source=%s | where mod(age, 10) = 0 | sort -age | fields name, age",
                 TEST_INDEX_STATE_COUNTRY));
 
-    verifySchema(actual, schema("name", "string"), schema("age", "integer"));
+    verifySchema(actual, schema("name", "string"), schema("age", "int"));
 
     verifyDataRowsInOrder(actual, rows("Jake", 70), rows("Hello", 30), rows("Jane", 20));
   }
@@ -269,7 +267,7 @@ public void testModFloatAndNegative() {
                 "source=%s | eval f = mod(float_number, 2), n = -1 * short_number %% 2, nd = -1 *"
                     + " double_number %% 2 | fields f, n, nd",
                 TEST_INDEX_DATATYPE_NUMERIC));
-    verifySchema(actual, schema("f", "float"), schema("n", "integer"), schema("nd", "double"));
+    verifySchema(actual, schema("f", "float"), schema("n", "int"), schema("nd", "double"));
     verifyDataRows(actual, closeTo(0.2, -1, -1.1));
   }
 
@@ -284,12 +282,12 @@ public void testModShouldReturnWiderTypes() {
                 TEST_INDEX_DATATYPE_NUMERIC));
     verifySchema(
         actual,
-        schema("b", "integer"),
-        schema("i", "integer"),
-        schema("l", "long"),
+        schema("b", "int"),
+        schema("i", "int"),
+        schema("l", "bigint"),
         schema("f", "float"),
         schema("d", "double"),
-        schema("s", "short"));
+        schema("s", "smallint"));
     verifyDataRows(actual, closeTo(0, 2, 1, 0.2, 1.1, 3));
   }
 
@@ -299,7 +297,7 @@ public void testModByZeroShouldReturnNull() {
         executeQuery(
             String.format(
                 "source=%s | head 1 | eval z = mod(5, 0) | fields z", TEST_INDEX_STATE_COUNTRY));
-    verifySchema(actual, schema("z", "integer"));
+    verifySchema(actual, schema("z", "int"));
     verifyDataRows(actual, rows((Object) null));
   }
 
@@ -349,7 +347,7 @@ public void testSignAndRound() {
                 TEST_INDEX_STATE_COUNTRY));
 
     verifySchema(
-        actual, schema("name", "string"), schema("age", "integer"), schema("thirty_one", "double"));
+        actual, schema("name", "string"), schema("age", "int"), schema("thirty_one", "double"));
     verifyDataRows(actual, rows("Hello", 30, 31));
   }
 
@@ -366,10 +364,10 @@ public void testDivide() {
                 TEST_INDEX_DATATYPE_NUMERIC));
     verifySchema(
         actual,
-        schema("r1", "integer"),
-        schema("r2", "integer"),
-        schema("r3", "integer"),
-        schema("r4", "short"),
+        schema("r1", "int"),
+        schema("r2", "int"),
+        schema("r3", "int"),
+        schema("r4", "smallint"),
         schema("r5", "float"),
         schema("r6", "float"),
         schema("r7", "double"),
@@ -404,8 +402,8 @@ public void testDivideShouldReturnNull() {
     verifySchema(
         actual,
         schema("r2", "double"),
-        schema("r3", "integer"),
-        schema("r4", "integer"),
+        schema("r3", "int"),
+        schema("r4", "int"),
         schema("r5", "double"),
         schema("r6", "double"));
     verifyDataRows(actual, rows(null, null, null, null, null));