From 7d78c3ef1aa9789e28a5383df3d6c877b1bff75e Mon Sep 17 00:00:00 2001 From: zy-kkk Date: Fri, 21 Jun 2024 14:34:44 +0800 Subject: [PATCH] [improvement](sqlserver catalog) Can configure whether to use encryption when connecting to SQL Server using the catalog --- .../src/main/java/org/apache/doris/common/Config.java | 4 ++++ .../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 9e401b16588cfe..dcdcc7dd035d23 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 1faf27e1040e18..a502a96afea9fd 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 static String handleJdbcUrl(String jdbcUrl) throws DdlException { 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;