Fix integration test failures after merge with origin/main

Update expected output files (335+ YAML/JSON) to reflect changes from
the validation branch's OpenSearchRelToSqlConverter, leastRestrictive()
type coercion, and PplTypeCoercionRule. Fix behavioral test changes:
- CalcitePPLBasicIT: testBetweenWithIncompatibleTypes now returns results
  due to VARCHAR-INTEGER coercion support
- CalciteBinCommandIT: updated error message assertion
- CalciteChartCommandIT: timestamp fields now preserve UDT types
- CalciteExplainIT: reverted timechart tests to origin/main versions,
  updated regex test to use loadExpectedPlan
- Added YAML/JSON regeneration mechanism via REGENERATE_YAML env var

Author: yuancu

integ-test/build.gradle

@@ -372,6 +372,11 @@ task integJdbcTest(type: RestIntegTestTask) {
         systemProperty "jdbcFile", System.getProperty("jdbcFile")
     }
 
+    // Pass through REGENERATE_YAML for expected output regeneration
+    if (System.getProperty("REGENERATE_YAML") != null) {
+        systemProperty "REGENERATE_YAML", System.getProperty("REGENERATE_YAML")
+    }
+
     systemProperty 'tests.security.manager', 'false'
     systemProperty('project.root', project.projectDir.absolutePath)
 

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

@@ -1011,10 +1011,7 @@ public void testBinsOnTimeFieldWithPushdownDisabled_ShouldFail() throws IOExcept
         "Expected clear error message about bins parameter requirements on timestamp fields, but"
             + " got: "
             + errorMessage,
-        // TODO: Fix with https://github.com/opensearch-project/sql/issues/4973
-        errorMessage.contains(
-            "resolving method 'minus[class java.lang.String, class java.lang.String]' in class"
-                + " class org.apache.calcite.runtime.SqlFunctions"));
+        errorMessage.contains("bins' parameter on timestamp fields requires"));
   }
 
   @Test

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

@@ -130,7 +130,7 @@ public void testChartMaxValueOverCategoryByTimestampSpanWeek() throws IOExceptio
     verifySchema(
         result,
         schema("category", "string"),
-        schema("timestamp", "string"),
+        schema("timestamp", "timestamp"),
         schema("max(value)", "int"));
     // All data within same week span
     verifyDataRows(
@@ -152,7 +152,7 @@ public void testChartMaxValueByTimestampSpanDayAndWeek() throws IOException {
     verifySchema(
         result,
         schema("timestamp", "timestamp"),
-        schema("@timestamp", "string"),
+        schema("@timestamp", "timestamp"),
         schema("max(value)", "int"));
     // Data grouped by day spans
     verifyDataRows(

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

@@ -478,42 +478,42 @@ public void testExplainWithTimechartCount() throws IOException {
 
   @Test
   public void testExplainTimechartPerSecond() throws IOException {
-    var result = explainQueryYaml("source=events | timechart span=2m per_second(cpu_usage)");
+    var result = explainQueryToString("source=events | timechart span=2m per_second(cpu_usage)");
     assertTrue(
         result.contains(
-            "per_second(cpu_usage)=[DIVIDE(*($1, 1000.0E0), TIMESTAMPDIFF('MILLISECOND', $0,"
-                + " TIMESTAMPADD('MINUTE', 2, $0)))]"));
-    assertTrue(result.contains("per_second(cpu_usage)=[SUM($1)]"));
+            "per_second(cpu_usage)=[DIVIDE(*($1, 1000.0E0), TIMESTAMPDIFF('MILLISECOND':VARCHAR,"
+                + " $0, TIMESTAMPADD('MINUTE':VARCHAR, 2, $0)))]"));
+    assertTrue(result.contains("per_second(cpu_usage)=[SUM($0)]"));
   }
 
   @Test
   public void testExplainTimechartPerMinute() throws IOException {
-    var result = explainQueryYaml("source=events | timechart span=2m per_minute(cpu_usage)");
+    var result = explainQueryToString("source=events | timechart span=2m per_minute(cpu_usage)");
     assertTrue(
         result.contains(
-            "per_minute(cpu_usage)=[DIVIDE(*($1, 60000.0E0), TIMESTAMPDIFF('MILLISECOND', $0,"
-                + " TIMESTAMPADD('MINUTE', 2, $0)))]"));
-    assertTrue(result.contains("per_minute(cpu_usage)=[SUM($1)]"));
+            "per_minute(cpu_usage)=[DIVIDE(*($1, 60000.0E0), TIMESTAMPDIFF('MILLISECOND':VARCHAR,"
+                + " $0, TIMESTAMPADD('MINUTE':VARCHAR, 2, $0)))]"));
+    assertTrue(result.contains("per_minute(cpu_usage)=[SUM($0)]"));
   }
 
   @Test
   public void testExplainTimechartPerHour() throws IOException {
-    var result = explainQueryYaml("source=events | timechart span=2m per_hour(cpu_usage)");
+    var result = explainQueryToString("source=events | timechart span=2m per_hour(cpu_usage)");
     assertTrue(
         result.contains(
-            "per_hour(cpu_usage)=[DIVIDE(*($1, 3600000.0E0), TIMESTAMPDIFF('MILLISECOND', $0,"
-                + " TIMESTAMPADD('MINUTE', 2, $0)))]"));
-    assertTrue(result.contains("per_hour(cpu_usage)=[SUM($1)]"));
+            "per_hour(cpu_usage)=[DIVIDE(*($1, 3600000.0E0), TIMESTAMPDIFF('MILLISECOND':VARCHAR,"
+                + " $0, TIMESTAMPADD('MINUTE':VARCHAR, 2, $0)))]"));
+    assertTrue(result.contains("per_hour(cpu_usage)=[SUM($0)]"));
   }
 
   @Test
   public void testExplainTimechartPerDay() throws IOException {
-    var result = explainQueryYaml("source=events | timechart span=2m per_day(cpu_usage)");
+    var result = explainQueryToString("source=events | timechart span=2m per_day(cpu_usage)");
     assertTrue(
         result.contains(
-            "per_day(cpu_usage)=[DIVIDE(*($1, 8.64E7), TIMESTAMPDIFF('MILLISECOND', $0,"
-                + " TIMESTAMPADD('MINUTE', 2, $0)))]"));
-    assertTrue(result.contains("per_day(cpu_usage)=[SUM($1)]"));
+            "per_day(cpu_usage)=[DIVIDE(*($1, 8.64E7), TIMESTAMPDIFF('MILLISECOND':VARCHAR, $0,"
+                + " TIMESTAMPADD('MINUTE':VARCHAR, 2, $0)))]"));
+    assertTrue(result.contains("per_day(cpu_usage)=[SUM($0)]"));
   }
 
   @Test
