fix: remove setting 'mcqaV2ForceString'

aliyun · Sep 24, 2024 · c6f9622 · c6f9622
1 parent 9c845a7
commit c6f9622
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/src/main/java/com/aliyun/odps/jdbc/OdpsConnection.java b/src/main/java/com/aliyun/odps/jdbc/OdpsConnection.java
@@ -136,8 +136,6 @@ public boolean isOdpsNamespaceSchema() {
 
   private boolean enableCommandApi;
   private boolean useInstanceTunnel;
-  private boolean mcqaV2ForceString;
-
   private boolean httpsCheck;
   private boolean skipSqlCheck;
   private boolean skipSqlInjectCheck;
@@ -289,7 +287,6 @@ public boolean isOdpsNamespaceSchema() {
     this.tunnelDownloadUseSingleReader = connRes.isTunnelDownloadUseSingleReader();
     this.useInstanceTunnel = connRes.isUseInstanceTunnel();
     this.verbose = connRes.isVerbose();
-    this.mcqaV2ForceString = connRes.isMcqaV2ForceString();
 
     if (!httpsCheck) {
       odps.getRestClient().setIgnoreCerts(true);
@@ -389,9 +386,6 @@ public void initSQLExecutor(String serviceName, FallbackPolicy fallbackPolicy)
     if (enableMcqaV2) {
       builder.quotaName(quotaName);
       builder.enableMcqaV2(true);
-      if (mcqaV2ForceString) {
-        builder.useInstanceTunnel(false);
-      }
     }
     long startTime = System.currentTimeMillis();
     executor = builder.build();
@@ -959,10 +953,6 @@ public boolean isUseInstanceTunnel() {
     return useInstanceTunnel;
   }
 
-  public boolean isMcqaV2ForceString() {
-    return mcqaV2ForceString;
-  }
-
   public boolean isVerbose() {
     return verbose;
   }

diff --git a/src/main/java/com/aliyun/odps/jdbc/utils/ConnectionResource.java b/src/main/java/com/aliyun/odps/jdbc/utils/ConnectionResource.java
@@ -95,7 +95,6 @@ public class ConnectionResource {
   private static final String RETRY_TIME_URL_KEY = "retryTime";
   private static final String SKIP_SQL_REWRITE_URL_KEY = "skipSqlRewrite";
   private static final String QUOTA_NAME_URL_KEY = "quotaName";
-  private static final String MCQA_V2_FORCE_STRING_URL_KEY = "mcqaV2ForceString";
   private static final String SKIP_SQL_INJECT_CHECK_URL_KEY = "skipSqlInjectCheck";
 
   /**
@@ -192,7 +191,6 @@ public class ConnectionResource {
   private boolean skipSqlRewrite = false;
   private boolean skipSqlInjectCheck = false;
   private boolean verbose = false;
-  private boolean mcqaV2ForceString = false;
   private String quotaName;
 
   public Boolean isOdpsNamespaceSchema() {
@@ -432,8 +430,6 @@ void init(Properties info, Map<String, String> paramsInURL) {
         Boolean.parseBoolean(
             tryGetFirstNonNullValueByAltMapAndAltKey(maps, "false", VERBOSE_PROP_KEY,
                                                      VERBOSE_PROP_KEY));
-    mcqaV2ForceString = Boolean.parseBoolean(tryGetFirstNonNullValueByAltMapAndAltKey(
-        maps, "false", MCQA_V2_FORCE_STRING_URL_KEY, MCQA_V2_FORCE_STRING_URL_KEY));
 
     // odpsNamespaceSchema in url or prop |  odps.namespace.schema in settings | odpsNamespaceSchema field
     // key not exists                     |      not set                       | null
@@ -682,12 +678,6 @@ public boolean isUseInstanceTunnel() {
     return useInstanceTunnel;
   }
 
-  public boolean isMcqaV2ForceString() {
-    return mcqaV2ForceString;
-  }
-
-
-
   public boolean isHttpsCheck() {
     return httpsCheck;
   }