[Calcite Engine] Only enable fallback for tests that need to fall back

integ-test/src/test/java/org/opensearch/sql/calcite/remote/fallback/CalciteConvertTZFunctionIT.java → integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteConvertTZFunctionIT.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.sql.calcite.remote.fallback;
+package org.opensearch.sql.calcite.remote;
 
 import org.opensearch.sql.ppl.ConvertTZFunctionIT;
 
@@ -12,5 +12,6 @@ public class CalciteConvertTZFunctionIT extends ConvertTZFunctionIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
+    disallowCalciteFallback();
   }
 }

integ-test/src/test/java/org/opensearch/sql/calcite/remote/fallback/CalciteCsvFormatIT.java → integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteCsvFormatIT.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.sql.calcite.remote.fallback;
+package org.opensearch.sql.calcite.remote;
 
 import org.opensearch.sql.ppl.CsvFormatIT;
 
@@ -12,5 +12,6 @@ public class CalciteCsvFormatIT extends CsvFormatIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
+    disallowCalciteFallback();
   }
 }

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.calcite.remote;
+
+import java.io.IOException;
+import org.opensearch.sql.ppl.DataTypeIT;
+
+public class CalciteDataTypeIT extends DataTypeIT {
+  @Override
+  public void init() throws Exception {
+    super.init();
+    enableCalcite();
+    disallowCalciteFallback();
+  }
+
+  @Override
+  public void test_nonnumeric_data_types() throws IOException {
+    withFallbackEnabled(
+        () -> {
+          try {
+            super.test_nonnumeric_data_types();
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        },
+        "ignore this class since IP type is unsupported in calcite engine");
+  }
+}

integ-test/src/test/java/org/opensearch/sql/calcite/remote/fallback/CalciteDateTimeComparisonIT.java → integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeComparisonIT.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.sql.calcite.remote.fallback;
+package org.opensearch.sql.calcite.remote;
 
 import org.opensearch.sql.ppl.DateTimeComparisonIT;
 
@@ -17,5 +17,6 @@ public CalciteDateTimeComparisonIT(String functionCall, String name, Boolean exp
   public void init() throws Exception {
     super.init();
     enableCalcite();
+    disallowCalciteFallback();
   }
 }

integ-test/src/test/java/org/opensearch/sql/calcite/remote/fallback/CalciteDateTimeFunctionIT.java → integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeFunctionIT.java

@@ -3,22 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.sql.calcite.remote.fallback;
+package org.opensearch.sql.calcite.remote;
 
-import java.io.IOException;
-import org.junit.Ignore;
 import org.opensearch.sql.ppl.DateTimeFunctionIT;
 
 public class CalciteDateTimeFunctionIT extends DateTimeFunctionIT {
   @Override
   public void init() throws Exception {
     super.init();
     enableCalcite();
-  }
-
-  @Ignore("https://github.com/opensearch-project/sql/issues/3475")
-  @Override
-  public void testTimestampDiff() throws IOException {
-    super.testTimestampDiff();
+    disallowCalciteFallback();
   }
 }

integ-test/src/test/java/org/opensearch/sql/calcite/remote/fallback/CalciteDateTimeImplementationIT.java → integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeImplementationIT.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.sql.calcite.remote.fallback;
+package org.opensearch.sql.calcite.remote;
 
 import org.opensearch.sql.ppl.DateTimeImplementationIT;
 
@@ -12,5 +12,6 @@ public class CalciteDateTimeImplementationIT extends DateTimeImplementationIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
+    disallowCalciteFallback();
   }
 }

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.calcite.remote;
+
+import java.io.IOException;
+import org.opensearch.sql.ppl.DedupCommandIT;
+
+public class CalciteDedupCommandIT extends DedupCommandIT {
+  @Override
+  public void init() throws Exception {
+    super.init();
+    enableCalcite();
+    disallowCalciteFallback();
+  }
+
+  @Override
+  public void testConsecutiveDedup() throws IOException {
+    withFallbackEnabled(
+        () -> {
+          try {
+            super.testConsecutiveDedup();
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        },
+        "https://github.com/opensearch-project/sql/issues/3415");
+  }
+}

integ-test/src/test/java/org/opensearch/sql/calcite/remote/fallback/CalciteDescribeCommandIT.java → integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDescribeCommandIT.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.sql.calcite.remote.fallback;
+package org.opensearch.sql.calcite.remote;
 
 import org.opensearch.sql.ppl.DescribeCommandIT;
 
@@ -12,5 +12,7 @@ public class CalciteDescribeCommandIT extends DescribeCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
+    // TODO: "https://github.com/opensearch-project/sql/issues/3460"
+    // disallowCalciteFallback();
   }
 }

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

