diff --git a/fe/.idea/vcs.xml b/fe/.idea/vcs.xml
index 7b2cdb1cbbd39ab..8c0f59e92e6c5bd 100644
--- a/fe/.idea/vcs.xml
+++ b/fe/.idea/vcs.xml
@@ -1,20 +1,4 @@
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/fe/fe-common/src/main/java/org/apache/doris/catalog/AggStateType.java b/fe/fe-common/src/main/java/org/apache/doris/catalog/AggStateType.java
index d2c5b625ca62cf7..9c38e12f9988672 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/catalog/AggStateType.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/catalog/AggStateType.java
@@ -76,17 +76,18 @@ public boolean getResultIsNullable() {
@Override
public String toSql(int depth) {
StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.append("AGG_STATE<").append(functionName).append("(");
+ stringBuilder.append("agg_state<").append(functionName).append("(");
for (int i = 0; i < subTypes.size(); i++) {
if (i > 0) {
stringBuilder.append(", ");
}
stringBuilder.append(subTypes.get(i).toSql());
if (subTypeNullables.get(i)) {
- stringBuilder.append(" NULL");
+ stringBuilder.append(" null");
}
}
- stringBuilder.append(")>");
+ stringBuilder.append(")");
+ stringBuilder.append(">");
return stringBuilder.toString();
}
diff --git a/fe/fe-common/src/main/java/org/apache/doris/catalog/ArrayType.java b/fe/fe-common/src/main/java/org/apache/doris/catalog/ArrayType.java
index 19a55a067555f53..86e95ff5cb9be97 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/catalog/ArrayType.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/catalog/ArrayType.java
@@ -130,11 +130,13 @@ public static ArrayType create(Type type, boolean containsNull) {
@Override
public String toSql(int depth) {
+ StringBuilder typeStr = new StringBuilder();
+ typeStr.append("array<").append(itemType.toSql(depth + 1));
if (!containsNull) {
- return "ARRAY<" + itemType.toSql(depth + 1) + " NOT NULL>";
- } else {
- return "ARRAY<" + itemType.toSql(depth + 1) + ">";
+ typeStr.append(" not null");
}
+ typeStr.append(">");
+ return typeStr.toString();
}
@Override
@@ -213,7 +215,7 @@ public boolean supportSubType(Type subType) {
@Override
public String toString() {
- return String.format("ARRAY<%s>", itemType.toString());
+ return String.format("array<%s>", itemType.toString());
}
@Override
diff --git a/fe/fe-common/src/main/java/org/apache/doris/catalog/MapType.java b/fe/fe-common/src/main/java/org/apache/doris/catalog/MapType.java
index 53cd926ebe7197c..c0a96a2b70911fc 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/catalog/MapType.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/catalog/MapType.java
@@ -106,9 +106,9 @@ public boolean equals(Object other) {
@Override
public String toSql(int depth) {
if (depth >= MAX_NESTING_DEPTH) {
- return "MAP<...>";
+ return "map<...>";
}
- return String.format("MAP<%s,%s>",
+ return String.format("map<%s,%s>",
keyType.toSql(depth + 1), valueType.toSql(depth + 1));
}
@@ -176,7 +176,7 @@ public Type specializeTemplateType(Type specificType, Map speciali
@Override
public String toString() {
- return String.format("MAP<%s,%s>",
+ return String.format("map<%s,%s>",
keyType.toString(), valueType.toString());
}
diff --git a/fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java b/fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java
index cf57b45b3d1bed9..e9f1b50c0dfad87 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java
@@ -579,36 +579,34 @@ public static ScalarType createHllType() {
public String toString() {
if (type == PrimitiveType.CHAR) {
if (isWildcardChar()) {
- return "CHARACTER(" + MAX_CHAR_LENGTH + ")";
+ return "character(" + MAX_CHAR_LENGTH + ")";
}
- return "CHAR(" + len + ")";
+ return "char(" + len + ")";
} else if (type == PrimitiveType.DECIMALV2) {
if (isWildcardDecimal()) {
- return "DECIMAL(*, *)";
+ return "decimal(*,*)";
}
- return "DECIMAL(" + precision + ", " + scale + ")";
+ return "decimal(" + precision + "," + scale + ")";
} else if (type.isDecimalV3Type()) {
if (isWildcardDecimal()) {
- return "DECIMALV3(*, *)";
+ return "decimalv3(*,*)";
}
- return "DECIMALV3(" + precision + ", " + scale + ")";
+ return "decimalv3(" + precision + "," + scale + ")";
} else if (type == PrimitiveType.DATETIMEV2) {
- return "DATETIMEV2(" + scale + ")";
+ return "datetimev2(" + scale + ")";
} else if (type == PrimitiveType.TIMEV2) {
- return "TIMEV2(" + scale + ")";
+ return "timev2(" + scale + ")";
} else if (type == PrimitiveType.VARCHAR) {
if (isWildcardVarchar()) {
- return "VARCHAR(" + MAX_VARCHAR_LENGTH + ")";
+ return "varchar(" + MAX_VARCHAR_LENGTH + ")";
}
- return "VARCHAR(" + len + ")";
+ return "varchar(" + len + ")";
} else if (type == PrimitiveType.STRING) {
- return "TEXT";
+ return "text";
} else if (type == PrimitiveType.JSONB) {
- return "JSON";
- } else if (type == PrimitiveType.VARIANT) {
- return "VARIANT";
+ return "json";
}
- return type.toString();
+ return type.toString().toLowerCase();
}
@Override
@@ -617,73 +615,73 @@ public String toSql(int depth) {
switch (type) {
case CHAR:
if (isWildcardChar()) {
- stringBuilder.append("CHARACTER").append("(").append(MAX_CHAR_LENGTH).append(")");
+ stringBuilder.append("character").append("(").append(MAX_CHAR_LENGTH).append(")");
} else if (Strings.isNullOrEmpty(lenStr)) {
- stringBuilder.append("CHAR").append("(").append(len).append(")");
+ stringBuilder.append("char").append("(").append(len).append(")");
} else {
- stringBuilder.append("CHAR").append("(`").append(lenStr).append("`)");
+ stringBuilder.append("char").append("(`").append(lenStr).append("`)");
}
break;
case VARCHAR:
if (isWildcardVarchar()) {
- return "VARCHAR(" + MAX_VARCHAR_LENGTH + ")";
+ return "varchar(" + MAX_VARCHAR_LENGTH + ")";
} else if (Strings.isNullOrEmpty(lenStr)) {
- stringBuilder.append("VARCHAR").append("(").append(len).append(")");
+ stringBuilder.append("varchar").append("(").append(len).append(")");
} else {
- stringBuilder.append("VARCHAR").append("(`").append(lenStr).append("`)");
+ stringBuilder.append("varchar").append("(`").append(lenStr).append("`)");
}
break;
case DECIMALV2:
if (Strings.isNullOrEmpty(precisionStr)) {
- stringBuilder.append("DECIMAL").append("(").append(precision)
- .append(", ").append(scale).append(")");
+ stringBuilder.append("decimalv2").append("(").append(precision)
+ .append(",").append(scale).append(")");
} else if (!Strings.isNullOrEmpty(precisionStr) && !Strings.isNullOrEmpty(scaleStr)) {
- stringBuilder.append("DECIMAL").append("(`").append(precisionStr)
- .append("`, `").append(scaleStr).append("`)");
+ stringBuilder.append("decimalv2").append("(`").append(precisionStr)
+ .append("`,`").append(scaleStr).append("`)");
} else {
- stringBuilder.append("DECIMAL").append("(`").append(precisionStr).append("`)");
+ stringBuilder.append("decimalv2").append("(`").append(precisionStr).append("`)");
}
break;
case DECIMAL32:
case DECIMAL64:
case DECIMAL128:
case DECIMAL256:
- String typeName = "DECIMALV3";
+ String typeName = "decimalv3";
if (Strings.isNullOrEmpty(precisionStr)) {
stringBuilder.append(typeName).append("(").append(precision)
- .append(", ").append(scale).append(")");
+ .append(",").append(scale).append(")");
} else if (!Strings.isNullOrEmpty(precisionStr) && !Strings.isNullOrEmpty(scaleStr)) {
stringBuilder.append(typeName).append("(`").append(precisionStr)
- .append("`, `").append(scaleStr).append("`)");
+ .append("`,`").append(scaleStr).append("`)");
} else {
stringBuilder.append(typeName).append("(`").append(precisionStr).append("`)");
}
break;
case DATETIMEV2:
- stringBuilder.append("DATETIMEV2").append("(").append(scale).append(")");
+ stringBuilder.append("datetimev2").append("(").append(scale).append(")");
break;
case TIME:
- stringBuilder.append("TIME");
+ stringBuilder.append("time");
break;
case TIMEV2:
- stringBuilder.append("TIME").append("(").append(scale).append(")");
+ stringBuilder.append("time").append("(").append(scale).append(")");
break;
case BOOLEAN:
- return "BOOLEAN";
+ return "boolean";
case TINYINT:
- return "TINYINT";
+ return "tinyint";
case SMALLINT:
- return "SMALLINT";
+ return "smallint";
case INT:
- return "INT";
+ return "int";
case BIGINT:
- return "BIGINT";
+ return "bigint";
case LARGEINT:
- return "LARGEINT";
+ return "largeint";
case IPV4:
- return "IPV4";
+ return "ipv4";
case IPV6:
- return "IPV6";
+ return "ipv6";
case FLOAT:
case DOUBLE:
case DATE:
@@ -694,15 +692,14 @@ public String toSql(int depth) {
case VARIANT:
case QUANTILE_STATE:
case LAMBDA_FUNCTION:
- case ARRAY:
case NULL_TYPE:
- stringBuilder.append(type);
+ stringBuilder.append(type.toString().toLowerCase());
break;
case STRING:
- stringBuilder.append("TEXT");
+ stringBuilder.append("text");
break;
case JSONB:
- stringBuilder.append("JSON");
+ stringBuilder.append("json");
break;
default:
stringBuilder.append("unknown type: ").append(type);
diff --git a/fe/fe-common/src/main/java/org/apache/doris/catalog/StructField.java b/fe/fe-common/src/main/java/org/apache/doris/catalog/StructField.java
index 1f30b35dadfb954..ecbfd30ca23538e 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/catalog/StructField.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/catalog/StructField.java
@@ -88,7 +88,7 @@ public boolean getContainsNull() {
public String toSql(int depth) {
String typeSql;
if (depth < Type.MAX_NESTING_DEPTH) {
- typeSql = !containsNull ? "not_null(" + type.toSql(depth) + ")" : type.toSql(depth);
+ typeSql = type.toSql(depth + 1) + (!containsNull ? " not null" : "");
} else {
typeSql = "...";
}
@@ -97,7 +97,7 @@ public String toSql(int depth) {
sb.append(":").append(typeSql);
}
if (!Strings.isNullOrEmpty(comment)) {
- sb.append(String.format(" COMMENT '%s'", comment));
+ sb.append(String.format(" comment '%s'", comment));
}
return sb.toString();
}
diff --git a/fe/fe-common/src/main/java/org/apache/doris/catalog/StructType.java b/fe/fe-common/src/main/java/org/apache/doris/catalog/StructType.java
index e447f2dceebdb6b..724310cca0af55a 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/catalog/StructType.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/catalog/StructType.java
@@ -78,13 +78,13 @@ public StructType() {
@Override
public String toSql(int depth) {
if (depth >= MAX_NESTING_DEPTH) {
- return "STRUCT<...>";
+ return "struct<...>";
}
ArrayList fieldsSql = Lists.newArrayList();
for (StructField f : fields) {
fieldsSql.add(f.toSql(depth + 1));
}
- return String.format("STRUCT<%s>", Joiner.on(",").join(fieldsSql));
+ return String.format("struct<%s>", Joiner.on(",").join(fieldsSql));
}
@Override
@@ -331,7 +331,7 @@ public String toString() {
for (StructField f : fields) {
fieldsSql.add(f.toString());
}
- return String.format("STRUCT<%s>", Joiner.on(",").join(fieldsSql));
+ return String.format("struct<%s>", Joiner.on(",").join(fieldsSql));
}
@Override
diff --git a/fe/fe-common/src/main/java/org/apache/doris/catalog/Type.java b/fe/fe-common/src/main/java/org/apache/doris/catalog/Type.java
index f2eccaaf54afa39..1831981f9f26dc1 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/catalog/Type.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/catalog/Type.java
@@ -451,32 +451,34 @@ public boolean typeContainsPrecision() {
}
public String hideVersionForVersionColumn(Boolean isToSql) {
- if (isDatetimeV2()) {
- StringBuilder typeStr = new StringBuilder("DATETIME");
+ if (isDatetime() || isDatetimeV2()) {
+ StringBuilder typeStr = new StringBuilder("datetime");
if (((ScalarType) this).getScalarScale() > 0) {
typeStr.append("(").append(((ScalarType) this).getScalarScale()).append(")");
}
return typeStr.toString();
- } else if (isDateV2()) {
- return "DATE";
- } else if (isDecimalV3()) {
- StringBuilder typeStr = new StringBuilder("DECIMAL");
+ } else if (isDate() || isDateV2()) {
+ return "date";
+ } else if (isDecimalV2() || isDecimalV3()) {
+ StringBuilder typeStr = new StringBuilder("decimal");
ScalarType sType = (ScalarType) this;
int scale = sType.getScalarScale();
int precision = sType.getScalarPrecision();
- // not default
- if (!sType.isDefaultDecimal()) {
- typeStr.append("(").append(precision).append(", ").append(scale)
- .append(")");
+ typeStr.append("(").append(precision).append(",").append(scale).append(")");
+ return typeStr.toString();
+ } else if (isTime() || isTimeV2()) {
+ StringBuilder typeStr = new StringBuilder("time");
+ if (((ScalarType) this).getScalarScale() > 0) {
+ typeStr.append("(").append(((ScalarType) this).getScalarScale()).append(")");
}
return typeStr.toString();
} else if (isArrayType()) {
String nestedDesc = ((ArrayType) this).getItemType().hideVersionForVersionColumn(isToSql);
- return "ARRAY<" + nestedDesc + ">";
+ return "array<" + nestedDesc + ">";
} else if (isMapType()) {
String keyDesc = ((MapType) this).getKeyType().hideVersionForVersionColumn(isToSql);
String valueDesc = ((MapType) this).getValueType().hideVersionForVersionColumn(isToSql);
- return "MAP<" + keyDesc + "," + valueDesc + ">";
+ return "map<" + keyDesc + "," + valueDesc + ">";
} else if (isStructType()) {
List fieldDesc = new ArrayList<>();
StructType structType = (StructType) this;
@@ -484,7 +486,7 @@ public String hideVersionForVersionColumn(Boolean isToSql) {
StructField field = structType.getFields().get(i);
fieldDesc.add(field.getName() + ":" + field.getType().hideVersionForVersionColumn(isToSql));
}
- return "STRUCT<" + StringUtils.join(fieldDesc, ",") + ">";
+ return "struct<" + StringUtils.join(fieldDesc, ",") + ">";
} else if (isToSql) {
return this.toSql();
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExpressionFunctions.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExpressionFunctions.java
index 7296516907a6a9e..fdf109d2909001d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExpressionFunctions.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExpressionFunctions.java
@@ -207,7 +207,7 @@ private void registerFEFunction(ImmutableMultimap.Builder argTypes = new ArrayList<>();
for (String type : annotation.argTypes()) {
argTypes.add(ScalarType.createType(type));
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ColumnType.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ColumnType.java
index d4813dbc8200fff..954e2e2c901a5cf 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ColumnType.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ColumnType.java
@@ -192,7 +192,7 @@ public static void write(DataOutput out, Type type) throws IOException {
}
public static Type read(DataInput in) throws IOException {
- PrimitiveType primitiveType = PrimitiveType.valueOf(Text.readString(in));
+ PrimitiveType primitiveType = PrimitiveType.valueOf(Text.readString(in).toUpperCase());
if (primitiveType == PrimitiveType.ARRAY) {
Type itermType = read(in);
boolean containsNull = in.readBoolean();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionKey.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionKey.java
index ff5fa91ee6ca6e1..9f129235dfa780e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionKey.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionKey.java
@@ -396,11 +396,11 @@ public void write(DataOutput out) throws IOException {
public void readFields(DataInput in) throws IOException {
int count = in.readInt();
for (int i = 0; i < count; i++) {
- PrimitiveType type = PrimitiveType.valueOf(Text.readString(in));
+ PrimitiveType type = PrimitiveType.valueOf(Text.readString(in).toUpperCase());
boolean isMax = in.readBoolean();
if (type == PrimitiveType.NULL_TYPE) {
String realType = StringLiteral.read(in).getStringValue();
- type = PrimitiveType.valueOf(realType);
+ type = PrimitiveType.valueOf(realType.toUpperCase());
types.add(type);
keys.add(NullLiteral.create(Type.fromPrimitiveType(type)));
continue;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/Histogram.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/Histogram.java
index 2068c368c40f52e..4c81d2833d05252 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/statistics/Histogram.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/Histogram.java
@@ -115,7 +115,7 @@ public static Histogram deserializeFromJson(String json) {
JsonObject histogramJson = JsonParser.parseString(json).getAsJsonObject();
String typeStr = histogramJson.get("data_type").getAsString();
- Type dataType = Type.fromPrimitiveType(PrimitiveType.valueOf(typeStr));
+ Type dataType = Type.fromPrimitiveType(PrimitiveType.valueOf(typeStr.toUpperCase()));
histogramBuilder.setDataType(dataType);
float sampleRate = histogramJson.get("sample_rate").getAsFloat();
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnsClauseTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnsClauseTest.java
index 06a4fe601381f6d..194dbd899badc5f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnsClauseTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnsClauseTest.java
@@ -48,21 +48,21 @@ public void testNormal() throws AnalysisException {
columns.add(definition);
AddColumnsClause clause = new AddColumnsClause(columns, null, null);
clause.analyze(analyzer);
- Assert.assertEquals("ADD COLUMN (`col1` INT NOT NULL DEFAULT \"0\" COMMENT \"\", "
- + "`col2` INT NOT NULL DEFAULT \"0\" COMMENT \"\")", clause.toString());
+ Assert.assertEquals("ADD COLUMN (`col1` int NOT NULL DEFAULT \"0\" COMMENT \"\", "
+ + "`col2` int NOT NULL DEFAULT \"0\" COMMENT \"\")", clause.toString());
clause = new AddColumnsClause(columns, "", null);
clause.analyze(analyzer);
- Assert.assertEquals("ADD COLUMN (`col1` INT NOT NULL DEFAULT \"0\" COMMENT \"\", "
- + "`col2` INT NOT NULL DEFAULT \"0\" COMMENT \"\")",
+ Assert.assertEquals("ADD COLUMN (`col1` int NOT NULL DEFAULT \"0\" COMMENT \"\", "
+ + "`col2` int NOT NULL DEFAULT \"0\" COMMENT \"\")",
clause.toString());
Assert.assertNull(clause.getRollupName());
clause = new AddColumnsClause(columns, "testTable", null);
clause.analyze(analyzer);
- Assert.assertEquals("ADD COLUMN (`col1` INT NOT NULL DEFAULT \"0\" COMMENT \"\", "
- + "`col2` INT NOT NULL DEFAULT \"0\" COMMENT \"\") IN `testTable`",
+ Assert.assertEquals("ADD COLUMN (`col1` int NOT NULL DEFAULT \"0\" COMMENT \"\", "
+ + "`col2` int NOT NULL DEFAULT \"0\" COMMENT \"\") IN `testTable`",
clause.toString());
Assert.assertNull(clause.getProperties());
Assert.assertEquals("testTable", clause.getRollupName());
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ColumnDefTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ColumnDefTest.java
index fad5787a37bc792..fc9bd4a7ac6c14e 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ColumnDefTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ColumnDefTest.java
@@ -61,7 +61,7 @@ public void testNormal() throws AnalysisException {
ColumnDef column = new ColumnDef("col", intCol);
column.analyze(true);
- Assert.assertEquals("`col` INT NOT NULL COMMENT \"\"", column.toString());
+ Assert.assertEquals("`col` int NOT NULL COMMENT \"\"", column.toString());
Assert.assertEquals("col", column.getName());
Assert.assertEquals(PrimitiveType.INT, column.getType().getPrimitiveType());
Assert.assertNull(column.getAggregateType());
@@ -72,14 +72,14 @@ public void testNormal() throws AnalysisException {
column.analyze(true);
Assert.assertNull(column.getAggregateType());
Assert.assertEquals("10", column.getDefaultValue());
- Assert.assertEquals("`col` INT NOT NULL DEFAULT \"10\" COMMENT \"\"", column.toSql());
+ Assert.assertEquals("`col` int NOT NULL DEFAULT \"10\" COMMENT \"\"", column.toSql());
// agg
column = new ColumnDef("col", floatCol, false, AggregateType.SUM, false, new DefaultValue(true, "10"), "");
column.analyze(true);
Assert.assertEquals("10", column.getDefaultValue());
Assert.assertEquals(AggregateType.SUM, column.getAggregateType());
- Assert.assertEquals("`col` FLOAT SUM NOT NULL DEFAULT \"10\" COMMENT \"\"", column.toSql());
+ Assert.assertEquals("`col` float SUM NOT NULL DEFAULT \"10\" COMMENT \"\"", column.toSql());
}
@Test
@@ -89,14 +89,14 @@ public void testReplaceIfNotNull() throws AnalysisException {
ColumnDef column = new ColumnDef("col", intCol, false, AggregateType.REPLACE_IF_NOT_NULL, false, DefaultValue.NOT_SET, "");
column.analyze(true);
Assert.assertEquals(AggregateType.REPLACE_IF_NOT_NULL, column.getAggregateType());
- Assert.assertEquals("`col` INT REPLACE_IF_NOT_NULL NULL DEFAULT \"null\" COMMENT \"\"", column.toSql());
+ Assert.assertEquals("`col` int REPLACE_IF_NOT_NULL NULL DEFAULT \"null\" COMMENT \"\"", column.toSql());
} // CHECKSTYLE IGNORE THIS LINE
{ // CHECKSTYLE IGNORE THIS LINE
// not allow null
ColumnDef column = new ColumnDef("col", intCol, false, AggregateType.REPLACE_IF_NOT_NULL, false, new DefaultValue(true, "10"), "");
column.analyze(true);
Assert.assertEquals(AggregateType.REPLACE_IF_NOT_NULL, column.getAggregateType());
- Assert.assertEquals("`col` INT REPLACE_IF_NOT_NULL NULL DEFAULT \"10\" COMMENT \"\"", column.toSql());
+ Assert.assertEquals("`col` int REPLACE_IF_NOT_NULL NULL DEFAULT \"10\" COMMENT \"\"", column.toSql());
} // CHECKSTYLE IGNORE THIS LINE
}
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableAsSelectStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableAsSelectStmtTest.java
index f13a72b1f024bdb..e9e2d3a8ee777f2 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableAsSelectStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableAsSelectStmtTest.java
@@ -83,9 +83,9 @@ public void testDecimal() throws Exception {
+ "as select * from `test`.`decimal_table`";
createTableAsSelect(selectFromDecimal);
Assertions.assertEquals("CREATE TABLE `select_decimal_table` (\n"
- + " `userId` VARCHAR(255) NOT NULL,\n"
+ + " `userId` varchar(255) NOT NULL,\n"
+ " `amount_decimal` "
- + "DECIMAL" + "(10, 2) NOT NULL\n"
+ + "decimal" + "(10,2) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
@@ -110,7 +110,7 @@ public void testDecimal() throws Exception {
if (Config.enable_decimal_conversion) {
Assertions.assertEquals(
"CREATE TABLE `select_decimal_table_1` (\n"
- + " `__sum_0` DECIMAL(38, 2) NULL\n"
+ + " `__sum_0` decimal(38,2) NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`__sum_0`)\n"
+ "DISTRIBUTED BY HASH(`__sum_0`) BUCKETS 10\n"
@@ -170,8 +170,8 @@ public void testVarchar() throws Exception {
createTableAsSelect(selectFromVarchar);
ShowResultSet showResultSet = showCreateTableByName("select_varchar");
Assertions.assertEquals("CREATE TABLE `select_varchar` (\n"
- + " `userId` VARCHAR(255) NOT NULL,\n"
- + " `username` VARCHAR(255) NOT NULL\n"
+ + " `userId` varchar(255) NOT NULL,\n"
+ + " `username` varchar(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
@@ -199,7 +199,7 @@ public void testFunction() throws Exception {
ShowResultSet showResultSet1 = showCreateTableByName("select_function_1");
Assertions.assertEquals(
"CREATE TABLE `select_function_1` (\n"
- + " `__count_0` BIGINT NULL\n"
+ + " `__count_0` bigint NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`__count_0`)\n"
+ "DISTRIBUTED BY HASH(`__count_0`) BUCKETS 10\n"
@@ -225,11 +225,11 @@ public void testFunction() throws Exception {
ShowResultSet showResultSet2 = showCreateTableByName("select_function_2");
Assertions.assertEquals(
"CREATE TABLE `select_function_2` (\n"
- + " `__sum_0` BIGINT NULL,\n"
- + " `__sum_1` BIGINT NULL,\n"
- + " `__sum_2` BIGINT NULL,\n"
- + " `__count_3` BIGINT NULL,\n"
- + " `__count_4` BIGINT NULL\n"
+ + " `__sum_0` bigint NULL,\n"
+ + " `__sum_1` bigint NULL,\n"
+ + " `__sum_2` bigint NULL,\n"
+ + " `__count_3` bigint NULL,\n"
+ + " `__count_4` bigint NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`__sum_0`, `__sum_1`, `__sum_2`)\n"
+ "DISTRIBUTED BY HASH(`__sum_0`) BUCKETS 10\n"
@@ -256,7 +256,7 @@ public void testAlias() throws Exception {
createTableAsSelect(selectAlias1);
ShowResultSet showResultSet1 = showCreateTableByName("select_alias_1");
Assertions.assertEquals("CREATE TABLE `select_alias_1` (\n"
- + " `amount` BIGINT NULL\n"
+ + " `amount` bigint NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`amount`)\n"
+ "DISTRIBUTED BY HASH(`amount`) BUCKETS 10\n"
@@ -278,8 +278,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(255) NOT NULL,\n"
- + " `username` VARCHAR(255) NOT NULL\n"
+ + " `alias_name` varchar(255) NOT NULL,\n"
+ + " `username` varchar(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`alias_name`)\n"
+ "DISTRIBUTED BY HASH(`alias_name`) BUCKETS 10\n"
@@ -307,9 +307,9 @@ public void testJoin() throws Exception {
createTableAsSelect(selectFromJoin);
ShowResultSet showResultSet = showCreateTableByName("select_join");
Assertions.assertEquals("CREATE TABLE `select_join` (\n"
- + " `userId` VARCHAR(255) NOT NULL,\n"
- + " `username` VARCHAR(255) NOT NULL,\n"
- + " `status` INT NOT NULL\n"
+ + " `userId` varchar(255) NOT NULL,\n"
+ + " `username` varchar(255) NOT NULL,\n"
+ + " `status` int NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
@@ -333,10 +333,10 @@ public void testJoin() throws Exception {
createTableAsSelect(selectFromJoin1);
ShowResultSet showResultSet1 = showCreateTableByName("select_join1");
Assertions.assertEquals("CREATE TABLE `select_join1` (\n"
- + " `userId1` VARCHAR(255) NOT NULL,\n"
- + " `userId2` VARCHAR(255) NOT NULL,\n"
- + " `username` VARCHAR(255) NOT NULL,\n"
- + " `status` INT NOT NULL\n"
+ + " `userId1` varchar(255) NOT NULL,\n"
+ + " `userId2` varchar(255) NOT NULL,\n"
+ + " `username` varchar(255) NOT NULL,\n"
+ + " `status` int NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId1`)\n"
+ "DISTRIBUTED BY HASH(`userId1`) BUCKETS 10\n"
@@ -365,9 +365,9 @@ public void testName() throws Exception {
createTableAsSelect(selectFromName);
ShowResultSet showResultSet = showCreateTableByName("select_name");
Assertions.assertEquals("CREATE TABLE `select_name` (\n"
- + " `user` VARCHAR(255) NOT NULL,\n"
- + " `testname` VARCHAR(255) NOT NULL,\n"
- + " `userstatus` INT NOT NULL\n"
+ + " `user` varchar(255) NOT NULL,\n"
+ + " `testname` varchar(255) NOT NULL,\n"
+ + " `userstatus` int NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`user`)\n"
+ "DISTRIBUTED BY HASH(`user`) BUCKETS 10\n"
@@ -395,7 +395,7 @@ public void testUnion() throws Exception {
ShowResultSet showResultSet = showCreateTableByName("select_union");
Assertions.assertEquals(
"CREATE TABLE `select_union` (\n"
- + " `userId` VARCHAR(255) NULL\n"
+ + " `userId` varchar(255) NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
@@ -422,7 +422,7 @@ public void testCte() throws Exception {
ShowResultSet showResultSet = showCreateTableByName("select_cte");
Assertions.assertEquals(
"CREATE TABLE `select_cte` (\n"
- + " `userId` VARCHAR(255) NOT NULL\n"
+ + " `userId` varchar(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
@@ -445,7 +445,7 @@ public void testCte() throws Exception {
createTableAsSelect(selectFromCteAndUnion);
ShowResultSet showResultSet1 = showCreateTableByName("select_cte_union");
Assertions.assertEquals("CREATE TABLE `select_cte_union` (\n"
- + " `id` TINYINT NULL\n"
+ + " `id` tinyint NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`id`)\n"
+ "DISTRIBUTED BY HASH(`id`) BUCKETS 10\n"
@@ -472,8 +472,8 @@ public void testPartition() throws Exception {
createTableAsSelect(selectFromPartition);
ShowResultSet showResultSet = showCreateTableByName("selectPartition");
Assertions.assertEquals("CREATE TABLE `selectPartition` (\n"
- + " `userId` VARCHAR(255) NOT NULL,\n"
- + " `username` VARCHAR(255) NOT NULL\n"
+ + " `userId` varchar(255) NOT NULL,\n"
+ + " `username` varchar(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
+ "PARTITION BY LIST(`userId`)\n"
@@ -502,8 +502,8 @@ public void testDefaultTimestamp() throws Exception {
createTableAsSelect(createSql);
ShowResultSet showResultSet = showCreateTableByName("test_default_timestamp");
Assertions.assertEquals("CREATE TABLE `test_default_timestamp` (\n"
- + " `userId` VARCHAR(255) NOT NULL,\n"
- + " `date` DATETIME"
+ + " `userId` varchar(255) NOT NULL,\n"
+ + " `date` datetime"
+ " NULL DEFAULT CURRENT_TIMESTAMP\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`userId`)\n"
@@ -532,7 +532,7 @@ public void testAggValue() throws Exception {
ShowResultSet showResultSet = showCreateTableByName("test_agg_value");
Assertions.assertEquals(
"CREATE TABLE `test_agg_value` (\n"
- + " `username` VARCHAR(255) NOT NULL\n"
+ + " `username` varchar(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`username`)\n"
+ "DISTRIBUTED BY HASH(`username`) BUCKETS 10\n"
@@ -560,8 +560,8 @@ public void testUseKeyType() throws Exception {
ShowResultSet showResultSet = showCreateTableByName("test_use_key_type");
Assertions.assertEquals(
"CREATE TABLE `test_use_key_type` (\n"
- + " `userId` VARCHAR(255) NOT NULL,\n"
- + " `username` VARCHAR(255) NOT NULL\n"
+ + " `userId` varchar(255) NOT NULL,\n"
+ + " `username` varchar(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "UNIQUE KEY(`userId`)\n"
+ "DISTRIBUTED BY HASH(`userId`) BUCKETS 10\n"
@@ -614,9 +614,9 @@ public void testQuerySchema() throws Exception {
Env.getDdlStmt(tbl, createTableStmts, null, null, false, true, -1L);
createStmts.add(createTableStmts.get(0));
if (tbl.getName().equals("qs1")) {
- Assert.assertEquals("CREATE TABLE `qs1` (\n"
- + " `k1` INT NULL,\n"
- + " `k2` INT NULL\n"
+ Assertions.assertEquals("CREATE TABLE `qs1` (\n"
+ + " `k1` int NULL,\n"
+ + " `k2` int NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`k1`, `k2`)\n"
+ "DISTRIBUTED BY HASH(`k1`) BUCKETS 1\n"
@@ -632,12 +632,11 @@ public void testQuerySchema() throws Exception {
+ "\"enable_single_replica_compaction\" = \"false\",\n"
+ "\"group_commit_interval_ms\" = \"10000\",\n"
+ "\"group_commit_data_bytes\" = \"134217728\"\n"
- + ");",
- createTableStmts.get(0));
+ + ");", createTableStmts.get(0));
} else {
- Assert.assertEquals("CREATE TABLE `qs2` (\n"
- + " `k1` INT NULL,\n"
- + " `k2` INT NULL\n"
+ Assertions.assertEquals("CREATE TABLE `qs2` (\n"
+ + " `k1` int NULL,\n"
+ + " `k2` int NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`k1`, `k2`)\n"
+ "DISTRIBUTED BY HASH(`k1`) BUCKETS 1\n"
@@ -653,8 +652,7 @@ public void testQuerySchema() throws Exception {
+ "\"enable_single_replica_compaction\" = \"false\",\n"
+ "\"group_commit_interval_ms\" = \"10000\",\n"
+ "\"group_commit_data_bytes\" = \"134217728\"\n"
- + ");",
- createTableStmts.get(0));
+ + ");", createTableStmts.get(0));
}
}
Assert.assertEquals(2, createStmts.size());
@@ -670,9 +668,9 @@ public void testVarcharLength() throws Exception {
String showStr = showResultSet.getResultRows().get(0).get(1);
Assertions.assertEquals(
"CREATE TABLE `varchar_len1` (\n"
- + " `__literal_0` VARCHAR(65533) NULL,\n"
- + " `__concat_1` VARCHAR(65533) NULL,\n"
- + " `userId` VARCHAR(255) NOT NULL\n"
+ + " `__literal_0` varchar(65533) NULL,\n"
+ + " `__concat_1` varchar(65533) NULL,\n"
+ + " `userId` varchar(255) NOT NULL\n"
+ ") ENGINE=OLAP\n"
+ "DUPLICATE KEY(`__literal_0`)\n"
+ "DISTRIBUTED BY HASH(`__literal_0`) BUCKETS 10\n"
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableStmtTest.java
index 8bc1504b6a114fb..38b68727eb4bb5b 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/CreateTableStmtTest.java
@@ -412,8 +412,8 @@ public void testToSql() {
properties, null, "", null);
String createTableSql = "CREATE TABLE IF NOT EXISTS `demo`.`testTosql1` (\n"
- + " `a` BIGINT NOT NULL COMMENT \"\",\n"
- + " `b` INT NOT NULL COMMENT \"\"\n"
+ + " `a` bigint NOT NULL COMMENT \"\",\n"
+ + " `b` int NOT NULL COMMENT \"\"\n"
+ ") ENGINE = olap\n"
+ "AGGREGATE KEY(`a`)\n"
+ "PROPERTIES (\"replication_num\" = \"1\")";
@@ -441,14 +441,14 @@ public void testToSql() {
tableName, columnDefs, engineName, keysDesc, null, null,
properties, null, "", null);
createTableSql = "CREATE TABLE `demo`.`testTosql2` (\n"
- + " `a` BIGINT NOT NULL COMMENT \"\",\n"
- + " `b` INT NOT NULL COMMENT \"\",\n"
- + " `c` TEXT NULL COMMENT \"\",\n"
- + " `d` DOUBLE NULL COMMENT \"\",\n"
- + " `e` DECIMALV3(38, 0) NOT NULL COMMENT \"\",\n"
- + " `f` DATE NOT NULL COMMENT \"\",\n"
- + " `g` SMALLINT NOT NULL COMMENT \"\",\n"
- + " `h` BOOLEAN NOT NULL COMMENT \"\"\n"
+ + " `a` bigint NOT NULL COMMENT \"\",\n"
+ + " `b` int NOT NULL COMMENT \"\",\n"
+ + " `c` text NULL COMMENT \"\",\n"
+ + " `d` double NULL COMMENT \"\",\n"
+ + " `e` decimalv3(38,0) NOT NULL COMMENT \"\",\n"
+ + " `f` date NOT NULL COMMENT \"\",\n"
+ + " `g` smallint NOT NULL COMMENT \"\",\n"
+ + " `h` boolean NOT NULL COMMENT \"\"\n"
+ ") ENGINE = olap\n"
+ "DUPLICATE KEY(`a`, `d`, `f`)\n"
+ "PROPERTIES (\"replication_num\" = \"10\")";
@@ -475,8 +475,8 @@ public void testToSqlWithComment() {
tableName, columnDefs, engineName, keysDesc, null, null,
properties, null, "xxx", null);
String createTableSql = "CREATE TABLE IF NOT EXISTS `demo`.`testToSqlWithComment1` (\n"
- + " `a` BIGINT NOT NULL COMMENT \"\",\n"
- + " `b` INT NOT NULL COMMENT \"\"\n"
+ + " `a` bigint NOT NULL COMMENT \"\",\n"
+ + " `b` int NOT NULL COMMENT \"\"\n"
+ ") ENGINE = olap\n"
+ "AGGREGATE KEY(`a`)\n"
+ "COMMENT \"xxx\"\n"
@@ -503,14 +503,14 @@ public void testToSqlWithComment() {
tableName, columnDefs, engineName, keysDesc, null, null,
properties, null, "xxx", null);
createTableSql = "CREATE TABLE `demo`.`testToSqlWithComment2` (\n"
- + " `a` BIGINT NOT NULL COMMENT \"\",\n"
- + " `b` INT NOT NULL COMMENT \"\",\n"
- + " `c` TEXT NULL COMMENT \"\",\n"
- + " `d` DOUBLE NULL COMMENT \"\",\n"
- + " `e` DECIMALV3(38, 0) NOT NULL COMMENT \"\",\n"
- + " `f` DATE NOT NULL COMMENT \"\",\n"
- + " `g` SMALLINT NOT NULL COMMENT \"\",\n"
- + " `h` BOOLEAN NOT NULL COMMENT \"\"\n"
+ + " `a` bigint NOT NULL COMMENT \"\",\n"
+ + " `b` int NOT NULL COMMENT \"\",\n"
+ + " `c` text NULL COMMENT \"\",\n"
+ + " `d` double NULL COMMENT \"\",\n"
+ + " `e` decimalv3(38,0) NOT NULL COMMENT \"\",\n"
+ + " `f` date NOT NULL COMMENT \"\",\n"
+ + " `g` smallint NOT NULL COMMENT \"\",\n"
+ + " `h` boolean NOT NULL COMMENT \"\"\n"
+ ") ENGINE = olap\n"
+ "DUPLICATE KEY(`a`, `d`, `f`)\n"
+ "COMMENT \"xxx\"\n"
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/MapLiteralTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/MapLiteralTest.java
index ed16560cf077db9..c36d9fcc0d25838 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/MapLiteralTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/MapLiteralTest.java
@@ -21,7 +21,7 @@
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.FormatOptions;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -65,50 +65,51 @@ public static void setUp() throws AnalysisException {
public void testGetStringValueForArray() throws AnalysisException {
FormatOptions options = FormatOptions.getDefault();
MapLiteral mapLiteral1 = new MapLiteral(intLiteral1, floatLiteral);
- Assert.assertEquals("{\"1\":\"2.15\"}", mapLiteral1.getStringValueForArray(options));
+ Assertions.assertEquals("{\"1\":\"2.15\"}", mapLiteral1.getStringValueForArray(options));
MapLiteral mapLiteral2 = new MapLiteral(boolLiteral, stringLiteral);
- Assert.assertEquals("{\"1\":\"shortstring\"}", mapLiteral2.getStringValueForArray(options));
+ Assertions.assertEquals("{\"1\":\"shortstring\"}", mapLiteral2.getStringValueForArray(options));
MapLiteral mapLiteral3 = new MapLiteral(largeIntLiteral, dateLiteral);
- Assert.assertEquals("{\"1000000000000000000000\":\"2022-10-10\"}", mapLiteral3.getStringValueForArray(options));
+ Assertions.assertEquals("{\"1000000000000000000000\":\"2022-10-10\"}", mapLiteral3.getStringValueForArray(options));
MapLiteral mapLiteral4 = new MapLiteral(nullLiteral, nullLiteral);
- Assert.assertEquals("{null:null}", mapLiteral4.getStringValueForArray(options));
+ Assertions.assertEquals("{null:null}", mapLiteral4.getStringValueForArray(options));
MapLiteral mapLiteral5 = new MapLiteral(datetimeLiteral, dateLiteral);
- Assert.assertEquals("{\"2022-10-10 12:10:10\":\"2022-10-10\"}", mapLiteral5.getStringValueForArray(options));
+ Assertions.assertEquals("{\"2022-10-10 12:10:10\":\"2022-10-10\"}",
+ mapLiteral5.getStringValueForArray(options));
MapLiteral mapLiteral6 = new MapLiteral();
- Assert.assertEquals("{}", mapLiteral6.getStringValueForArray(options));
+ Assertions.assertEquals("{}", mapLiteral6.getStringValueForArray(options));
MapLiteral mapLiteral7 = new MapLiteral(nullLiteral, intLiteral1);
- Assert.assertEquals("{null:\"1\"}", mapLiteral7.getStringValueForArray(options));
+ Assertions.assertEquals("{null:\"1\"}", mapLiteral7.getStringValueForArray(options));
MapLiteral mapLiteral8 = new MapLiteral(intLiteral1, nullLiteral);
- Assert.assertEquals("{\"1\":null}", mapLiteral8.getStringValueForArray(options));
+ Assertions.assertEquals("{\"1\":null}", mapLiteral8.getStringValueForArray(options));
MapLiteral mapLiteral10 = new MapLiteral(intLiteral1, arrayLiteral);
- Assert.assertEquals("{\"1\":[\"1\", \"2.15\"]}", mapLiteral10.getStringValueForArray(options));
+ Assertions.assertEquals("{\"1\":[\"1\", \"2.15\"]}", mapLiteral10.getStringValueForArray(options));
try {
new MapLiteral(arrayLiteral, floatLiteral);
} catch (Exception e) {
- Assert.assertEquals("errCode = 2, "
- + "detailMessage = Invalid key type in Map, not support ARRAY", e.getMessage());
+ Assertions.assertEquals("errCode = 2, "
+ + "detailMessage = Invalid key type in Map, not support array", e.getMessage());
}
MapLiteral mapLiteral11 = new MapLiteral(decimalLiteral1, mapLiteral);
- Assert.assertEquals("{\"1.0\":{\"1\":\"2.15\"}}", mapLiteral11.getStringValueForArray(options));
+ Assertions.assertEquals("{\"1.0\":{\"1\":\"2.15\"}}", mapLiteral11.getStringValueForArray(options));
try {
new MapLiteral(mapLiteral, decimalLiteral1);
} catch (Exception e) {
- Assert.assertEquals("errCode = 2, "
- + "detailMessage = Invalid key type in Map, not support MAP", e.getMessage());
+ Assertions.assertEquals("errCode = 2, "
+ + "detailMessage = Invalid key type in Map, not support map", e.getMessage());
}
MapLiteral mapLiteral13 = new MapLiteral(stringLiteral, structLiteral);
- Assert.assertEquals("{\"shortstring\":{\"1\", \"2.15\", \"1.0\", \"2022-10-10\"}}",
+ Assertions.assertEquals("{\"shortstring\":{\"1\", \"2.15\", \"1.0\", \"2022-10-10\"}}",
mapLiteral13.getStringValueForArray(options));
try {
new MapLiteral(structLiteral, stringLiteral);
} catch (Exception e) {
- Assert.assertEquals("errCode = 2, detailMessage = Invalid key type in Map, "
- + "not support STRUCT", e.getMessage());
+ Assertions.assertEquals("errCode = 2, detailMessage = Invalid key type in Map, "
+ + "not support struct", e.getMessage());
}
}
@@ -116,50 +117,50 @@ public void testGetStringValueForArray() throws AnalysisException {
public void testGetStringValueForArrayForPresto() throws AnalysisException {
FormatOptions options = FormatOptions.getForPresto();
MapLiteral mapLiteral1 = new MapLiteral(intLiteral1, floatLiteral);
- Assert.assertEquals("{1=2.15}", mapLiteral1.getStringValueForArray(options));
+ Assertions.assertEquals("{1=2.15}", mapLiteral1.getStringValueForArray(options));
MapLiteral mapLiteral2 = new MapLiteral(boolLiteral, stringLiteral);
- Assert.assertEquals("{1=shortstring}", mapLiteral2.getStringValueForArray(options));
+ Assertions.assertEquals("{1=shortstring}", mapLiteral2.getStringValueForArray(options));
MapLiteral mapLiteral3 = new MapLiteral(largeIntLiteral, dateLiteral);
- Assert.assertEquals("{1000000000000000000000=2022-10-10}", mapLiteral3.getStringValueForArray(options));
+ Assertions.assertEquals("{1000000000000000000000=2022-10-10}", mapLiteral3.getStringValueForArray(options));
MapLiteral mapLiteral4 = new MapLiteral(nullLiteral, nullLiteral);
- Assert.assertEquals("{NULL=NULL}", mapLiteral4.getStringValueForArray(options));
+ Assertions.assertEquals("{NULL=NULL}", mapLiteral4.getStringValueForArray(options));
MapLiteral mapLiteral5 = new MapLiteral(datetimeLiteral, dateLiteral);
- Assert.assertEquals("{2022-10-10 12:10:10=2022-10-10}", mapLiteral5.getStringValueForArray(options));
+ Assertions.assertEquals("{2022-10-10 12:10:10=2022-10-10}", mapLiteral5.getStringValueForArray(options));
MapLiteral mapLiteral6 = new MapLiteral();
- Assert.assertEquals("{}", mapLiteral6.getStringValueForArray(options));
+ Assertions.assertEquals("{}", mapLiteral6.getStringValueForArray(options));
MapLiteral mapLiteral7 = new MapLiteral(nullLiteral, intLiteral1);
- Assert.assertEquals("{NULL=1}", mapLiteral7.getStringValueForArray(options));
+ Assertions.assertEquals("{NULL=1}", mapLiteral7.getStringValueForArray(options));
MapLiteral mapLiteral8 = new MapLiteral(intLiteral1, nullLiteral);
- Assert.assertEquals("{1=NULL}", mapLiteral8.getStringValueForArray(options));
+ Assertions.assertEquals("{1=NULL}", mapLiteral8.getStringValueForArray(options));
MapLiteral mapLiteral10 = new MapLiteral(intLiteral1, arrayLiteral);
- Assert.assertEquals("{1=[1, 2.15]}", mapLiteral10.getStringValueForArray(options));
+ Assertions.assertEquals("{1=[1, 2.15]}", mapLiteral10.getStringValueForArray(options));
try {
new MapLiteral(arrayLiteral, floatLiteral);
} catch (Exception e) {
- Assert.assertEquals("errCode = 2, "
- + "detailMessage = Invalid key type in Map, not support ARRAY", e.getMessage());
+ Assertions.assertEquals("errCode = 2, "
+ + "detailMessage = Invalid key type in Map, not support array", e.getMessage());
}
MapLiteral mapLiteral11 = new MapLiteral(decimalLiteral1, mapLiteral);
- Assert.assertEquals("{1.0={1=2.15}}", mapLiteral11.getStringValueForArray(options));
+ Assertions.assertEquals("{1.0={1=2.15}}", mapLiteral11.getStringValueForArray(options));
try {
new MapLiteral(mapLiteral, decimalLiteral1);
} catch (Exception e) {
- Assert.assertEquals("errCode = 2, "
- + "detailMessage = Invalid key type in Map, not support MAP", e.getMessage());
+ Assertions.assertEquals("errCode = 2, "
+ + "detailMessage = Invalid key type in Map, not support map", e.getMessage());
}
MapLiteral mapLiteral13 = new MapLiteral(stringLiteral, structLiteral);
- Assert.assertEquals("{shortstring={1, 2.15, 1.0, 2022-10-10}}",
+ Assertions.assertEquals("{shortstring={1, 2.15, 1.0, 2022-10-10}}",
mapLiteral13.getStringValueForArray(options));
try {
new MapLiteral(structLiteral, stringLiteral);
} catch (Exception e) {
- Assert.assertEquals("errCode = 2, detailMessage = Invalid key type in Map, "
- + "not support STRUCT", e.getMessage());
+ Assertions.assertEquals("errCode = 2, detailMessage = Invalid key type in Map, "
+ + "not support struct", e.getMessage());
}
}
@@ -167,54 +168,54 @@ public void testGetStringValueForArrayForPresto() throws AnalysisException {
public void testGetStringInFe() throws AnalysisException {
FormatOptions options = FormatOptions.getDefault();
MapLiteral mapLiteral1 = new MapLiteral(intLiteral1, floatLiteral);
- Assert.assertEquals("{1:2.15}", mapLiteral1.getStringValueInFe(options));
+ Assertions.assertEquals("{1:2.15}", mapLiteral1.getStringValueInFe(options));
MapLiteral mapLiteral11 = new MapLiteral(intLiteral1, floatLiteral1);
- Assert.assertEquals("{1:\"11:22:33\"}", mapLiteral11.getStringValueInFe(options));
+ Assertions.assertEquals("{1:\"11:22:33\"}", mapLiteral11.getStringValueInFe(options));
MapLiteral mapLiteral2 = new MapLiteral(boolLiteral, stringLiteral);
- Assert.assertEquals("{1:\"shortstring\"}", mapLiteral2.getStringValueInFe(options));
+ Assertions.assertEquals("{1:\"shortstring\"}", mapLiteral2.getStringValueInFe(options));
MapLiteral mapLiteral3 = new MapLiteral(largeIntLiteral, dateLiteral);
- Assert.assertEquals("{1000000000000000000000:\"2022-10-10\"}", mapLiteral3.getStringValueInFe(options));
+ Assertions.assertEquals("{1000000000000000000000:\"2022-10-10\"}", mapLiteral3.getStringValueInFe(options));
MapLiteral mapLiteral4 = new MapLiteral(floatLiteral1, nullLiteral);
- Assert.assertEquals("{\"11:22:33\":null}", mapLiteral4.getStringValueInFe(options));
+ Assertions.assertEquals("{\"11:22:33\":null}", mapLiteral4.getStringValueInFe(options));
MapLiteral mapLiteral5 = new MapLiteral(datetimeLiteral, dateLiteral);
- Assert.assertEquals("{\"2022-10-10 12:10:10\":\"2022-10-10\"}", mapLiteral5.getStringValueInFe(options));
+ Assertions.assertEquals("{\"2022-10-10 12:10:10\":\"2022-10-10\"}", mapLiteral5.getStringValueInFe(options));
MapLiteral mapLiteral6 = new MapLiteral(decimalLiteral1, decimalLiteral2);
- Assert.assertEquals("{1.0:2}", mapLiteral6.getStringValueInFe(options));
+ Assertions.assertEquals("{1.0:2}", mapLiteral6.getStringValueInFe(options));
MapLiteral mapLiteral7 = new MapLiteral();
- Assert.assertEquals("{}", mapLiteral7.getStringValueInFe(options));
+ Assertions.assertEquals("{}", mapLiteral7.getStringValueInFe(options));
MapLiteral mapLiteral8 = new MapLiteral(nullLiteral, intLiteral1);
- Assert.assertEquals("{null:1}", mapLiteral8.getStringValueInFe(options));
+ Assertions.assertEquals("{null:1}", mapLiteral8.getStringValueInFe(options));
MapLiteral mapLiteral9 = new MapLiteral(intLiteral1, nullLiteral);
- Assert.assertEquals("{1:null}", mapLiteral9.getStringValueInFe(options));
+ Assertions.assertEquals("{1:null}", mapLiteral9.getStringValueInFe(options));
MapLiteral mapLiteral10 = new MapLiteral(intLiteral1, arrayLiteral);
- Assert.assertEquals("{\"1\":[\"1\", \"2.15\"]}", mapLiteral10.getStringValueForArray(options));
+ Assertions.assertEquals("{\"1\":[\"1\", \"2.15\"]}", mapLiteral10.getStringValueForArray(options));
try {
new MapLiteral(arrayLiteral, floatLiteral);
} catch (Exception e) {
- Assert.assertEquals("errCode = 2, "
- + "detailMessage = Invalid key type in Map, not support ARRAY", e.getMessage());
+ Assertions.assertEquals("errCode = 2, "
+ + "detailMessage = Invalid key type in Map, not support array", e.getMessage());
}
MapLiteral mapLiteral12 = new MapLiteral(decimalLiteral1, mapLiteral);
- Assert.assertEquals("{\"1.0\":{\"1\":\"2.15\"}}", mapLiteral12.getStringValueForArray(options));
+ Assertions.assertEquals("{\"1.0\":{\"1\":\"2.15\"}}", mapLiteral12.getStringValueForArray(options));
try {
new MapLiteral(mapLiteral, decimalLiteral1);
} catch (Exception e) {
- Assert.assertEquals("errCode = 2, "
- + "detailMessage = Invalid key type in Map, not support MAP", e.getMessage());
+ Assertions.assertEquals("errCode = 2, "
+ + "detailMessage = Invalid key type in Map, not support map", e.getMessage());
}
MapLiteral mapLiteral13 = new MapLiteral(stringLiteral, structLiteral);
- Assert.assertEquals("{\"shortstring\":{\"1\", \"2.15\", \"1.0\", \"2022-10-10\"}}",
+ Assertions.assertEquals("{\"shortstring\":{\"1\", \"2.15\", \"1.0\", \"2022-10-10\"}}",
mapLiteral13.getStringValueForArray(options));
try {
new MapLiteral(structLiteral, stringLiteral);
} catch (Exception e) {
- Assert.assertEquals("errCode = 2, "
+ Assertions.assertEquals("errCode = 2, "
+ "detailMessage = Invalid key type in Map, "
- + "not support STRUCT", e.getMessage());
+ + "not support struct", e.getMessage());
}
}
@@ -222,54 +223,54 @@ public void testGetStringInFe() throws AnalysisException {
public void testGetStringInFeForPresto() throws AnalysisException {
FormatOptions options = FormatOptions.getForPresto();
MapLiteral mapLiteral1 = new MapLiteral(intLiteral1, floatLiteral);
- Assert.assertEquals("{1=2.15}", mapLiteral1.getStringValueInFe(options));
+ Assertions.assertEquals("{1=2.15}", mapLiteral1.getStringValueInFe(options));
MapLiteral mapLiteral11 = new MapLiteral(intLiteral1, floatLiteral1);
- Assert.assertEquals("{1=11:22:33}", mapLiteral11.getStringValueInFe(options));
+ Assertions.assertEquals("{1=11:22:33}", mapLiteral11.getStringValueInFe(options));
MapLiteral mapLiteral2 = new MapLiteral(boolLiteral, stringLiteral);
- Assert.assertEquals("{1=shortstring}", mapLiteral2.getStringValueInFe(options));
+ Assertions.assertEquals("{1=shortstring}", mapLiteral2.getStringValueInFe(options));
MapLiteral mapLiteral3 = new MapLiteral(largeIntLiteral, dateLiteral);
- Assert.assertEquals("{1000000000000000000000=2022-10-10}", mapLiteral3.getStringValueInFe(options));
+ Assertions.assertEquals("{1000000000000000000000=2022-10-10}", mapLiteral3.getStringValueInFe(options));
MapLiteral mapLiteral4 = new MapLiteral(floatLiteral1, nullLiteral);
- Assert.assertEquals("{11:22:33=NULL}", mapLiteral4.getStringValueInFe(options));
+ Assertions.assertEquals("{11:22:33=NULL}", mapLiteral4.getStringValueInFe(options));
MapLiteral mapLiteral5 = new MapLiteral(datetimeLiteral, dateLiteral);
- Assert.assertEquals("{2022-10-10 12:10:10=2022-10-10}", mapLiteral5.getStringValueInFe(options));
+ Assertions.assertEquals("{2022-10-10 12:10:10=2022-10-10}", mapLiteral5.getStringValueInFe(options));
MapLiteral mapLiteral6 = new MapLiteral(decimalLiteral1, decimalLiteral2);
- Assert.assertEquals("{1.0=2}", mapLiteral6.getStringValueInFe(options));
+ Assertions.assertEquals("{1.0=2}", mapLiteral6.getStringValueInFe(options));
MapLiteral mapLiteral7 = new MapLiteral();
- Assert.assertEquals("{}", mapLiteral7.getStringValueInFe(options));
+ Assertions.assertEquals("{}", mapLiteral7.getStringValueInFe(options));
MapLiteral mapLiteral8 = new MapLiteral(nullLiteral, intLiteral1);
- Assert.assertEquals("{NULL=1}", mapLiteral8.getStringValueInFe(options));
+ Assertions.assertEquals("{NULL=1}", mapLiteral8.getStringValueInFe(options));
MapLiteral mapLiteral9 = new MapLiteral(intLiteral1, nullLiteral);
- Assert.assertEquals("{1=NULL}", mapLiteral9.getStringValueInFe(options));
+ Assertions.assertEquals("{1=NULL}", mapLiteral9.getStringValueInFe(options));
MapLiteral mapLiteral10 = new MapLiteral(intLiteral1, arrayLiteral);
- Assert.assertEquals("{1=[1, 2.15]}", mapLiteral10.getStringValueForArray(options));
+ Assertions.assertEquals("{1=[1, 2.15]}", mapLiteral10.getStringValueForArray(options));
try {
new MapLiteral(arrayLiteral, floatLiteral);
} catch (Exception e) {
- Assert.assertEquals("errCode = 2, "
- + "detailMessage = Invalid key type in Map, not support ARRAY", e.getMessage());
+ Assertions.assertEquals("errCode = 2, "
+ + "detailMessage = Invalid key type in Map, not support array", e.getMessage());
}
MapLiteral mapLiteral12 = new MapLiteral(decimalLiteral1, mapLiteral);
- Assert.assertEquals("{1.0={1=2.15}}", mapLiteral12.getStringValueForArray(options));
+ Assertions.assertEquals("{1.0={1=2.15}}", mapLiteral12.getStringValueForArray(options));
try {
new MapLiteral(mapLiteral, decimalLiteral1);
} catch (Exception e) {
- Assert.assertEquals("errCode = 2, "
- + "detailMessage = Invalid key type in Map, not support MAP", e.getMessage());
+ Assertions.assertEquals("errCode = 2, "
+ + "detailMessage = Invalid key type in Map, not support map", e.getMessage());
}
MapLiteral mapLiteral13 = new MapLiteral(stringLiteral, structLiteral);
- Assert.assertEquals("{shortstring={1, 2.15, 1.0, 2022-10-10}}",
+ Assertions.assertEquals("{shortstring={1, 2.15, 1.0, 2022-10-10}}",
mapLiteral13.getStringValueForArray(options));
try {
new MapLiteral(structLiteral, stringLiteral);
} catch (Exception e) {
- Assert.assertEquals("errCode = 2, "
+ Assertions.assertEquals("errCode = 2, "
+ "detailMessage = Invalid key type in Map, "
- + "not support STRUCT", e.getMessage());
+ + "not support struct", e.getMessage());
}
}
}
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java
index fe32999bc6eaf3d..cc01f66a9c9aa66 100755
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java
@@ -301,8 +301,8 @@ public void testDeduplicateOrs() throws Exception {
String commonExpr2 = "`t3`.`k3` = `t1`.`k3`";
String commonExpr3 = "`t1`.`k1` = `t5`.`k1`";
String commonExpr4 = "t5`.`k2` = 'United States'";
- String betweenExpanded1 = "(CAST(CAST(`t1`.`k4` AS DECIMALV3(12, 2)) AS INT) >= 100) AND (CAST(CAST(`t1`.`k4` AS DECIMALV3(12, 2)) AS INT) <= 150)";
- String betweenExpanded2 = "(CAST(CAST(`t1`.`k4` AS DECIMALV3(12, 2)) AS INT) >= 50) AND (CAST(CAST(`t1`.`k4` AS DECIMALV3(12, 2)) AS INT) <= 100)";
+ String betweenExpanded1 = "(CAST(CAST(`t1`.`k4` AS decimalv3(12,2)) AS int) >= 100) AND (CAST(CAST(`t1`.`k4` AS decimalv3(12,2)) AS int) <= 150)";
+ String betweenExpanded2 = "(CAST(CAST(`t1`.`k4` AS decimalv3(12,2)) AS int) >= 50) AND (CAST(CAST(`t1`.`k4` AS decimalv3(12,2)) AS int) <= 100)";
String betweenExpanded3 = "(`t1`.`k4` >= 50) AND (`t1`.`k4` <= 250)";
String rewrittenSql = stmt.toSql();
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowBuildIndexStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowBuildIndexStmtTest.java
index fa88156dd47c2c6..61ea17c374bbc37 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowBuildIndexStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowBuildIndexStmtTest.java
@@ -104,7 +104,7 @@ public ProcNodeInterface open(String path) throws AnalysisException {
stmt1.analyze(analyzer);
Assertions.assertEquals(stmt1.toSql(), "SHOW BUILD INDEX FROM `testDb` WHERE "
- + "(`a`.`b`.`c`.`createtime` > CAST('%.b.%' AS DATETIMEV2(0))) "
+ + "(`a`.`b`.`c`.`createtime` > CAST('%.b.%' AS datetimev2(0))) "
+ "AND (`a`.`b`.`c`.`tablename` = '%.b.%') "
+ "ORDER BY `a`.`b`.`c`.`TableName` DESC NULLS LAST LIMIT 1, 100");
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateFunctionTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateFunctionTest.java
index 30256d394deb47b..20ed1faec72a1ee 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateFunctionTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateFunctionTest.java
@@ -46,7 +46,7 @@ public void testNormal() throws Exception {
String sql = "SHOW CREATE FUNCTION id_masking_create(bigint)";
ShowResultSet showResultSet = showCreateFunction(sql);
String showSql = showResultSet.getResultRows().get(0).get(1);
- Assertions.assertTrue(showSql.contains("CREATE ALIAS FUNCTION id_masking_create(BIGINT) WITH PARAMETER(id)"));
+ Assertions.assertTrue(showSql.contains("CREATE ALIAS FUNCTION id_masking_create(bigint) WITH PARAMETER(id)"));
}
@Test
@@ -55,7 +55,7 @@ public void testShowCreateGlobalFunction() throws Exception {
ShowResultSet showResultSet = showCreateFunction(sql);
String showSql = showResultSet.getResultRows().get(0).get(1);
Assertions.assertTrue(
- showSql.contains("CREATE GLOBAL ALIAS FUNCTION id_masking_global_create(BIGINT) WITH PARAMETER(id)"));
+ showSql.contains("CREATE GLOBAL ALIAS FUNCTION id_masking_global_create(bigint) WITH PARAMETER(id)"));
}
}
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateTableStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateTableStmtTest.java
index 0a5653b7f9ed347..353fbad9fabfc82 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateTableStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateTableStmtTest.java
@@ -48,7 +48,7 @@ public void testNormal() throws Exception {
String sql = "show create table table1";
ShowResultSet showResultSet = showCreateTable(sql);
String showSql = showResultSet.getResultRows().get(0).get(1);
- Assertions.assertTrue(showSql.contains("`k1` INT NULL COMMENT 'test column k1'"));
+ Assertions.assertTrue(showSql.contains("`k1` int NULL COMMENT 'test column k1'"));
Assertions.assertTrue(showSql.contains("COMMENT 'test table1'"));
}
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableTest.java
index 6def5f1774b9eb0..c3315b060425b49 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableTest.java
@@ -311,7 +311,7 @@ public void testDistributionColumnsType() throws Exception {
+ ");");
expectedEx.expect(DdlException.class);
- expectedEx.expectMessage("Colocate tables distribution columns must have the same data type: k2(VARCHAR(10)) should be INT");
+ expectedEx.expectMessage("Colocate tables distribution columns must have the same data type: k2(varchar(10)) should be int");
createTable("create table " + dbName + "." + tableName2 + " (\n"
+ " `k1` int NULL COMMENT \"\",\n"
+ " `k2` varchar(10) NULL COMMENT \"\"\n"
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java
index 9cacbe7a5f6654d..c3d0da0e45ee837 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java
@@ -48,7 +48,7 @@ public void testPrimitiveType() throws AnalysisException {
type.analyze(null);
Assert.assertEquals(PrimitiveType.INT, type.getType().getPrimitiveType());
- Assert.assertEquals("INT", type.toSql());
+ Assert.assertEquals("int", type.toSql());
// equal type
TypeDef type2 = TypeDef.create(PrimitiveType.INT);
@@ -69,7 +69,7 @@ public void testInvalidType() throws AnalysisException {
public void testCharType() throws AnalysisException {
TypeDef type = TypeDef.createVarchar(10);
type.analyze(null);
- Assert.assertEquals("VARCHAR(10)", type.toString());
+ Assert.assertEquals("varchar(10)", type.toString());
Assert.assertEquals(PrimitiveType.VARCHAR, type.getType().getPrimitiveType());
Assert.assertEquals(10, type.getType().getLength());
@@ -91,10 +91,10 @@ public void testDecimal() throws AnalysisException {
TypeDef type = TypeDef.createDecimal(12, 5);
type.analyze(null);
if (Config.enable_decimal_conversion) {
- Assert.assertEquals("DECIMALV3(12, 5)", type.toString());
+ Assert.assertEquals("decimalv3(12,5)", type.toString());
Assert.assertEquals(PrimitiveType.DECIMAL64, type.getType().getPrimitiveType());
} else {
- Assert.assertEquals("DECIMAL(12, 5)", type.toString());
+ Assert.assertEquals("decimalv2(12,5)", type.toString());
Assert.assertEquals(PrimitiveType.DECIMALV2, type.getType().getPrimitiveType());
}
Assert.assertEquals(12, ((ScalarType) type.getType()).getScalarPrecision());
@@ -119,7 +119,7 @@ public void testDecimal() throws AnalysisException {
public void testDatetimeV2() throws AnalysisException {
TypeDef type = TypeDef.createDatetimeV2(3);
type.analyze(null);
- Assert.assertEquals("DATETIMEV2(3)", type.toString());
+ Assert.assertEquals("datetimev2(3)", type.toString());
Assert.assertEquals(PrimitiveType.DATETIMEV2, type.getType().getPrimitiveType());
Assert.assertEquals(ScalarType.DATETIME_PRECISION, ((ScalarType) type.getType()).getScalarPrecision());
Assert.assertEquals(3, ((ScalarType) type.getType()).getScalarScale());
@@ -160,7 +160,7 @@ public void testDateV2() throws AnalysisException {
public void testTimeV2() throws AnalysisException {
TypeDef type = TypeDef.createTimeV2(3);
type.analyze(null);
- Assert.assertEquals("TIME(3)", type.toString());
+ Assert.assertEquals("time(3)", type.toString());
Assert.assertEquals(PrimitiveType.TIMEV2, type.getType().getPrimitiveType());
Assert.assertEquals(ScalarType.DATETIME_PRECISION, ((ScalarType) type.getType()).getScalarPrecision());
Assert.assertEquals(3, ((ScalarType) type.getType()).getScalarScale());
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateFunctionTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateFunctionTest.java
index 6646c356a8fcd4f..034b761ca989aa7 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateFunctionTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateFunctionTest.java
@@ -144,10 +144,10 @@ public void test() throws Exception {
queryStr = "select db1.decimal(k3, 4, 1) from db1.tbl1;";
if (Config.enable_decimal_conversion) {
Assert.assertTrue(containsIgnoreCase(dorisAssert.query(queryStr).explainQuery(),
- "CAST(`k3` AS DECIMALV3(4, 1))"));
+ "CAST(`k3` AS decimalv3(4,1))"));
} else {
Assert.assertTrue(containsIgnoreCase(dorisAssert.query(queryStr).explainQuery(),
- "CAST(`k3` AS DECIMAL(4, 1))"));
+ "CAST(`k3` AS decimal(4,1))"));
}
// cast any type to varchar with fixed length
@@ -176,7 +176,7 @@ public void test() throws Exception {
queryStr = "select db1.varchar(k1, 4) from db1.tbl1;";
Assert.assertTrue(containsIgnoreCase(dorisAssert.query(queryStr).explainQuery(),
- "CAST(`k1` AS VARCHAR(65533))"));
+ "CAST(`k1` AS varchar(65533))"));
// cast any type to char with fixed length
createFuncStr = "create alias function db1.to_char(all, int) with parameter(text, length) as "
@@ -204,7 +204,7 @@ public void test() throws Exception {
queryStr = "select db1.to_char(k1, 4) from db1.tbl1;";
Assert.assertTrue(containsIgnoreCase(dorisAssert.query(queryStr).explainQuery(),
- "CAST(`k1` AS CHARACTER"));
+ "CAST(`k1` AS character"));
}
@Test
@@ -241,7 +241,7 @@ public void testCreateGlobalFunction() throws Exception {
queryStr = "select id_masking(k1) from db2.tbl1";
Assert.assertTrue(containsIgnoreCase(dorisAssert.query(queryStr).explainQuery(),
- "concat(left(CAST(CAST(k1 AS BIGINT) AS VARCHAR(65533)), 3), '****', right(CAST(CAST(k1 AS BIGINT) AS VARCHAR(65533)), 4))"));
+ "concat(left(CAST(CAST(k1 AS bigint) AS varchar(65533)), 3), '****', right(CAST(CAST(k1 AS bigint) AS varchar(65533)), 4))"));
// 4. create alias function with cast
// cast any type to decimal with specific precision and scale
@@ -259,10 +259,10 @@ public void testCreateGlobalFunction() throws Exception {
queryStr = "select decimal(k3, 4, 1) from db2.tbl1;";
if (Config.enable_decimal_conversion) {
Assert.assertTrue(containsIgnoreCase(dorisAssert.query(queryStr).explainQuery(),
- "CAST(`k3` AS DECIMALV3(4, 1))"));
+ "CAST(`k3` AS decimalv3(4,1))"));
} else {
Assert.assertTrue(containsIgnoreCase(dorisAssert.query(queryStr).explainQuery(),
- "CAST(`k3` AS DECIMAL(4, 1))"));
+ "CAST(`k3` AS decimal(4,1))"));
}
// 5. cast any type to varchar with fixed length
@@ -279,7 +279,7 @@ public void testCreateGlobalFunction() throws Exception {
queryStr = "select varchar(k1, 4) from db2.tbl1;";
Assert.assertTrue(containsIgnoreCase(dorisAssert.query(queryStr).explainQuery(),
- "CAST(`k1` AS VARCHAR(65533))"));
+ "CAST(`k1` AS varchar(65533))"));
// 6. cast any type to char with fixed length
createFuncStr = "create global alias function db2.to_char(all, int) with parameter(text, length) as "
@@ -295,7 +295,7 @@ public void testCreateGlobalFunction() throws Exception {
queryStr = "select to_char(k1, 4) from db2.tbl1;";
Assert.assertTrue(containsIgnoreCase(dorisAssert.query(queryStr).explainQuery(),
- "CAST(`k1` AS CHARACTER(255))"));
+ "CAST(`k1` AS character(255))"));
}
private void testFunctionQuery(ConnectContext ctx, String queryStr, Boolean isStringLiteral) throws Exception {
diff --git a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsUtilTest.java b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsUtilTest.java
index 5ec5151532fe9ec..a58b785dbca8eff 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsUtilTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/external/elasticsearch/EsUtilTest.java
@@ -232,25 +232,25 @@ public void testDateType() throws IOException, URISyntaxException {
String name = column.getName();
String type = column.getType().toSql();
if ("test2".equals(name)) {
- Assertions.assertEquals("DATETIMEV2(0)", type);
+ Assertions.assertEquals("datetimev2(0)", type);
}
if ("test3".equals(name)) {
- Assertions.assertEquals("DATETIMEV2(0)", type);
+ Assertions.assertEquals("datetimev2(0)", type);
}
if ("test4".equals(name)) {
- Assertions.assertEquals("DATEV2", type);
+ Assertions.assertEquals("datev2", type);
}
if ("test5".equals(name)) {
- Assertions.assertEquals("DATETIMEV2(0)", type);
+ Assertions.assertEquals("datetimev2(0)", type);
}
if ("test6".equals(name)) {
- Assertions.assertEquals("DATEV2", type);
+ Assertions.assertEquals("datev2", type);
}
if ("test7".equals(name)) {
- Assertions.assertEquals("DATETIMEV2(0)", type);
+ Assertions.assertEquals("datetimev2(0)", type);
}
if ("test8".equals(name)) {
- Assertions.assertEquals("BIGINT", type);
+ Assertions.assertEquals("bigint", type);
}
}
}
@@ -260,8 +260,8 @@ public void testFieldAlias() throws IOException, URISyntaxException {
ObjectNode testFieldAlias = EsUtil.getRootSchema(
EsUtil.getMapping(loadJsonFromFile("data/es/test_field_alias.json")), null, new ArrayList<>());
List parseColumns = EsUtil.genColumnsFromEs("test_field_alias", null, testFieldAlias, true, new ArrayList<>());
- Assertions.assertEquals("DATETIMEV2(0)", parseColumns.get(2).getType().toSql());
- Assertions.assertEquals("TEXT", parseColumns.get(4).getType().toSql());
+ Assertions.assertEquals("datetimev2(0)", parseColumns.get(2).getType().toSql());
+ Assertions.assertEquals("text", parseColumns.get(4).getType().toSql());
}
@Test
diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
index 9ff6e7ac3ca693e..2aff60804f466f3 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
@@ -566,20 +566,20 @@ public void testTypeCast() throws Exception {
// disable cast hll/bitmap to string
assertSQLPlanOrErrorMsgContains(
"select cast(id2 as varchar) from test.hll_table;",
- "Invalid type cast of `id2` from HLL to VARCHAR(65533)"
+ "Invalid type cast of `id2` from hll to varchar(65533)"
);
assertSQLPlanOrErrorMsgContains(
"select cast(id2 as varchar) from test.bitmap_table;",
- "Invalid type cast of `id2` from BITMAP to VARCHAR(65533)"
+ "Invalid type cast of `id2` from bitmap to varchar(65533)"
);
// disable implicit cast hll/bitmap to string
assertSQLPlanOrErrorMsgContains(
"select length(id2) from test.hll_table;",
- "No matching function with signature: length(HLL)"
+ "No matching function with signature: length(hll)"
);
assertSQLPlanOrErrorMsgContains(
"select length(id2) from test.bitmap_table;",
- "No matching function with signature: length(BITMAP)"
+ "No matching function with signature: length(bitmap)"
);
}
@@ -2064,7 +2064,7 @@ public void testResultExprs() throws Exception {
Assert.assertFalse(explainString.contains("OUTPUT EXPRS:\n 3\n 4"));
System.out.println(explainString);
Assert.assertTrue(explainString.contains(
- "OUTPUT EXPRS:\n" + " CAST( 3 AS INT)\n" + " CAST( 4 AS INT)"));
+ "OUTPUT EXPRS:\n" + " CAST( 3 AS int)\n" + " CAST( 4 AS int)"));
}
@Test
diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/RuntimeFilterGeneratorTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/RuntimeFilterGeneratorTest.java
index a55cec4cdfb6550..2b4d868249a3652 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/planner/RuntimeFilterGeneratorTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/planner/RuntimeFilterGeneratorTest.java
@@ -158,12 +158,12 @@ public void testGenerateRuntimeFiltersMode() {
Assert.assertEquals(hashJoinNode.getRuntimeFilters().size(), 4);
Assert.assertEquals(lhsScanNode.getRuntimeFilters().size(), 4);
String rfString = hashJoinNode.getRuntimeFilterExplainString(true);
- Assert.assertTrue(rfString, rfString.contains("RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
- Assert.assertTrue(rfString.contains("RF001[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ Assert.assertTrue(rfString, rfString.contains("RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
+ Assert.assertTrue(rfString.contains("RF001[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF002[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF002[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF003[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT"));
+ "RF003[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint"));
rfString = lhsScanNode.getRuntimeFilterExplainString(false);
Assert.assertTrue(rfString, rfString.contains("RF000[in] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`"));
@@ -188,12 +188,12 @@ public void testGenerateRuntimeFiltersMode() {
Assert.assertEquals(lhsScanNode.getRuntimeFilters().size(), 4);
rfString = hashJoinNode.getRuntimeFilterExplainString(true);
Assert.assertTrue(rfString, rfString.contains(
- "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
- Assert.assertTrue(rfString.contains("RF001[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
+ Assert.assertTrue(rfString.contains("RF001[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF002[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF002[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF003[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF003[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
rfString = lhsScanNode.getRuntimeFilterExplainString(false);
Assert.assertTrue(rfString, rfString.contains(
"RF000[in] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`"));
@@ -262,7 +262,7 @@ public void testGenerateRuntimeFiltersType() {
};
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
Assert.assertEquals(hashJoinNode.getRuntimeFilterExplainString(true),
- "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)(-1/0/2097152)\n",
+ "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)(-1/0/2097152)\n",
hashJoinNode.getRuntimeFilterExplainString(true));
Assert.assertEquals(lhsScanNode.getRuntimeFilterExplainString(false),
lhsScanNode.getRuntimeFilterExplainString(false),
@@ -282,7 +282,7 @@ public void testGenerateRuntimeFiltersType() {
};
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
Assert.assertEquals(hashJoinNode.getRuntimeFilterExplainString(true),
- "RF000[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)(-1/0/2097152)\n");
+ "RF000[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)(-1/0/2097152)\n");
Assert.assertEquals(lhsScanNode.getRuntimeFilterExplainString(false),
"RF000[bloom] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`\n");
Assert.assertEquals(testPlanFragment.getTargetRuntimeFilterIds().size(), 1);
@@ -301,9 +301,9 @@ public void testGenerateRuntimeFiltersType() {
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
String rfString = hashJoinNode.getRuntimeFilterExplainString(true);
Assert.assertTrue(rfString, rfString.contains(
- "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString, rfString.contains(
- "RF001[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF001[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
rfString = lhsScanNode.getRuntimeFilterExplainString(false);
Assert.assertTrue(rfString, rfString.contains(
"RF000[in] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`"));
@@ -324,7 +324,7 @@ public void testGenerateRuntimeFiltersType() {
};
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
Assert.assertEquals(hashJoinNode.getRuntimeFilterExplainString(true),
- "RF000[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)(-1/0/2097152)\n");
+ "RF000[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)(-1/0/2097152)\n");
Assert.assertEquals(lhsScanNode.getRuntimeFilterExplainString(false),
"RF000[min_max] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`\n");
Assert.assertEquals(testPlanFragment.getTargetRuntimeFilterIds().size(), 1);
@@ -343,9 +343,9 @@ public void testGenerateRuntimeFiltersType() {
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
rfString = hashJoinNode.getRuntimeFilterExplainString(true);
Assert.assertTrue(rfString.contains(
- "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF001[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF001[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
rfString = lhsScanNode.getRuntimeFilterExplainString(false);
Assert.assertTrue(rfString.contains(
"RF000[in] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`"));
@@ -367,9 +367,9 @@ public void testGenerateRuntimeFiltersType() {
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
rfString = hashJoinNode.getRuntimeFilterExplainString(true);
Assert.assertTrue(rfString.contains(
- "RF000[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF000[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF001[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF001[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
rfString = lhsScanNode.getRuntimeFilterExplainString(false);
Assert.assertTrue(rfString.contains(
@@ -392,11 +392,11 @@ public void testGenerateRuntimeFiltersType() {
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
rfString = hashJoinNode.getRuntimeFilterExplainString(true);
Assert.assertTrue(rfString.contains(
- "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF001[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF001[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF002[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF002[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
rfString = lhsScanNode.getRuntimeFilterExplainString(false);
Assert.assertTrue(rfString.contains(
"RF000[in] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`"));
@@ -419,7 +419,7 @@ public void testGenerateRuntimeFiltersType() {
};
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
Assert.assertEquals(hashJoinNode.getRuntimeFilterExplainString(true),
- "RF000[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)(-1/0/2097152)\n");
+ "RF000[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)(-1/0/2097152)\n");
Assert.assertEquals(lhsScanNode.getRuntimeFilterExplainString(false),
"RF000[in_or_bloom] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`\n");
Assert.assertEquals(testPlanFragment.getTargetRuntimeFilterIds().size(), 1);
@@ -438,9 +438,9 @@ public void testGenerateRuntimeFiltersType() {
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
rfString = hashJoinNode.getRuntimeFilterExplainString(true);
Assert.assertTrue(rfString.contains(
- "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF001[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF001[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
rfString = lhsScanNode.getRuntimeFilterExplainString(false);
Assert.assertTrue(rfString.contains(
@@ -463,9 +463,9 @@ public void testGenerateRuntimeFiltersType() {
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
rfString = hashJoinNode.getRuntimeFilterExplainString(true);
Assert.assertTrue(rfString.contains(
- "RF000[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF000[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF001[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF001[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
rfString = lhsScanNode.getRuntimeFilterExplainString(false);
Assert.assertTrue(rfString.contains(
"RF000[bloom] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`"));
@@ -487,11 +487,11 @@ public void testGenerateRuntimeFiltersType() {
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
rfString = hashJoinNode.getRuntimeFilterExplainString(true);
Assert.assertTrue(rfString.contains(
- "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF001[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF001[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF002[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF002[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
rfString = lhsScanNode.getRuntimeFilterExplainString(false);
Assert.assertTrue(rfString.contains(
"RF000[in] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`"));
@@ -515,9 +515,9 @@ public void testGenerateRuntimeFiltersType() {
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
rfString = hashJoinNode.getRuntimeFilterExplainString(true);
Assert.assertTrue(rfString.contains(
- "RF000[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF000[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF001[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF001[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
rfString = lhsScanNode.getRuntimeFilterExplainString(false);
Assert.assertTrue(rfString.contains(
"RF000[min_max] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`"));
@@ -539,11 +539,11 @@ public void testGenerateRuntimeFiltersType() {
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
rfString = hashJoinNode.getRuntimeFilterExplainString(true);
Assert.assertTrue(rfString.contains(
- "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF001[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF001[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF002[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF002[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
rfString = lhsScanNode.getRuntimeFilterExplainString(false);
Assert.assertTrue(rfString.contains(
"RF000[in] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`"));
@@ -568,11 +568,11 @@ public void testGenerateRuntimeFiltersType() {
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
rfString = hashJoinNode.getRuntimeFilterExplainString(true);
Assert.assertTrue(rfString.contains(
- "RF000[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF000[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF001[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF001[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF002[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF002[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
rfString = lhsScanNode.getRuntimeFilterExplainString(false);
Assert.assertTrue(rfString.contains(
"RF000[bloom] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`"));
@@ -596,13 +596,13 @@ public void testGenerateRuntimeFiltersType() {
RuntimeFilterGenerator.generateRuntimeFilters(analyzer, hashJoinNode);
rfString = hashJoinNode.getRuntimeFilterExplainString(true);
Assert.assertTrue(rfString.contains(
- "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF000[in] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF001[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF001[bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF002[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF002[min_max] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
Assert.assertTrue(rfString.contains(
- "RF003[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS BIGINT)"));
+ "RF003[in_or_bloom] <- CAST(`test_db`.`test_rhs_tbl`.`test_rhs_col` AS bigint)"));
rfString = lhsScanNode.getRuntimeFilterExplainString(false);
Assert.assertTrue(rfString.contains(
"RF000[in] -> `test_db`.`test_lhs_tbl`.`test_lhs_col`"));
diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/TableFunctionPlanTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/TableFunctionPlanTest.java
index c50d573de9bdad7..98f368427953412 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/planner/TableFunctionPlanTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/planner/TableFunctionPlanTest.java
@@ -79,7 +79,7 @@ public void normalTableFunction() throws Exception {
explainString.contains("table function: explode_split(`db1`.`tbl1`.`k2`, ',')"));
Assert.assertTrue(explainString.contains("tuple ids: 0 1"));
Assert.assertTrue(explainString.contains("TupleDescriptor{id=1, tbl=tmp"));
- Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=e1, colUniqueId=-1, type=VARCHAR"));
+ Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=e1, colUniqueId=-1, type=varchar"));
}
/* Case2 without output explode column
@@ -95,7 +95,7 @@ public void withoutOutputExplodeColumn() throws Exception {
explainString.contains("table function: explode_split(`db1`.`tbl1`.`k2`, ',')"));
Assert.assertTrue(explainString.contains("tuple ids: 0 1"));
Assert.assertTrue(explainString.contains("TupleDescriptor{id=1, tbl=tmp"));
- Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=e1, colUniqueId=-1, type=VARCHAR"));
+ Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=e1, colUniqueId=-1, type=varchar"));
}
/* Case3 group by explode column
@@ -116,7 +116,7 @@ public void groupByExplodeColumn() throws Exception {
explainString.contains("table function: explode_split(`db1`.`tbl1`.`k2`, ',')"));
Assert.assertTrue(explainString.contains("tuple ids: 0 1"));
Assert.assertTrue(explainString.contains("TupleDescriptor{id=1, tbl=tmp"));
- Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=e1, colUniqueId=-1, type=VARCHAR"));
+ Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=e1, colUniqueId=-1, type=varchar"));
// group by tuple
Assert.assertTrue(explainString.contains("TupleDescriptor{id=2, tbl=null"));
}
@@ -135,7 +135,7 @@ public void whereExplodeColumn() throws Exception {
Assert.assertTrue(explainString.contains("`e1` = '1'"));
Assert.assertTrue(explainString.contains("tuple ids: 0 1"));
Assert.assertTrue(explainString.contains("TupleDescriptor{id=1, tbl=tmp"));
- Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=e1, colUniqueId=-1, type=VARCHAR"));
+ Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=e1, colUniqueId=-1, type=varchar"));
}
/* Case5 where normal column
@@ -151,7 +151,7 @@ public void whereNormalColumn() throws Exception {
explainString.contains("table function: explode_split(`db1`.`tbl1`.`k2`, ',')"));
Assert.assertTrue(explainString.contains("tuple ids: 0 1"));
Assert.assertTrue(explainString.contains("TupleDescriptor{id=1, tbl=tmp"));
- Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=e1, colUniqueId=-1, type=VARCHAR"));
+ Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=e1, colUniqueId=-1, type=varchar"));
Assert.assertTrue(UtFrameUtils.checkPlanResultContainsNode(explainString, 0, "OlapScanNode"));
Assert.assertTrue(explainString.contains("`k1` = 1"));
}
@@ -171,10 +171,10 @@ public void testMultiLateralView() throws Exception {
Assert.assertTrue(explainString.contains("lateral view tuple id: 1 2"));
// lateral view 2 tuple
Assert.assertTrue(explainString.contains("TupleDescriptor{id=1, tbl=tmp2"));
- Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=e2, colUniqueId=-1, type=VARCHAR"));
+ Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=e2, colUniqueId=-1, type=varchar"));
// lateral view 1 tuple
Assert.assertTrue(explainString.contains("TupleDescriptor{id=2, tbl=tmp1"));
- Assert.assertTrue(explainString.contains("SlotDescriptor{id=2, col=e1, colUniqueId=-1, type=VARCHAR"));
+ Assert.assertTrue(explainString.contains("SlotDescriptor{id=2, col=e1, colUniqueId=-1, type=varchar"));
}
// test explode_split function
@@ -188,11 +188,11 @@ public void testMultiLateralView() throws Exception {
public void errorParam() throws Exception {
String sql = "explain select /*+ SET_VAR(enable_nereids_planner=false) */ k1, e1 from db1.tbl1 lateral view explode_split(k2) tmp as e1;";
String explainString = UtFrameUtils.getSQLPlanOrErrorMsg(ctx, sql);
- Assert.assertTrue(explainString.contains("No matching function with signature: explode_split(VARCHAR(1))"));
+ Assert.assertTrue(explainString.contains("No matching function with signature: explode_split(varchar(1))"));
sql = "explain select /*+ SET_VAR(enable_nereids_planner=false) */ k1, e1 from db1.tbl1 lateral view explode_split(k1) tmp as e1;";
explainString = UtFrameUtils.getSQLPlanOrErrorMsg(ctx, sql);
- Assert.assertTrue(explainString.contains("No matching function with signature: explode_split(INT)"));
+ Assert.assertTrue(explainString.contains("No matching function with signature: explode_split(int)"));
}
/* Case2 table function in where stmt
@@ -203,7 +203,7 @@ public void tableFunctionInWhere() throws Exception {
String sql = "explain select /*+ SET_VAR(enable_nereids_planner=false) */ k1 from db1.tbl1 where explode_split(k2, \",\");";
String explainString = UtFrameUtils.getSQLPlanOrErrorMsg(ctx, sql);
Assert.assertTrue(explainString,
- explainString.contains("No matching function with signature: explode_split(VARCHAR(1), VARCHAR(65533))."));
+ explainString.contains("No matching function with signature: explode_split(varchar(1), varchar(65533))."));
}
// test projection
@@ -350,8 +350,8 @@ public void scalarFunctionInLateralView() throws Exception {
explainString.contains("table function: explode_split(concat(`a`.`k2`, ',', `a`.`k3`), ',')"));
Assert.assertTrue(explainString.contains("lateral view tuple id: 1"));
Assert.assertTrue(explainString.contains("output slot id: 3"));
- Assert.assertTrue(explainString.contains("SlotDescriptor{id=0, col=k2, colUniqueId=1, type=VARCHAR(1)"));
- Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=k3, colUniqueId=2, type=VARCHAR(1)"));
+ Assert.assertTrue(explainString.contains("SlotDescriptor{id=0, col=k2, colUniqueId=1, type=varchar(1)"));
+ Assert.assertTrue(explainString.contains("SlotDescriptor{id=1, col=k3, colUniqueId=2, type=varchar(1)"));
}
// lateral view of subquery
@@ -368,7 +368,7 @@ public void lateralViewColumnOfReduceTuple() throws Exception {
Assert.assertTrue(explainString.contains("lateral view tuple id: 2"));
Assert.assertTrue(explainString.contains("output slot id: 2"));
Assert.assertTrue(explainString.contains("tuple ids: 0 2"));
- Assert.assertTrue(explainString.contains("SlotDescriptor{id=2, col=e1, colUniqueId=-1, type=VARCHAR"));
+ Assert.assertTrue(explainString.contains("SlotDescriptor{id=2, col=e1, colUniqueId=-1, type=varchar"));
}
/*
@@ -384,7 +384,7 @@ public void aggInlineView() throws Exception {
Assert.assertTrue(explainString.contains("lateral view tuple id: 3"));
Assert.assertTrue(explainString.contains("output slot id: 3"));
Assert.assertTrue(explainString.contains("tuple ids: 1 3"));
- Assert.assertTrue(explainString.contains("SlotDescriptor{id=3, col=e1, colUniqueId=-1, type=VARCHAR"));
+ Assert.assertTrue(explainString.contains("SlotDescriptor{id=3, col=e1, colUniqueId=-1, type=varchar"));
}
/*
@@ -403,19 +403,19 @@ public void aggColumnInlineViewInTB() throws Exception {
Assert.assertTrue(explainString.contains("tuple ids: 1 3"));
String formatString = explainString.replaceAll(" ", "");
Assert.assertTrue(formatString.contains(
- "SlotDescriptor{id=0,col=k1,colUniqueId=0,type=INT"
+ "SlotDescriptor{id=0,col=k1,colUniqueId=0,type=int"
));
Assert.assertTrue(formatString.contains(
- "SlotDescriptor{id=1,col=k2,colUniqueId=1,type=VARCHAR(1)"
+ "SlotDescriptor{id=1,col=k2,colUniqueId=1,type=varchar(1)"
));
Assert.assertTrue(formatString.contains(
- "SlotDescriptor{id=2,col=k1,colUniqueId=0,type=INT"
+ "SlotDescriptor{id=2,col=k1,colUniqueId=0,type=int"
));
Assert.assertTrue(formatString.contains(
- "SlotDescriptor{id=3,col=null,colUniqueId=null,type=VARCHAR"
+ "SlotDescriptor{id=3,col=null,colUniqueId=null,type=varchar"
));
Assert.assertTrue(formatString.contains(
- "SlotDescriptor{id=6,col=e1,colUniqueId=-1,type=VARCHAR"
+ "SlotDescriptor{id=6,col=e1,colUniqueId=-1,type=varchar"
));
}
diff --git a/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleFunctionTest.java b/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleFunctionTest.java
index e034c2f3576a102..d7841313d714829 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleFunctionTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/rewrite/ExtractCommonFactorsRuleFunctionTest.java
@@ -273,27 +273,27 @@ public void testRewriteLikePredicate() throws Exception {
// tinyint
String sql = "select /*+ SET_VAR(enable_nereids_planner=false) */ * from tb3 where k1 like '%4%';";
LOG.info("EXPLAIN:{}", dorisAssert.query(sql).explainQuery());
- dorisAssert.query(sql).explainContains("CAST(`k1` AS VARCHAR(65533)) LIKE '%4%'");
+ dorisAssert.query(sql).explainContains("CAST(`k1` AS varchar(65533)) LIKE '%4%'");
// smallint
sql = "select /*+ SET_VAR(enable_nereids_planner=false) */ * from tb3 where k2 like '%4%';";
LOG.info("EXPLAIN:{}", dorisAssert.query(sql).explainQuery());
- dorisAssert.query(sql).explainContains("CAST(`k2` AS VARCHAR(65533)) LIKE '%4%'");
+ dorisAssert.query(sql).explainContains("CAST(`k2` AS varchar(65533)) LIKE '%4%'");
// int
sql = "select /*+ SET_VAR(enable_nereids_planner=false) */ * from tb3 where k3 like '%4%';";
LOG.info("EXPLAIN:{}", dorisAssert.query(sql).explainQuery());
- dorisAssert.query(sql).explainContains("CAST(`k3` AS VARCHAR(65533)) LIKE '%4%'");
+ dorisAssert.query(sql).explainContains("CAST(`k3` AS varchar(65533)) LIKE '%4%'");
// bigint
sql = "select /*+ SET_VAR(enable_nereids_planner=false) */ * from tb3 where k4 like '%4%';";
LOG.info("EXPLAIN:{}", dorisAssert.query(sql).explainQuery());
- dorisAssert.query(sql).explainContains("CAST(`k4` AS VARCHAR(65533)) LIKE '%4%'");
+ dorisAssert.query(sql).explainContains("CAST(`k4` AS varchar(65533)) LIKE '%4%'");
// largeint
sql = "select /*+ SET_VAR(enable_nereids_planner=false) */ * from tb3 where k5 like '%4%';";
LOG.info("EXPLAIN:{}", dorisAssert.query(sql).explainQuery());
- dorisAssert.query(sql).explainContains("CAST(`k5` AS VARCHAR(65533)) LIKE '%4%'");
+ dorisAssert.query(sql).explainContains("CAST(`k5` AS varchar(65533)) LIKE '%4%'");
}
@Test
diff --git a/fe/fe-core/src/test/java/org/apache/doris/rewrite/InferFiltersRuleTest.java b/fe/fe-core/src/test/java/org/apache/doris/rewrite/InferFiltersRuleTest.java
index d5cb69272f38030..fdac5c3dcc3e6cb 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/rewrite/InferFiltersRuleTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/rewrite/InferFiltersRuleTest.java
@@ -200,7 +200,7 @@ public void testOnIsNotNullPredicate() throws Exception {
+ " where tb1.k1 = tb2.k1 and tb2.k1 = tb3.k1 and tb2.k1 = 1";
String planString = dorisAssert.query(query).explainQuery();
Assert.assertTrue(planString.contains("`tb1`.`k1` = 1"));
- Assert.assertTrue(planString, planString.contains("CAST(`tb3`.`k1` AS INT)"));
+ Assert.assertTrue(planString, planString.contains("CAST(`tb3`.`k1` AS int)"));
}
@Test
@@ -280,7 +280,7 @@ public void testWhere3Tables1stInner2ndRightJoinEqLiteralAt2nd() throws Exceptio
+ " where tb1.k1 = tb2.k1 and tb2.k1 = tb3.k1 and tb2.k1 = 1";
String planString = dorisAssert.query(query).explainQuery();
Assert.assertTrue(planString, planString.contains("`tb1`.`k1` = 1"));
- Assert.assertTrue(planString, planString.contains("CAST(`tb3`.`k1` AS INT) = 1"));
+ Assert.assertTrue(planString, planString.contains("CAST(`tb3`.`k1` AS int) = 1"));
}
@Test
diff --git a/fe/fe-core/src/test/java/org/apache/doris/statistics/HistogramTest.java b/fe/fe-core/src/test/java/org/apache/doris/statistics/HistogramTest.java
index b5ca8d8095c2d91..a6278df5231bd02 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/statistics/HistogramTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/statistics/HistogramTest.java
@@ -94,8 +94,8 @@ void testSerializeToJson() throws AnalysisException {
JsonObject histogramJson = JsonParser.parseString(json).getAsJsonObject();
String typeStr = histogramJson.get("data_type").getAsString();
- Assertions.assertEquals("DATETIME", typeStr);
- Type datatype = Type.fromPrimitiveType(PrimitiveType.valueOf(typeStr));
+ Assertions.assertEquals("datetime", typeStr);
+ Type datatype = Type.fromPrimitiveType(PrimitiveType.valueOf(typeStr.toUpperCase()));
Assertions.assertNotNull(datatype);
int numBuckets = histogramJson.get("num_buckets").getAsInt();
diff --git a/regression-test/data/bloom_filter_p0/test_create_table_with_bloom_filter.out b/regression-test/data/bloom_filter_p0/test_create_table_with_bloom_filter.out
index 0409ab7fb3c0d7b..612337ab30bf66c 100644
--- a/regression-test/data/bloom_filter_p0/test_create_table_with_bloom_filter.out
+++ b/regression-test/data/bloom_filter_p0/test_create_table_with_bloom_filter.out
@@ -3,56 +3,56 @@
1 2 4 8 50string 500varchar c 65535varchar 0.000000 123456789012345678.123456789 111.1 11222323232.1 11345643534234231.1 2013-12-01 1900-01-01T00:00 2013-12-01 1900-01-01T00:00 1900-01-01T00:00:00.111 1900-01-01T00:00:00.111111 1 2 4 8 50string 500varchar_replace c 65535varchar 12345678901234.123456 123456789012345678.123456789 111.1 11222323232.1 11345643534234231.1 1900-01-01 1900-01-01 1900-01-01 1900-01-01T00:00 1900-01-01T00:00 1900-01-01T00:00 2013-12-01 2013-12-01 2013-12-01 1900-01-01T00:00 1900-01-01T00:00 1900-01-01T00:00 1900-01-01T00:00:00.111 1900-01-01T00:00:00.111 1900-01-01T00:00:00.111 1900-01-01T00:00:00.111111 1900-01-01T00:00:00.111111 1900-01-01T00:00:00.111111 0.4 0.8
-- !desc_tb --
-tinyint_key TINYINT No true \N
-smallint_key SMALLINT No true \N BLOOM_FILTER
-int_key INT No true \N BLOOM_FILTER
-bigint_key BIGINT No true \N BLOOM_FILTER
-char_50_key CHAR(50) No true \N BLOOM_FILTER
-character_key VARCHAR(500) No true \N BLOOM_FILTER
-char_key CHAR(1) No true \N BLOOM_FILTER
-character_most_key VARCHAR(65533) No true \N BLOOM_FILTER
-decimal_key DECIMAL(20, 6) No true \N BLOOM_FILTER
-decimal_most_key DECIMAL(27, 9) No true \N BLOOM_FILTER
-decimal32_key DECIMAL(5, 1) No true \N BLOOM_FILTER
-decimal64_key DECIMAL(14, 1) No true \N BLOOM_FILTER
-decimal128_key DECIMAL(38, 1) No true \N BLOOM_FILTER
-date_key DATE No true \N BLOOM_FILTER
-datetime_key DATETIME No true \N BLOOM_FILTER
-datev2_key DATE No true \N BLOOM_FILTER
-datetimev2_key_1 DATETIME No true \N BLOOM_FILTER
-datetimev2_key_2 DATETIME(3) No true \N BLOOM_FILTER
-datetimev2_key_3 DATETIME(6) No true \N BLOOM_FILTER
-tinyint_value TINYINT No false \N SUM
-smallint_value SMALLINT No false \N SUM
-int_value INT No false \N SUM
-bigint_value BIGINT No false \N SUM
-char_50_value CHAR(50) No false \N REPLACE
-character_value VARCHAR(500) No false \N REPLACE
-char_value CHAR(1) No false \N REPLACE
-character_most_value VARCHAR(65533) No false \N REPLACE
-decimal_value DECIMAL(20, 6) No false \N SUM
-decimal_most_value DECIMAL(27, 9) No false \N SUM
-decimal32_value DECIMAL(5, 1) No false \N SUM
-decimal64_value DECIMAL(14, 1) No false \N SUM
-decimal128_value DECIMAL(38, 1) No false \N SUM
-date_value_max DATE No false \N MAX
-date_value_replace DATE No false \N REPLACE
-date_value_min DATE No false \N MIN
-datetime_value_max DATETIME No false \N MAX
-datetime_value_replace DATETIME No false \N REPLACE
-datetime_value_min DATETIME No false \N MIN
-datev2_value_max DATE No false \N MAX
-datev2_value_replace DATE No false \N REPLACE
-datev2_value_min DATE No false \N MIN
-datetimev2_value_1_max DATETIME No false \N MAX
-datetimev2_value_1_replace DATETIME No false \N REPLACE
-datetimev2_value_1_min DATETIME No false \N MIN
-datetimev2_value_2_max DATETIME(3) No false \N MAX
-datetimev2_value_2_replace DATETIME(3) No false \N REPLACE
-datetimev2_value_2_min DATETIME(3) No false \N MIN
-datetimev2_value_3_max DATETIME(6) No false \N MAX
-datetimev2_value_3_replace DATETIME(6) No false \N REPLACE
-datetimev2_value_3_min DATETIME(6) No false \N MIN
-float_value FLOAT No false \N SUM
-double_value DOUBLE No false \N SUM
+tinyint_key tinyint No true \N
+smallint_key smallint No true \N BLOOM_FILTER
+int_key int No true \N BLOOM_FILTER
+bigint_key bigint No true \N BLOOM_FILTER
+char_50_key char(50) No true \N BLOOM_FILTER
+character_key varchar(500) No true \N BLOOM_FILTER
+char_key char(1) No true \N BLOOM_FILTER
+character_most_key varchar(65533) No true \N BLOOM_FILTER
+decimal_key decimal(20,6) No true \N BLOOM_FILTER
+decimal_most_key decimal(27,9) No true \N BLOOM_FILTER
+decimal32_key decimal(5,1) No true \N BLOOM_FILTER
+decimal64_key decimal(14,1) No true \N BLOOM_FILTER
+decimal128_key decimal(38,1) No true \N BLOOM_FILTER
+date_key date No true \N BLOOM_FILTER
+datetime_key datetime No true \N BLOOM_FILTER
+datev2_key date No true \N BLOOM_FILTER
+datetimev2_key_1 datetime No true \N BLOOM_FILTER
+datetimev2_key_2 datetime(3) No true \N BLOOM_FILTER
+datetimev2_key_3 datetime(6) No true \N BLOOM_FILTER
+tinyint_value tinyint No false \N SUM
+smallint_value smallint No false \N SUM
+int_value int No false \N SUM
+bigint_value bigint No false \N SUM
+char_50_value char(50) No false \N REPLACE
+character_value varchar(500) No false \N REPLACE
+char_value char(1) No false \N REPLACE
+character_most_value varchar(65533) No false \N REPLACE
+decimal_value decimal(20,6) No false \N SUM
+decimal_most_value decimal(27,9) No false \N SUM
+decimal32_value decimal(5,1) No false \N SUM
+decimal64_value decimal(14,1) No false \N SUM
+decimal128_value decimal(38,1) No false \N SUM
+date_value_max date No false \N MAX
+date_value_replace date No false \N REPLACE
+date_value_min date No false \N MIN
+datetime_value_max datetime No false \N MAX
+datetime_value_replace datetime No false \N REPLACE
+datetime_value_min datetime No false \N MIN
+datev2_value_max date No false \N MAX
+datev2_value_replace date No false \N REPLACE
+datev2_value_min date No false \N MIN
+datetimev2_value_1_max datetime No false \N MAX
+datetimev2_value_1_replace datetime No false \N REPLACE
+datetimev2_value_1_min datetime No false \N MIN
+datetimev2_value_2_max datetime(3) No false \N MAX
+datetimev2_value_2_replace datetime(3) No false \N REPLACE
+datetimev2_value_2_min datetime(3) No false \N MIN
+datetimev2_value_3_max datetime(6) No false \N MAX
+datetimev2_value_3_replace datetime(6) No false \N REPLACE
+datetimev2_value_3_min datetime(6) No false \N MIN
+float_value float No false \N SUM
+double_value double No false \N SUM
diff --git a/regression-test/data/correctness/test_view_varchar_length.out b/regression-test/data/correctness/test_view_varchar_length.out
index 2b67988f7fd8524..e53fe9ff97fe63f 100644
--- a/regression-test/data/correctness/test_view_varchar_length.out
+++ b/regression-test/data/correctness/test_view_varchar_length.out
@@ -1,4 +1,4 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !sql --
-name VARCHAR(32) No false \N
+name varchar(32) No false \N
diff --git a/regression-test/data/data_model_p0/aggregate/test_aggregate_table.out b/regression-test/data/data_model_p0/aggregate/test_aggregate_table.out
index d147f656433df58..1a7ed71eb2e57cf 100644
--- a/regression-test/data/data_model_p0/aggregate/test_aggregate_table.out
+++ b/regression-test/data/data_model_p0/aggregate/test_aggregate_table.out
@@ -3,46 +3,46 @@
0 3 2 1 \N 2
-- !desc_date_table --
-k INT Yes true \N
-int_value_sum INT Yes false \N SUM
-int_value_max INT Yes false \N MAX
-int_value_min INT Yes false \N MIN
-int_value_replace INT Yes false \N REPLACE
-int_value_replace_if_not_null INT Yes false \N REPLACE_IF_NOT_NULL
+k int Yes true \N
+int_value_sum int Yes false \N SUM
+int_value_max int Yes false \N MAX
+int_value_min int Yes false \N MIN
+int_value_replace int Yes false \N REPLACE
+int_value_replace_if_not_null int Yes false \N REPLACE_IF_NOT_NULL
-- !string_agg_table --
0 2 \N
-- !desc_string_table --
-k INT Yes true \N
-char_value_max CHAR(10) Yes false \N MAX
-char_value_min CHAR(10) Yes false \N MIN
-char_value_replace CHAR(10) Yes false \N REPLACE
-char_value_replace_if_not_null CHAR(10) Yes false \N REPLACE_IF_NOT_NULL
+k int Yes true \N
+char_value_max char(10) Yes false \N MAX
+char_value_min char(10) Yes false \N MIN
+char_value_replace char(10) Yes false \N REPLACE
+char_value_replace_if_not_null char(10) Yes false \N REPLACE_IF_NOT_NULL
-- !date_agg_table --
0 2000-12-31 2000-01-01 \N 2000-12-31 2000-12-31 2000-01-01 \N 2000-12-31 2000-12-31T11:11:11 2000-01-01T11:11:11 \N 2000-12-31T11:11:11 2000-12-31T11:11:11.111 2000-01-01T11:11:11.111 \N 2000-12-31T11:11:11.111 2000-12-31T11:11:11.111111 2000-01-01T11:11:11.111111 \N 2000-12-31T11:11:11.111111
-- !desc_date_table --
-k INT Yes true \N
-date_value_max DATE Yes false \N MAX
-date_value_min DATE Yes false \N MIN
-date_value_replace DATE Yes false \N REPLACE
-date_value_replace_if_not_null DATE Yes false \N REPLACE_IF_NOT_NULL
-datev2_value_max DATE Yes false \N MAX
-datev2_value_min DATE Yes false \N MIN
-datev2_value_replace DATE Yes false \N REPLACE
-datev2_value_replace_if_not_null DATE Yes false \N REPLACE_IF_NOT_NULL
-datetimev2_value_max DATETIME Yes false \N MAX
-datetimev2_value_min DATETIME Yes false \N MIN
-datetimev2_value_replace DATETIME Yes false \N REPLACE
-datetimev2_value_replace_if_not_null DATETIME Yes false \N REPLACE_IF_NOT_NULL
-datetimev2_value_max_1 DATETIME(3) Yes false \N MAX
-datetimev2_value_min_1 DATETIME(3) Yes false \N MIN
-datetimev2_value_replace_1 DATETIME(3) Yes false \N REPLACE
-datetimev2_value_replace_if_not_null_1 DATETIME(3) Yes false \N REPLACE_IF_NOT_NULL
-datetimev2_value_max_2 DATETIME(6) Yes false \N MAX
-datetimev2_value_min_2 DATETIME(6) Yes false \N MIN
-datetimev2_value_replace_2 DATETIME(6) Yes false \N REPLACE
-datetimev2_value_replace_if_not_null_2 DATETIME(6) Yes false \N REPLACE_IF_NOT_NULL
+k int Yes true \N
+date_value_max date Yes false \N MAX
+date_value_min date Yes false \N MIN
+date_value_replace date Yes false \N REPLACE
+date_value_replace_if_not_null date Yes false \N REPLACE_IF_NOT_NULL
+datev2_value_max date Yes false \N MAX
+datev2_value_min date Yes false \N MIN
+datev2_value_replace date Yes false \N REPLACE
+datev2_value_replace_if_not_null date Yes false \N REPLACE_IF_NOT_NULL
+datetimev2_value_max datetime Yes false \N MAX
+datetimev2_value_min datetime Yes false \N MIN
+datetimev2_value_replace datetime Yes false \N REPLACE
+datetimev2_value_replace_if_not_null datetime Yes false \N REPLACE_IF_NOT_NULL
+datetimev2_value_max_1 datetime(3) Yes false \N MAX
+datetimev2_value_min_1 datetime(3) Yes false \N MIN
+datetimev2_value_replace_1 datetime(3) Yes false \N REPLACE
+datetimev2_value_replace_if_not_null_1 datetime(3) Yes false \N REPLACE_IF_NOT_NULL
+datetimev2_value_max_2 datetime(6) Yes false \N MAX
+datetimev2_value_min_2 datetime(6) Yes false \N MIN
+datetimev2_value_replace_2 datetime(6) Yes false \N REPLACE
+datetimev2_value_replace_if_not_null_2 datetime(6) Yes false \N REPLACE_IF_NOT_NULL
diff --git a/regression-test/data/data_model_p0/duplicate/storage/test_dup_tab_auto_inc_col.out b/regression-test/data/data_model_p0/duplicate/storage/test_dup_tab_auto_inc_col.out
index f1dbbd892ff5e96..1a70808697a5c7d 100644
--- a/regression-test/data/data_model_p0/duplicate/storage/test_dup_tab_auto_inc_col.out
+++ b/regression-test/data/data_model_p0/duplicate/storage/test_dup_tab_auto_inc_col.out
@@ -1,11 +1,11 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !desc --
-id BIGINT No true \N AUTO_INCREMENT
-value INT No false \N NONE
+id bigint No true \N AUTO_INCREMENT
+value int No false \N NONE
-- !desc --
-id INT No true \N
-value BIGINT No false \N NONE,AUTO_INCREMENT
+id int No true \N
+value bigint No false \N NONE,AUTO_INCREMENT
-- !sql --
1
diff --git a/regression-test/data/data_model_p0/duplicate/storage/test_dup_tab_auto_inc_start_value_col.out b/regression-test/data/data_model_p0/duplicate/storage/test_dup_tab_auto_inc_start_value_col.out
index f1dbbd892ff5e96..1a70808697a5c7d 100644
--- a/regression-test/data/data_model_p0/duplicate/storage/test_dup_tab_auto_inc_start_value_col.out
+++ b/regression-test/data/data_model_p0/duplicate/storage/test_dup_tab_auto_inc_start_value_col.out
@@ -1,11 +1,11 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !desc --
-id BIGINT No true \N AUTO_INCREMENT
-value INT No false \N NONE
+id bigint No true \N AUTO_INCREMENT
+value int No false \N NONE
-- !desc --
-id INT No true \N
-value BIGINT No false \N NONE,AUTO_INCREMENT
+id int No true \N
+value bigint No false \N NONE,AUTO_INCREMENT
-- !sql --
1
diff --git a/regression-test/data/data_model_p0/duplicate/test_duplicate_table.out b/regression-test/data/data_model_p0/duplicate/test_duplicate_table.out
index ca53c5f958dfa66..a2023bbb3b79e97 100644
--- a/regression-test/data/data_model_p0/duplicate/test_duplicate_table.out
+++ b/regression-test/data/data_model_p0/duplicate/test_duplicate_table.out
@@ -5,14 +5,14 @@
0 2 test int 2000-02-02 2000-02-02 2000-02-02T11:00:11 2000-02-02T11:00:11.111 2000-02-02T11:00:11.111111
-- !desc_dup_table --
-k INT Yes true \N
-int_value INT Yes false \N NONE
-char_value CHAR(10) Yes false \N NONE
-date_value DATE Yes false \N NONE
-date_value2 DATE Yes false \N NONE
-date_value3 DATETIME Yes false \N NONE
-date_value4 DATETIME(3) Yes false \N NONE
-date_value5 DATETIME(6) Yes false \N NONE
+k int Yes true \N
+int_value int Yes false \N NONE
+char_value char(10) Yes false \N NONE
+date_value date Yes false \N NONE
+date_value2 date Yes false \N NONE
+date_value3 datetime Yes false \N NONE
+date_value4 datetime(3) Yes false \N NONE
+date_value5 datetime(6) Yes false \N NONE
-- !select_dup_table --
0 1 2 3
@@ -20,8 +20,8 @@ date_value5 DATETIME(6) Yes false \N NONE
0 1 2 5
-- !desc_dup_table --
-k1 INT Yes true \N
-k2 INT Yes true \N
-k3 INT Yes true \N
-int_value INT Yes false \N NONE
+k1 int Yes true \N
+k2 int Yes true \N
+k3 int Yes true \N
+int_value int Yes false \N NONE
diff --git a/regression-test/data/data_model_p0/duplicate/test_duplicate_table_without_keys.out b/regression-test/data/data_model_p0/duplicate/test_duplicate_table_without_keys.out
index 3ff8e0394afb356..25e83d20671b1c6 100644
--- a/regression-test/data/data_model_p0/duplicate/test_duplicate_table_without_keys.out
+++ b/regression-test/data/data_model_p0/duplicate/test_duplicate_table_without_keys.out
@@ -5,10 +5,10 @@
0 1 2 5
-- !desc_dup_table --
-k1 INT Yes true \N
-k2 INT Yes true \N
-k3 INT Yes true \N
-int_value INT Yes false \N NONE
+k1 int Yes true \N
+k2 int Yes true \N
+k3 int Yes true \N
+int_value int Yes false \N NONE
-- !select_dup_table --
0 1 2 3
@@ -16,10 +16,10 @@ int_value INT Yes false \N NONE
0 1 2 5
-- !desc_dup_table --
-k1 INT Yes false \N NONE
-k2 INT Yes false \N NONE
-k3 INT Yes false \N NONE
-int_value INT Yes false \N NONE
+k1 int Yes false \N NONE
+k2 int Yes false \N NONE
+k3 int Yes false \N NONE
+int_value int Yes false \N NONE
-- !select_dup_table --
0 1 2 0 3
@@ -27,16 +27,16 @@ int_value INT Yes false \N NONE
0 1 2 0 5
-- !desc_dup_table --
-k1 INT Yes false \N NONE
-k2 INT Yes false \N NONE
-k3 INT Yes false \N NONE
-new_col1 INT Yes false 0 NONE
-int_value INT Yes false \N NONE
+k1 int Yes false \N NONE
+k2 int Yes false \N NONE
+k3 int Yes false \N NONE
+new_col1 int Yes false 0 NONE
+int_value int Yes false \N NONE
-- !desc_dup_table --
-k1 INT Yes false \N NONE
-k2 INT Yes false \N NONE
-k3 INT Yes false \N NONE
-new_col1 INT Yes false 0 NONE
-int_value INT Yes false \N NONE
+k1 int Yes false \N NONE
+k2 int Yes false \N NONE
+k3 int Yes false \N NONE
+new_col1 int Yes false 0 NONE
+int_value int Yes false \N NONE
diff --git a/regression-test/data/data_model_p0/unique/test_unique_table.out b/regression-test/data/data_model_p0/unique/test_unique_table.out
index d888313de27466a..61a4f47f355e2e7 100644
--- a/regression-test/data/data_model_p0/unique/test_unique_table.out
+++ b/regression-test/data/data_model_p0/unique/test_unique_table.out
@@ -3,19 +3,19 @@
0 \N \N \N
-- !desc_uniq_table --
-k INT Yes true \N
-int_value INT Yes false \N NONE
-char_value CHAR(10) Yes false \N NONE
-date_value DATE Yes false \N NONE
+k int Yes true \N
+int_value int Yes false \N NONE
+char_value char(10) Yes false \N NONE
+date_value date Yes false \N NONE
-- !0 --
-k1 INT Yes true \N
-v1 TINYINT Yes false \N NONE
-v2 INT Yes false \N NONE
-v3 INT Yes false \N NONE
-or INT Yes false \N NONE
-__DORIS_DELETE_SIGN__ TINYINT No false 0 NONE
-__DORIS_VERSION_COL__ BIGINT No false 0 NONE
+k1 int Yes true \N
+v1 tinyint Yes false \N NONE
+v2 int Yes false \N NONE
+v3 int Yes false \N NONE
+or int Yes false \N NONE
+__DORIS_DELETE_SIGN__ tinyint No false 0 NONE
+__DORIS_VERSION_COL__ bigint No false 0 NONE
-- !1 --
1 1 1 1 1 0 2
diff --git a/regression-test/data/data_model_p0/unique/test_unique_table_like.out b/regression-test/data/data_model_p0/unique/test_unique_table_like.out
index f6e03d26dff9a3d..0aeb45ed24665fc 100644
--- a/regression-test/data/data_model_p0/unique/test_unique_table_like.out
+++ b/regression-test/data/data_model_p0/unique/test_unique_table_like.out
@@ -1,19 +1,19 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !desc_uniq_table --
-k INT Yes true \N
-int_value INT Yes false \N NONE
-char_value CHAR(10) Yes false \N NONE
-date_value DATE Yes false \N NONE
-__DORIS_DELETE_SIGN__ TINYINT No false 0 NONE
-__DORIS_VERSION_COL__ BIGINT No false 0 NONE
-__DORIS_SEQUENCE_COL__ INT Yes false \N NONE
+k int Yes true \N
+int_value int Yes false \N NONE
+char_value char(10) Yes false \N NONE
+date_value date Yes false \N NONE
+__DORIS_DELETE_SIGN__ tinyint No false 0 NONE
+__DORIS_VERSION_COL__ bigint No false 0 NONE
+__DORIS_SEQUENCE_COL__ int Yes false \N NONE
-- !desc_uniq_table --
-k INT Yes true \N
-int_value INT Yes false \N NONE
-char_value CHAR(10) Yes false \N NONE
-date_value DATE Yes false \N NONE
-__DORIS_DELETE_SIGN__ TINYINT No false 0 NONE
-__DORIS_VERSION_COL__ BIGINT No false 0 NONE
-__DORIS_SEQUENCE_COL__ INT Yes false \N NONE
+k int Yes true \N
+int_value int Yes false \N NONE
+char_value char(10) Yes false \N NONE
+date_value date Yes false \N NONE
+__DORIS_DELETE_SIGN__ tinyint No false 0 NONE
+__DORIS_VERSION_COL__ bigint No false 0 NONE
+__DORIS_SEQUENCE_COL__ int Yes false \N NONE
diff --git a/regression-test/data/data_model_p0/unique/test_unique_table_new_sequence.out b/regression-test/data/data_model_p0/unique/test_unique_table_new_sequence.out
index 4a895d81517dcc0..b986bbeabfd8358 100644
--- a/regression-test/data/data_model_p0/unique/test_unique_table_new_sequence.out
+++ b/regression-test/data/data_model_p0/unique/test_unique_table_new_sequence.out
@@ -46,14 +46,14 @@
3 6 13 14 15 0 2 13
-- !desc --
-k1 INT Yes true \N
-v1 TINYINT Yes false \N NONE
-v2 INT Yes false \N NONE
-v3 INT Yes false \N NONE
-v4 INT Yes false \N NONE
-__DORIS_DELETE_SIGN__ TINYINT No false 0 NONE
-__DORIS_VERSION_COL__ BIGINT No false 0 NONE
-__DORIS_SEQUENCE_COL__ INT Yes false \N NONE
+k1 int Yes true \N
+v1 tinyint Yes false \N NONE
+v2 int Yes false \N NONE
+v3 int Yes false \N NONE
+v4 int Yes false \N NONE
+__DORIS_DELETE_SIGN__ tinyint No false 0 NONE
+__DORIS_VERSION_COL__ bigint No false 0 NONE
+__DORIS_SEQUENCE_COL__ int Yes false \N NONE
-- !1 --
1 1 1 1 1 0 2 1
@@ -71,14 +71,14 @@ __DORIS_SEQUENCE_COL__ INT Yes false \N NONE
3 3 3 3 3 0 2 3
-- !desc --
-k1 INT Yes true \N
-v1 TINYINT Yes false \N REPLACE
-v2 INT Yes false \N REPLACE
-v3 INT Yes false \N REPLACE
-or INT Yes false \N REPLACE
-__DORIS_DELETE_SIGN__ TINYINT No false 0 REPLACE
-__DORIS_VERSION_COL__ BIGINT No false 0 REPLACE
-__DORIS_SEQUENCE_COL__ INT Yes false \N REPLACE
+k1 int Yes true \N
+v1 tinyint Yes false \N REPLACE
+v2 int Yes false \N REPLACE
+v3 int Yes false \N REPLACE
+or int Yes false \N REPLACE
+__DORIS_DELETE_SIGN__ tinyint No false 0 REPLACE
+__DORIS_VERSION_COL__ bigint No false 0 REPLACE
+__DORIS_SEQUENCE_COL__ int Yes false \N REPLACE
-- !all --
1 4 11 12 13
@@ -127,14 +127,14 @@ __DORIS_SEQUENCE_COL__ INT Yes false \N REPLACE
3 6 13 14 15 0 2 13
-- !desc --
-k1 INT Yes true \N
-v1 TINYINT Yes false \N NONE
-v2 INT Yes false \N NONE
-v3 INT Yes false \N NONE
-v4 INT Yes false \N NONE
-__DORIS_DELETE_SIGN__ TINYINT No false 0 NONE
-__DORIS_VERSION_COL__ BIGINT No false 0 NONE
-__DORIS_SEQUENCE_COL__ INT Yes false \N NONE
+k1 int Yes true \N
+v1 tinyint Yes false \N NONE
+v2 int Yes false \N NONE
+v3 int Yes false \N NONE
+v4 int Yes false \N NONE
+__DORIS_DELETE_SIGN__ tinyint No false 0 NONE
+__DORIS_VERSION_COL__ bigint No false 0 NONE
+__DORIS_SEQUENCE_COL__ int Yes false \N NONE
-- !1 --
1 1 1 1 1 0 2 1
@@ -152,12 +152,12 @@ __DORIS_SEQUENCE_COL__ INT Yes false \N NONE
3 3 3 3 3 0 2 3
-- !desc --
-k1 INT Yes true \N
-v1 TINYINT Yes false \N REPLACE
-v2 INT Yes false \N REPLACE
-v3 INT Yes false \N REPLACE
-or INT Yes false \N REPLACE
-__DORIS_DELETE_SIGN__ TINYINT No false 0 REPLACE
-__DORIS_VERSION_COL__ BIGINT No false 0 REPLACE
-__DORIS_SEQUENCE_COL__ INT Yes false \N REPLACE
+k1 int Yes true \N
+v1 tinyint Yes false \N REPLACE
+v2 int Yes false \N REPLACE
+v3 int Yes false \N REPLACE
+or int Yes false \N REPLACE
+__DORIS_DELETE_SIGN__ tinyint No false 0 REPLACE
+__DORIS_VERSION_COL__ bigint No false 0 REPLACE
+__DORIS_SEQUENCE_COL__ int Yes false \N REPLACE
diff --git a/regression-test/data/datatype_p0/agg_state/nereids/test_agg_state_nereids.out b/regression-test/data/datatype_p0/agg_state/nereids/test_agg_state_nereids.out
index 8cdb1b8a59d4978..f18546168c347ad 100644
--- a/regression-test/data/datatype_p0/agg_state/nereids/test_agg_state_nereids.out
+++ b/regression-test/data/datatype_p0/agg_state/nereids/test_agg_state_nereids.out
@@ -15,8 +15,8 @@
\N
-- !desc --
-k1 INT Yes true \N
-k2 AGG_STATE No false \N GENERIC
+k1 int Yes true \N
+k2 agg_state No false \N GENERIC
-- !length1 --
1 11
diff --git a/regression-test/data/datatype_p0/agg_state/test_agg_state.out b/regression-test/data/datatype_p0/agg_state/test_agg_state.out
index 0e1e5b6ed91e976..4bfd8e793c10a7c 100644
--- a/regression-test/data/datatype_p0/agg_state/test_agg_state.out
+++ b/regression-test/data/datatype_p0/agg_state/test_agg_state.out
@@ -15,8 +15,8 @@
\N
-- !desc --
-k1 INT Yes true \N
-k2 AGG_STATE No false \N GENERIC
+k1 int Yes true \N
+k2 agg_state No false \N GENERIC
-- !length1 --
1 11
diff --git a/regression-test/data/datatype_p0/bitmap/test_bitmap_int.out b/regression-test/data/datatype_p0/bitmap/test_bitmap_int.out
index 3ff7233cef75a59..30f8ec06e76cc97 100644
Binary files a/regression-test/data/datatype_p0/bitmap/test_bitmap_int.out and b/regression-test/data/datatype_p0/bitmap/test_bitmap_int.out differ
diff --git a/regression-test/data/datatype_p0/decimalv3/test_show_decimalv3.out b/regression-test/data/datatype_p0/decimalv3/test_show_decimalv3.out
index 2d3715e48d48d9c..df199714b703967 100644
--- a/regression-test/data/datatype_p0/decimalv3/test_show_decimalv3.out
+++ b/regression-test/data/datatype_p0/decimalv3/test_show_decimalv3.out
@@ -1,17 +1,17 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !select1 --
-id INT No true \N
-dd DECIMAL(15, 6) Yes false \N NONE
+id int No true \N
+dd decimal(15,6) Yes false \N NONE
-- !select2 --
-showdb UNIQUE_KEYS id INT INT No true \N true
- dd DECIMAL(15, 6) DECIMALV3(15, 6) Yes false \N NONE true
+showdb UNIQUE_KEYS id int int No true \N true
+ dd DECIMAL(15, 6) decimalv3(15,6) Yes false \N NONE true
-- !select3 --
-id INT No true \N
-dd DECIMAL(38, 9) Yes false \N NONE
+id int No true \N
+dd decimal(38,9) Yes false \N NONE
-- !select4 --
-showdb UNIQUE_KEYS id INT INT No true \N true
- dd DECIMAL(38, 9) DECIMALV3(38, 9) Yes false \N NONE true
+showdb UNIQUE_KEYS id int int No true \N true
+ dd DECIMAL(38, 9) decimalv3(38,9) Yes false \N NONE true
diff --git a/regression-test/data/datatype_p0/nested_types/meta/test_complextype_nested_version_schema.out b/regression-test/data/datatype_p0/nested_types/meta/test_complextype_nested_version_schema.out
index 40f88985ab25fc2..c9e7e6f77f27e90 100644
--- a/regression-test/data/datatype_p0/nested_types/meta/test_complextype_nested_version_schema.out
+++ b/regression-test/data/datatype_p0/nested_types/meta/test_complextype_nested_version_schema.out
@@ -1,8 +1,8 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !sql --
-id INT Yes true \N
-c1 ARRAY Yes false \N NONE
-c2 DECIMAL(12, 1) Yes false \N NONE
-c3 MAP Yes false \N NONE
-c4 STRUCT Yes false \N NONE
+id int Yes true \N
+c1 array Yes false \N NONE
+c2 decimal(12,1) Yes false \N NONE
+c3 map Yes false \N NONE
+c4 struct Yes false \N NONE
diff --git a/regression-test/data/datatype_p0/scalar_types/get_assignment_compatible_type.out b/regression-test/data/datatype_p0/scalar_types/get_assignment_compatible_type.out
index 723726cdc371ad1..1875bb026596791 100644
--- a/regression-test/data/datatype_p0/scalar_types/get_assignment_compatible_type.out
+++ b/regression-test/data/datatype_p0/scalar_types/get_assignment_compatible_type.out
@@ -1,6 +1,6 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !test_sql --
-test_decimal_boolean_view CREATE VIEW `test_decimal_boolean_view` AS SELECT `id` AS `id`, `c1` AS `c1`, `c2` AS `c2` FROM `regression_test_datatype_p0_scalar_types`.`test_decimal_boolean` WHERE (0.0 = CAST(`c1` AS DECIMALV3(2, 1))) AND (CAST(`c2` AS DECIMALV3(6, 1)) = 1.0); utf8mb4 utf8mb4_0900_bin
+test_decimal_boolean_view CREATE VIEW `test_decimal_boolean_view` AS SELECT `id` AS `id`, `c1` AS `c1`, `c2` AS `c2` FROM `regression_test_datatype_p0_scalar_types`.`test_decimal_boolean` WHERE (0.0 = CAST(`c1` AS decimalv3(2,1))) AND (CAST(`c2` AS decimalv3(6,1)) = 1.0); utf8mb4 utf8mb4_0900_bin
-- !test_union --
0.0
diff --git a/regression-test/data/ddl_p0/test_create_table_like.out b/regression-test/data/ddl_p0/test_create_table_like.out
index dd25363ab112c41..07f4254ab329066 100644
--- a/regression-test/data/ddl_p0/test_create_table_like.out
+++ b/regression-test/data/ddl_p0/test_create_table_like.out
@@ -1,21 +1,21 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !desc_create_table --
-decimal_test DUP_KEYS name VARCHAR(65533) VARCHAR(65533) Yes true \N true
- id SMALLINT SMALLINT Yes false \N NONE true
- timestamp0 DECIMAL(38, 9) DECIMALV3(38, 9) Yes false \N NONE true
- timestamp1 DECIMAL DECIMALV3(10, 0) Yes false \N NONE true
- timestamp2 DECIMAL(10, 1) DECIMALV3(10, 1) Yes false \N NONE true
- timestamp3 DECIMAL DECIMALV3(10, 0) Yes false \N NONE true
- timestamp4 DECIMAL(10, 1) DECIMALV3(10, 1) Yes false \N NONE true
+decimal_test DUP_KEYS name varchar(65533) varchar(65533) Yes true \N true
+ id smallint smallint Yes false \N NONE true
+ timestamp0 DECIMAL(38, 9) decimalv3(38,9) Yes false \N NONE true
+ timestamp1 DECIMAL decimalv3(10,0) Yes false \N NONE true
+ timestamp2 DECIMAL(10, 1) decimalv3(10,1) Yes false \N NONE true
+ timestamp3 DECIMAL decimalv3(10,0) Yes false \N NONE true
+ timestamp4 DECIMAL(10, 1) decimalv3(10,1) Yes false \N NONE true
-- !desc_create_table_like --
-decimal_test_like DUP_KEYS name VARCHAR(65533) VARCHAR(65533) Yes true \N true
- id SMALLINT SMALLINT Yes false \N NONE true
- timestamp0 DECIMAL(38, 9) DECIMALV3(38, 9) Yes false \N NONE true
- timestamp1 DECIMAL DECIMALV3(10, 0) Yes false \N NONE true
- timestamp2 DECIMAL(10, 1) DECIMALV3(10, 1) Yes false \N NONE true
- timestamp3 DECIMAL DECIMALV3(10, 0) Yes false \N NONE true
- timestamp4 DECIMAL(10, 1) DECIMALV3(10, 1) Yes false \N NONE true
+decimal_test_like DUP_KEYS name varchar(65533) varchar(65533) Yes true \N true
+ id smallint smallint Yes false \N NONE true
+ timestamp0 DECIMAL(38, 9) decimalv3(38,9) Yes false \N NONE true
+ timestamp1 DECIMAL decimalv3(10,0) Yes false \N NONE true
+ timestamp2 DECIMAL(10, 1) decimalv3(10,1) Yes false \N NONE true
+ timestamp3 DECIMAL decimalv3(10,0) Yes false \N NONE true
+ timestamp4 DECIMAL(10, 1) decimalv3(10,1) Yes false \N NONE true
-- !select_table_like --
test1 1 123456789.000000000 1234567891 123456789.0 1234567891 123456789.0
diff --git a/regression-test/data/ddl_p0/test_create_view.out b/regression-test/data/ddl_p0/test_create_view.out
index 4ba274b5347e89f..1edf464474fd28b 100644
--- a/regression-test/data/ddl_p0/test_create_view.out
+++ b/regression-test/data/ddl_p0/test_create_view.out
@@ -25,5 +25,5 @@
3 [-1, 20, 0] [0, 1, 0]
-- !test_view_6 --
-v1 CREATE VIEW `v1` AS SELECT `error_code` AS `error_code`, 1 AS `__literal_1`, 'string' AS `__literal_2`, now() AS `__now_3`, dayofyear(`op_time`) AS `__dayofyear_4`, CAST(`source` AS BIGINT) AS `__cast_expr_5`, min(`timestamp`) OVER (ORDER BY `op_time` DESC NULLS LAST ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) AS `__min_6`, (1 > 2) AS `__binary_predicate_7`, (2 + 3) AS `__arithmetic_expr_8`, 1 IN (1, 2, 3, 4) AS `__in_predicate_9`, `remark` LIKE '%like' AS `__like_predicate_10`, CASE WHEN (`remark` = 's') THEN 1 ELSE 2 END AS `__case_expr_11`, (TRUE | FALSE) AS `__arithmetic_expr_12` FROM `regression_test_ddl_p0`.`view_column_name_test`;
+v1 CREATE VIEW `v1` AS SELECT `error_code` AS `error_code`, 1 AS `__literal_1`, 'string' AS `__literal_2`, now() AS `__now_3`, dayofyear(`op_time`) AS `__dayofyear_4`, CAST(`source` AS bigint) AS `__cast_expr_5`, min(`timestamp`) OVER (ORDER BY `op_time` DESC NULLS LAST ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING) AS `__min_6`, (1 > 2) AS `__binary_predicate_7`, (2 + 3) AS `__arithmetic_expr_8`, 1 IN (1, 2, 3, 4) AS `__in_predicate_9`, `remark` LIKE '%like' AS `__like_predicate_10`, CASE WHEN (`remark` = 's') THEN 1 ELSE 2 END AS `__case_expr_11`, (TRUE | FALSE) AS `__arithmetic_expr_12` FROM `regression_test_ddl_p0`.`view_column_name_test`;
diff --git a/regression-test/data/ddl_p0/test_createtable_strlen.out b/regression-test/data/ddl_p0/test_createtable_strlen.out
index 2a89d34218f47bc..1d63a26d7d3ca66 100644
--- a/regression-test/data/ddl_p0/test_createtable_strlen.out
+++ b/regression-test/data/ddl_p0/test_createtable_strlen.out
@@ -1,7 +1,7 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !create --
-k1 CHAR(1) Yes true \N
-K2 CHAR(10) Yes false \N NONE
-K3 VARCHAR(65533) Yes false \N NONE
-K4 VARCHAR(10) Yes false \N NONE
+k1 char(1) Yes true \N
+K2 char(10) Yes false \N NONE
+K3 varchar(65533) Yes false \N NONE
+K4 varchar(10) Yes false \N NONE
diff --git a/regression-test/data/export_p0/outfile/outfile_expr/test_outfile_expr_generate_col_name.out b/regression-test/data/export_p0/outfile/outfile_expr/test_outfile_expr_generate_col_name.out
index e168da81791e4b3..406bc7660ffd689 100644
--- a/regression-test/data/export_p0/outfile/outfile_expr/test_outfile_expr_generate_col_name.out
+++ b/regression-test/data/export_p0/outfile/outfile_expr/test_outfile_expr_generate_col_name.out
@@ -36,7 +36,7 @@ false
false
-- !desc_s3 --
-__greater_than_0 BOOLEAN Yes false \N NONE
+__greater_than_0 boolean Yes false \N NONE
-- !select_base1 --
10
@@ -45,7 +45,7 @@ __greater_than_0 BOOLEAN Yes false \N NONE
10
-- !desc_s3 --
-__max_0 INT Yes false \N NONE
+__max_0 int Yes false \N NONE
-- !select_base1 --
1 id = 1
@@ -72,8 +72,8 @@ __max_0 INT Yes false \N NONE
9 id not exist
-- !desc_s3 --
-__case_when_1 TEXT Yes false \N NONE
-id INT Yes false \N NONE
+__case_when_1 text Yes false \N NONE
+id int Yes false \N NONE
-- !select_base1 --
1 1 string 19 false 5 true 1
@@ -100,14 +100,14 @@ id INT Yes false \N NONE
9 1 string 27 false 5 true 1
-- !desc_s3 --
-__add_5 INT Yes false \N NONE
-__bit_or_7 INT Yes false \N NONE
-__cast_3 BIGINT Yes false \N NONE
-__greater_than_4 BOOLEAN Yes false \N NONE
-__in_predicate_6 BOOLEAN Yes false \N NONE
-__literal_1 INT Yes false \N NONE
-__literal_2 TEXT Yes false \N NONE
-id INT Yes false \N NONE
+__add_5 int Yes false \N NONE
+__bit_or_7 int Yes false \N NONE
+__cast_3 bigint Yes false \N NONE
+__greater_than_4 boolean Yes false \N NONE
+__in_predicate_6 boolean Yes false \N NONE
+__literal_1 int Yes false \N NONE
+__literal_2 text Yes false \N NONE
+id int Yes false \N NONE
-- !select_base1 --
2566 888 9999
@@ -134,9 +134,9 @@ id INT Yes false \N NONE
2566 888 9999
-- !desc_s3 --
-__cast_0 TEXT Yes false \N NONE
-__cast_1 BIGINT Yes false \N NONE
-__cast_2 TEXT Yes false \N NONE
+__cast_0 text Yes false \N NONE
+__cast_1 bigint Yes false \N NONE
+__cast_2 text Yes false \N NONE
-- !select_base1 --
false
@@ -163,7 +163,7 @@ false
false
-- !desc_s3 --
-__greater_than_0 BOOLEAN Yes false \N NONE
+__greater_than_0 boolean Yes false \N NONE
-- !select_base1 --
10
@@ -172,7 +172,7 @@ __greater_than_0 BOOLEAN Yes false \N NONE
10
-- !desc_s3 --
-__max_0 INT Yes false \N NONE
+__max_0 int Yes false \N NONE
-- !select_base1 --
1 id = 1
@@ -199,8 +199,8 @@ __max_0 INT Yes false \N NONE
9 id not exist
-- !desc_s3 --
-__case_when_1 TEXT Yes false \N NONE
-id INT Yes false \N NONE
+__case_when_1 text Yes false \N NONE
+id int Yes false \N NONE
-- !select_base1 --
1 1 string 19 false 5 true 1
@@ -227,14 +227,14 @@ id INT Yes false \N NONE
9 1 string 27 false 5 true 1
-- !desc_s3 --
-__add_5 SMALLINT Yes false \N NONE
-__bit_or_7 TINYINT Yes false \N NONE
-__cast_3 BIGINT Yes false \N NONE
-__greater_than_4 BOOLEAN Yes false \N NONE
-__in_predicate_6 BOOLEAN Yes false \N NONE
-__literal_1 TINYINT Yes false \N NONE
-__literal_2 VARCHAR(6) Yes false \N NONE
-id INT Yes false \N NONE
+__add_5 smallint Yes false \N NONE
+__bit_or_7 tinyint Yes false \N NONE
+__cast_3 bigint Yes false \N NONE
+__greater_than_4 boolean Yes false \N NONE
+__in_predicate_6 boolean Yes false \N NONE
+__literal_1 tinyint Yes false \N NONE
+__literal_2 varchar(6) Yes false \N NONE
+id int Yes false \N NONE
-- !select_base1 --
2566 888 9999
@@ -261,7 +261,7 @@ id INT Yes false \N NONE
2566 888 9999
-- !desc_s3 --
-__cast_0 TEXT Yes false \N NONE
-__cast_1 BIGINT Yes false \N NONE
-__cast_2 TEXT Yes false \N NONE
+__cast_0 text Yes false \N NONE
+__cast_1 bigint Yes false \N NONE
+__cast_2 text Yes false \N NONE
diff --git a/regression-test/data/external_table_p0/hive/test_hive_basic_type.out b/regression-test/data/external_table_p0/hive/test_hive_basic_type.out
index 1688a7cfa514b8d..388b95944e9b412 100644
--- a/regression-test/data/external_table_p0/hive/test_hive_basic_type.out
+++ b/regression-test/data/external_table_p0/hive/test_hive_basic_type.out
@@ -104,7 +104,7 @@ true 8 8 8 80 8.8 80.8 7298 12/31/10 8 2010-12-31T12:08:13.780 2010 12
-- !26 --
-- !27 --
-test DATETIME(6) Yes true \N
+test datetime(6) Yes true \N
-- !28 --
\N
@@ -114,7 +114,7 @@ test DATETIME(6) Yes true \N
2023-04-20T15:51:49
-- !29 --
-test DATETIME(6) Yes true \N
+test datetime(6) Yes true \N
-- !30 --
\N
@@ -124,7 +124,7 @@ test DATETIME(6) Yes true \N
2023-04-20T15:51:49
-- !31 --
-test DATETIME(6) Yes true \N
+test datetime(6) Yes true \N
-- !32 --
\N
@@ -370,7 +370,7 @@ true 8 8 8 80 8.8 80.8 7298 12/31/10 8 2010-12-31T12:08:13.780 2010 12
-- !26 --
-- !27 --
-test DATETIME(6) Yes true \N
+test datetime(6) Yes true \N
-- !28 --
\N
@@ -380,7 +380,7 @@ test DATETIME(6) Yes true \N
2023-04-20T15:51:49
-- !29 --
-test DATETIME(6) Yes true \N
+test datetime(6) Yes true \N
-- !30 --
\N
@@ -390,7 +390,7 @@ test DATETIME(6) Yes true \N
2023-04-20T15:51:49
-- !31 --
-test DATETIME(6) Yes true \N
+test datetime(6) Yes true \N
-- !32 --
\N
@@ -636,7 +636,7 @@ true 8 8 8 80 8.8 80.8 7298 12/31/10 8 2010-12-31T12:08:13.780 2010 12
-- !26 --
-- !27 --
-test DATETIME(6) Yes true \N
+test datetime(6) Yes true \N
-- !28 --
\N
@@ -646,7 +646,7 @@ test DATETIME(6) Yes true \N
2023-04-20T15:51:49
-- !29 --
-test DATETIME(6) Yes true \N
+test datetime(6) Yes true \N
-- !30 --
\N
@@ -656,7 +656,7 @@ test DATETIME(6) Yes true \N
2023-04-20T15:51:49
-- !31 --
-test DATETIME(6) Yes true \N
+test datetime(6) Yes true \N
-- !32 --
\N
@@ -902,7 +902,7 @@ true 8 8 8 80 8.8 80.8 7298 12/31/10 8 2010-12-31T12:08:13.780 2010 12
-- !26 --
-- !27 --
-test DATETIME(6) Yes true \N
+test datetime(6) Yes true \N
-- !28 --
\N
@@ -912,7 +912,7 @@ test DATETIME(6) Yes true \N
2023-04-20T15:51:49
-- !29 --
-test DATETIME(6) Yes true \N
+test datetime(6) Yes true \N
-- !30 --
\N
@@ -922,7 +922,7 @@ test DATETIME(6) Yes true \N
2023-04-20T15:51:49
-- !31 --
-test DATETIME(6) Yes true \N
+test datetime(6) Yes true \N
-- !32 --
\N
diff --git a/regression-test/data/external_table_p0/hive/test_hive_parquet_alter_column.out b/regression-test/data/external_table_p0/hive/test_hive_parquet_alter_column.out
index 1377d4857c8dc12..e3e755c4d565c1f 100644
--- a/regression-test/data/external_table_p0/hive/test_hive_parquet_alter_column.out
+++ b/regression-test/data/external_table_p0/hive/test_hive_parquet_alter_column.out
@@ -1,18 +1,18 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !desc --
-col_int INT Yes true \N
-col_smallint INT Yes true \N
-col_tinyint INT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int int Yes true \N
+col_smallint int Yes true \N
+col_tinyint int Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -89,19 +89,19 @@ ADC
123.45
-- !desc --
-col_int INT Yes true \N
-col_smallint SMALLINT Yes true \N
-col_tinyint SMALLINT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int int Yes true \N
+col_smallint smallint Yes true \N
+col_tinyint smallint Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -178,19 +178,19 @@ ADC
123.45
-- !desc --
-col_int INT Yes true \N
-col_smallint SMALLINT Yes true \N
-col_tinyint TINYINT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int int Yes true \N
+col_smallint smallint Yes true \N
+col_tinyint tinyint Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -267,19 +267,19 @@ ADC
123.45
-- !desc --
-col_int BIGINT Yes true \N
-col_smallint BIGINT Yes true \N
-col_tinyint BIGINT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int bigint Yes true \N
+col_smallint bigint Yes true \N
+col_tinyint bigint Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -356,19 +356,19 @@ ADC
123.45
-- !desc --
-col_int FLOAT Yes true \N
-col_smallint FLOAT Yes true \N
-col_tinyint FLOAT Yes true \N
-col_bigint FLOAT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int float Yes true \N
+col_smallint float Yes true \N
+col_tinyint float Yes true \N
+col_bigint float Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1.0 -400.0 -20.0 -4.0E8 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -445,19 +445,19 @@ ADC
123.45
-- !desc --
-col_int DOUBLE Yes true \N
-col_smallint DOUBLE Yes true \N
-col_tinyint DOUBLE Yes true \N
-col_bigint DOUBLE Yes true \N
-col_float DOUBLE Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int double Yes true \N
+col_smallint double Yes true \N
+col_tinyint double Yes true \N
+col_bigint double Yes true \N
+col_float double Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1.0 -400.0 -20.0 -4.0E8 40.54439926147461 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -534,19 +534,19 @@ ADC
123.45
-- !desc --
-col_int INT Yes true \N
-col_smallint SMALLINT Yes true \N
-col_tinyint TINYINT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int int Yes true \N
+col_smallint smallint Yes true \N
+col_tinyint tinyint Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -623,19 +623,19 @@ ADC
123.45
-- !desc --
-col_int TEXT Yes true \N
-col_smallint TEXT Yes true \N
-col_tinyint TEXT Yes true \N
-col_bigint TEXT Yes true \N
-col_float TEXT Yes true \N
-col_double TEXT Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char TEXT Yes true \N
-col_varchar TEXT Yes true \N
-col_date TEXT Yes true \N
-col_timestamp TEXT Yes true \N
-col_decimal TEXT Yes true \N
+col_int text Yes true \N
+col_smallint text Yes true \N
+col_tinyint text Yes true \N
+col_bigint text Yes true \N
+col_float text Yes true \N
+col_double text Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char text Yes true \N
+col_varchar text Yes true \N
+col_date text Yes true \N
+col_timestamp text Yes true \N
+col_decimal text Yes true \N
-- !show --
-1 -200 -10 -20000000 20.577700 30.750000 false First A ADC 2023-10-06 2023-10-09 17:15:00 1238.45
@@ -712,19 +712,19 @@ ADC
123.45
-- !desc --
-col_int CHAR(10) Yes true \N
-col_smallint CHAR(10) Yes true \N
-col_tinyint CHAR(10) Yes true \N
-col_bigint CHAR(10) Yes true \N
-col_float CHAR(10) Yes true \N
-col_double CHAR(10) Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string CHAR(10) Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar CHAR(10) Yes true \N
-col_date CHAR(10) Yes true \N
-col_timestamp CHAR(10) Yes true \N
-col_decimal CHAR(10) Yes true \N
+col_int char(10) Yes true \N
+col_smallint char(10) Yes true \N
+col_tinyint char(10) Yes true \N
+col_bigint char(10) Yes true \N
+col_float char(10) Yes true \N
+col_double char(10) Yes true \N
+col_boolean boolean Yes true \N
+col_string char(10) Yes true \N
+col_char char(10) Yes true \N
+col_varchar char(10) Yes true \N
+col_date char(10) Yes true \N
+col_timestamp char(10) Yes true \N
+col_decimal char(10) Yes true \N
-- !show --
-1 -200 -10 -20000000 20.577700 30.750000 false First A ADC 2023-10-06 2023-10-09 17:15:00 1238.45
@@ -801,19 +801,19 @@ ADC
123.45
-- !desc --
-col_int VARCHAR(20) Yes true \N
-col_smallint VARCHAR(20) Yes true \N
-col_tinyint VARCHAR(20) Yes true \N
-col_bigint VARCHAR(20) Yes true \N
-col_float VARCHAR(20) Yes true \N
-col_double VARCHAR(20) Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string VARCHAR(20) Yes true \N
-col_char VARCHAR(20) Yes true \N
-col_varchar VARCHAR(20) Yes true \N
-col_date VARCHAR(20) Yes true \N
-col_timestamp VARCHAR(20) Yes true \N
-col_decimal VARCHAR(20) Yes true \N
+col_int varchar(20) Yes true \N
+col_smallint varchar(20) Yes true \N
+col_tinyint varchar(20) Yes true \N
+col_bigint varchar(20) Yes true \N
+col_float varchar(20) Yes true \N
+col_double varchar(20) Yes true \N
+col_boolean boolean Yes true \N
+col_string varchar(20) Yes true \N
+col_char varchar(20) Yes true \N
+col_varchar varchar(20) Yes true \N
+col_date varchar(20) Yes true \N
+col_timestamp varchar(20) Yes true \N
+col_decimal varchar(20) Yes true \N
-- !show --
-1 -200 -10 -20000000 20.577700 30.750000 false First A ADC 2023-10-06 2023-10-09 17:15:00 1238.45
@@ -890,19 +890,19 @@ ADC
123.45
-- !desc --
-col_int INT Yes true \N
-col_smallint SMALLINT Yes true \N
-col_tinyint TINYINT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int int Yes true \N
+col_smallint smallint Yes true \N
+col_tinyint tinyint Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -979,19 +979,19 @@ ADC
123.45
-- !desc --
-col_int INT Yes true \N
-col_smallint SMALLINT Yes true \N
-col_tinyint TINYINT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int int Yes true \N
+col_smallint smallint Yes true \N
+col_tinyint tinyint Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -1068,19 +1068,19 @@ ADC
123.45
-- !desc --
-col_int DECIMAL(5, 1) Yes true \N
-col_smallint DECIMAL(5, 1) Yes true \N
-col_tinyint DECIMAL(5, 1) Yes true \N
-col_bigint DECIMAL(5, 1) Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(5, 1) Yes true \N
+col_int decimal(5,1) Yes true \N
+col_smallint decimal(5,1) Yes true \N
+col_tinyint decimal(5,1) Yes true \N
+col_bigint decimal(5,1) Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(5,1) Yes true \N
-- !show --
-1.0 -400.0 -20.0 29496729.6 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.4
@@ -1675,19 +1675,19 @@ B
-- !decimal_decimal --
-- !desc --
-col_int INT Yes true \N
-col_smallint INT Yes true \N
-col_tinyint INT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int int Yes true \N
+col_smallint int Yes true \N
+col_tinyint int Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -1764,19 +1764,19 @@ ADC
123.45
-- !desc --
-col_int INT Yes true \N
-col_smallint SMALLINT Yes true \N
-col_tinyint SMALLINT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int int Yes true \N
+col_smallint smallint Yes true \N
+col_tinyint smallint Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -1853,19 +1853,19 @@ ADC
123.45
-- !desc --
-col_int INT Yes true \N
-col_smallint SMALLINT Yes true \N
-col_tinyint TINYINT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int int Yes true \N
+col_smallint smallint Yes true \N
+col_tinyint tinyint Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -1942,19 +1942,19 @@ ADC
123.45
-- !desc --
-col_int BIGINT Yes true \N
-col_smallint BIGINT Yes true \N
-col_tinyint BIGINT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int bigint Yes true \N
+col_smallint bigint Yes true \N
+col_tinyint bigint Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -2031,19 +2031,19 @@ ADC
123.45
-- !desc --
-col_int FLOAT Yes true \N
-col_smallint FLOAT Yes true \N
-col_tinyint FLOAT Yes true \N
-col_bigint FLOAT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int float Yes true \N
+col_smallint float Yes true \N
+col_tinyint float Yes true \N
+col_bigint float Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1.0 -400.0 -20.0 -4.0E8 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -2120,19 +2120,19 @@ ADC
123.45
-- !desc --
-col_int DOUBLE Yes true \N
-col_smallint DOUBLE Yes true \N
-col_tinyint DOUBLE Yes true \N
-col_bigint DOUBLE Yes true \N
-col_float DOUBLE Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int double Yes true \N
+col_smallint double Yes true \N
+col_tinyint double Yes true \N
+col_bigint double Yes true \N
+col_float double Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1.0 -400.0 -20.0 -4.0E8 40.54439926147461 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -2209,19 +2209,19 @@ ADC
123.45
-- !desc --
-col_int INT Yes true \N
-col_smallint SMALLINT Yes true \N
-col_tinyint TINYINT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int int Yes true \N
+col_smallint smallint Yes true \N
+col_tinyint tinyint Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -2298,19 +2298,19 @@ ADC
123.45
-- !desc --
-col_int TEXT Yes true \N
-col_smallint TEXT Yes true \N
-col_tinyint TEXT Yes true \N
-col_bigint TEXT Yes true \N
-col_float TEXT Yes true \N
-col_double TEXT Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char TEXT Yes true \N
-col_varchar TEXT Yes true \N
-col_date TEXT Yes true \N
-col_timestamp TEXT Yes true \N
-col_decimal TEXT Yes true \N
+col_int text Yes true \N
+col_smallint text Yes true \N
+col_tinyint text Yes true \N
+col_bigint text Yes true \N
+col_float text Yes true \N
+col_double text Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char text Yes true \N
+col_varchar text Yes true \N
+col_date text Yes true \N
+col_timestamp text Yes true \N
+col_decimal text Yes true \N
-- !show --
-1 -200 -10 -20000000 20.577700 30.750000 false First A ADC 2023-10-06 2023-10-09 17:15:00 1238.45
@@ -2387,19 +2387,19 @@ ADC
123.45
-- !desc --
-col_int CHAR(10) Yes true \N
-col_smallint CHAR(10) Yes true \N
-col_tinyint CHAR(10) Yes true \N
-col_bigint CHAR(10) Yes true \N
-col_float CHAR(10) Yes true \N
-col_double CHAR(10) Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string CHAR(10) Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar CHAR(10) Yes true \N
-col_date CHAR(10) Yes true \N
-col_timestamp CHAR(10) Yes true \N
-col_decimal CHAR(10) Yes true \N
+col_int char(10) Yes true \N
+col_smallint char(10) Yes true \N
+col_tinyint char(10) Yes true \N
+col_bigint char(10) Yes true \N
+col_float char(10) Yes true \N
+col_double char(10) Yes true \N
+col_boolean boolean Yes true \N
+col_string char(10) Yes true \N
+col_char char(10) Yes true \N
+col_varchar char(10) Yes true \N
+col_date char(10) Yes true \N
+col_timestamp char(10) Yes true \N
+col_decimal char(10) Yes true \N
-- !show --
-1 -200 -10 -20000000 20.577700 30.750000 false First A ADC 2023-10-06 2023-10-09 17:15:00 1238.45
@@ -2476,19 +2476,19 @@ ADC
123.45
-- !desc --
-col_int VARCHAR(20) Yes true \N
-col_smallint VARCHAR(20) Yes true \N
-col_tinyint VARCHAR(20) Yes true \N
-col_bigint VARCHAR(20) Yes true \N
-col_float VARCHAR(20) Yes true \N
-col_double VARCHAR(20) Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string VARCHAR(20) Yes true \N
-col_char VARCHAR(20) Yes true \N
-col_varchar VARCHAR(20) Yes true \N
-col_date VARCHAR(20) Yes true \N
-col_timestamp VARCHAR(20) Yes true \N
-col_decimal VARCHAR(20) Yes true \N
+col_int varchar(20) Yes true \N
+col_smallint varchar(20) Yes true \N
+col_tinyint varchar(20) Yes true \N
+col_bigint varchar(20) Yes true \N
+col_float varchar(20) Yes true \N
+col_double varchar(20) Yes true \N
+col_boolean boolean Yes true \N
+col_string varchar(20) Yes true \N
+col_char varchar(20) Yes true \N
+col_varchar varchar(20) Yes true \N
+col_date varchar(20) Yes true \N
+col_timestamp varchar(20) Yes true \N
+col_decimal varchar(20) Yes true \N
-- !show --
-1 -200 -10 -20000000 20.577700 30.750000 false First A ADC 2023-10-06 2023-10-09 17:15:00 1238.45
@@ -2565,19 +2565,19 @@ ADC
123.45
-- !desc --
-col_int INT Yes true \N
-col_smallint SMALLINT Yes true \N
-col_tinyint TINYINT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int int Yes true \N
+col_smallint smallint Yes true \N
+col_tinyint tinyint Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -2654,19 +2654,19 @@ ADC
123.45
-- !desc --
-col_int INT Yes true \N
-col_smallint SMALLINT Yes true \N
-col_tinyint TINYINT Yes true \N
-col_bigint BIGINT Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(10, 2) Yes true \N
+col_int int Yes true \N
+col_smallint smallint Yes true \N
+col_tinyint tinyint Yes true \N
+col_bigint bigint Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(10,2) Yes true \N
-- !show --
-1 -400 -20 -400000000 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.45
@@ -2743,19 +2743,19 @@ ADC
123.45
-- !desc --
-col_int DECIMAL(5, 1) Yes true \N
-col_smallint DECIMAL(5, 1) Yes true \N
-col_tinyint DECIMAL(5, 1) Yes true \N
-col_bigint DECIMAL(5, 1) Yes true \N
-col_float FLOAT Yes true \N
-col_double DOUBLE Yes true \N
-col_boolean BOOLEAN Yes true \N
-col_string TEXT Yes true \N
-col_char CHAR(10) Yes true \N
-col_varchar VARCHAR(255) Yes true \N
-col_date DATE Yes true \N
-col_timestamp DATETIME(6) Yes true \N
-col_decimal DECIMAL(5, 1) Yes true \N
+col_int decimal(5,1) Yes true \N
+col_smallint decimal(5,1) Yes true \N
+col_tinyint decimal(5,1) Yes true \N
+col_bigint decimal(5,1) Yes true \N
+col_float float Yes true \N
+col_double double Yes true \N
+col_boolean boolean Yes true \N
+col_string text Yes true \N
+col_char char(10) Yes true \N
+col_varchar varchar(255) Yes true \N
+col_date date Yes true \N
+col_timestamp datetime(6) Yes true \N
+col_decimal decimal(5,1) Yes true \N
-- !show --
-1.0 -400.0 -20.0 29496729.6 40.5444 50.75 false First A ADC 2023-10-06 2023-10-09T17:15 1238.4
diff --git a/regression-test/data/external_table_p0/hive/write/test_hive_ctas_to_doris.out b/regression-test/data/external_table_p0/hive/write/test_hive_ctas_to_doris.out
index 656b47258aaf1fd..41ba121e1023058 100644
--- a/regression-test/data/external_table_p0/hive/write/test_hive_ctas_to_doris.out
+++ b/regression-test/data/external_table_p0/hive/write/test_hive_ctas_to_doris.out
@@ -3,35 +3,35 @@
65540 65533 4
-- !q02 --
-id INT Yes true \N
-str1 TEXT Yes true \N
-str2 TEXT Yes true \N
-str3 TEXT Yes true \N
+id int Yes true \N
+str1 text Yes true \N
+str2 text Yes true \N
+str3 text Yes true \N
-- !q03 --
65540 65533 4
-- !q04 --
-id INT Yes true \N
-str1 TEXT Yes false \N NONE
-str2 TEXT Yes false \N NONE
-str3 VARCHAR(65533) Yes false \N NONE
+id int Yes true \N
+str1 text Yes false \N NONE
+str2 text Yes false \N NONE
+str3 varchar(65533) Yes false \N NONE
-- !q05 --
65540 65533 4
-- !q06 --
-id INT Yes true \N
-str1 TEXT Yes false \N NONE
-str2 VARCHAR(65533) Yes false \N NONE
-str3 TEXT Yes false \N NONE
+id int Yes true \N
+str1 text Yes false \N NONE
+str2 varchar(65533) Yes false \N NONE
+str3 text Yes false \N NONE
-- !q07 --
65540 65533 4
-- !q08 --
-id INT Yes true \N
-str1 TEXT Yes false \N NONE
-str2 TEXT Yes false \N NONE
-str3 VARCHAR(65533) Yes false \N NONE
+id int Yes true \N
+str1 text Yes false \N NONE
+str2 text Yes false \N NONE
+str3 varchar(65533) Yes false \N NONE
diff --git a/regression-test/data/external_table_p0/iceberg/iceberg_complex_type.out b/regression-test/data/external_table_p0/iceberg/iceberg_complex_type.out
index b236e47c390d0d2..3f2301d3e38e388 100644
--- a/regression-test/data/external_table_p0/iceberg/iceberg_complex_type.out
+++ b/regression-test/data/external_table_p0/iceberg/iceberg_complex_type.out
@@ -1,11 +1,11 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !parquet_v1_1 --
-id INT Yes true \N
-col2 ARRAY>>>> Yes true \N
-col3 MAP,MAP>> Yes true \N
-col4 STRUCT,y:ARRAY,z:MAP> Yes true \N
-col5 MAP>>>>>>> Yes true \N
-col6 STRUCT,yy:ARRAY