From 2f839eea7f1f65f9f72d9ca6245b01e7b0d04084 Mon Sep 17 00:00:00 2001
From: Lantao Jin <ltjin@amazon.com>
Date: Thu, 31 Jul 2025 11:14:22 +0800
Subject: [PATCH 1/2] Disable a failed PPL query fallback to v2 by default

Signed-off-by: Lantao Jin <ltjin@amazon.com>
---
 docs/user/admin/settings.rst                     | 16 ++++++++--------
 .../resources/rest-api-spec/test/issues/2489.yml |  2 --
 .../resources/rest-api-spec/test/issues/3343.yml |  2 --
 .../resources/rest-api-spec/test/issues/3477.yml |  2 --
 .../resources/rest-api-spec/test/issues/3570.yml |  2 --
 .../resources/rest-api-spec/test/issues/3595.yml |  2 --
 .../resources/rest-api-spec/test/issues/3607.yml |  2 --
 .../resources/rest-api-spec/test/issues/3635.yml |  2 --
 .../resources/rest-api-spec/test/issues/3646.yml |  2 --
 .../resources/rest-api-spec/test/issues/3655.yml |  2 --
 .../resources/rest-api-spec/test/issues/3810.yml |  2 --
 .../resources/rest-api-spec/test/issues/3881.yml |  2 --
 .../opensearch/setting/OpenSearchSettings.java   |  2 +-
 13 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/docs/user/admin/settings.rst b/docs/user/admin/settings.rst
index ab74e2bb567..177b911bdd1 100644
--- a/docs/user/admin/settings.rst
+++ b/docs/user/admin/settings.rst
@@ -749,9 +749,9 @@ plugins.calcite.enabled
 Description
 -----------
 
-This setting is present from 3.0.0-beta. You can enable Calcite as new query optimizer and execution engine to all coming requests.
+You can enable Calcite as new query optimizer and execution engine to all coming requests.
 
-1. The default value is false in 3.0.0-beta.
+1. The default value is false since 3.0.0.
 2. This setting is node scope.
 3. This setting can be updated dynamically.
 
@@ -764,9 +764,9 @@ plugins.calcite.fallback.allowed
 Description
 -----------
 
-This setting is present from 3.0.0-beta. If Calcite is enabled, you can use this setting to decide whether to allow fallback to v2 engine for some queries which are not supported by v3 engine.
+If Calcite is enabled, you can use this setting to decide whether to allow fallback to v2 engine for some queries which are not supported by v3 engine.
 
-1. The default value is true in 3.0.0-beta.
+1. The default value is false since 3.2.0.
 2. This setting is node scope.
 3. This setting can be updated dynamically.
 
@@ -776,9 +776,9 @@ plugins.calcite.pushdown.enabled
 Description
 -----------
 
-This setting is present from 3.0.0-beta. If Calcite is enabled, you can use this setting to decide whether to enable the operator pushdown optimization for v3 engine.
+If Calcite is enabled, you can use this setting to decide whether to enable the operator pushdown optimization for v3 engine.
 
-1. The default value is true in 3.0.0-beta.
+1. The default value is true since 3.0.0.
 2. This setting is node scope.
 3. This setting can be updated dynamically.
 
@@ -788,8 +788,8 @@ plugins.calcite.pushdown.rowcount.estimation.factor
 Description
 -----------
 
-This setting is present from 3.1.0. If Calcite pushdown optimization is enabled, this setting is used to estimate the row count of the query plan. The value is a factor to multiply the row count of the table scan to get the estimated row count.
+If Calcite pushdown optimization is enabled, this setting is used to estimate the row count of the query plan. The value is a factor to multiply the row count of the table scan to get the estimated row count.
 
-1. The default value is 0.9 in 3.1.0.
+1. The default value is 0.9 since 3.1.0.
 2. This setting is node scope.
 3. This setting can be updated dynamically.
diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/2489.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/2489.yml
index a6c727cf479..edda68f1e10 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/2489.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/2489.yml
@@ -15,7 +15,6 @@ setup:
         body:
           transient:
             plugins.calcite.enabled : true
-            plugins.calcite.fallback.allowed : false
 
 ---
 teardown:
@@ -24,7 +23,6 @@ teardown:
         body:
           transient:
             plugins.calcite.enabled : false
-            plugins.calcite.fallback.allowed : true
 
 ---
 "Handle epoch field in string format":
diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3343.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3343.yml
index d6aee4622f7..c107809c62b 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3343.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3343.yml
@@ -16,7 +16,6 @@ setup:
         body:
           transient:
             plugins.calcite.enabled : true
-            plugins.calcite.fallback.allowed : false
 
 ---
 teardown:
@@ -25,7 +24,6 @@ teardown:
         body:
           transient:
             plugins.calcite.enabled : false
-            plugins.calcite.fallback.allowed : true
 
 ---
 "Handle struct field with dynamic mapping disabled":
diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3477.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3477.yml
index 8f5bdc17bc5..0c4d9d06a06 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3477.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3477.yml
@@ -4,7 +4,6 @@ setup:
         body:
           transient:
             plugins.calcite.enabled : true
-            plugins.calcite.fallback.allowed : false
 
 ---
 teardown:
@@ -13,7 +12,6 @@ teardown:
         body:
           transient:
             plugins.calcite.enabled : false
-            plugins.calcite.fallback.allowed : true
 
 ---
 "Handle flattened document value":
diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3570.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3570.yml
index dede93077e3..10e1ff7e1ec 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3570.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3570.yml
@@ -4,7 +4,6 @@ setup:
         body:
           transient:
             plugins.calcite.enabled: true
-            plugins.calcite.fallback.allowed: false
   - do:
       bulk:
         index: hdfs_logs
@@ -35,7 +34,6 @@ teardown:
         body:
           transient:
             plugins.calcite.enabled : false
-            plugins.calcite.fallback.allowed : true
 
 
 ---
diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3595.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3595.yml
index 5cbb2d449f0..581b1b2ca39 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3595.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3595.yml
@@ -4,7 +4,6 @@ setup:
         body:
           transient:
             plugins.calcite.enabled : true
-            plugins.calcite.fallback.allowed : false
             plugins.query.size_limit : 1
 
 ---
@@ -14,7 +13,6 @@ teardown:
         body:
           transient:
             plugins.calcite.enabled : false
-            plugins.calcite.fallback.allowed : true
 
 ---
 "Handle lookup command with query size limit is 1":
diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3607.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3607.yml
index 6a1838991b2..d8ac8cef26b 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3607.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3607.yml
@@ -10,7 +10,6 @@ setup:
         body:
           transient:
             plugins.calcite.enabled : true
-            plugins.calcite.fallback.allowed : false
             plugins.query.size_limit : 200
 
 ---
@@ -20,7 +19,6 @@ teardown:
         body:
           transient:
             plugins.calcite.enabled : false
-            plugins.calcite.fallback.allowed : true
 
 ---
 "Handle aggregation with window_size_limit is less than query.size_limit":
diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3635.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3635.yml
index 2e604409b83..6059b390c9a 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3635.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3635.yml
@@ -4,7 +4,6 @@ setup:
         body:
           transient:
             plugins.calcite.enabled : true
-            plugins.calcite.fallback.allowed : false
 
 ---
 teardown:
@@ -13,7 +12,6 @@ teardown:
         body:
           transient:
             plugins.calcite.enabled : false
-            plugins.calcite.fallback.allowed : true
 
 ---
 "Push down filter with nested field":
diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3646.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3646.yml
index 95b280f77be..3e54154dc73 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3646.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3646.yml
@@ -32,7 +32,6 @@ setup:
         body:
           transient:
             plugins.calcite.enabled : true
-            plugins.calcite.fallback.allowed : false
 
 ---
 teardown:
@@ -41,7 +40,6 @@ teardown:
         body:
           transient:
             plugins.calcite.enabled : false
-            plugins.calcite.fallback.allowed : true
 
 ---
 "Path of alias type points to nested field":
diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3655.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3655.yml
index 20559f8a495..b197ed987fa 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3655.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3655.yml
@@ -34,7 +34,6 @@ teardown:
         body:
           transient:
             plugins.calcite.enabled : false
-            plugins.calcite.fallback.allowed : true
 
 ---
 "Support match_only_text field type with Calcite enabled":
@@ -43,7 +42,6 @@ teardown:
         body:
           transient:
             plugins.calcite.enabled : true
-            plugins.calcite.fallback.allowed : false
 
   - do:
       headers:
diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3810.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3810.yml
index cfda26cede8..cac57bc6b8b 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3810.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3810.yml
@@ -4,7 +4,6 @@ setup:
         body:
           transient:
             plugins.calcite.enabled : true
-            plugins.calcite.fallback.allowed : false
 
 ---
 teardown:
@@ -13,7 +12,6 @@ teardown:
         body:
           transient:
             plugins.calcite.enabled : false
-            plugins.calcite.fallback.allowed : true
 
 ---
 "Decimal literal should convert to double in pushdown":
diff --git a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3881.yml b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3881.yml
index b639b84a7ef..22be04c228e 100644
--- a/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3881.yml
+++ b/integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3881.yml
@@ -4,7 +4,6 @@ setup:
         body:
           transient:
             plugins.calcite.enabled : true
-            plugins.calcite.fallback.allowed : false
 
 ---
 teardown:
@@ -13,7 +12,6 @@ teardown:
         body:
           transient:
             plugins.calcite.enabled : false
