This is an automated email from the ASF dual-hosted git repository.
wanghailin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new adf888e008 [Improve][Connector-V2] Remove system table limit (#7391)
adf888e008 is described below
commit adf888e008046441ee913d88744c76e42b604cbf
Author: Jia Fan <[email protected]>
AuthorDate: Tue Aug 20 14:04:41 2024 +0800
[Improve][Connector-V2] Remove system table limit (#7391)
---
.../jdbc/catalog/AbstractJdbcCatalog.java | 21 ++------------
.../seatunnel/jdbc/catalog/dm/DamengCatalog.java | 11 --------
.../seatunnel/jdbc/catalog/iris/IrisCatalog.java | 4 ---
.../seatunnel/jdbc/catalog/mysql/MySqlCatalog.java | 7 -----
.../catalog/oceanbase/OceanBaseMySqlCatalog.java | 10 -------
.../catalog/oceanbase/OceanBaseOracleCatalog.java | 10 -------
.../jdbc/catalog/oracle/OracleCatalog.java | 33 ----------------------
.../jdbc/catalog/psql/PostgresCatalog.java | 12 --------
.../jdbc/catalog/redshift/RedshiftCatalog.java | 17 -----------
.../jdbc/catalog/saphana/SapHanaCatalog.java | 33 ----------------------
.../seatunnel/jdbc/catalog/tidb/TiDBCatalog.java | 8 ------
.../seatunnel/jdbc/catalog/xugu/XuguCatalog.java | 8 ------
.../starrocks/catalog/StarRocksCatalog.java | 14 +--------
13 files changed, 3 insertions(+), 185 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/AbstractJdbcCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/AbstractJdbcCatalog.java
index 247a68c62d..69f1007b6c 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/AbstractJdbcCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/AbstractJdbcCatalog.java
@@ -55,12 +55,10 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import static com.google.common.base.Preconditions.checkArgument;
@@ -71,9 +69,6 @@ import static
org.apache.seatunnel.common.exception.CommonErrorCode.UNSUPPORTED_
public abstract class AbstractJdbcCatalog implements Catalog {
private static final Logger LOG =
LoggerFactory.getLogger(AbstractJdbcCatalog.class);
- protected static final Set<String> SYS_DATABASES = new HashSet<>();
- protected static final Set<String> EXCLUDED_SCHEMAS = new HashSet<>();
-
protected final String catalogName;
protected final String defaultDatabase;
protected final String username;
@@ -271,13 +266,7 @@ public abstract class AbstractJdbcCatalog implements
Catalog {
@Override
public List<String> listDatabases() throws CatalogException {
try {
- return queryString(
- defaultUrl,
- getListDatabaseSql(),
- rs -> {
- String s = rs.getString(1);
- return SYS_DATABASES.contains(s) ? null : s;
- });
+ return queryString(defaultUrl, getListDatabaseSql(), rs ->
rs.getString(1));
} catch (Exception e) {
throw new CatalogException(
String.format("Failed listing database in catalog %s",
this.catalogName), e);
@@ -289,9 +278,6 @@ public abstract class AbstractJdbcCatalog implements
Catalog {
if (StringUtils.isBlank(databaseName)) {
return false;
}
- if (SYS_DATABASES.contains(databaseName)) {
- return false;
- }
try {
return querySQLResultExists(
getUrlFromDatabaseName(databaseName),
@@ -318,7 +304,7 @@ public abstract class AbstractJdbcCatalog implements
Catalog {
protected String getTableName(ResultSet rs) throws SQLException {
String schemaName = rs.getString(1);
String tableName = rs.getString(2);
- if (StringUtils.isNotBlank(schemaName) &&
!SYS_DATABASES.contains(schemaName)) {
+ if (StringUtils.isNotBlank(schemaName)) {
return schemaName + "." + tableName;
}
return null;
@@ -347,9 +333,6 @@ public abstract class AbstractJdbcCatalog implements
Catalog {
@Override
public boolean tableExists(TablePath tablePath) throws CatalogException {
String databaseName = tablePath.getDatabaseName();
- if (EXCLUDED_SCHEMAS.contains(tablePath.getSchemaName())) {
- return false;
- }
try {
return querySQLResultExists(
this.getUrlFromDatabaseName(databaseName),
getTableWithConditionSql(tablePath));
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/dm/DamengCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/dm/DamengCatalog.java
index 0525a47584..13dcdf0783 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/dm/DamengCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/dm/DamengCatalog.java
@@ -37,15 +37,10 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
@Slf4j
public class DamengCatalog extends AbstractJdbcCatalog {
- private static final List<String> EXCLUDED_SCHEMAS =
- Collections.unmodifiableList(
- Arrays.asList("SYS", "SYSDBA", "SYSSSO", "SYSAUDITOR",
"CTISYS"));
private static final String SELECT_COLUMNS_SQL =
"SELECT COLUMNS.COLUMN_NAME, COLUMNS.DATA_TYPE,
COLUMNS.DATA_LENGTH, COLUMNS.DATA_PRECISION, COLUMNS.DATA_SCALE "
@@ -110,9 +105,6 @@ public class DamengCatalog extends AbstractJdbcCatalog {
@Override
protected String getTableName(ResultSet rs) throws SQLException {
- if (EXCLUDED_SCHEMAS.contains(rs.getString(1))) {
- return null;
- }
return rs.getString(1) + "." + rs.getString(2);
}
@@ -177,9 +169,6 @@ public class DamengCatalog extends AbstractJdbcCatalog {
List<String> tables = new ArrayList<>();
while (rs.next()) {
- if (EXCLUDED_SCHEMAS.contains(rs.getString(1))) {
- continue;
- }
tables.add(rs.getString(1) + "." + rs.getString(2));
}
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/iris/IrisCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/iris/IrisCatalog.java
index 5898d4e855..fad902b984 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/iris/IrisCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/iris/IrisCatalog.java
@@ -62,7 +62,6 @@ public class IrisCatalog extends AbstractJdbcCatalog {
public IrisCatalog(
String catalogName, String username, String password,
JdbcUrlUtil.UrlInfo urlInfo) {
super(catalogName, username, password, urlInfo, null);
- SYS_DATABASES.add("%SYS");
}
@Override
@@ -138,9 +137,6 @@ public class IrisCatalog extends AbstractJdbcCatalog {
@Override
public boolean tableExists(TablePath tablePath) throws CatalogException {
- if (EXCLUDED_SCHEMAS.contains(tablePath.getSchemaName())) {
- return false;
- }
return querySQLResultExists(
this.getUrlFromDatabaseName(tablePath.getDatabaseName()),
getTableWithConditionSql(tablePath));
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/mysql/MySqlCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/mysql/MySqlCatalog.java
index 65922383ee..1c414c56e2 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/mysql/MySqlCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/mysql/MySqlCatalog.java
@@ -57,13 +57,6 @@ public class MySqlCatalog extends AbstractJdbcCatalog {
private static final String SELECT_TABLE_EXISTS =
"SELECT TABLE_SCHEMA,TABLE_NAME FROM information_schema.tables
WHERE table_schema = '%s' AND table_name = '%s'";
- static {
- SYS_DATABASES.add("information_schema");
- SYS_DATABASES.add("mysql");
- SYS_DATABASES.add("performance_schema");
- SYS_DATABASES.add("sys");
- }
-
private MySqlVersion version;
private MySqlTypeConverter typeConverter;
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java
index ceeff2587f..33aa2f8ccd 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java
@@ -56,16 +56,6 @@ public class OceanBaseMySqlCatalog extends
AbstractJdbcCatalog {
private static final String SELECT_TABLE_EXISTS =
"SELECT TABLE_SCHEMA,TABLE_NAME FROM information_schema.tables
WHERE table_schema = '%s' AND table_name = '%s'";
- static {
- SYS_DATABASES.clear();
- SYS_DATABASES.add("information_schema");
- SYS_DATABASES.add("mysql");
- SYS_DATABASES.add("oceanbase");
- SYS_DATABASES.add("LBACSYS");
- SYS_DATABASES.add("ORAAUDITOR");
- SYS_DATABASES.add("SYS");
- }
-
private OceanBaseMySqlTypeConverter typeConverter;
public OceanBaseMySqlCatalog(
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseOracleCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseOracleCatalog.java
index 7e8f844699..cb563a2229 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseOracleCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseOracleCatalog.java
@@ -31,13 +31,6 @@ import static
org.apache.seatunnel.shade.com.google.common.base.Preconditions.ch
public class OceanBaseOracleCatalog extends OracleCatalog {
- static {
- EXCLUDED_SCHEMAS.add("oceanbase");
- EXCLUDED_SCHEMAS.add("LBACSYS");
- EXCLUDED_SCHEMAS.add("ORAAUDITOR");
- EXCLUDED_SCHEMAS.add("SYS");
- }
-
public OceanBaseOracleCatalog(
String catalogName,
String username,
@@ -59,9 +52,6 @@ public class OceanBaseOracleCatalog extends OracleCatalog {
@Override
public boolean tableExists(TablePath tablePath) throws CatalogException {
- if (EXCLUDED_SCHEMAS.contains(tablePath.getSchemaName())) {
- return false;
- }
return querySQLResultExists(
this.getUrlFromDatabaseName(tablePath.getDatabaseName()),
getTableWithConditionSql(tablePath));
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oracle/OracleCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oracle/OracleCatalog.java
index 338a894c08..5aa6dcd874 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oracle/OracleCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oracle/OracleCatalog.java
@@ -35,37 +35,11 @@ import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
@Slf4j
public class OracleCatalog extends AbstractJdbcCatalog {
- protected static List<String> EXCLUDED_SCHEMAS_ALL =
- Collections.unmodifiableList(
- Arrays.asList(
- "APPQOSSYS",
- "AUDSYS",
- "CTXSYS",
- "DVSYS",
- "DBSFWUSER",
- "DBSNMP",
- "GSMADMIN_INTERNAL",
- "LBACSYS",
- "MDSYS",
- "OJVMSYS",
- "OLAPSYS",
- "ORDDATA",
- "ORDSYS",
- "OUTLN",
- "SYS",
- "SYSTEM",
- "WMSYS",
- "XDB",
- "EXFSYS",
- "SYSMAN"));
-
private static final String SELECT_COLUMNS_SQL_TEMPLATE =
"SELECT\n"
+ " cols.COLUMN_NAME,\n"
@@ -97,10 +71,6 @@ public class OracleCatalog extends AbstractJdbcCatalog {
+ "ORDER BY \n"
+ " cols.column_id \n";
- static {
- EXCLUDED_SCHEMAS.addAll(EXCLUDED_SCHEMAS_ALL);
- }
-
public OracleCatalog(
String catalogName,
String username,
@@ -157,9 +127,6 @@ public class OracleCatalog extends AbstractJdbcCatalog {
@Override
protected String getTableName(ResultSet rs) throws SQLException {
- if (EXCLUDED_SCHEMAS.contains(rs.getString(1))) {
- return null;
- }
return rs.getString(1) + "." + rs.getString(2);
}
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresCatalog.java
index c1cf2e4253..4851f3461a 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresCatalog.java
@@ -81,18 +81,6 @@ public class PostgresCatalog extends AbstractJdbcCatalog {
+ "ORDER BY \n"
+ " a.attnum;";
- static {
- SYS_DATABASES.add("information_schema");
- SYS_DATABASES.add("pg_catalog");
- SYS_DATABASES.add("root");
- SYS_DATABASES.add("pg_toast");
- SYS_DATABASES.add("pg_temp_1");
- SYS_DATABASES.add("pg_toast_temp_1");
- SYS_DATABASES.add("postgres");
- SYS_DATABASES.add("template0");
- SYS_DATABASES.add("template1");
- }
-
public PostgresCatalog(
String catalogName,
String username,
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/redshift/RedshiftCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/redshift/RedshiftCatalog.java
index b0fa834dc7..1c12a083ee 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/redshift/RedshiftCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/redshift/RedshiftCatalog.java
@@ -44,23 +44,6 @@ public class RedshiftCatalog extends AbstractJdbcCatalog {
private final String SELECT_COLUMNS =
"SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA =
'%s' AND TABLE_NAME ='%s' ORDER BY ordinal_position ASC";
- static {
- EXCLUDED_SCHEMAS.add("information_schema");
- EXCLUDED_SCHEMAS.add("catalog_history");
- EXCLUDED_SCHEMAS.add("pg_auto_copy");
- EXCLUDED_SCHEMAS.add("pg_automv");
- EXCLUDED_SCHEMAS.add("pg_catalog");
- EXCLUDED_SCHEMAS.add("pg_internal");
- EXCLUDED_SCHEMAS.add("pg_s3");
- }
-
- static {
- SYS_DATABASES.add("template0");
- SYS_DATABASES.add("template1");
- SYS_DATABASES.add("awsdatacatalog");
- SYS_DATABASES.add("padb_harvest");
- }
-
protected final Map<String, Connection> connectionMap;
public RedshiftCatalog(
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/saphana/SapHanaCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/saphana/SapHanaCatalog.java
index 56d68f0264..70b01b397e 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/saphana/SapHanaCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/saphana/SapHanaCatalog.java
@@ -43,39 +43,6 @@ import static
org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.sa
@Slf4j
public class SapHanaCatalog extends AbstractJdbcCatalog {
- static {
- SYS_DATABASES.add("SYS");
- SYS_DATABASES.add("SYSTEM");
- SYS_DATABASES.add("SYS_DATABASES");
- SYS_DATABASES.add("_SYS_ADVISOR");
- SYS_DATABASES.add("_SYS_AFL");
- SYS_DATABASES.add("_SYS_BI");
- SYS_DATABASES.add("_SYS_BIC");
- SYS_DATABASES.add("_SYS_DATA_ANONYMIZATION");
- SYS_DATABASES.add("_SYS_DI");
- SYS_DATABASES.add("_SYS_EPM");
- SYS_DATABASES.add("_SYS_LDB");
- SYS_DATABASES.add("_SYS_PLAN_STABILITY");
- SYS_DATABASES.add("_SYS_REPO");
- SYS_DATABASES.add("_SYS_RT");
- SYS_DATABASES.add("_SYS_SECURITY");
- SYS_DATABASES.add("_SYS_SQL_ANALYZER");
- SYS_DATABASES.add("_SYS_STATISTICS");
- SYS_DATABASES.add("_SYS_TABLE_REPLICAS");
- SYS_DATABASES.add("_SYS_TASK");
- SYS_DATABASES.add("_SYS_TELEMETRY");
- SYS_DATABASES.add("_SYS_XS");
- SYS_DATABASES.add("_SYS_DI_CATALOG");
- SYS_DATABASES.add("_SYS_EPM_DATA");
- SYS_DATABASES.add("_SYS_DI_SU");
- SYS_DATABASES.add("_SYS_WORKLOAD_REPLAY");
- SYS_DATABASES.add("_SYS_AUDIT");
- SYS_DATABASES.add("_SYS_DI_BI_CATALOG");
- SYS_DATABASES.add("_SYS_DI_CDS_CATALOG");
- SYS_DATABASES.add("_SYS_DI_SEARCH_CATALOG");
- SYS_DATABASES.add("_SYS_DI_TO");
- }
-
private static final String SELECT_COLUMNS_SQL_TEMPLATE =
"SELECT\n"
+ " C.COLUMN_NAME,\n"
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/tidb/TiDBCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/tidb/TiDBCatalog.java
index 82a0edbce9..869a06586e 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/tidb/TiDBCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/tidb/TiDBCatalog.java
@@ -22,14 +22,6 @@ import
org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.mysql.MySqlCatalog
public class TiDBCatalog extends MySqlCatalog {
- static {
- SYS_DATABASES.clear();
- SYS_DATABASES.add("information_schema");
- SYS_DATABASES.add("mysql");
- SYS_DATABASES.add("performance_schema");
- SYS_DATABASES.add("metrics_schema");
- }
-
public TiDBCatalog(
String catalogName, String username, String pwd,
JdbcUrlUtil.UrlInfo urlInfo) {
super(catalogName, username, pwd, urlInfo);
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/xugu/XuguCatalog.java
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/xugu/XuguCatalog.java
index 1ba14be9f5..2881280d32 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/xugu/XuguCatalog.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/xugu/XuguCatalog.java
@@ -35,16 +35,11 @@ import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
@Slf4j
public class XuguCatalog extends AbstractJdbcCatalog {
- protected static List<String> EXCLUDED_SCHEMAS =
- Collections.unmodifiableList(Arrays.asList("GUEST", "SYSAUDITOR",
"SYSSSO"));
-
private static final String SELECT_COLUMNS_SQL_TEMPLATE =
"SELECT\n"
+ " dc.COLUMN_NAME,\n"
@@ -172,9 +167,6 @@ public class XuguCatalog extends AbstractJdbcCatalog {
@Override
protected String getTableName(ResultSet rs) throws SQLException {
- if (EXCLUDED_SCHEMAS.contains(rs.getString(1))) {
- return null;
- }
return rs.getString(1) + "." + rs.getString(2);
}
diff --git
a/seatunnel-connectors-v2/connector-starrocks/src/main/java/org/apache/seatunnel/connectors/seatunnel/starrocks/catalog/StarRocksCatalog.java
b/seatunnel-connectors-v2/connector-starrocks/src/main/java/org/apache/seatunnel/connectors/seatunnel/starrocks/catalog/StarRocksCatalog.java
index e71aae291a..0aee20aa94 100644
---
a/seatunnel-connectors-v2/connector-starrocks/src/main/java/org/apache/seatunnel/connectors/seatunnel/starrocks/catalog/StarRocksCatalog.java
+++
b/seatunnel-connectors-v2/connector-starrocks/src/main/java/org/apache/seatunnel/connectors/seatunnel/starrocks/catalog/StarRocksCatalog.java
@@ -60,11 +60,9 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.Set;
import java.util.stream.IntStream;
import static
org.apache.seatunnel.shade.com.google.common.base.Preconditions.checkArgument;
@@ -80,15 +78,8 @@ public class StarRocksCatalog implements Catalog {
protected String defaultUrl;
private final JdbcUrlUtil.UrlInfo urlInfo;
private final String template;
-
- private static final Set<String> SYS_DATABASES = new HashSet<>();
private static final Logger LOG =
LoggerFactory.getLogger(StarRocksCatalog.class);
- static {
- SYS_DATABASES.add("information_schema");
- SYS_DATABASES.add("_statistics_");
- }
-
public StarRocksCatalog(
String catalogName, String username, String pwd, String
defaultUrl, String template) {
@@ -114,10 +105,7 @@ public class StarRocksCatalog implements Catalog {
List<String> databases = new ArrayList<>();
while (rs.next()) {
- String databaseName = rs.getString(1);
- if (!SYS_DATABASES.contains(databaseName)) {
- databases.add(rs.getString(1));
- }
+ databases.add(rs.getString(1));
}
return databases;
