Fix append and multisearch ITs (1932/2066)

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

Author: yuancu

core/src/main/java/org/opensearch/sql/calcite/utils/OpenSearchTypeFactory.java

@@ -340,6 +340,7 @@ public Type getJavaClass(RelDataType type) {
       int timeCount = 0;
       int ipCount = 0;
       int binaryCount = 0;
+      int otherCount = 0;
       for (RelDataType t : types) {
         if (t.isNullable()) {
           nullableCount++;
@@ -349,6 +350,9 @@ public Type getJavaClass(RelDataType type) {
         } else if (t.getSqlTypeName() == SqlTypeName.ANY) {
           anyCount++;
         }
+        if (t.getSqlTypeName() == SqlTypeName.OTHER) {
+          otherCount++;
+        }
         if (OpenSearchTypeUtil.isDate(t)) {
           dateCount++;
         } else if (OpenSearchTypeUtil.isTime(t)) {
@@ -365,7 +369,10 @@ public Type getJavaClass(RelDataType type) {
           udt = createUDT(ExprUDT.EXPR_DATE, nullableCount > 0);
         } else if (timeCount == types.size()) {
           udt = createUDT(ExprUDT.EXPR_TIME, nullableCount > 0);
-        } else if (ipCount == types.size()) {
+        }
+        // There are cases where UDT IP interleaves with its intermediate SQL type for validation
+        // OTHER, we check otherCount to patch such cases
+        else if (ipCount == types.size() || otherCount == types.size()) {
           udt = createUDT(ExprUDT.EXPR_IP, nullableCount > 0);
         } else if (binaryCount == types.size()) {
           udt = createUDT(ExprUDT.EXPR_BINARY, nullableCount > 0);

integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMultisearchCommandIT.java

@@ -152,10 +152,10 @@ public void testMultisearchWithTimestampInterleaving() throws IOException {
 
     verifySchema(
         result,
-        schema("@timestamp", null, "string"),
+        schema("@timestamp", null, "timestamp"),
         schema("category", null, "string"),
         schema("value", null, "int"),
-        schema("timestamp", null, "string"));
+        schema("timestamp", null, "timestamp"));
 
     verifyDataRows(
         result,

integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLAppendCommandIT.java

@@ -253,7 +253,7 @@ public void testAppendSchemaMergeWithTimestampUDT() throws IOException {
         schema("account_number", "bigint"),
         schema("firstname", "string"),
         schema("age", "int"),
-        schema("birthdate", "string"));
+        schema("birthdate", "timestamp"));
     verifyDataRows(actual, rows(32, null, 34, "2018-08-11 00:00:00"));
   }