diff --git a/docs/en/docs/lakehouse/multi-catalog/jdbc.md b/docs/en/docs/lakehouse/multi-catalog/jdbc.md index 4ad4ce493b..3f7c72ee10 100644 --- a/docs/en/docs/lakehouse/multi-catalog/jdbc.md +++ b/docs/en/docs/lakehouse/multi-catalog/jdbc.md @@ -256,10 +256,10 @@ CREATE CATALOG jdbc_oceanbase_oracle PROPERTIES ( > When the JDBC is connected, you can specify which database/schema to connect. For example, you can specify the DataBase in mysql `jdbc_url`; you can specify the CurrentSchema in PG `jdbc_url`. > > `include_database_list`: -> When `only_specified_database=true`, only synchronize the specified databases. split with ',', default value is '', means no filter takes effect, synchronizes all databases. db name is case sensitive. +> It only takes effect when `only_specified_database=true`, specify the database that needs to be synchronized, separated by ',', and the db name is case-sensitive. > > `exclude_database_list`: -> When `only_specified_database=true`, specify databases that do not need to synchronize. split with ',', default value is '', means no filter takes effect, synchronizes all databases. db name is case sensitive. +> It only takes effect when `only specified database=true`, specifies multiple databases that do not need to be synchronized, separated by ',', and the db name is case-sensitive. > > When `include_database_list` and `exclude_database_list` specify overlapping databases, `exclude_database_list` would take effect with higher privilege over `include_database_list`. > diff --git a/docs/zh-CN/docs/lakehouse/multi-catalog/jdbc.md b/docs/zh-CN/docs/lakehouse/multi-catalog/jdbc.md index 10bc6286a6..f93eb6f8e4 100644 --- a/docs/zh-CN/docs/lakehouse/multi-catalog/jdbc.md +++ b/docs/zh-CN/docs/lakehouse/multi-catalog/jdbc.md @@ -257,10 +257,10 @@ CREATE CATALOG jdbc_oceanbase_oracle PROPERTIES ( > 在jdbc连接时可以指定链接到哪个database/schema, 如:mysql中jdbc_url中可以指定database, pg的jdbc_url中可以指定currentSchema。 > > `include_database_list`: -> 当`only_specified_database=true`时,指定需要同步的 database,以','分割。默认为'',即不做任何过滤,同步所有database。db名称是大小写敏感的 +> 仅在`only_specified_database=true`时生效,指定需要同步的 database,以','分割,db名称是大小写敏感的。 > > `exclude_database_list`: -> 当`only_specified_database=true`时,指定不需要同步的多个database,以','分割。默认为'',即不做任何过滤,同步所有database。db名称是大小写敏感的。 +> 仅在`only_specified_database=true`时生效,指定不需要同步的多个database,以','分割,db名称是大小写敏感的。 > > 当 `include_database_list` 和 `exclude_database_list` 有重合的database配置时,`exclude_database_list`会优先生效。 > diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java index 6198796688..d8334b75f0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java @@ -234,7 +234,7 @@ public abstract class ExternalCatalog if (!excludeDatabaseMap.isEmpty() && excludeDatabaseMap.containsKey(dbName)) { continue; } - if (!includeDatabaseMap.isEmpty() && includeDatabaseMap.containsKey(dbName)) { + if (!includeDatabaseMap.isEmpty() && !includeDatabaseMap.containsKey(dbName)) { continue; } long dbId; diff --git a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClient.java b/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClient.java index 535d7daf4f..b0ab8a6980 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClient.java +++ b/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClient.java @@ -229,7 +229,7 @@ public class JdbcClient { if (!excludeDatabaseMap.isEmpty() && excludeDatabaseMap.containsKey(db)) { continue; } - if (!includeDatabaseMap.isEmpty() && includeDatabaseMap.containsKey(db)) { + if (!includeDatabaseMap.isEmpty() && !includeDatabaseMap.containsKey(db)) { continue; } databaseNames.add(db); @@ -250,10 +250,10 @@ public class JdbcClient { try { switch (dbType) { case JdbcResource.MYSQL: - case JdbcResource.CLICKHOUSE: case JdbcResource.OCEANBASE: databaseNames.add(conn.getCatalog()); break; + case JdbcResource.CLICKHOUSE: case JdbcResource.POSTGRESQL: case JdbcResource.ORACLE: case JdbcResource.SQLSERVER: