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

[improvement](multi-catalog) use date/datetimev2 as default col type for catalog table (#16304)

Browse Source 
1. When mapping column from external datasource, use date/datetimev2 as default type
2. check `is_cancelled` when read data, to avoid endless loop after query is cancelled
This commit is contained in:
Mingyu Chen
2023-02-02 17:35:48 +08:00
committed by GitHub
parent 557159d3ce
commit cb6875b5a4
6 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fe/fe-core/src/main/java/org/apache/doris/catalog/HiveMetaStoreClientHelper.java
View File

@ -686,9 +686,9 @@ public class HiveMetaStoreClientHelper {
case "bigint":
return Type.BIGINT;
case "date":
return ScalarType.getDefaultDateType(Type.DATE);
return ScalarType.createDateV2Type();
case "timestamp":
return ScalarType.getDefaultDateType(Type.DATETIME);
return ScalarType.createDatetimeV2Type(0);
case "float":
return Type.FLOAT;
case "double":

2
fe/fe-core/src/main/java/org/apache/doris/external/elasticsearch/EsUtil.java vendored
View File

@ -446,7 +446,7 @@ public class EsUtil {
case "scaled_float":
return Type.DOUBLE;
case "date":
return ScalarType.getDefaultDateType(Type.DATE);
return ScalarType.createDateV2Type();
case "keyword":
case "text":
case "ip":

18
fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClient.java vendored
View File

@ -390,10 +390,10 @@ public class JdbcClient {
case "BIGINT":
return Type.BIGINT;
case "DATE":
return ScalarType.getDefaultDateType(Type.DATE);
return ScalarType.createDateV2Type();
case "TIMESTAMP":
case "DATETIME":
return ScalarType.getDefaultDateType(Type.DATETIME);
return ScalarType.createDatetimeV2Type(0);
case "FLOAT":
return Type.FLOAT;
case "DOUBLE":
@ -473,9 +473,9 @@ public class JdbcClient {
return charType;
case "timestamp":
case "timestamptz":
return ScalarType.getDefaultDateType(Type.DATETIME);
return ScalarType.createDatetimeV2Type(0);
case "date":
return ScalarType.getDefaultDateType(Type.DATE);
return ScalarType.createDateV2Type();
case "bool":
return Type.BOOLEAN;
case "bit":
@ -530,7 +530,7 @@ public class JdbcClient {
|| ckType.startsWith("FixedString")) {
return ScalarType.createStringType();
} else if (ckType.startsWith("DateTime")) {
return ScalarType.getDefaultDateType(Type.DATETIME);
return ScalarType.createDatetimeV2Type(0);
}
switch (ckType) {
case "Bool":
@ -559,7 +559,7 @@ public class JdbcClient {
return Type.DOUBLE;
case "Date":
case "Date32":
return ScalarType.getDefaultDateType(Type.DATE);
return ScalarType.createDateV2Type();
default:
return Type.UNSUPPORTED;
}
@ -574,7 +574,7 @@ public class JdbcClient {
if (oracleType.equals("TIMESTAMPTZ") || oracleType.equals("TIMESTAMPLTZ")) {
return Type.UNSUPPORTED;
}
return ScalarType.getDefaultDateType(Type.DATETIME);
return ScalarType.createDatetimeV2Type(0);
}
switch (oracleType) {
case "NUMBER":
@ -605,7 +605,7 @@ public class JdbcClient {
case "FLOAT":
return Type.DOUBLE;
case "DATE":
return ScalarType.getDefaultDateType(Type.DATETIME);
return ScalarType.createDatetimeV2Type(0);
case "VARCHAR2":
case "NVARCHAR2":
case "CHAR":
@ -650,7 +650,7 @@ public class JdbcClient {
int scale = fieldSchema.getDecimalDigits();
return ScalarType.createDecimalV3Type(precision, scale);
case "date":
return ScalarType.getDefaultDateType(Type.DATE);
return ScalarType.createDateV2Type();
case "datetime":
case "datetime2":
case "smalldatetime":