@@ -0,0 +1,56 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.calcite.remote;
+
+import org.opensearch.sql.ppl.ExplainIT;
+
+public class CalciteExplainIT extends ExplainIT {
+  @Override
+  public void init() throws Exception {
+    super.init();
+    enableCalcite();
+    disallowCalciteFallback();
+  }
+
+  @Override
+  public void testFillNullPushDownExplain() throws Exception {
+    withFallbackEnabled(
+        () -> {
+          try {
+            super.testFillNullPushDownExplain();
+          } catch (Exception e) {
+            throw new RuntimeException(e);
+          }
+        },
+        "https://github.com/opensearch-project/sql/issues/3461");
+  }
+
+  @Override
+  public void testTrendlinePushDownExplain() throws Exception {
+    withFallbackEnabled(
+        () -> {
+          try {
+            super.testTrendlinePushDownExplain();
+          } catch (Exception e) {
+            throw new RuntimeException(e);
+          }
+        },
+        "https://github.com/opensearch-project/sql/issues/3466");
+  }
+
+  @Override
+  public void testTrendlineWithSortPushDownExplain() throws Exception {
+    withFallbackEnabled(
+        () -> {
+          try {
+            super.testTrendlineWithSortPushDownExplain();
+          } catch (Exception e) {
+            throw new RuntimeException(e);
+          }
+        },
+        "https://github.com/opensearch-project/sql/issues/3466");
+  }
+}

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.calcite.remote;
+
+import java.io.IOException;
+import org.opensearch.sql.ppl.FieldsCommandIT;
+
+public class CalciteFieldsCommandIT extends FieldsCommandIT {
+  @Override
+  public void init() throws Exception {
+    super.init();
+    enableCalcite();
+    disallowCalciteFallback();
+  }
+
+  @Override
+  public void testDelimitedMetadataFields() throws IOException {
+    withFallbackEnabled(
+        () -> {
+          try {
+            super.testDelimitedMetadataFields();
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        },
+        "Calcite doesn't support metadata fields in fields yet");
+  }
+
+  @Override
+  public void testMetadataFields() throws IOException {
+    withFallbackEnabled(
+        () -> {
+          try {
+            super.testMetadataFields();
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        },
+        "Calcite doesn't support metadata fields in fields yet");
+  }
+}

integ-test/src/test/java/org/opensearch/sql/calcite/remote/fallback/CalciteFillNullCommandIT.java → integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFillNullCommandIT.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.sql.calcite.remote.fallback;
+package org.opensearch.sql.calcite.remote;
 
 import org.opensearch.sql.ppl.FillNullCommandIT;
 
@@ -12,5 +12,7 @@ public class CalciteFillNullCommandIT extends FillNullCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
+    // TODO: "https://github.com/opensearch-project/sql/issues/3461"
+    // disallowCalciteFallback();
   }
 }

integ-test/src/test/java/org/opensearch/sql/calcite/remote/fallback/CalciteGeoIpFunctionsIT.java → integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteGeoIpFunctionsIT.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.sql.calcite.remote.fallback;
+package org.opensearch.sql.calcite.remote;
 
 import org.opensearch.sql.ppl.GeoIpFunctionsIT;
 
@@ -12,5 +12,7 @@ public class CalciteGeoIpFunctionsIT extends GeoIpFunctionsIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
+    // TODO: "https://github.com/opensearch-project/sql/issues/3506"
+    // disallowCalciteFallback();
   }
 }

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

@@ -0,0 +1,31 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.sql.calcite.remote;
+
+import java.io.IOException;
+import org.opensearch.sql.ppl.GeoPointFormatsIT;
+
+public class CalciteGeoPointFormatsIT extends GeoPointFormatsIT {
+  @Override
+  public void init() throws Exception {
+    super.init();
+    enableCalcite();
+    disallowCalciteFallback();
+  }
+
+  @Override
+  public void testReadingGeoHash() throws IOException {
+    withFallbackEnabled(
+        () -> {
+          try {
+            super.testReadingGeoHash();
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        },
+        "Need to support metadata, https://github.com/opensearch-project/sql/issues/3333");
+  }
+}

integ-test/src/test/java/org/opensearch/sql/calcite/remote/fallback/CalciteHeadCommandIT.java → integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteHeadCommandIT.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.sql.calcite.remote.fallback;
+package org.opensearch.sql.calcite.remote;
 
 import org.opensearch.sql.ppl.HeadCommandIT;
 
@@ -12,5 +12,6 @@ public class CalciteHeadCommandIT extends HeadCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
+    disallowCalciteFallback();
   }
 }

integ-test/src/test/java/org/opensearch/sql/calcite/remote/fallback/CalciteIPComparisonIT.java → integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteIPComparisonIT.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.sql.calcite.remote.fallback;
+package org.opensearch.sql.calcite.remote;
 
 import org.opensearch.sql.ppl.IPComparisonIT;
 
@@ -12,5 +12,6 @@ public class CalciteIPComparisonIT extends IPComparisonIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
+    disallowCalciteFallback();
   }
 }