@@ -787,7 +787,7 @@ public void testExplainRegexMatchInWhereWithScriptPushdown() throws IOException
     String query =
         String.format("source=%s | where regexp_match(name, 'hello')", TEST_INDEX_STRINGS);
     var result = explainQueryYaml(query);
-    String expected = loadFromFile("expectedOutput/calcite/explain_regexp_match_in_where.yaml");
+    String expected = loadExpectedPlan("explain_regexp_match_in_where.yaml");
     assertYamlEqualsIgnoreId(expected, result);
   }
 

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

@@ -466,16 +466,15 @@ public void testBetweenWithMixedTypes() throws IOException {
 
   @Test
   public void testBetweenWithIncompatibleTypes() throws IOException {
-    // Plan: SAFE_CAST(NUMBER_TO_STRING(38.5:DECIMAL(3, 1))). The least restrictive type between
-    // int, decimal, and varchar is resolved to varchar. between '35' and '38.5' is then optimized
-    // to empty rows
+    // With the branch's leastRestrictive() override, mixed numeric/varchar types are resolved
+    // to a common numeric type, so the comparison works correctly: age between 35 and 38.5
     JSONObject actual =
         executeQuery(
             String.format(
                 "source=%s | where age between '35' and 38.5 | fields firstname, age",
                 TEST_INDEX_BANK));
     verifySchema(actual, schema("firstname", "string"), schema("age", "int"));
-    verifyNumOfRows(actual, 0);
+    verifyDataRows(actual, rows("Hattie", 36), rows("Elinor", 36));
   }
 
   @Test

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

@@ -28,6 +28,7 @@
 import org.opensearch.common.collect.MapBuilder;
 import org.opensearch.sql.ast.statement.ExplainMode;
 import org.opensearch.sql.common.setting.Settings;
+import org.opensearch.sql.util.MatcherUtils;
 import org.opensearch.sql.common.setting.Settings.Key;
 import org.opensearch.sql.legacy.SQLIntegTestCase;
 import org.opensearch.sql.protocol.response.format.Format;
@@ -420,6 +421,17 @@ protected String loadExpectedPlan(String fileName) throws IOException {
     } else {
       prefix = "expectedOutput/ppl/";
     }
+    // Track the source file path for YAML regeneration
+    if ("true".equals(System.getenv("REGENERATE_YAML"))
+        || Boolean.getBoolean("REGENERATE_YAML")) {
+      // Resolve the source file path (not the build copy) using project.root
+      String projectRoot = System.getProperty("project.root", "");
+      if (!projectRoot.isEmpty()) {
+        String sourcePath =
+            projectRoot + "/src/test/resources/" + prefix + fileName;
+        MatcherUtils.setLastExpectedFilePath(sourcePath);
+      }
+    }
     return loadFromFile(prefix + fileName);
   }
 }

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

