You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2023/06/13 15:01:21 UTC
[doris] branch branch-1.2-lts updated: [1.2][improvement](jdbc) support support get mysql information_schema's table and clickhouse system's table (#20769)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new 4eb080bbed [1.2][improvement](jdbc) support support get mysql information_schema's table and clickhouse system's table (#20769)
4eb080bbed is described below
commit 4eb080bbed518a568f1f3138c807c08f8f26ac40
Author: zy-kkk <zh...@gmail.com>
AuthorDate: Tue Jun 13 23:01:09 2023 +0800
[1.2][improvement](jdbc) support support get mysql information_schema's table and clickhouse system's table (#20769)
cherry-pick from #20768
---
.../java/org/apache/doris/external/jdbc/JdbcClient.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
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 2cd6c0ab64..1d3c556b21 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
@@ -261,17 +261,21 @@ public class JdbcClient {
}
List<String> tablesName = Lists.newArrayList();
String[] types = {"TABLE", "VIEW"};
+ String[] mysqlTypes = {"TABLE", "VIEW", "SYSTEM VIEW"};
+ String[] ckTypes = {"TABLE", "VIEW", "SYSTEM TABLE"};
String[] hanaTypes = {"TABLE", "VIEW", "OLAP VIEW", "JOIN VIEW", "HIERARCHY VIEW", "CALC VIEW"};
try {
DatabaseMetaData databaseMetaData = conn.getMetaData();
String catalogName = conn.getCatalog();
switch (dbType) {
case JdbcResource.MYSQL:
- rs = databaseMetaData.getTables(dbName, null, null, types);
+ rs = databaseMetaData.getTables(dbName, null, null, mysqlTypes);
+ break;
+ case JdbcResource.CLICKHOUSE:
+ rs = databaseMetaData.getTables(dbName, null, null, ckTypes);
break;
case JdbcResource.POSTGRESQL:
case JdbcResource.ORACLE:
- case JdbcResource.CLICKHOUSE:
case JdbcResource.SQLSERVER:
rs = databaseMetaData.getTables(null, dbName, null, types);
break;
@@ -309,17 +313,21 @@ public class JdbcClient {
tableName = lowerTableToRealTable.get(tableName);
}
String[] types = {"TABLE", "VIEW"};
+ String[] mysqlTypes = {"TABLE", "VIEW", "SYSTEM VIEW"};
+ String[] ckTypes = {"TABLE", "VIEW", "SYSTEM TABLE"};
String[] hanaTypes = {"TABLE", "VIEW", "OLAP VIEW", "JOIN VIEW", "HIERARCHY VIEW", "CALC VIEW"};
try {
DatabaseMetaData databaseMetaData = conn.getMetaData();
String catalogName = conn.getCatalog();
switch (dbType) {
case JdbcResource.MYSQL:
- rs = databaseMetaData.getTables(dbName, null, tableName, types);
+ rs = databaseMetaData.getTables(dbName, null, null, mysqlTypes);
+ break;
+ case JdbcResource.CLICKHOUSE:
+ rs = databaseMetaData.getTables(dbName, null, null, ckTypes);
break;
case JdbcResource.POSTGRESQL:
case JdbcResource.ORACLE:
- case JdbcResource.CLICKHOUSE:
case JdbcResource.SQLSERVER:
rs = databaseMetaData.getTables(null, dbName, null, types);
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org