Skip to content

Commit

Permalink
[Fix](planner)fix ctas incorrect string types of the target table. (#…
Browse files Browse the repository at this point in the history 
…21754)

string types from src table will be replaced to text type in ctas table, we change it to be corresponding to the src table.
  • Loading branch information
@sohardforaname
sohardforaname authored Jul 20, 2023
1 parent a151326 commit f3d9a84
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 24 deletions.
14 changes: 14 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/FunctionCallExpr.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1749,6 +1749,20 @@ && collectChildReturnTypes()[0].isDecimalV3()) {
this.type = PRECISION_INFER_RULE.getOrDefault(fnName.getFunction(), DEFAULT_PRECISION_INFER_RULE)
.apply(children, this.type);
}

// cast(xx as char(N)/varchar(N)) will be handled as substr(cast(xx as char, varchar), 1, N),
// but type is varchar(*), we change it to varchar(N);
if (fn.getFunctionName().getFunction().equals("substr")
&& children.size() == 3
&& children.get(1) instanceof IntLiteral
&& children.get(2) instanceof IntLiteral) {
long len = ((IntLiteral) children.get(2)).getValue();
if (type.isWildcardChar()) {
this.type = ScalarType.createCharType(((int) (len)));
} else if (type.isWildcardVarchar()) {
this.type = ScalarType.createVarchar(((int) (len)));
}
}
// rewrite return type if is nested type function
analyzeNestedFunction();
}
Expand Down
21 changes: 16 additions & 5 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1193,13 +1193,24 @@ public void createTableAsSelect(CreateTableAsSelectStmt stmt) throws DdlExceptio
Expr resultExpr = resultExprs.get(i);
Type resultType = resultExpr.getType();
if (resultExpr instanceof FunctionCallExpr
&& resultExpr.getType().getPrimitiveType().equals(PrimitiveType.VARCHAR)) {
resultType = ScalarType.createVarchar(65533);
&& resultExpr.getType().getPrimitiveType().equals(PrimitiveType.VARCHAR)
&& resultExpr.getType().getLength() == -1) {
resultType = ScalarType.createVarchar(ScalarType.MAX_VARCHAR_LENGTH);
}
if (resultType.isStringType() && (keysDesc == null || !keysDesc.containsCol(name))) {
// Use String for varchar/char/string type,
// to avoid char-length-vs-byte-length issue.
typeDef = new TypeDef(ScalarType.createStringType());
switch (resultType.getPrimitiveType()) {
case STRING:
typeDef = new TypeDef(ScalarType.createStringType());
break;
case VARCHAR:
typeDef = new TypeDef(ScalarType.createVarchar(resultType.getLength()));
break;
case CHAR:
typeDef = new TypeDef(ScalarType.createCharType(resultType.getLength()));
break;
default:
throw new DdlException("Unsupported string type for ctas");
}
} else if (resultType.isDecimalV2() && resultType.equals(ScalarType.DECIMALV2)) {
typeDef = new TypeDef(ScalarType.createDecimalType(27, 9));
} else if (resultType.isDecimalV3()) {
Expand Down
38 changes: 19 additions & 19 deletions fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableAsSelectStmtTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void testDecimal() throws Exception {
+ "as select * from `test`.`decimal_table`";
createTableAsSelect(selectFromDecimal);
Assertions.assertEquals("CREATE TABLE `select_decimal_table` (\n"
+ " `userId` varchar(65533) NOT NULL,\n"
+ " `userId` varchar(255) NOT NULL,\n"
+ " `amount_decimal` "
+ "DECIMAL" + "(10, 2) NOT NULL\n"
+ ") ENGINE=OLAP\n"
Expand Down Expand Up @@ -154,8 +154,8 @@ public void testVarchar() throws Exception {
createTableAsSelect(selectFromVarchar);
ShowResultSet showResultSet = showCreateTableByName("select_varchar");
Assertions.assertEquals("CREATE TABLE `select_varchar` (\n"
+ " `userId` varchar(65533) NOT NULL,\n"
+ " `username` text NOT NULL\n"
+ " `userId` varchar(255) NOT NULL,\n"
+ " `username` varchar(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
+ "COMMENT 'OLAP'\n"
Expand Down Expand Up @@ -242,8 +242,8 @@ public void testAlias() throws Exception {
createTableAsSelect(selectAlias2);
ShowResultSet showResultSet2 = showCreateTableByName("select_alias_2");
Assertions.assertEquals("CREATE TABLE `select_alias_2` (\n"
+ " `alias_name` varchar(65533) NOT NULL,\n"
+ " `username` text NOT NULL\n"
+ " `alias_name` varchar(255) NOT NULL,\n"
+ " `username` varchar(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`alias_name`)\n"
+ "COMMENT 'OLAP'\n"
Expand All @@ -266,8 +266,8 @@ public void testJoin() throws Exception {
createTableAsSelect(selectFromJoin);
ShowResultSet showResultSet = showCreateTableByName("select_join");
Assertions.assertEquals("CREATE TABLE `select_join` (\n"
+ " `userId` varchar(65533) NOT NULL,\n"
+ " `username` text NOT NULL,\n"
+ " `userId` varchar(255) NOT NULL,\n"
+ " `username` varchar(255) NOT NULL,\n"
+ " `status` int(11) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
Expand All @@ -287,9 +287,9 @@ public void testJoin() throws Exception {
createTableAsSelect(selectFromJoin1);
ShowResultSet showResultSet1 = showCreateTableByName("select_join1");
Assertions.assertEquals("CREATE TABLE `select_join1` (\n"
+ " `userId1` varchar(65533) NOT NULL,\n"
+ " `userId2` text NOT NULL,\n"
+ " `username` text NOT NULL,\n"
+ " `userId1` varchar(255) NOT NULL,\n"
+ " `userId2` varchar(255) NOT NULL,\n"
+ " `username` varchar(255) NOT NULL,\n"
+ " `status` int(11) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId1`)\n"
Expand All @@ -314,8 +314,8 @@ public void testName() throws Exception {
createTableAsSelect(selectFromName);
ShowResultSet showResultSet = showCreateTableByName("select_name");
Assertions.assertEquals("CREATE TABLE `select_name` (\n"
+ " `user` varchar(65533) NOT NULL,\n"
+ " `testname` text NOT NULL,\n"
+ " `user` varchar(255) NOT NULL,\n"
+ " `testname` varchar(255) NOT NULL,\n"
+ " `userstatus` int(11) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`user`)\n"
Expand All @@ -339,7 +339,7 @@ public void testUnion() throws Exception {
ShowResultSet showResultSet = showCreateTableByName("select_union");
Assertions.assertEquals(
"CREATE TABLE `select_union` (\n"
+ " `userId` varchar(65533) NULL\n"
+ " `userId` varchar(255) NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
+ "COMMENT 'OLAP'\n"
Expand All @@ -361,7 +361,7 @@ public void testCte() throws Exception {
ShowResultSet showResultSet = showCreateTableByName("select_cte");
Assertions.assertEquals(
"CREATE TABLE `select_cte` (\n"
+ " `userId` varchar(65533) NOT NULL\n"
+ " `userId` varchar(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
+ "COMMENT 'OLAP'\n"
Expand Down Expand Up @@ -401,8 +401,8 @@ public void testPartition() throws Exception {
createTableAsSelect(selectFromPartition);
ShowResultSet showResultSet = showCreateTableByName("selectPartition");
Assertions.assertEquals("CREATE TABLE `selectPartition` (\n"
+ " `userId` varchar(65533) NOT NULL,\n"
+ " `username` text NOT NULL\n"
+ " `userId` varchar(255) NOT NULL,\n"
+ " `username` varchar(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
+ "COMMENT 'OLAP'\n"
Expand All @@ -426,7 +426,7 @@ public void testDefaultTimestamp() throws Exception {
createTableAsSelect(createSql);
ShowResultSet showResultSet = showCreateTableByName("test_default_timestamp");
Assertions.assertEquals("CREATE TABLE `test_default_timestamp` (\n"
+ " `userId` varchar(65533) NOT NULL,\n"
+ " `userId` varchar(255) NOT NULL,\n"
+ " `date` datetime"
+ " NULL DEFAULT CURRENT_TIMESTAMP\n"
+ ") ENGINE=OLAP\n"
Expand All @@ -451,7 +451,7 @@ public void testAggValue() throws Exception {
ShowResultSet showResultSet = showCreateTableByName("test_agg_value");
Assertions.assertEquals(
"CREATE TABLE `test_agg_value` (\n"
+ " `username` varchar(65533) NOT NULL\n"
+ " `username` varchar(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`username`)\n"
+ "COMMENT 'OLAP'\n"
Expand All @@ -475,7 +475,7 @@ public void testUseKeyType() throws Exception {
Assertions.assertEquals(
"CREATE TABLE `test_use_key_type` (\n"
+ " `userId` varchar(255) NOT NULL,\n"
+ " `username` text NOT NULL\n"
+ " `username` varchar(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "UNIQUE KEY(`userId`)\n"
+ "COMMENT 'OLAP'\n"
Expand Down

0 comments on commit f3d9a84

Please sign in to comment.