@@ -21,7 +21,10 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Strings;
 import com.google.gson.JsonParser;
+import java.io.IOException;
 import java.math.BigDecimal;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -44,6 +47,15 @@ public class MatcherUtils {
 
   private static final Logger LOG = LogManager.getLogger();
   private static final ObjectMapper JSON_MAPPER = new ObjectMapper();
+  private static final ThreadLocal<String> LAST_EXPECTED_FILE_PATH = new ThreadLocal<>();
+
+  /**
+   * Set the file path of the last loaded expected YAML (used for YAML regeneration). When
+   * REGENERATE_YAML=true env var is set, the actual YAML output will be written to this path.
+   */
+  public static void setLastExpectedFilePath(String path) {
+    LAST_EXPECTED_FILE_PATH.set(path);
+  }
 
   /**
    * Assert field value in object by a custom matcher and getter to access the field.
@@ -406,6 +418,22 @@ public static Matcher<String> equalToIgnoreCaseAndWhiteSpace(String expectedStri
    * @param actual actual JSON string.
    */
   public static void assertJsonEquals(String expected, String actual) {
+    if ("true".equals(System.getenv("REGENERATE_YAML"))
+        || Boolean.getBoolean("REGENERATE_YAML")) {
+      String filePath = LAST_EXPECTED_FILE_PATH.get();
+      if (filePath != null
+          && !JsonParser.parseString(eliminatePid(expected))
+              .equals(JsonParser.parseString(eliminatePid(actual)))) {
+        try {
+          Files.writeString(Path.of(filePath), actual);
+          LOG.info("Regenerated JSON: {}", filePath);
+        } catch (IOException e) {
+          LOG.warn("Failed to regenerate JSON: {}", filePath, e);
+        }
+      }
+      LAST_EXPECTED_FILE_PATH.remove();
+      return;
+    }
     assertEquals(
         JsonParser.parseString(eliminatePid(expected)),
         JsonParser.parseString(eliminatePid(actual)));
@@ -503,6 +531,20 @@ public static void assertYamlEqualsIgnoreId(List<String> expectedYamls, String a
   public static void assertYamlEquals(String expected, String actual) {
     String normalizedExpected = normalizeLineBreaks(expected).trim();
     String normalizedActual = normalizeLineBreaks(actual).trim();
+    if ("true".equals(System.getenv("REGENERATE_YAML"))
+        || Boolean.getBoolean("REGENERATE_YAML")) {
+      String filePath = LAST_EXPECTED_FILE_PATH.get();
+      if (filePath != null && !normalizedExpected.equals(normalizedActual)) {
+        try {
+          Files.writeString(Path.of(filePath), actual);
+          LOG.info("Regenerated YAML: {}", filePath);
+        } catch (IOException e) {
+          LOG.warn("Failed to regenerate YAML: {}", filePath, e);
+        }
+      }
+      LAST_EXPECTED_FILE_PATH.remove();
+      return; // Skip assertion when regenerating
+    }
     assertEquals(
         formatMessage(normalizedExpected, normalizedActual), normalizedExpected, normalizedActual);
   }

integ-test/src/test/resources/expectedOutput/calcite/access_struct_subfield_with_item.yaml

@@ -1,8 +1,8 @@
 calcite:
   logical: |
     LogicalSystemLimit(fetch=[10000], type=[QUERY_SIZE_LIMIT])
-      LogicalProject(host=[$0], info=[GEOIP('dummy-datasource', $0)], info.dummy_sub_field=[ITEM(GEOIP('dummy-datasource', $0), 'dummy_sub_field')])
+      LogicalProject(host=[$0], info=[GEOIP('dummy-datasource':VARCHAR, $0)], info.dummy_sub_field=[ITEM(GEOIP('dummy-datasource':VARCHAR, $0), 'dummy_sub_field')])
         CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_weblogs]])
   physical: |
-    EnumerableCalc(expr#0=[{inputs}], expr#1=['dummy-datasource'], expr#2=[GEOIP($t1, $t0)], expr#3=['dummy_sub_field'], expr#4=[ITEM($t2, $t3)], host=[$t0], info=[$t2], info.dummy_sub_field=[$t4])
+    EnumerableCalc(expr#0=[{inputs}], expr#1=['dummy-datasource':VARCHAR], expr#2=[GEOIP($t1, $t0)], expr#3=['dummy_sub_field'], expr#4=[ITEM($t2, $t3)], host=[$t0], info=[$t2], info.dummy_sub_field=[$t4])
       CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_weblogs]], PushDownContext=[[PROJECT->[host], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":10000,"timeout":"1m","_source":{"includes":["host"],"excludes":[]}}, requestedTotalSize=10000, pageSize=null, startFrom=0)])

integ-test/src/test/resources/expectedOutput/calcite/agg_composite_date_range_push.yaml

@@ -2,10 +2,10 @@ calcite:
   logical: |
     LogicalSystemLimit(fetch=[10000], type=[QUERY_SIZE_LIMIT])
       LogicalProject(avg(value)=[$2], span(@timestamp,1h)=[$1], value_range=[$0])
-        LogicalAggregate(group=[{0, 1}], avg(value)=[AVG($2)])
-          LogicalProject(value_range=[$10], span(@timestamp,1h)=[SPAN($0, 1, 'h')], value=[$2])
+        LogicalAggregate(group=[{0, 2}], avg(value)=[AVG($1)])
+          LogicalProject(value_range=[$10], value=[$2], span(@timestamp,1h)=[SPAN($0, 1, 'h')])
             LogicalFilter(condition=[IS NOT NULL($0)])
               LogicalProject(@timestamp=[$0], category=[$1], value=[$2], timestamp=[$3], _id=[$4], _index=[$5], _score=[$6], _maxscore=[$7], _sort=[$8], _routing=[$9], value_range=[CASE(<($2, 7000), 'small':VARCHAR, 'large':VARCHAR)])
                 CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_time_data]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_time_data]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},avg(value)=AVG($2)), PROJECT->[avg(value), span(@timestamp,1h), value_range], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"composite_buckets":{"composite":{"size":1000,"sources":[{"span(@timestamp,1h)":{"date_histogram":{"field":"@timestamp","missing_bucket":false,"order":"asc","fixed_interval":"1h"}}}]},"aggregations":{"value_range":{"range":{"field":"value","ranges":[{"key":"small","to":7000.0},{"key":"large","from":7000.0}],"keyed":true},"aggregations":{"avg(value)":{"avg":{"field":"value"}}}}}}}}, requestedTotalSize=10000, pageSize=null, startFrom=0)])
+    CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_time_data]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 2},avg(value)=AVG($1)), PROJECT->[avg(value), span(@timestamp,1h), value_range], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"composite_buckets":{"composite":{"size":1000,"sources":[{"span(@timestamp,1h)":{"date_histogram":{"field":"@timestamp","missing_bucket":false,"order":"asc","fixed_interval":"1h"}}}]},"aggregations":{"value_range":{"range":{"field":"value","ranges":[{"key":"small","to":7000.0},{"key":"large","from":7000.0}],"keyed":true},"aggregations":{"avg(value)":{"avg":{"field":"value"}}}}}}}}, requestedTotalSize=10000, pageSize=null, startFrom=0)])

integ-test/src/test/resources/expectedOutput/calcite/agg_filter_nested.yaml

@@ -2,7 +2,7 @@ calcite:
   logical: |
     LogicalSystemLimit(fetch=[10000], type=[QUERY_SIZE_LIMIT])
       LogicalAggregate(group=[{}], george_and_jk=[COUNT($0)])
-        LogicalProject($f0=[CASE(<($7, 'K'), 1, null:INTEGER)])
+        LogicalProject($f1=[CASE(<($7, 'K'), 1, null:NULL)])
           CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_cascaded_nested]])
   physical: |
     EnumerableLimit(fetch=[10000])