-            plugins.calcite.fallback.allowed : true
 
 ---
 "Handle sag with nullAs":
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/OpenSearchSettings.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/OpenSearchSettings.java
index fc6e5728700..e12ff9f9ab8 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/OpenSearchSettings.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/setting/OpenSearchSettings.java
@@ -109,7 +109,7 @@ public class OpenSearchSettings extends Settings {
   public static final Setting<?> CALCITE_FALLBACK_ALLOWED_SETTING =
       Setting.boolSetting(
           Key.CALCITE_FALLBACK_ALLOWED.getKeyValue(),
-          true,
+          false,
           Setting.Property.NodeScope,
           Setting.Property.Dynamic);
 

From 524f39d1edf6411938bd4109f1736ea9bbd59ba7 Mon Sep 17 00:00:00 2001
From: Lantao Jin <ltjin@amazon.com>
Date: Mon, 4 Aug 2025 20:40:45 +0800
Subject: [PATCH 2/2] Workaround the permissionIT

Signed-off-by: Lantao Jin <ltjin@amazon.com>
---
 .../org/opensearch/sql/calcite/big5/CalcitePPLBig5IT.java     | 1 -
 .../sql/calcite/clickbench/CalcitePPLClickBenchIT.java        | 1 -
 .../opensearch/sql/calcite/remote/CalciteArrayFunctionIT.java | 1 -
 .../sql/calcite/remote/CalciteConvertTZFunctionIT.java        | 1 -
 .../org/opensearch/sql/calcite/remote/CalciteCsvFormatIT.java | 1 -
 .../org/opensearch/sql/calcite/remote/CalciteDataTypeIT.java  | 1 -
 .../sql/calcite/remote/CalciteDateTimeComparisonIT.java       | 1 -
 .../sql/calcite/remote/CalciteDateTimeFunctionIT.java         | 1 -
 .../sql/calcite/remote/CalciteDateTimeImplementationIT.java   | 1 -
 .../opensearch/sql/calcite/remote/CalciteDedupCommandIT.java  | 1 -
 .../sql/calcite/remote/CalciteDescribeCommandIT.java          | 1 -
 .../opensearch/sql/calcite/remote/CalciteExpandCommandIT.java | 1 -
 .../org/opensearch/sql/calcite/remote/CalciteExplainIT.java   | 1 -
 .../opensearch/sql/calcite/remote/CalciteFieldsCommandIT.java | 1 -
 .../sql/calcite/remote/CalciteFillNullCommandIT.java          | 1 -
 .../sql/calcite/remote/CalciteFlattenCommandIT.java           | 1 -
 .../sql/calcite/remote/CalciteFlattenDocValueIT.java          | 1 -
 .../sql/calcite/remote/CalciteGeoIpFunctionsIT.java           | 1 -
 .../sql/calcite/remote/CalciteGeoPointFormatsIT.java          | 1 -
 .../opensearch/sql/calcite/remote/CalciteHeadCommandIT.java   | 1 -
 .../opensearch/sql/calcite/remote/CalciteIPComparisonIT.java  | 1 -
 .../opensearch/sql/calcite/remote/CalciteIPFunctionsIT.java   | 1 -
 .../sql/calcite/remote/CalciteInformationSchemaCommandIT.java | 2 --
 .../opensearch/sql/calcite/remote/CalciteJsonFunctionsIT.java | 4 +---
 .../sql/calcite/remote/CalciteLegacyAPICompatibilityIT.java   | 1 -
 .../org/opensearch/sql/calcite/remote/CalciteLikeQueryIT.java | 1 -
 .../sql/calcite/remote/CalciteMatchBoolPrefixIT.java          | 1 -
 .../org/opensearch/sql/calcite/remote/CalciteMatchIT.java     | 1 -
 .../opensearch/sql/calcite/remote/CalciteMatchPhraseIT.java   | 1 -
 .../sql/calcite/remote/CalciteMatchPhrasePrefixIT.java        | 1 -
 .../sql/calcite/remote/CalciteMathematicalFunctionIT.java     | 1 -
 .../opensearch/sql/calcite/remote/CalciteMultiMatchIT.java    | 1 -
 .../sql/calcite/remote/CalciteNewAddedCommandsIT.java         | 1 -
 .../sql/calcite/remote/CalciteNowLikeFunctionIT.java          | 1 -
 .../sql/calcite/remote/CalciteObjectFieldOperateIT.java       | 1 -
 .../org/opensearch/sql/calcite/remote/CalciteOperatorIT.java  | 1 -
 .../sql/calcite/remote/CalcitePPLAggregationIT.java           | 1 -
 .../opensearch/sql/calcite/remote/CalcitePPLAppendcolIT.java  | 1 -
 .../org/opensearch/sql/calcite/remote/CalcitePPLBasicIT.java  | 1 -
 .../remote/CalcitePPLBuiltinDatetimeFunctionInvalidIT.java    | 1 -
 .../sql/calcite/remote/CalcitePPLBuiltinFunctionIT.java       | 1 -
 .../sql/calcite/remote/CalcitePPLBuiltinFunctionsNullIT.java  | 1 -
 .../sql/calcite/remote/CalcitePPLCaseFunctionIT.java          | 1 -
 .../sql/calcite/remote/CalcitePPLCastFunctionIT.java          | 1 -
 .../calcite/remote/CalcitePPLConditionBuiltinFunctionIT.java  | 1 -
 .../sql/calcite/remote/CalcitePPLCryptographicFunctionIT.java | 1 -
 .../org/opensearch/sql/calcite/remote/CalcitePPLDedupIT.java  | 1 -
 .../opensearch/sql/calcite/remote/CalcitePPLEventstatsIT.java | 1 -
 .../sql/calcite/remote/CalcitePPLExistsSubqueryIT.java        | 1 -
 .../opensearch/sql/calcite/remote/CalcitePPLExplainIT.java    | 1 -
 .../opensearch/sql/calcite/remote/CalcitePPLFillnullIT.java   | 1 -
 .../org/opensearch/sql/calcite/remote/CalcitePPLGrokIT.java   | 1 -
 .../opensearch/sql/calcite/remote/CalcitePPLIPFunctionIT.java | 1 -
 .../opensearch/sql/calcite/remote/CalcitePPLInSubqueryIT.java | 1 -
 .../org/opensearch/sql/calcite/remote/CalcitePPLJoinIT.java   | 1 -
 .../sql/calcite/remote/CalcitePPLJsonBuiltinFunctionIT.java   | 1 -
 .../org/opensearch/sql/calcite/remote/CalcitePPLLookupIT.java | 1 -
 .../org/opensearch/sql/calcite/remote/CalcitePPLParseIT.java  | 1 -
 .../opensearch/sql/calcite/remote/CalcitePPLPatternsIT.java   | 1 -
 .../org/opensearch/sql/calcite/remote/CalcitePPLPluginIT.java | 1 -
 .../org/opensearch/sql/calcite/remote/CalcitePPLRenameIT.java | 1 -
 .../sql/calcite/remote/CalcitePPLScalarSubqueryIT.java        | 1 -
 .../org/opensearch/sql/calcite/remote/CalcitePPLSortIT.java   | 1 -
 .../sql/calcite/remote/CalcitePPLStringBuiltinFunctionIT.java | 1 -
 .../opensearch/sql/calcite/remote/CalcitePPLTrendlineIT.java  | 1 -
 .../opensearch/sql/calcite/remote/CalciteParseCommandIT.java  | 1 -
 .../calcite/remote/CalcitePrometheusDataSourceCommandsIT.java | 1 -
 .../opensearch/sql/calcite/remote/CalciteQueryAnalysisIT.java | 1 -
 .../opensearch/sql/calcite/remote/CalciteQueryStringIT.java   | 1 -
 .../opensearch/sql/calcite/remote/CalciteRareCommandIT.java   | 1 -
 .../sql/calcite/remote/CalciteRelevanceFunctionIT.java        | 1 -
 .../opensearch/sql/calcite/remote/CalciteRenameCommandIT.java | 1 -
 .../sql/calcite/remote/CalciteResourceMonitorIT.java          | 1 -
 .../opensearch/sql/calcite/remote/CalciteSearchCommandIT.java | 1 -
 .../org/opensearch/sql/calcite/remote/CalciteSettingsIT.java  | 1 -
 .../sql/calcite/remote/CalciteShowDataSourcesCommandIT.java   | 4 ++--
 .../sql/calcite/remote/CalciteSimpleQueryStringIT.java        | 1 -
 .../opensearch/sql/calcite/remote/CalciteSortCommandIT.java   | 1 -
 .../opensearch/sql/calcite/remote/CalciteStatsCommandIT.java  | 1 -
 .../sql/calcite/remote/CalciteSystemFunctionIT.java           | 1 -
 .../opensearch/sql/calcite/remote/CalciteTextFunctionIT.java  | 1 -
 .../opensearch/sql/calcite/remote/CalciteTopCommandIT.java    | 1 -
 .../sql/calcite/remote/CalciteTrendlineCommandIT.java         | 2 --
 .../sql/calcite/remote/CalciteVisualizationFormatIT.java      | 1 -
 .../opensearch/sql/calcite/remote/CalciteWhereCommandIT.java  | 1 -
 .../standalone/CalcitePPLDateTimeBuiltinFunctionIT.java       | 1 -
 .../sql/calcite/standalone/CalcitePPLIntegTestCase.java       | 1 -
 .../org/opensearch/sql/calcite/tpch/CalcitePPLTpchIT.java     | 1 -
 .../src/test/java/org/opensearch/sql/ppl/IPComparisonIT.java  | 1 -
 .../java/org/opensearch/sql/security/PPLPermissionsIT.java    | 2 ++
 90 files changed, 5 insertions(+), 94 deletions(-)

diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/big5/CalcitePPLBig5IT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/big5/CalcitePPLBig5IT.java
index f8b235c45ef..da5139b6086 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/big5/CalcitePPLBig5IT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/big5/CalcitePPLBig5IT.java
@@ -15,6 +15,5 @@ public class CalcitePPLBig5IT extends PPLBig5IT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/clickbench/CalcitePPLClickBenchIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/clickbench/CalcitePPLClickBenchIT.java
index a75a42704f8..14b64efbe9b 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/clickbench/CalcitePPLClickBenchIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/clickbench/CalcitePPLClickBenchIT.java
@@ -15,6 +15,5 @@ public class CalcitePPLClickBenchIT extends PPLClickBenchIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteArrayFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteArrayFunctionIT.java
index bbd462bacb3..905b46cc36b 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteArrayFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteArrayFunctionIT.java
@@ -20,7 +20,6 @@ public class CalciteArrayFunctionIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
     loadIndex(Index.BANK);
   }
 
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteConvertTZFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteConvertTZFunctionIT.java
index e02562afaf0..6c105f15d63 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteConvertTZFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteConvertTZFunctionIT.java
@@ -12,6 +12,5 @@ public class CalciteConvertTZFunctionIT extends ConvertTZFunctionIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteCsvFormatIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteCsvFormatIT.java
index 7ac32f67612..b185ad4b130 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteCsvFormatIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteCsvFormatIT.java
@@ -12,6 +12,5 @@ public class CalciteCsvFormatIT extends CsvFormatIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDataTypeIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDataTypeIT.java
index 15672b50ef6..643d14fabb1 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDataTypeIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDataTypeIT.java
@@ -12,6 +12,5 @@ public class CalciteDataTypeIT extends DataTypeIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeComparisonIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeComparisonIT.java
index eea340a9ba7..09ea9d2f0fe 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeComparisonIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeComparisonIT.java
@@ -17,6 +17,5 @@ public CalciteDateTimeComparisonIT(String functionCall, String name, Boolean exp
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeFunctionIT.java
index fe0a7207c42..a069c6566ba 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeFunctionIT.java
@@ -14,7 +14,6 @@ public class CalciteDateTimeFunctionIT extends DateTimeFunctionIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   // TODO: Remove this when supporting type coercion and casting with Calcite
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeImplementationIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeImplementationIT.java
index a41bffc6f3e..7f765bd6886 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeImplementationIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDateTimeImplementationIT.java
@@ -12,6 +12,5 @@ public class CalciteDateTimeImplementationIT extends DateTimeImplementationIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDedupCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDedupCommandIT.java
index 803ad4120ee..6da1268313b 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDedupCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDedupCommandIT.java
@@ -13,7 +13,6 @@ public class CalciteDedupCommandIT extends DedupCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   @Override
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDescribeCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDescribeCommandIT.java
index 087e8d21474..458cf9a25ac 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDescribeCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteDescribeCommandIT.java
@@ -12,6 +12,5 @@ public class CalciteDescribeCommandIT extends DescribeCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteExpandCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteExpandCommandIT.java
index 63f20ba6f51..f32d5192e82 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteExpandCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteExpandCommandIT.java
@@ -29,7 +29,6 @@ public void init() throws Exception {
     loadIndex(Index.NESTED_SIMPLE);
     loadIndex(Index.ARRAY);
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   @Test
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteExplainIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteExplainIT.java
index 7ab4eab104b..6545fc1bfda 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteExplainIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteExplainIT.java
@@ -18,7 +18,6 @@ public class CalciteExplainIT extends ExplainIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   @Override
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFieldsCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFieldsCommandIT.java
index 0de2e28eb31..a5c7c361bd1 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFieldsCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFieldsCommandIT.java
@@ -12,6 +12,5 @@ public class CalciteFieldsCommandIT extends FieldsCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFillNullCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFillNullCommandIT.java
index edc31680768..08b9da7b1ad 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFillNullCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFillNullCommandIT.java
@@ -12,6 +12,5 @@ public class CalciteFillNullCommandIT extends FillNullCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFlattenCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFlattenCommandIT.java
index 9b4b68d2569..9b72d67dfbd 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFlattenCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFlattenCommandIT.java
@@ -30,7 +30,6 @@ public void init() throws Exception {
     super.init();
     loadIndex(NESTED_WITHOUT_ARRAYS);
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   @Test
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFlattenDocValueIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFlattenDocValueIT.java
index d60c468ba4e..2b306f4049f 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFlattenDocValueIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteFlattenDocValueIT.java
@@ -12,6 +12,5 @@ public class CalciteFlattenDocValueIT extends FlattenDocValueIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteGeoIpFunctionsIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteGeoIpFunctionsIT.java
index 20de0289d17..9de93a515a2 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteGeoIpFunctionsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteGeoIpFunctionsIT.java
@@ -12,6 +12,5 @@ public class CalciteGeoIpFunctionsIT extends GeoIpFunctionsIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteGeoPointFormatsIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteGeoPointFormatsIT.java
index 9f1f046c3ea..c136d4c3e59 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteGeoPointFormatsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteGeoPointFormatsIT.java
@@ -13,7 +13,6 @@ public class CalciteGeoPointFormatsIT extends GeoPointFormatsIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   @Override
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteHeadCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteHeadCommandIT.java
index e28144c10dc..579eca4289f 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteHeadCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteHeadCommandIT.java
@@ -12,6 +12,5 @@ public class CalciteHeadCommandIT extends HeadCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteIPComparisonIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteIPComparisonIT.java
index 082ba8ca3be..0ee2693f90b 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteIPComparisonIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteIPComparisonIT.java
@@ -12,6 +12,5 @@ public class CalciteIPComparisonIT extends IPComparisonIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteIPFunctionsIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteIPFunctionsIT.java
index 122ed9b022f..0f16a426882 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteIPFunctionsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteIPFunctionsIT.java
@@ -13,7 +13,6 @@ public class CalciteIPFunctionsIT extends IPFunctionsIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   @Override
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteInformationSchemaCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteInformationSchemaCommandIT.java
index 2d3f30c34a1..ad12edf4a4c 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteInformationSchemaCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteInformationSchemaCommandIT.java
@@ -14,7 +14,5 @@ public class CalciteInformationSchemaCommandIT extends InformationSchemaCommandI
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    // TODO: "https://github.com/opensearch-project/sql/issues/3455"
-    // disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteJsonFunctionsIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteJsonFunctionsIT.java
index 06493982016..0932d6cf77b 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteJsonFunctionsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteJsonFunctionsIT.java
@@ -8,13 +8,11 @@
 import org.junit.Ignore;
 import org.opensearch.sql.ppl.JsonFunctionsIT;
 
-@Ignore
+@Ignore("https://github.com/opensearch-project/sql/issues/3436")
 public class CalciteJsonFunctionsIT extends JsonFunctionsIT {
   @Override
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    // TODO: "https://github.com/opensearch-project/sql/issues/3436"
-    // disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteLegacyAPICompatibilityIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteLegacyAPICompatibilityIT.java
index fc4d4db83b0..4851fd303da 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteLegacyAPICompatibilityIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteLegacyAPICompatibilityIT.java
@@ -12,6 +12,5 @@ public class CalciteLegacyAPICompatibilityIT extends LegacyAPICompatibilityIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteLikeQueryIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteLikeQueryIT.java
index 4df20014be3..a0bc25b8caa 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteLikeQueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteLikeQueryIT.java
@@ -15,7 +15,6 @@ public class CalciteLikeQueryIT extends LikeQueryIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   @Override
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchBoolPrefixIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchBoolPrefixIT.java
index 8dde7c6775a..a683912ff2d 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchBoolPrefixIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchBoolPrefixIT.java
@@ -12,6 +12,5 @@ public class CalciteMatchBoolPrefixIT extends MatchBoolPrefixIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchIT.java
index d9ba581e40e..1be4ddf24ed 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchIT.java
@@ -12,6 +12,5 @@ public class CalciteMatchIT extends MatchIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchPhraseIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchPhraseIT.java
index b324d859171..04e8e4bc209 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchPhraseIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchPhraseIT.java
@@ -12,6 +12,5 @@ public class CalciteMatchPhraseIT extends MatchPhraseIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchPhrasePrefixIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchPhrasePrefixIT.java
index 5ca7d8487e9..76c2b2a2ca6 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchPhrasePrefixIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMatchPhrasePrefixIT.java
@@ -12,6 +12,5 @@ public class CalciteMatchPhrasePrefixIT extends MatchPhrasePrefixIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMathematicalFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMathematicalFunctionIT.java
index 0933504fd27..0d6bf47f539 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMathematicalFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMathematicalFunctionIT.java
@@ -12,6 +12,5 @@ public class CalciteMathematicalFunctionIT extends MathematicalFunctionIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMultiMatchIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMultiMatchIT.java
index be5bd3d194f..808b38d80dc 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMultiMatchIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteMultiMatchIT.java
@@ -12,6 +12,5 @@ public class CalciteMultiMatchIT extends MultiMatchIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteNewAddedCommandsIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteNewAddedCommandsIT.java
index c8a8a2c8384..efef0600419 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteNewAddedCommandsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteNewAddedCommandsIT.java
@@ -12,6 +12,5 @@ public class CalciteNewAddedCommandsIT extends NewAddedCommandsIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteNowLikeFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteNowLikeFunctionIT.java
index a66fe01dc89..d6cd154d636 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteNowLikeFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteNowLikeFunctionIT.java
@@ -27,6 +27,5 @@ public CalciteNowLikeFunctionIT(
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteObjectFieldOperateIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteObjectFieldOperateIT.java
index 6f181e37f77..82ab2bbf703 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteObjectFieldOperateIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteObjectFieldOperateIT.java
@@ -12,6 +12,5 @@ public class CalciteObjectFieldOperateIT extends ObjectFieldOperateIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteOperatorIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteOperatorIT.java
index fda1e12dd77..73d1a83a9fe 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteOperatorIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteOperatorIT.java
@@ -13,7 +13,6 @@ public class CalciteOperatorIT extends OperatorIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   @Override
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLAggregationIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLAggregationIT.java
index 26a980b62a6..efe9c10c7dc 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLAggregationIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLAggregationIT.java
@@ -32,7 +32,6 @@ public class CalcitePPLAggregationIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.BANK);
     loadIndex(Index.BANK_WITH_NULL_VALUES);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLAppendcolIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLAppendcolIT.java
index 449088410bb..877c10947b8 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLAppendcolIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLAppendcolIT.java
@@ -21,7 +21,6 @@ public class CalcitePPLAppendcolIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
     loadIndex(Index.ACCOUNT);
   }
 
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBasicIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBasicIT.java
index 031710eb529..21e02f77afe 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBasicIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBasicIT.java
@@ -26,7 +26,6 @@ public class CalcitePPLBasicIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     Request request1 = new Request("PUT", "/test/_doc/1?refresh=true");
     request1.setJsonEntity("{\"name\": \"hello\", \"age\": 20}");
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBuiltinDatetimeFunctionInvalidIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBuiltinDatetimeFunctionInvalidIT.java
index d1327986821..9c94d1e025d 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBuiltinDatetimeFunctionInvalidIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBuiltinDatetimeFunctionInvalidIT.java
@@ -18,7 +18,6 @@ public class CalcitePPLBuiltinDatetimeFunctionInvalidIT extends PPLIntegTestCase
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(SQLIntegTestCase.Index.STATE_COUNTRY);
     loadIndex(SQLIntegTestCase.Index.STATE_COUNTRY_WITH_NULL);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBuiltinFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBuiltinFunctionIT.java
index 5999d110b56..58f4cb849b3 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBuiltinFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBuiltinFunctionIT.java
@@ -27,7 +27,6 @@ public class CalcitePPLBuiltinFunctionIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.STATE_COUNTRY);
     loadIndex(Index.DATA_TYPE_NUMERIC);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBuiltinFunctionsNullIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBuiltinFunctionsNullIT.java
index db15b3f7113..c7651014ea6 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBuiltinFunctionsNullIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBuiltinFunctionsNullIT.java
@@ -23,7 +23,6 @@ public class CalcitePPLBuiltinFunctionsNullIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.STATE_COUNTRY);
     loadIndex(Index.STATE_COUNTRY_WITH_NULL);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLCaseFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLCaseFunctionIT.java
index b9713c48b5e..7e4425d3a41 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLCaseFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLCaseFunctionIT.java
@@ -23,7 +23,6 @@ public class CalcitePPLCaseFunctionIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.WEBLOG);
     appendDataForBadResponse();
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLCastFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLCastFunctionIT.java
index bd08a3a5214..9560aa0939a 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLCastFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLCastFunctionIT.java
@@ -26,7 +26,6 @@ public class CalcitePPLCastFunctionIT extends CastFunctionIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   @Test
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLConditionBuiltinFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLConditionBuiltinFunctionIT.java
index d31a8db1cdc..d37adb4c32c 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLConditionBuiltinFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLConditionBuiltinFunctionIT.java
@@ -20,7 +20,6 @@ public class CalcitePPLConditionBuiltinFunctionIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.STATE_COUNTRY);
     loadIndex(Index.STATE_COUNTRY_WITH_NULL);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLCryptographicFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLCryptographicFunctionIT.java
