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

[fix](ctas) fix wrong string column length after executing ctas from external table (#14090)

Browse Source
This commit is contained in:
Mingyu Chen
2022-11-10 11:36:56 +08:00
committed by GitHub
parent 17867e446f
commit 8c5c6d9d7f
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -771,7 +771,7 @@ public class HiveMetaStoreClientHelper {
return Type.DOUBLE;
case "string":
case "binary":
return Type.STRING;
return ScalarType.createStringType();
default:
break;
}

6
fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
View File

@ -98,6 +98,7 @@ import org.apache.doris.catalog.Partition;
import org.apache.doris.catalog.PartitionInfo;
import org.apache.doris.catalog.PartitionItem;
import org.apache.doris.catalog.PartitionType;
import org.apache.doris.catalog.PrimitiveType;
import org.apache.doris.catalog.RangePartitionItem;
import org.apache.doris.catalog.Replica;
import org.apache.doris.catalog.Replica.ReplicaState;
@ -1206,7 +1207,6 @@ public class InternalCatalog implements CatalogIf<Database> {
Expr resultExpr = resultExprs.get(i);
Type resultType = resultExpr.getType();
if (resultType.isStringType() && resultType.getLength() < 0) {
// alway set text length MAX_STRING_LENGTH
typeDef = new TypeDef(ScalarType.createStringType());
} else if (resultType.isDecimalV2() && resultType.equals(ScalarType.DECIMALV2)) {
typeDef = new TypeDef(ScalarType.createDecimalType(27, 9));
@ -1220,9 +1220,9 @@ public class InternalCatalog implements CatalogIf<Database> {
// If this is the first column, because olap table does not support the first column to be
// string, float, double or array, we should check and modify its type
// For string type, change it to varchar.
// For other unsupport types, just remain unchanged, the analysis phash of create table stmt
// For other unsupported types, just remain unchanged, the analysis phash of create table stmt
// will handle it.
if (typeDef.getType() == Type.STRING) {
if (typeDef.getType().getPrimitiveType() == PrimitiveType.STRING) {
typeDef = TypeDef.createVarchar(ScalarType.MAX_VARCHAR_LENGTH);
}
}

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

@ -416,7 +416,7 @@ public class EsUtil {
case "nested":
case "object":
default:
return Type.STRING;
return ScalarType.createStringType();
}
}

2
regression-test/suites/rollup_p0/test_rollup_agg_date.groovy
View File

@ -54,7 +54,7 @@ suite("test_rollup_agg_date", "rollup") {
}
}
}
Thread.sleep(200)
Thread.sleep(2000)
sql "ALTER TABLE ${tbName} ADD COLUMN datetimev4 datetimev2(3) MAX NULL;"
max_try_secs = 60
while (max_try_secs--) {