database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](jdbc catalog) fix get doris column info when lower case (#32190)

Browse Source
This commit is contained in:
zy-kkk
2024-03-13 23:04:56 +08:00
committed by yiguolei
parent c33277a957
commit e3150250bf
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
View File

@ -252,7 +252,7 @@ public abstract class JdbcClient {
remoteTablesNames.add(rs.getString("TABLE_NAME"));
}
} catch (SQLException e) {
throw new JdbcClientException("failed to get all tables for remote database %s", e, remoteDbName);
throw new JdbcClientException("failed to get all tables for remote database: `%s`", e, remoteDbName);
}
});
return filterTableNames(remoteDbName, remoteTablesNames);
@ -313,8 +313,8 @@ public abstract class JdbcClient {
tableSchema.add(field);
}
} catch (SQLException e) {
throw new JdbcClientException("failed to get jdbc columns info for table %.%s: %s",
e, localDbName, localTableName, Util.getRootCauseMessage(e));
throw new JdbcClientException("failed to get jdbc columns info for remote table `%s.%s`: %s",
remoteDbName, remoteTableName, Util.getRootCauseMessage(e));
} finally {
close(rs, conn);
}
@ -415,8 +415,8 @@ public abstract class JdbcClient {
return jdbcLowerCaseMetaMatching.setDatabaseNameMapping(filteredDatabaseNames);
}
protected List<String> filterTableNames(String remoteDbName, List<String> localTableNames) {
return jdbcLowerCaseMetaMatching.setTableNameMapping(remoteDbName, localTableNames);
protected List<String> filterTableNames(String remoteDbName, List<String> remoteTableNames) {
return jdbcLowerCaseMetaMatching.setTableNameMapping(remoteDbName, remoteTableNames);
}
protected List<Column> filterColumnName(String remoteDbName, String remoteTableName, List<Column> remoteColumns) {

16
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java
View File

@ -134,7 +134,7 @@ public class JdbcMySQLClient extends JdbcClient {
// in mysql-jdbc-connector-5.1.*, TYPE_NAME of BITMAP column in doris will be "BITMAP"
field.setDataTypeName(rs.getString("TYPE_NAME"));
if (isDoris) {
mapFieldtoType = getColumnsDataTypeUseQuery(localDbName, localTableName);
mapFieldtoType = getColumnsDataTypeUseQuery(remoteDbName, remoteTableName);
field.setDataTypeName(mapFieldtoType.get(rs.getString("COLUMN_NAME")));
}
field.setColumnSize(rs.getInt("COLUMN_SIZE"));
@ -152,8 +152,8 @@ public class JdbcMySQLClient extends JdbcClient {
tableSchema.add(field);
}
} catch (SQLException e) {
throw new JdbcClientException("failed to get jdbc columns info for table %.%s: %s",
e, localDbName, localTableName, Util.getRootCauseMessage(e));
throw new JdbcClientException("failed to get jdbc columns info for remote table `%s.%s`: %s",
remoteDbName, remoteTableName, Util.getRootCauseMessage(e));
} finally {
close(rs, conn);
}
@ -282,15 +282,15 @@ public class JdbcMySQLClient extends JdbcClient {
/**
* get all columns like DatabaseMetaData.getColumns in mysql-jdbc-connector
*/
private Map<String, String> getColumnsDataTypeUseQuery(String dbName, String tableName) {
private Map<String, String> getColumnsDataTypeUseQuery(String remoteDbName, String remoteTableName) {
Connection conn = getConnection();
ResultSet resultSet = null;
Map<String, String> fieldtoType = Maps.newHashMap();
StringBuilder queryBuf = new StringBuilder("SHOW FULL COLUMNS FROM ");
queryBuf.append(tableName);
queryBuf.append(remoteTableName);
queryBuf.append(" FROM ");
queryBuf.append(dbName);
queryBuf.append(remoteDbName);
try (Statement stmt = conn.createStatement()) {
resultSet = stmt.executeQuery(queryBuf.toString());
while (resultSet.next()) {
@ -301,8 +301,8 @@ public class JdbcMySQLClient extends JdbcClient {
fieldtoType.put(fieldName, typeName);
}
} catch (SQLException e) {
throw new JdbcClientException("failed to get column list from jdbc for table %s:%s", tableName,
Util.getRootCauseMessage(e));
throw new JdbcClientException("failed to get jdbc columns info for remote table `%s.%s`: %s",
remoteDbName, remoteTableName, Util.getRootCauseMessage(e));
} finally {
close(resultSet, conn);
}