index 12f1f9ae01e..5f371a7816f 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLCryptographicFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLCryptographicFunctionIT.java
@@ -22,7 +22,6 @@ public class CalcitePPLCryptographicFunctionIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.STATE_COUNTRY);
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLDedupIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLDedupIT.java
index 2f01418cf95..ebf3c600f6e 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLDedupIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLDedupIT.java
@@ -19,7 +19,6 @@ public class CalcitePPLDedupIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.DUPLICATION_NULLABLE);
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLEventstatsIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLEventstatsIT.java
index 5e0bdc21a0a..66febcb29fa 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLEventstatsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLEventstatsIT.java
@@ -22,7 +22,6 @@ public class CalcitePPLEventstatsIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.STATE_COUNTRY);
     loadIndex(Index.STATE_COUNTRY_WITH_NULL);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLExistsSubqueryIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLExistsSubqueryIT.java
index 409008f7aea..72bcad9e6c6 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLExistsSubqueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLExistsSubqueryIT.java
@@ -28,7 +28,6 @@ public class CalcitePPLExistsSubqueryIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.WORKER);
     loadIndex(Index.WORK_INFORMATION);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLExplainIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLExplainIT.java
index 648672ad1a3..22372f31d3f 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLExplainIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLExplainIT.java
@@ -18,7 +18,6 @@ public class CalcitePPLExplainIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     Request request1 = new Request("PUT", "/test/_doc/1?refresh=true");
     request1.setJsonEntity("{\"name\": \"hello\", \"age\": 20}");
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLFillnullIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLFillnullIT.java
index 73fd6239d15..8073589e066 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLFillnullIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLFillnullIT.java
@@ -22,7 +22,6 @@ public class CalcitePPLFillnullIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.STATE_COUNTRY_WITH_NULL);
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLGrokIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLGrokIT.java
index 8a94833e54e..1f189bfcebf 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLGrokIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLGrokIT.java
@@ -23,7 +23,6 @@ public class CalcitePPLGrokIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.BANK);
     loadIndex(Index.WEBLOG);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLIPFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLIPFunctionIT.java
