This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 4c4f0be576c [branch-2.0][improvement](sqlserver catalog) Can configure
whether to use encryption when connecting to SQL Server using the catalog
(#36940)
4c4f0be576c is described below
commit 4c4f0be576c68f0b981866404bd2f7e3ca4a3b0e
Author: zy-kkk <zhongy...@gmail.com>
AuthorDate: Mon Jul 1 15:04:32 2024 +0800
[branch-2.0][improvement](sqlserver catalog) Can configure whether to use
encryption when connecting to SQL Server using the catalog (#36940)
pick #36659
pick #37015
---
fe/fe-common/src/main/java/org/apache/doris/common/Config.java | 4 ++++
fe/fe-core/src/main/java/org/apache/doris/catalog/JdbcResource.java | 3 +++
2 files changed, 7 insertions(+)
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
index 9e401b16588..dcdcc7dd035 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
@@ -148,6 +148,10 @@ public class Config extends ConfigBase {
+ "The default is * to allow all, if set to empty, all are
not allowed"})
public static String jdbc_driver_secure_path = "*";
+ @ConfField(description = {"强制 SQLServer Jdbc Catalog 加密为 false",
+ "Force SQLServer Jdbc Catalog encrypt to false"})
+ public static boolean force_sqlserver_jdbc_encrypt_false = false;
+
@ConfField(mutable = true, masterOnly = true, description = {"broker load
时，单个节点上 load 执行计划的默认并行度",
"The default parallelism of the load execution plan on a single
node when the broker load is submitted"})
public static int default_load_parallelism = 1;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/JdbcResource.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/JdbcResource.java
index a5ee2c2b2a8..51d2d9b2a9c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/JdbcResource.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/JdbcResource.java
@@ -360,6 +360,9 @@ public class JdbcResource extends Resource {
newJdbcUrl = checkAndSetJdbcBoolParam(dbType, newJdbcUrl,
"reWriteBatchedInserts", "false", "true");
}
if (dbType.equals(SQLSERVER)) {
+ if (Config.force_sqlserver_jdbc_encrypt_false) {
+ newJdbcUrl = checkAndSetJdbcBoolParam(dbType, newJdbcUrl,
"encrypt", "true", "false");
+ }
newJdbcUrl = checkAndSetJdbcBoolParam(dbType, newJdbcUrl,
"useBulkCopyForBatchInsert", "false", "true");
}
return newJdbcUrl;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
