Replace windows carriages with spaces when sanitizing queries to explain

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

Author: yuancu

integ-test/src/test/java/org/opensearch/sql/calcite/pushdown/CalciteNoPushdownIT.java

@@ -10,6 +10,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.opensearch.sql.calcite.remote.*;
+import org.opensearch.sql.calcite.tpch.CalcitePPLTpchIT;
 import org.opensearch.sql.ppl.PPLIntegTestCase;
 
 /**
@@ -102,7 +103,8 @@
   CalciteTopCommandIT.class,
   CalciteTrendlineCommandIT.class,
   CalciteVisualizationFormatIT.class,
-  CalciteWhereCommandIT.class
+  CalciteWhereCommandIT.class,
+  CalcitePPLTpchIT.class
 })
 public class CalciteNoPushdownIT {
   private static boolean wasPushdownEnabled;

integ-test/src/test/java/org/opensearch/sql/calcite/tpch/CalcitePPLTpchIT.java

@@ -463,6 +463,6 @@ public void testQ22() throws IOException {
    */
   private static String sanitize(String ppl) {
     String withoutComments = ppl.replaceAll("(?s)/\\*.*?\\*/", "");
-    return withoutComments.replaceAll("\\n", " ").trim();
+    return withoutComments.replaceAll("\\r\\n", " ").replaceAll("\\n", " ").trim();
   }
 }