index f52937bb49b..df7cca1b6c0 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLIPFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLIPFunctionIT.java
@@ -21,7 +21,6 @@ public class CalcitePPLIPFunctionIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.GEOIP);
     loadIndex(Index.WEBLOG);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLInSubqueryIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLInSubqueryIT.java
index 9811c2e7425..ad8f8d4a890 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLInSubqueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLInSubqueryIT.java
@@ -29,7 +29,6 @@ public class CalcitePPLInSubqueryIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.WORKER);
     loadIndex(Index.WORK_INFORMATION);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLJoinIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLJoinIT.java
index 9a9fb6de372..890206f0a39 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLJoinIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLJoinIT.java
@@ -29,7 +29,6 @@ public class CalcitePPLJoinIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.STATE_COUNTRY);
     loadIndex(Index.OCCUPATION);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLJsonBuiltinFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLJsonBuiltinFunctionIT.java
index 03e176d0df9..ee6ae6ecd4c 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLJsonBuiltinFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLJsonBuiltinFunctionIT.java
@@ -21,7 +21,6 @@ public class CalcitePPLJsonBuiltinFunctionIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.STATE_COUNTRY);
     loadIndex(Index.STATE_COUNTRY_WITH_NULL);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLLookupIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLLookupIT.java
index d4fa41559ba..dd1086c8cae 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLLookupIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLLookupIT.java
@@ -25,7 +25,6 @@ public class CalcitePPLLookupIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.WORKER);
     loadIndex(Index.WORK_INFORMATION);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLParseIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLParseIT.java
