Skip to content

Commit

Permalink
[improvement](jdbc catalog)Rename config from `disable_jdbc_sqlserver…
Browse files Browse the repository at this point in the history
…_encrypt` to `force_sqlserver_jdbc_encrypt_false` (#37015)

Front #36659
Renamed the configuration parameter `disable_jdbc_sqlserver_encrypt` to
`force_sqlserver_jdbc_encrypt_false` to make its purpose clearer and
more explicit. This new name better indicates that the parameter forces
the JDBC URL to set `encrypt=false` when enabled.
  • Loading branch information
zy-kkk authored and dataroaring committed Jul 2, 2024
1 parent 5c5261f commit cefa74d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ public class Config extends ConfigBase {
"MySQL Jdbc Catalog mysql does not support pushdown functions"})
public static String[] jdbc_mysql_unsupported_pushdown_functions = {"date_trunc", "money_format", "negative"};

@ConfField(description = {"SQLServer Jdbc Catalog 关闭加密",
"SQLServer Jdbc Catalog close encrypt"})
public static boolean disable_jdbc_sqlserver_encrypt = false;
@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"})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ public static String handleJdbcUrl(String jdbcUrl) throws DdlException {
newJdbcUrl = checkAndSetJdbcBoolParam(dbType, newJdbcUrl, "reWriteBatchedInserts", "false", "true");
}
if (dbType.equals(SQLSERVER)) {
if (Config.disable_jdbc_sqlserver_encrypt) {
if (Config.force_sqlserver_jdbc_encrypt_false) {
newJdbcUrl = checkAndSetJdbcBoolParam(dbType, newJdbcUrl, "encrypt", "true", "false");
}
newJdbcUrl = checkAndSetJdbcBoolParam(dbType, newJdbcUrl, "useBulkCopyForBatchInsert", "false", "true");
Expand Down

0 comments on commit cefa74d

Please sign in to comment.