Ignore IP comparison and explain ITs in CalciteNoPushdownIT

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

Author: yuancu

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

@@ -7,7 +7,7 @@
 
 package org.opensearch.sql.calcite.pushdown;
 
-import org.junit.AfterClass;
+import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -26,7 +26,8 @@
   CalciteDedupCommandIT.class,
   CalciteDescribeCommandIT.class,
   CalciteExpandCommandIT.class,
-  CalciteExplainIT.class,
+  // TODO: Add expected plans for CalciteExplainIT without pushdown
+  //  CalciteExplainIT.class,
   CalciteFieldsCommandIT.class,
   CalciteFillNullCommandIT.class,
   CalciteFlattenCommandIT.class,
@@ -35,7 +36,9 @@
   CalciteGeoPointFormatsIT.class,
   CalciteHeadCommandIT.class,
   CalciteInformationSchemaCommandIT.class,
-  CalciteIPComparisonIT.class,
+  // TODO: Enable after implementing comparison for IP addresses with Calcite
+  //  https://github.com/opensearch-project/sql/issues/3776
+  // CalciteIPComparisonIT.class,
   CalciteIPFunctionsIT.class,
   CalciteJsonFunctionsIT.class,
   CalciteLegacyAPICompatibilityIT.class,
@@ -99,13 +102,16 @@
   CalciteWhereCommandIT.class
 })
 public class CalciteNoPushdownIT {
+  private static boolean wasPushdownEnabled;
+
   @BeforeClass
   public static void disablePushdown() {
+    wasPushdownEnabled = PPLIntegTestCase.GlobalPushdownConfig.enabled;
     PPLIntegTestCase.GlobalPushdownConfig.enabled = false;
   }
 
-  @AfterClass
-  public static void enablePushdown() {
-    PPLIntegTestCase.GlobalPushdownConfig.enabled = true;
+  @After
+  public void restorePushdown() {
+    PPLIntegTestCase.GlobalPushdownConfig.enabled = wasPushdownEnabled;
   }
 }

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

@@ -7,7 +7,7 @@
 
 package org.opensearch.sql.calcite.pushdown;
 
-import org.junit.AfterClass;
+import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -86,7 +86,6 @@
   CalciteRenameCommandIT.class,
   CalciteResourceMonitorIT.class,
   CalciteSearchCommandIT.class,
-  CalciteSettingsIT.class,
   CalciteShowDataSourcesCommandIT.class,
   CalciteSimpleQueryStringIT.class,
   CalciteSortCommandIT.class,
@@ -99,13 +98,16 @@
   CalciteWhereCommandIT.class
 })
 public class CalcitePushdownIT {
-  @AfterClass
-  public static void disablePushdown() {
-    PPLIntegTestCase.GlobalPushdownConfig.enabled = false;
-  }
+  private static boolean wasPushdownEnabled;
 
   @BeforeClass
   public static void enablePushdown() {
+    wasPushdownEnabled = PPLIntegTestCase.GlobalPushdownConfig.enabled;
     PPLIntegTestCase.GlobalPushdownConfig.enabled = true;
   }
+
+  @After
+  public void restorePushdown() {
+    PPLIntegTestCase.GlobalPushdownConfig.enabled = wasPushdownEnabled;
+  }
 }

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

@@ -19,6 +19,8 @@ public class IPComparisonIT extends PPLIntegTestCase {
   @Override
   public void init() throws Exception {
     super.init();
+    enableCalcite();
+    disallowCalciteFallback();
     loadIndex(SQLIntegTestCase.Index.WEBLOG);
   }