index 02d757888d7..56907f8f822 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLParseIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLParseIT.java
@@ -23,7 +23,6 @@ public class CalcitePPLParseIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.BANK);
     loadIndex(Index.BANK_WITH_NULL_VALUES);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLPatternsIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLPatternsIT.java
index 24a5e65737f..ad8b824cbbe 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLPatternsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLPatternsIT.java
@@ -24,7 +24,6 @@ public class CalcitePPLPatternsIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.BANK);
     loadIndex(Index.WEBLOG);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLPluginIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLPluginIT.java
index f0b4bd096df..0bf3d561548 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLPluginIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLPluginIT.java
@@ -12,6 +12,5 @@ public class CalcitePPLPluginIT extends PPLPluginIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLRenameIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLRenameIT.java
index bd2d1b00f7c..0458e7e5a2a 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLRenameIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLRenameIT.java
@@ -23,7 +23,6 @@ public class CalcitePPLRenameIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.STATE_COUNTRY);
   }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLScalarSubqueryIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLScalarSubqueryIT.java
index cc445001fed..2c53fbd47ca 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLScalarSubqueryIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLScalarSubqueryIT.java
@@ -25,7 +25,6 @@ public class CalcitePPLScalarSubqueryIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.WORKER);
     loadIndex(Index.WORK_INFORMATION);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLSortIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLSortIT.java
