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

[fix](jdbc catalog) Fix type recognition error when using query tvf to query doris (#40481)

Browse Source 
pick  (#40122)

Using string to match Doris type will not work with query tvf, so use
field matching instead
This commit is contained in:
zy-kkk
2024-09-06 19:30:32 +08:00
committed by GitHub
parent c1abaa4679
commit 962c382077
4 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.function.Consumer;
@ -174,7 +175,7 @@ public class JdbcMySQLClient extends JdbcClient {
protected Type jdbcTypeToDoris(JdbcFieldSchema fieldSchema) {
// For Doris type
if (isDoris) {
return dorisTypeToDoris(fieldSchema.getDataTypeName().orElse("unknown").toUpperCase());
return dorisTypeToDoris(fieldSchema);
}
// For mysql type: "INT UNSIGNED":
// fieldSchema.getDataTypeName().orElse("unknown").split(" ")[0] == "INT"
@ -319,7 +320,8 @@ public class JdbcMySQLClient extends JdbcClient {
return fieldtoType;
}
private Type dorisTypeToDoris(String type) {
private Type dorisTypeToDoris(JdbcFieldSchema fieldSchema) {
String type = fieldSchema.getDataTypeName().orElse("unknown").toUpperCase();
if (type == null || type.isEmpty()) {
return Type.UNSUPPORTED;
}
@ -329,7 +331,9 @@ public class JdbcMySQLClient extends JdbcClient {
// For ARRAY type
if (upperType.startsWith("ARRAY")) {
String innerType = upperType.substring(6, upperType.length() - 1).trim();
Type arrayInnerType = dorisTypeToDoris(innerType);
JdbcFieldSchema innerFieldSchema = new JdbcFieldSchema(fieldSchema);
innerFieldSchema.setDataTypeName(Optional.of(innerType));
Type arrayInnerType = dorisTypeToDoris(innerFieldSchema);
return ArrayType.create(arrayInnerType, true);
}
@ -356,9 +360,8 @@ public class JdbcMySQLClient extends JdbcClient {
return Type.DOUBLE;
case "DECIMAL":
case "DECIMALV3": {
String[] params = upperType.substring(openParen + 1, upperType.length() - 1).split(",");
int precision = Integer.parseInt(params[0].trim());
int scale = Integer.parseInt(params[1].trim());
int precision = fieldSchema.getColumnSize().orElse(0);
int scale = fieldSchema.getDecimalDigits().orElse(0);
return createDecimalOrStringType(precision, scale);
}
case "DATE":
@ -374,11 +377,11 @@ public class JdbcMySQLClient extends JdbcClient {
return ScalarType.createDatetimeV2Type(scale);
}
case "CHAR":
case "VARCHAR": {
int length = Integer.parseInt(upperType.substring(openParen + 1, upperType.length() - 1));
return baseType.equals("CHAR")
? ScalarType.createCharType(length) : ScalarType.createVarcharType(length);
}
ScalarType charType = ScalarType.createType(PrimitiveType.CHAR);
charType.setLength(fieldSchema.getColumnSize().orElse(0));
return charType;
case "VARCHAR":
return ScalarType.createVarcharType(fieldSchema.getColumnSize().orElse(0));
case "STRING":
case "TEXT":
case "JSON":

13
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/util/JdbcFieldSchema.java
View File

@ -47,6 +47,19 @@ public class JdbcFieldSchema {
protected int charOctetLength;
protected boolean isAllowNull;
public JdbcFieldSchema(JdbcFieldSchema other) {
this.columnName = other.columnName;
this.dataType = other.dataType;
this.dataTypeName = other.dataTypeName;
this.columnSize = other.columnSize;
this.decimalDigits = other.decimalDigits;
this.numPrecRadix = other.numPrecRadix;
this.remarks = other.remarks;
this.charOctetLength = other.charOctetLength;
this.isAllowNull = other.isAllowNull;
}
public JdbcFieldSchema(ResultSet rs) throws SQLException {
this.columnName = rs.getString("COLUMN_NAME");
this.dataType = getInteger(rs, "DATA_TYPE").orElseThrow(() -> new IllegalStateException("DATA_TYPE is null"));