(temp) improved debug info for test failures

Author: Swiddis

core/src/main/java/org/opensearch/sql/executor/analytics/AnalyticsExecutionEngine.java

@@ -276,8 +276,23 @@ private Schema buildSchema(List<RelDataTypeField> fields) {
 
   private ExprType convertType(RelDataType type) {
     try {
-      return OpenSearchTypeFactory.convertAnalyticsEngineRelDataTypeToExprType(type);
+      ExprType result = OpenSearchTypeFactory.convertAnalyticsEngineRelDataTypeToExprType(type);
+      if (result == org.opensearch.sql.data.type.ExprCoreType.UNDEFINED) {
+        // Log when we're about to return UNDEFINED so we can diagnose type inference issues
+        org.apache.logging.log4j.LogManager.getLogger(AnalyticsExecutionEngine.class)
+            .warn(
+                "convertType: RelDataType {} (SqlTypeName={}) converted to UNDEFINED",
+                type,
+                type.getSqlTypeName());
+      }
+      return result;
     } catch (IllegalArgumentException e) {
+      org.apache.logging.log4j.LogManager.getLogger(AnalyticsExecutionEngine.class)
+          .warn(
+              "convertType: Failed to convert RelDataType {} (SqlTypeName={}), returning UNKNOWN",
+              type,
+              type.getSqlTypeName(),
+              e);
       return org.opensearch.sql.data.type.ExprCoreType.UNKNOWN;
     }
   }

integ-test/src/test/java/org/opensearch/sql/util/MatcherUtils.java

@@ -147,7 +147,12 @@ public static Matcher<JSONObject> kvInt(String key, Matcher<Integer> matcher) {
   @SafeVarargs
   public static void verifySchema(JSONObject response, Matcher<JSONObject>... matchers) {
     try {
-      verify(response.getJSONArray("schema"), matchers);
+      JSONArray schema = response.getJSONArray("schema");
+      LOG.info(
+          "[TRIAGE] verifySchema - expected {} columns, actual {} columns",
+          matchers.length,
+          schema.length());
+      verify(schema, matchers);
     } catch (Exception e) {
       LOG.error(String.format("verify schema failed, response: %s", response.toString()), e);
       throw e;
@@ -166,7 +171,14 @@ public static void verifySchemaInOrder(JSONObject response, Matcher<JSONObject>.
 
   @SafeVarargs
   public static void verifyDataRows(JSONObject response, Matcher<JSONArray>... matchers) {
-    verify(response.getJSONArray("datarows"), matchers);
+    // ponytail: debug logging for multi-shard triage
+    JSONArray actual = response.getJSONArray("datarows");
+    LOG.info(
+        "[TRIAGE] verifyDataRows - expected {} rows, actual {} rows",
+        matchers.length,
+        actual.length());
+    LOG.info("[TRIAGE] Actual data rows: {}", actual.toString());
+    verify(actual, matchers);
   }
 
   @SafeVarargs
@@ -204,8 +216,20 @@ public static void verifyNumOfRows(JSONObject response, int numOfRow) {
   public static <T> void verify(JSONArray array, Matcher<T>... matchers) {
     List<T> objects = new ArrayList<>();
     array.iterator().forEachRemaining(o -> objects.add((T) o));
-    assertEquals(matchers.length, objects.size());
-    assertThat(objects, containsInAnyOrder(matchers));
+    // ponytail: debug logging for multi-shard triage
+    if (matchers.length != objects.size()) {
+      LOG.warn(
+          "[TRIAGE] verify() count mismatch - expected {}, got {}",
+          matchers.length,
+          objects.size());
+    }
+    try {
+      assertEquals(matchers.length, objects.size());
+      assertThat(objects, containsInAnyOrder(matchers));
+    } catch (AssertionError e) {
+      LOG.error("[TRIAGE] verify() failed - assertion error: {}", e.getMessage());
+      throw e;
+    }
   }
 
   // TODO: this is temporary fix for fixing serverless tests to pass as it creates multiple shards
@@ -239,8 +263,20 @@ public static <T> void verifyAddressRow(JSONArray array, Matcher<T>... matchers)
   public static <T> void verifyInOrder(JSONArray array, Matcher<T>... matchers) {
     List<T> objects = new ArrayList<>();
     array.iterator().forEachRemaining(o -> objects.add((T) o));
-    assertEquals(matchers.length, objects.size());
-    assertThat(objects, contains(matchers));
+    // ponytail: debug logging for multi-shard triage
+    if (matchers.length != objects.size()) {
+      LOG.warn(
+          "[TRIAGE] verifyInOrder() count mismatch - expected {}, got {}",
+          matchers.length,
+          objects.size());
+    }
+    try {
+      assertEquals(matchers.length, objects.size());
+      assertThat(objects, contains(matchers));
+    } catch (AssertionError e) {
+      LOG.error("[TRIAGE] verifyInOrder() failed - assertion error: {}", e.getMessage());
+      throw e;
+    }
   }
 
   @SuppressWarnings("unchecked")