index 427906e09fa..559bcaf8eab 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLSortIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLSortIT.java
@@ -23,7 +23,6 @@ public class CalcitePPLSortIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.BANK);
     loadIndex(Index.BANK_WITH_NULL_VALUES);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLStringBuiltinFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLStringBuiltinFunctionIT.java
index 4ffad6dc74f..33befc23a50 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLStringBuiltinFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLStringBuiltinFunctionIT.java
@@ -21,7 +21,6 @@ public class CalcitePPLStringBuiltinFunctionIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.STATE_COUNTRY);
     loadIndex(Index.STATE_COUNTRY_WITH_NULL);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLTrendlineIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLTrendlineIT.java
index 0e8ece14142..8d31354aa90 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLTrendlineIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLTrendlineIT.java
@@ -23,7 +23,6 @@ public class CalcitePPLTrendlineIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.BANK);
     loadIndex(Index.BANK_WITH_NULL_VALUES);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteParseCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteParseCommandIT.java
index 533e2ab318c..6414a854401 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteParseCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteParseCommandIT.java
@@ -12,6 +12,5 @@ public class CalciteParseCommandIT extends ParseCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePrometheusDataSourceCommandsIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePrometheusDataSourceCommandsIT.java
index 7d489c42294..3a3b7f2cfb8 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePrometheusDataSourceCommandsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePrometheusDataSourceCommandsIT.java
@@ -14,6 +14,5 @@ public class CalcitePrometheusDataSourceCommandsIT extends PrometheusDataSourceC
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteQueryAnalysisIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteQueryAnalysisIT.java
index 65849d9b43f..2d1fb2e5aa7 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteQueryAnalysisIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteQueryAnalysisIT.java
@@ -16,7 +16,6 @@ public class CalciteQueryAnalysisIT extends QueryAnalysisIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   @Override
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteQueryStringIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteQueryStringIT.java
index cb16e5c8b1c..1c94d3b141c 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteQueryStringIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteQueryStringIT.java
@@ -12,6 +12,5 @@ public class CalciteQueryStringIT extends QueryStringIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteRareCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteRareCommandIT.java
index 75ba131672e..eaf59e09a73 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteRareCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteRareCommandIT.java
@@ -12,6 +12,5 @@ public class CalciteRareCommandIT extends RareCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteRelevanceFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteRelevanceFunctionIT.java
index d95fa514056..03fca9bc615 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteRelevanceFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteRelevanceFunctionIT.java
@@ -16,7 +16,6 @@ public class CalciteRelevanceFunctionIT extends RelevanceFunctionIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   // For Calcite, this PPL won't throw exception since it supports partial pushdown and has
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteRenameCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteRenameCommandIT.java
index f3cf25b3627..f48df368c6a 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteRenameCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteRenameCommandIT.java
@@ -12,6 +12,5 @@ public class CalciteRenameCommandIT extends RenameCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteResourceMonitorIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteResourceMonitorIT.java
index 209f16629a1..bc89537a6e8 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteResourceMonitorIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteResourceMonitorIT.java
@@ -12,6 +12,5 @@ public class CalciteResourceMonitorIT extends ResourceMonitorIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSearchCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSearchCommandIT.java
index acb45ec6c78..e1743b5fc26 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSearchCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSearchCommandIT.java
@@ -12,6 +12,5 @@ public class CalciteSearchCommandIT extends SearchCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSettingsIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSettingsIT.java
index d07407500d0..8149158af3c 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSettingsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSettingsIT.java
@@ -14,7 +14,6 @@ public class CalciteSettingsIT extends SettingsIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   @Override
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteShowDataSourcesCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteShowDataSourcesCommandIT.java
index d58b891f603..b1f9ea76fcf 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteShowDataSourcesCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteShowDataSourcesCommandIT.java
@@ -5,14 +5,14 @@
 
 package org.opensearch.sql.calcite.remote;
 
