Fix conflicts error

Signed-off-by: Lantao Jin <ltjin@amazon.com>

Author: LantaoJin

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

@@ -221,7 +221,7 @@ public void testExplainWithReverse() throws IOException {
   public void testExplainWithTimechartAvg() throws IOException {
     var result = explainQueryToString("source=events | timechart span=1m avg(cpu_usage) by host");
     String expected =
-        isPushdownEnabled()
+        !isPushdownDisabled()
             ? loadFromFile("expectedOutput/calcite/explain_timechart.json")
             : loadFromFile("expectedOutput/calcite/explain_timechart_no_pushdown.json");
     assertJsonEqualsIgnoreId(expected, result);
@@ -231,7 +231,7 @@ public void testExplainWithTimechartAvg() throws IOException {
   public void testExplainWithTimechartCount() throws IOException {
     var result = explainQueryToString("source=events | timechart span=1m count() by host");
     String expected =
-        isPushdownEnabled()
+        !isPushdownDisabled()
             ? loadFromFile("expectedOutput/calcite/explain_timechart_count.json")
             : loadFromFile("expectedOutput/calcite/explain_timechart_count_no_pushdown.json");
     assertJsonEqualsIgnoreId(expected, result);

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

@@ -40,7 +40,7 @@ public void testPushdownSortPlusExpression() throws IOException {
             "source=%s | eval age2 = age + 2 | sort age2 | fields age | head 2",
             TEST_INDEX_BANK);
     String explained = explainQueryToString(ppl);
-    if (isPushdownEnabled()) {
+    if (!isPushdownDisabled()) {
       assertTrue(
           explained.contains(
               "[SORT->[{\\n"
@@ -63,7 +63,7 @@ public void testPushdownSortMinusExpression() throws IOException {
             "source=%s | eval age2 = 1 - age | sort age2 | fields age | head 2",
             TEST_INDEX_BANK);
     String explained = explainQueryToString(ppl);
-    if (isPushdownEnabled()) {
+    if (!isPushdownDisabled()) {
       assertTrue(
           explained.contains(
               "[SORT->[{\\n"
@@ -86,7 +86,7 @@ public void testPushdownSortTimesExpression() throws IOException {
             "source=%s | eval age2 = 5 * age | sort age2 | fields age | head 2",
             TEST_INDEX_BANK);
     String explained = explainQueryToString(ppl);
-    if (isPushdownEnabled()) {
+    if (!isPushdownDisabled()) {
       assertTrue(
           explained.contains(
               "[SORT->[{\\n"
@@ -109,7 +109,7 @@ public void testPushdownSortByMultiExpressions() throws IOException {
             "source=%s | eval age2 = 5 * age | sort gender, age2 | fields gender, age | head 2",
             TEST_INDEX_BANK);
     String explained = explainQueryToString(ppl);
-    if (isPushdownEnabled()) {
+    if (!isPushdownDisabled()) {
       assertTrue(
           explained.contains(
               "[SORT->[{\\n"
@@ -137,7 +137,7 @@ public void testPushdownSortCastExpression() throws IOException {
             "source=%s | eval age2 = cast(age * 5 as long) | sort age2 | fields age | head 2",
             TEST_INDEX_BANK);
     String explained = explainQueryToString(ppl);
-    if (isPushdownEnabled()) {
+    if (!isPushdownDisabled()) {
       assertTrue(
           explained.contains(
               "[SORT->[{\\n"
@@ -160,7 +160,7 @@ public void testPushdownSortCastToDoubleExpression() throws IOException {
             "source=%s | eval age2 = cast(age as double) | sort age2 | fields age, age2 | head 2",
             TEST_INDEX_BANK);
     String explained = explainQueryToString(ppl);
-    if (isPushdownEnabled()) {
+    if (!isPushdownDisabled()) {
       assertTrue(
           explained.contains(
               "SORT->[{\\n"

integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLIntegTestCase.java

@@ -135,40 +135,6 @@ public List<?> getSettings() {
     };
   }
 
-  protected Settings enablePushdown() {
-    System.out.println(Settings.Key.CALCITE_PUSHDOWN_ENABLED.name() + " enabled");
-    return new Settings() {
-      private final Map<Key, Object> defaultSettings =
-          new ImmutableMap.Builder<Key, Object>()
-              .put(Key.QUERY_SIZE_LIMIT, 200)
-              .put(Key.SQL_CURSOR_KEEP_ALIVE, TimeValue.timeValueMinutes(1))
-              .put(Key.FIELD_TYPE_TOLERANCE, true)
-              .put(Key.CALCITE_ENGINE_ENABLED, true)
-              .put(Key.CALCITE_FALLBACK_ALLOWED, false)
-              .put(Key.CALCITE_PUSHDOWN_ENABLED, true)
-              .put(Key.CALCITE_PUSHDOWN_ROWCOUNT_ESTIMATION_FACTOR, 0.9)
-              .put(Key.PATTERN_METHOD, "SIMPLE_PATTERN")
-              .put(Key.PATTERN_MODE, "LABEL")
-              .put(Key.PATTERN_MAX_SAMPLE_COUNT, 10)
-              .put(Key.PATTERN_BUFFER_LIMIT, 100000)
-              .build();
-
-      @Override
-      public <T> T getSettingValue(Key key) {
-        return (T) defaultSettings.get(key);
-      }
-
-      @Override
-      public List<?> getSettings() {
-        return (List<?>) defaultSettings;
-      }
-    };
-  }
-
-  public boolean isPushdownEnabled() {
-    return getSettings().getSettingValue(Settings.Key.CALCITE_PUSHDOWN_ENABLED);
-  }
-
   protected String execute(String query) {
     AtomicReference<String> actual = new AtomicReference<>();
     pplService.execute(

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

@@ -257,7 +257,7 @@ public static class GlobalPushdownConfig {
   }
 
   /**
-   * Only check pushdown disabled instead enabled because enabled is the default value of pushdown
+   * We check pushdown disabled instead enabled because enabled is the default value of pushdown
    * config whatever calcite is enabled or not.
    */
   public boolean isPushdownDisabled() throws IOException {