fix conflicts

LantaoJin · LantaoJin · commit dd39a443d8b9 · 2025-11-24T15:10:58.000+08:00
Signed-off-by: Lantao Jin &lt;ltjin@amazon.com&gt;
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/tpch/CalcitePPLTpchIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/tpch/CalcitePPLTpchIT.java
@@ -404,7 +404,6 @@ public void testQ18() throws IOException {
     verifyNumOfRows(actual, 0);
   }
 
-  @Ignore("This IT is easily flaky failure in 2.19.0, but more stable after 2.19.3")
   @Test
   public void testQ19() throws IOException {
     String ppl = sanitize(loadFromFile("tpch/queries/q19.ppl"));

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,6 @@ public void testQ18() throws IOException {`
`404`	`404`	`verifyNumOfRows(actual, 0);`
`405`	`405`	`}`
`406`	`406`
`407`		`- @Ignore("This IT is easily flaky failure in 2.19.0, but more stable after 2.19.3")`
`408`	`407`	`@Test`
`409`	`408`	`public void testQ19() throws IOException {`
`410`	`409`	`String ppl = sanitize(loadFromFile("tpch/queries/q19.ppl"));`