+import org.junit.Ignore;
 import org.opensearch.sql.ppl.ShowDataSourcesCommandIT;
 
+@Ignore("https://github.com/opensearch-project/sql/issues/3465")
 public class CalciteShowDataSourcesCommandIT extends ShowDataSourcesCommandIT {
   @Override
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    // TODO: "https://github.com/opensearch-project/sql/issues/3465"
-    // disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSimpleQueryStringIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSimpleQueryStringIT.java
index b1fa95e0e2d..f4195e9553d 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSimpleQueryStringIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSimpleQueryStringIT.java
@@ -12,6 +12,5 @@ public class CalciteSimpleQueryStringIT extends SimpleQueryStringIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSortCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSortCommandIT.java
index a6fc42129c8..d37d8ec6154 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSortCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSortCommandIT.java
@@ -19,7 +19,6 @@ public class CalciteSortCommandIT extends SortCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   // TODO: Move this test to SortCommandIT once head-then-sort is fixed in v2.
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteStatsCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteStatsCommandIT.java
index 53961fafe39..19f95ec6c4e 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteStatsCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteStatsCommandIT.java
@@ -12,7 +12,6 @@ public class CalciteStatsCommandIT extends StatsCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
     setQuerySizeLimit(2000);
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSystemFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSystemFunctionIT.java
index a22c832ea00..1f3c527fc1c 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSystemFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteSystemFunctionIT.java
@@ -12,6 +12,5 @@ public class CalciteSystemFunctionIT extends SystemFunctionIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteTextFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteTextFunctionIT.java
index eee929e82e2..50b0753938d 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteTextFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteTextFunctionIT.java
@@ -12,6 +12,5 @@ public class CalciteTextFunctionIT extends TextFunctionIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteTopCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteTopCommandIT.java
index f43c28ea55d..76a8b1e49cf 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteTopCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteTopCommandIT.java
@@ -12,6 +12,5 @@ public class CalciteTopCommandIT extends TopCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteTrendlineCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteTrendlineCommandIT.java
index cabf6b8e780..419abce7f54 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteTrendlineCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteTrendlineCommandIT.java
@@ -12,7 +12,5 @@ public class CalciteTrendlineCommandIT extends TrendlineCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    // TODO: "https://github.com/opensearch-project/sql/issues/3466"
-    // disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteVisualizationFormatIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteVisualizationFormatIT.java
index 97c997e518d..7a9b7e8bad1 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteVisualizationFormatIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteVisualizationFormatIT.java
@@ -12,6 +12,5 @@ public class CalciteVisualizationFormatIT extends VisualizationFormatIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteWhereCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteWhereCommandIT.java
index 04cad7aee8d..582ce47000d 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteWhereCommandIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteWhereCommandIT.java
@@ -12,7 +12,6 @@ public class CalciteWhereCommandIT extends WhereCommandIT {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
   }
 
   @Override
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLDateTimeBuiltinFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLDateTimeBuiltinFunctionIT.java
index 94db43e9d5e..2a2836a21a6 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLDateTimeBuiltinFunctionIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLDateTimeBuiltinFunctionIT.java
@@ -39,7 +39,6 @@ public class CalcitePPLDateTimeBuiltinFunctionIT extends CalcitePPLIntegTestCase
   public void init() throws IOException {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.STATE_COUNTRY);
     loadIndex(Index.DATE_FORMATS);
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLIntegTestCase.java b/integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLIntegTestCase.java
index 0dc69d0217d..d48de12ae30 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLIntegTestCase.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLIntegTestCase.java
@@ -115,7 +115,6 @@ private Settings defaultSettings() {
               .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, false)
               .put(Key.CALCITE_PUSHDOWN_ROWCOUNT_ESTIMATION_FACTOR, 0.9)
               .put(Key.PATTERN_METHOD, "SIMPLE_PATTERN")
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
index cfe0f03bc01..a825d673f46 100644
--- 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
@@ -25,7 +25,6 @@ public class CalcitePPLTpchIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
 
     loadIndex(Index.TPCH_CUSTOMER);
     loadIndex(Index.TPCH_LINEITEM);
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/IPComparisonIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/IPComparisonIT.java
index a7ad74a2567..6e792088cb2 100644
--- a/integ-test/src/test/java/org/opensearch/sql/ppl/IPComparisonIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/ppl/IPComparisonIT.java
@@ -20,7 +20,6 @@ public class IPComparisonIT extends PPLIntegTestCase {
   public void init() throws Exception {
     super.init();
     enableCalcite();
-    disallowCalciteFallback();
     loadIndex(SQLIntegTestCase.Index.WEBLOG);
   }
 
diff --git a/integ-test/src/test/java/org/opensearch/sql/security/PPLPermissionsIT.java b/integ-test/src/test/java/org/opensearch/sql/security/PPLPermissionsIT.java
index 73b98fd4c85..25b1368fcdd 100644
--- a/integ-test/src/test/java/org/opensearch/sql/security/PPLPermissionsIT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/security/PPLPermissionsIT.java
@@ -78,6 +78,8 @@ protected void init() throws Exception {
     loadIndex(Index.DOG);
     // Enable Calcite engine to test PIT behavior with Calcite
     enableCalcite();
+    // TODO Handle permission failure in v3
+    allowCalciteFallback();
   }
 
   /**
