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 49538b669730d2..10bdb05130e8a6 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 @@ -77,20 +77,17 @@ public boolean getResultIsNullable() { @Override public String toSql(int depth) { StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("AGG_STATE 0) { stringBuilder.append(", "); } stringBuilder.append(subTypes.get(i).toSql()); if (subTypeNullables.get(i)) { - stringBuilder.append(" NULL"); + stringBuilder.append(" null"); } } - stringBuilder.append("), function_name="); - stringBuilder.append(functionName); - stringBuilder.append(", result_is_nullable="); - stringBuilder.append(resultIsNullable); + 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 19a55a067555f5..86e95ff5cb9be9 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 53cd926ebe7197..c0a96a2b70911f 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 56c5d3eb4bc2d3..e9f1b50c0dfad8 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("DECIMALV2").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("DECIMALV2").append("(`").append(precisionStr) - .append("`, `").append(scaleStr).append("`)"); + stringBuilder.append("decimalv2").append("(`").append(precisionStr) + .append("`,`").append(scaleStr).append("`)"); } else { - stringBuilder.append("DECIMALV2").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 1f30b35dadfb95..ecbfd30ca23538 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 e447f2dceebdb6..724310cca0af55 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 3d3653fe4902b1..9d2abc75d4478c 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 @@ -452,32 +452,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; @@ -485,7 +487,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/test/java/org/apache/doris/analysis/AddColumnsClauseTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnsClauseTest.java index 06a4fe601381f6..194dbd899badc5 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 7ede9c6b8fb600..246dd5dc8ffa2f 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, true, 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, true, 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 5e6c53b18ad2d9..ea16d65c3856c7 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 1fa6b675680e5b..b2d5e25975e063 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 @@ -416,8 +416,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\")"; @@ -445,14 +445,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\")"; @@ -479,8 +479,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" @@ -507,14 +507,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 ed16560cf077db..c36d9fcc0d2583 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 d0b877355251f4..16273abfd094f2 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 @@ -300,8 +300,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 fa88156dd47c2c..61ea17c374bbc3 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 30256d394deb47..20ed1faec72a1e 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 0a5653b7f9ed34..353fbad9fabfc8 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 6def5f1774b9eb..c3315b060425b4 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 9cacbe7a5f6654..c3d0da0e45ee83 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 32efc94bf71856..2bb52114dae32f 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(`k1` AS VARCHAR(65533)), 3), '****', right(CAST(`k1` AS VARCHAR(65533)), 4))")); + "concat(left(CAST(`k1` AS varchar(65533)), 3), '****', right(CAST(`k1` 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 5ec5151532fe9e..a58b785dbca8ef 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 632a062ed4a9e8..f0880e59f709a6 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 @@ -567,20 +567,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)" ); } @@ -2065,7 +2065,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 a55cec4cdfb655..2b4d868249a365 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 c50d573de9bdad..98f36842795341 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 e034c2f3576a10..d7841313d71482 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 d5cb69272f3803..fdac5c3dcc3e6c 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 b5ca8d8095c2d9..a6278df5231bd0 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 0409ab7fb3c0d7..612337ab30bf66 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 2b67988f7fd852..e53fe9ff97fe63 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 d147f656433df5..1a7ed71eb2e57c 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 f1dbbd892ff5e9..1a70808697a5c7 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 f1dbbd892ff5e9..1a70808697a5c7 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 ca53c5f958dfa6..a2023bbb3b79e9 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 3ff8e0394afb35..25e83d20671b1c 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 d888313de27466..61a4f47f355e2e 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 f6e03d26dff9a3..0aeb45ed24665f 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 4a895d81517dcc..b986bbeabfd835 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 3acebc4b1a9be2..f18546168c347a 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 62deb001ab7243..4bfd8e793c10a7 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 3ff7233cef75a5..30f8ec06e76cc9 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 2d3715e48d48d9..df199714b70396 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 40f88985ab25fc..c9e7e6f77f27e9 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 723726cdc371ad..1875bb02659679 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_generated_column/test_generated_column_nereids.out b/regression-test/data/ddl_p0/test_create_table_generated_column/test_generated_column_nereids.out index 8d34dd8f2b094f..85541d34cf1990 100644 --- a/regression-test/data/ddl_p0/test_create_table_generated_column/test_generated_column_nereids.out +++ b/regression-test/data/ddl_p0/test_create_table_generated_column/test_generated_column_nereids.out @@ -165,10 +165,10 @@ 1 2 CBDF2AA1377910BA93D9A86F33F6B924 -- !describe -- -a INT Yes true \N -c DOUBLE No false \N NONE,STORED GENERATED -b INT Yes false \N NONE -d INT Yes false \N NONE,STORED GENERATED +a int Yes true \N +c double No false \N NONE,STORED GENERATED +b int Yes false \N NONE +d int Yes false \N NONE,STORED GENERATED -- !test_update -- 1 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 dd25363ab112c4..07f4254ab32906 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 4ba274b5347e89..1edf464474fd28 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 2a89d34218f47b..1d63a26d7d3ca6 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 e168da81791e4b..406bc7660ffd68 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 1688a7cfa514b8..388b95944e9b41 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 1377d4857c8dc1..e3e755c4d565c1 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 656b47258aaf1f..41ba121e102305 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 b236e47c390d0d..3f2301d3e38e38 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>,zz:STRUCT>>> Yes true \N +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>,zz:struct>>> Yes true \N -- !parquet_v1_2 -- 1 [[[[[2, 2, 3, 9]]]]] {[2]:{2:{2:2}}} {"x":[2], "y":[2], "z":{1:"example"}} {2:{2:{2:{2:{2:{2:{"x":2, "y":[2]}}}}}}} {"xx":[2, 2, 3, 9], "yy":[{2:2}], "zz":{"xxx":{"xxxx":{"xxxxx":10123.33}}}} @@ -41,12 +41,12 @@ col6 STRUCT,yy:ARRAY>,zz:STRUCT>>>> 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>,zz:STRUCT>>> Yes true \N +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>,zz:struct>>> Yes true \N -- !parquet_v2_2 -- 1 [[[[[2, 2, 3, 9]]]]] {[2]:{2:{2:2}}} {"x":[2], "y":[2], "z":{1:"example"}} {2:{2:{2:{2:{2:{2:{"x":2, "y":[2]}}}}}}} {"xx":[2, 2, 3, 9], "yy":[{2:2}], "zz":{"xxx":{"xxxx":{"xxxxx":10123.33}}}} @@ -82,12 +82,12 @@ col6 STRUCT,yy:ARRAY>,zz:STRUCT>>>> 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>,zz:STRUCT>>> Yes true \N +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>,zz:struct>>> Yes true \N -- !orc_v1_2 -- 1 [[[[[2, 2, 3, 9]]]]] {[2]:{2:{2:2}}} {"x":[2], "y":[2], "z":{1:"example"}} {2:{2:{2:{2:{2:{2:{"x":2, "y":[2]}}}}}}} {"xx":[2, 2, 3, 9], "yy":[{2:2}], "zz":{"xxx":{"xxxx":{"xxxxx":10123.33}}}} @@ -123,12 +123,12 @@ col6 STRUCT,yy:ARRAY>,zz:STRUCT>>>> 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>,zz:STRUCT>>> Yes true \N +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>,zz:struct>>> Yes true \N -- !orc_v2_2 -- 1 [[[[[2, 2, 3, 9]]]]] {[2]:{2:{2:2}}} {"x":[2], "y":[2], "z":{1:"example"}} {2:{2:{2:{2:{2:{2:{"x":2, "y":[2]}}}}}}} {"xx":[2, 2, 3, 9], "yy":[{2:2}], "zz":{"xxx":{"xxxx":{"xxxxx":10123.33}}}} diff --git a/regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out index 7867c17559e281..aabc7c64d178a9 100644 --- a/regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out +++ b/regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out @@ -78,39 +78,39 @@ true 1 1 1 1 1 1.0 1.0 1.00000 1.0000000000 2021-01-01 2021-01-01T00:00 a a {"a" 2 -- !desc_ctas_base -- -bool_col BOOLEAN Yes true \N -tinyint_col TINYINT Yes true \N -smallint_col SMALLINT Yes true \N -int_col INT Yes false \N NONE -bigint_col BIGINT Yes false \N NONE -largeint_col LARGEINT Yes false \N NONE -float_col FLOAT Yes false \N NONE -double_col DOUBLE Yes false \N NONE -decimal_col DECIMAL(10, 5) Yes false \N NONE -decimal_col2 DECIMAL(30, 10) Yes false \N NONE -date_col DATE Yes false \N NONE -datetime_col DATETIME(3) Yes false \N NONE -char_col TEXT Yes false \N NONE -varchar_col TEXT Yes false \N NONE -json_col TEXT Yes false \N NONE +bool_col boolean Yes true \N +tinyint_col tinyint Yes true \N +smallint_col smallint Yes true \N +int_col int Yes false \N NONE +bigint_col bigint Yes false \N NONE +largeint_col largeint Yes false \N NONE +float_col float Yes false \N NONE +double_col double Yes false \N NONE +decimal_col decimal(10,5) Yes false \N NONE +decimal_col2 decimal(30,10) Yes false \N NONE +date_col date Yes false \N NONE +datetime_col datetime(3) Yes false \N NONE +char_col text Yes false \N NONE +varchar_col text Yes false \N NONE +json_col text Yes false \N NONE -- !desc_ctas_arr -- -int_col INT Yes true \N -arr_bool_col ARRAY Yes false \N NONE -arr_tinyint_col ARRAY Yes false \N NONE -arr_smallint_col ARRAY Yes false \N NONE -arr_int_col ARRAY Yes false \N NONE -arr_bigint_col ARRAY Yes false \N NONE -arr_largeint_col ARRAY Yes false \N NONE -arr_float_col ARRAY Yes false \N NONE -arr_double_col ARRAY Yes false \N NONE -arr_decimal1_col ARRAY Yes false \N NONE -arr_decimal2_col ARRAY Yes false \N NONE -arr_date_col ARRAY Yes false \N NONE -arr_datetime_col ARRAY Yes false \N NONE -arr_char_col ARRAY Yes false \N NONE -arr_varchar_col ARRAY Yes false \N NONE -arr_string_col ARRAY Yes false \N NONE +int_col int Yes true \N +arr_bool_col array Yes false \N NONE +arr_tinyint_col array Yes false \N NONE +arr_smallint_col array Yes false \N NONE +arr_int_col array Yes false \N NONE +arr_bigint_col array Yes false \N NONE +arr_largeint_col array Yes false \N NONE +arr_float_col array Yes false \N NONE +arr_double_col array Yes false \N NONE +arr_decimal1_col array Yes false \N NONE +arr_decimal2_col array Yes false \N NONE +arr_date_col array Yes false \N NONE +arr_datetime_col array Yes false \N NONE +arr_char_col array Yes false \N NONE +arr_varchar_col array Yes false \N NONE +arr_string_col array Yes false \N NONE -- !query_ctas_base -- \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N diff --git a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out index 981dbecd6fee00..e79545774a1514 100644 --- a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out +++ b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out @@ -318,38 +318,38 @@ mysql 203 303 403 503 603 7.14159 8.1415926 9.14159 0 \N -402 2017 -602 -902 -1102 2012-11-02 \N 2013-10-27T08:11:18 -5.14145 -6.1400000000001 -7.1400 row3 line3 09:11:09.567 text3 0xE86F6C6C6F20576F726C67 {"age": 24, "city": "ChongQing", "name": "ChenQi"} Option2 0x2F 0x58676C6C6F00000000000000 \N Value1 -- !ctas_desc -- -bigint BIGINT Yes false \N NONE -bigint_u LARGEINT Yes false \N NONE -binary TEXT Yes false \N NONE -bit TEXT Yes false \N NONE -blob TEXT Yes false \N NONE -boolean TINYINT Yes false \N NONE -char TEXT Yes false \N NONE -date DATE Yes false \N NONE -datetime DATETIME Yes false \N NONE -decimal DECIMAL(12, 4) Yes false \N NONE -decimal_u DECIMAL(19, 5) Yes false \N NONE -double DOUBLE Yes false \N NONE -double_u DOUBLE Yes false \N NONE -enum TEXT Yes false \N NONE -float FLOAT Yes false \N NONE -float_u FLOAT Yes false \N NONE -int INT Yes false \N NONE -int_u BIGINT Yes false \N NONE -json TEXT Yes false \N NONE -mediumint INT Yes false \N NONE -mediumint_u INT Yes true \N -set TEXT Yes false \N NONE -smallint SMALLINT Yes false \N NONE -smallint_u INT Yes true \N -text TEXT Yes false \N NONE -time TEXT Yes false \N NONE -timestamp DATETIME(4) Yes false \N NONE -tinyint TINYINT Yes false \N NONE -tinyint_u SMALLINT Yes true \N -varbinary TEXT Yes false \N NONE -varchar TEXT Yes false \N NONE -year SMALLINT Yes false \N NONE +bigint bigint Yes false \N NONE +bigint_u largeint Yes false \N NONE +binary text Yes false \N NONE +bit text Yes false \N NONE +blob text Yes false \N NONE +boolean tinyint Yes false \N NONE +char text Yes false \N NONE +date date Yes false \N NONE +datetime datetime Yes false \N NONE +decimal decimal(12,4) Yes false \N NONE +decimal_u decimal(19,5) Yes false \N NONE +double double Yes false \N NONE +double_u double Yes false \N NONE +enum text Yes false \N NONE +float float Yes false \N NONE +float_u float Yes false \N NONE +int int Yes false \N NONE +int_u bigint Yes false \N NONE +json text Yes false \N NONE +mediumint int Yes false \N NONE +mediumint_u int Yes true \N +set text Yes false \N NONE +smallint smallint Yes false \N NONE +smallint_u int Yes true \N +text text Yes false \N NONE +time text Yes false \N NONE +timestamp datetime(4) Yes false \N NONE +tinyint tinyint Yes false \N NONE +tinyint_u smallint Yes true \N +varbinary text Yes false \N NONE +varchar text Yes false \N NONE +year smallint Yes false \N NONE -- !mysql_view -- 10086 4294967295 201 diff --git a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_driver5_catalog.out b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_driver5_catalog.out index 318b0840f22541..7e16cadc3c7448 100644 --- a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_driver5_catalog.out +++ b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_driver5_catalog.out @@ -258,15 +258,6 @@ workload_policy 张三6 11 124314567 123 321312 1999-02-13T00:00 中国 男 0 张三7 11 123445167 123 321312 1998-02-13T00:00 中国 男 0 --- !test_filter_not_old_plan -- -张三1 11 12345678 123 321312 1999-02-13T00:00 中国 男 0 -张三2 11 12345671 123 321312 1999-02-13T00:00 中国 男 0 -张三3 11 12345673 123 321312 1999-02-13T00:00 中国 男 0 -张三4 11 123456711 123 321312 1999-02-13T00:00 中国 男 0 -张三5 11 1232134567 123 321312 1999-02-13T00:00 中国 男 0 -张三6 11 124314567 123 321312 1999-02-13T00:00 中国 男 0 -张三7 11 123445167 123 321312 1998-02-13T00:00 中国 男 0 - -- !test_insert1 -- doris1 18 @@ -328,38 +319,38 @@ mysql 203 303 403 503 603 7.14159 8.1415926 9.14159 0 \N -402 2017 -602 -902 -1102 2012-11-02 \N 2013-10-27T08:11:18 -5.14145 -6.1400000000001 -7.1400 row3 line3 09:11:09 text3 0xE86F6C6C6F20576F726C67 {"age": 24, "city": "ChongQing", "name": "ChenQi"} Option2 0x2F 0x58676C6C6F00000000000000 \N Value1 -- !ctas_desc -- -bigint BIGINT Yes false \N NONE -bigint_u LARGEINT Yes false \N NONE -binary TEXT Yes false \N NONE -bit TEXT Yes false \N NONE -blob TEXT Yes false \N NONE -boolean TINYINT Yes false \N NONE -char TEXT Yes false \N NONE -date DATE Yes false \N NONE -datetime DATETIME Yes false \N NONE -decimal DECIMAL(12, 4) Yes false \N NONE -decimal_u DECIMAL(19, 5) Yes false \N NONE -double DOUBLE Yes false \N NONE -double_u DOUBLE Yes false \N NONE -enum TEXT Yes false \N NONE -float FLOAT Yes false \N NONE -float_u FLOAT Yes false \N NONE -int INT Yes false \N NONE -int_u BIGINT Yes false \N NONE -json TEXT Yes false \N NONE -mediumint INT Yes false \N NONE -mediumint_u INT Yes true \N -set TEXT Yes false \N NONE -smallint SMALLINT Yes false \N NONE -smallint_u INT Yes true \N -text TEXT Yes false \N NONE -time TEXT Yes false \N NONE -timestamp DATETIME Yes false \N NONE -tinyint TINYINT Yes false \N NONE -tinyint_u SMALLINT Yes true \N -varbinary TEXT Yes false \N NONE -varchar TEXT Yes false \N NONE -year SMALLINT Yes false \N NONE +bigint bigint Yes false \N NONE +bigint_u largeint Yes false \N NONE +binary text Yes false \N NONE +bit text Yes false \N NONE +blob text Yes false \N NONE +boolean tinyint Yes false \N NONE +char text Yes false \N NONE +date date Yes false \N NONE +datetime datetime Yes false \N NONE +decimal decimal(12,4) Yes false \N NONE +decimal_u decimal(19,5) Yes false \N NONE +double double Yes false \N NONE +double_u double Yes false \N NONE +enum text Yes false \N NONE +float float Yes false \N NONE +float_u float Yes false \N NONE +int int Yes false \N NONE +int_u bigint Yes false \N NONE +json text Yes false \N NONE +mediumint int Yes false \N NONE +mediumint_u int Yes true \N +set text Yes false \N NONE +smallint smallint Yes false \N NONE +smallint_u int Yes true \N +text text Yes false \N NONE +time text Yes false \N NONE +timestamp datetime Yes false \N NONE +tinyint tinyint Yes false \N NONE +tinyint_u smallint Yes true \N +varbinary text Yes false \N NONE +varchar text Yes false \N NONE +year smallint Yes false \N NONE -- !mysql_view -- 10086 4294967295 201 diff --git a/regression-test/data/external_table_p0/jdbc/test_oracle_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_oracle_jdbc_catalog.out index 74e3ee619cd621..9fea31242a29b9 100644 --- a/regression-test/data/external_table_p0/jdbc/test_oracle_jdbc_catalog.out +++ b/regression-test/data/external_table_p0/jdbc/test_oracle_jdbc_catalog.out @@ -162,39 +162,39 @@ doris3 20 2 \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N -- !ctas_desc -- -ADDRESS TEXT Yes false \N NONE -BIGINT_VALUE1 BIGINT Yes false \N NONE -BIGINT_VALUE2 LARGEINT Yes false \N NONE -CITY TEXT Yes false \N NONE -COUNTRY TEXT Yes false \N NONE -ID LARGEINT Yes true \N -INT_VALUE1 INT Yes false \N NONE -INT_VALUE2 BIGINT Yes false \N NONE -N1 TEXT Yes false \N NONE -N2 LARGEINT Yes false \N NONE -N3 DECIMAL(9, 2) Yes false \N NONE -N4 LARGEINT Yes false \N NONE -N5 LARGEINT Yes false \N NONE -N6 DECIMAL(5, 2) Yes false \N NONE -N7 DOUBLE Yes false \N NONE -N8 DOUBLE Yes false \N NONE -N9 DOUBLE Yes false \N NONE -NAME TEXT Yes false \N NONE -NUM1 DECIMAL(5, 2) Yes false \N NONE -NUM2 INT Yes false \N NONE -NUM4 DECIMAL(7, 7) Yes false \N NONE -REMARK TEXT Yes false \N NONE -SMALLINT_VALUE1 SMALLINT Yes false \N NONE -SMALLINT_VALUE2 INT Yes false \N NONE -T1 DATETIME Yes false \N NONE -T2 DATETIME(3) Yes false \N NONE -T3 DATETIME(6) Yes false \N NONE -T4 DATETIME(6) Yes false \N NONE -T5 DATETIME(6) Yes false \N NONE -T6 TEXT Yes false \N NONE -T7 TEXT Yes false \N NONE -TINYINT_VALUE1 TINYINT Yes false \N NONE -TINYINT_VALUE2 SMALLINT Yes false \N NONE +ADDRESS text Yes false \N NONE +BIGINT_VALUE1 bigint Yes false \N NONE +BIGINT_VALUE2 largeint Yes false \N NONE +CITY text Yes false \N NONE +COUNTRY text Yes false \N NONE +ID largeint Yes true \N +INT_VALUE1 int Yes false \N NONE +INT_VALUE2 bigint Yes false \N NONE +N1 text Yes false \N NONE +N2 largeint Yes false \N NONE +N3 decimal(9,2) Yes false \N NONE +N4 largeint Yes false \N NONE +N5 largeint Yes false \N NONE +N6 decimal(5,2) Yes false \N NONE +N7 double Yes false \N NONE +N8 double Yes false \N NONE +N9 double Yes false \N NONE +NAME text Yes false \N NONE +NUM1 decimal(5,2) Yes false \N NONE +NUM2 int Yes false \N NONE +NUM4 decimal(7,7) Yes false \N NONE +REMARK text Yes false \N NONE +SMALLINT_VALUE1 smallint Yes false \N NONE +SMALLINT_VALUE2 int Yes false \N NONE +T1 datetime Yes false \N NONE +T2 datetime(3) Yes false \N NONE +T3 datetime(6) Yes false \N NONE +T4 datetime(6) Yes false \N NONE +T5 datetime(6) Yes false \N NONE +T6 text Yes false \N NONE +T7 text Yes false \N NONE +TINYINT_VALUE1 tinyint Yes false \N NONE +TINYINT_VALUE2 smallint Yes false \N NONE -- !select_insert_all_types -- 1 111 123 7456123.89 573 34 673.43 34.1264 60.0 23.231 99 9999 999999999 999999999999999999 999 99999 9999999999 9999999999999999999 1 china beijing alice abcdefghrjkmnopq 123.45 12300 0.0012345 2022-01-21T05:23:01 2019-11-12T20:33:57.999 2019-11-12T20:33:57.999998 2019-11-12T20:33:57.999996 2019-11-12T20:33:57.999997 223-9 12 10:23:1.123457 @@ -249,9 +249,9 @@ mysql 1 alice -- !query_lower_desc -- -doris_1 TEXT Yes true \N -doris_2 TEXT Yes true \N -doris_3 TEXT Yes true \N +doris_1 text Yes true \N +doris_2 text Yes true \N +doris_3 text Yes true \N -- !query_lower_all -- DORIS Doris doris diff --git a/regression-test/data/external_table_p0/jdbc/test_pg_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_pg_jdbc_catalog.out index 0c0598f4661787..892d6a8e38284b 100644 --- a/regression-test/data/external_table_p0/jdbc/test_pg_jdbc_catalog.out +++ b/regression-test/data/external_table_p0/jdbc/test_pg_jdbc_catalog.out @@ -2242,31 +2242,31 @@ doris3 20 2 \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N 2 \N \N \N \N \N \N \N \N -- !ctas_desc -- -bigint_value BIGINT Yes false \N NONE -bit_value BOOLEAN Yes false \N NONE -bitn_value TEXT Yes false \N NONE -bitnv_value TEXT Yes false \N NONE -box_value TEXT Yes false \N NONE -char_value TEXT Yes false \N NONE -cidr_value TEXT Yes false \N NONE -circle_value TEXT Yes false \N NONE -date_value DATE Yes false \N NONE -decimal_value DECIMAL(10, 3) Yes false \N NONE -id INT No true \N -inet_value TEXT Yes false \N NONE -int_value INT Yes false \N NONE -jsonb_value TEXT Yes false \N NONE -line_value TEXT Yes false \N NONE -lseg_value TEXT Yes false \N NONE -macaddr_value TEXT Yes false \N NONE -path_value TEXT Yes false \N NONE -point_value TEXT Yes false \N NONE -polygon_value TEXT Yes false \N NONE -real_value FLOAT Yes false \N NONE -serial4_value INT No false \N NONE -smallint_value SMALLINT Yes false \N NONE -timestamp_value DATETIME(6) Yes false \N NONE -varchar_value TEXT Yes false \N NONE +bigint_value bigint Yes false \N NONE +bit_value boolean Yes false \N NONE +bitn_value text Yes false \N NONE +bitnv_value text Yes false \N NONE +box_value text Yes false \N NONE +char_value text Yes false \N NONE +cidr_value text Yes false \N NONE +circle_value text Yes false \N NONE +date_value date Yes false \N NONE +decimal_value decimal(10,3) Yes false \N NONE +id int No true \N +inet_value text Yes false \N NONE +int_value int Yes false \N NONE +jsonb_value text Yes false \N NONE +line_value text Yes false \N NONE +lseg_value text Yes false \N NONE +macaddr_value text Yes false \N NONE +path_value text Yes false \N NONE +point_value text Yes false \N NONE +polygon_value text Yes false \N NONE +real_value float Yes false \N NONE +serial4_value int No false \N NONE +smallint_value smallint Yes false \N NONE +timestamp_value datetime(6) Yes false \N NONE +varchar_value text Yes false \N NONE -- !select_insert_all_types -- 1 abc def 2022-10-11 1 2 3 2022-10-22T10:59:59 34.123 false 12.123456 10.16.10.14/32 10.16.10.14 ff:ff:ff:ff:ff:aa 1010101010 01010 1 {"id":1} (1.0,1.0) {1.0,1.0,1.0} [(1.0,1.0),(2.0,2.0)] (2.0,2.0),(1.0,1.0) ((1.0,1.0),(2.0,2.0),(2.0,1.0)) ((1.0,1.0),(2.0,2.0),(2.0,1.0)) <(0.0,0.0),1.0> diff --git a/regression-test/data/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.out index f646561b0c964e..7a4adad4bfa304 100644 --- a/regression-test/data/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.out +++ b/regression-test/data/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.out @@ -88,44 +88,44 @@ sys 2 -- !desc_query_ctas -- -id INT No true \N -name TEXT Yes false \N NONE -age INT Yes false \N NONE -tinyint_value SMALLINT Yes false \N NONE -smallint_value SMALLINT Yes false \N NONE -bigint_value BIGINT Yes false \N NONE -real_value FLOAT Yes false \N NONE -float_value DOUBLE Yes false \N NONE -floatn_value FLOAT Yes false \N NONE -decimal_value DECIMAL(38, 0) Yes false \N NONE -numeric_value DECIMAL(38, 0) Yes false \N NONE -decimal_value2 DECIMAL(38, 10) Yes false \N NONE -numeric_value2 DECIMAL(38, 10) Yes false \N NONE -char_value TEXT Yes false \N NONE -varchar_value TEXT Yes false \N NONE -varcharmax_value TEXT Yes false \N NONE -nchar_value TEXT Yes false \N NONE -nvarchar_value TEXT Yes false \N NONE -nvarcharmax_value TEXT Yes false \N NONE -date_value DATE Yes false \N NONE -time_value TEXT Yes false \N NONE -datetime_value DATETIME(3) Yes false \N NONE -datetime2_value DATETIME(6) Yes false \N NONE -smalldatetime_value DATETIME Yes false \N NONE -datetimeoffset_value TEXT Yes false \N NONE -text_value TEXT Yes false \N NONE -ntext_value TEXT Yes false \N NONE -money_value DECIMAL(19, 4) Yes false \N NONE -smallmoney_value DECIMAL(10, 4) Yes false \N NONE -bit_value BOOLEAN Yes false \N NONE +id int No true \N +name text Yes false \N NONE +age int Yes false \N NONE +tinyint_value smallint Yes false \N NONE +smallint_value smallint Yes false \N NONE +bigint_value bigint Yes false \N NONE +real_value float Yes false \N NONE +float_value double Yes false \N NONE +floatn_value float Yes false \N NONE +decimal_value decimal(38,0) Yes false \N NONE +numeric_value decimal(38,0) Yes false \N NONE +decimal_value2 decimal(38,10) Yes false \N NONE +numeric_value2 decimal(38,10) Yes false \N NONE +char_value text Yes false \N NONE +varchar_value text Yes false \N NONE +varcharmax_value text Yes false \N NONE +nchar_value text Yes false \N NONE +nvarchar_value text Yes false \N NONE +nvarcharmax_value text Yes false \N NONE +date_value date Yes false \N NONE +time_value text Yes false \N NONE +datetime_value datetime(3) Yes false \N NONE +datetime2_value datetime(6) Yes false \N NONE +smalldatetime_value datetime Yes false \N NONE +datetimeoffset_value text Yes false \N NONE +text_value text Yes false \N NONE +ntext_value text Yes false \N NONE +money_value decimal(19,4) Yes false \N NONE +smallmoney_value decimal(10,4) Yes false \N NONE +bit_value boolean Yes false \N NONE -- !query_ctas -- 1 doris 18 0 1 1 123.123 123.123 123.123 12345678901234567890123456789012345678 12345678901234567890123456789012345678 1234567890123456789012345678.0123456789 1234567890123456789012345678.0123456789 Make Doris Great! Make Doris Great! Make Doris Great! Make Doris Great! Make Doris Great! Make Doris Great! 2023-01-17 16:49:05.123 2023-01-17T16:49:05 2023-01-17T16:49:05.123456 2023-01-17T16:49 2023-01-17 16:49:05 +08:00 Make Doris Great! Make Doris Great! 922337203685477.5807 214748.3647 false 2 \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N \N -- !desc_timestamp -- -id_col INT No true \N -timestamp_col TEXT Yes true \N +id_col int No true \N +timestamp_col text Yes true \N -- !query_timestamp -- 1 diff --git a/regression-test/data/external_table_p0/trino_connector/kafka/test_trino_kafka_base.out b/regression-test/data/external_table_p0/trino_connector/kafka/test_trino_kafka_base.out index 68f5a8ecf0881a..eb3009a5130f38 100644 --- a/regression-test/data/external_table_p0/trino_connector/kafka/test_trino_kafka_base.out +++ b/regression-test/data/external_table_p0/trino_connector/kafka/test_trino_kafka_base.out @@ -1,23 +1,23 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !basic_desc -- -k00 INT Yes true \N -k01 TEXT Yes true \N -k02 BOOLEAN Yes true \N -k03 TINYINT Yes true \N -k04 SMALLINT Yes true \N -k05 INT Yes true \N -k06 BIGINT Yes true \N -k07 TEXT Yes true \N -k08 DOUBLE Yes true \N -k09 DOUBLE Yes true \N -k10 TEXT Yes true \N -k11 TEXT Yes true \N -k12 TEXT Yes true \N -k13 TEXT Yes true \N -k14 TEXT Yes true \N -k15 TEXT Yes true \N -k16 TEXT Yes true \N -k17 TEXT Yes true \N +k00 int Yes true \N +k01 text Yes true \N +k02 boolean Yes true \N +k03 tinyint Yes true \N +k04 smallint Yes true \N +k05 int Yes true \N +k06 bigint Yes true \N +k07 text Yes true \N +k08 double Yes true \N +k09 double Yes true \N +k10 text Yes true \N +k11 text Yes true \N +k12 text Yes true \N +k13 text Yes true \N +k14 text Yes true \N +k15 text Yes true \N +k16 text Yes true \N +k17 text Yes true \N -- !basic_data -- 20 2023-08-17 false -5 18158 784479801 1485484354598941738 -6632681928222776815 9708.430664 -3.30432620706069E8 -816424174.0 571112646.0 2022-09-15 21:40:55 2023-02-23 2023-08-13 21:31:54 O X 2pYmX2vAhfEEHZZYPsgAmda1G7otnwx5TmUC879FPhDeIjvWI79ksBZpfFG2gp7jhCSbpZiecKGklB5SvG8tm31i5SUqe1xrWgLt4HSq7lMJWp75tx2kxD7pRIOpn diff --git a/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out b/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out index 953a99608ca7c1..d04dbb746f70bf 100644 --- a/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out +++ b/regression-test/data/external_table_p0/tvf/test_ctas_with_hdfs.out @@ -1,23 +1,23 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !desc -- -bigint_col BIGINT Yes false \N NONE -binary_col TEXT Yes false \N NONE -boolean_col BOOLEAN Yes false \N NONE -char_col TEXT Yes false \N NONE -date_col DATE Yes false \N NONE -decimal_col DECIMAL(12, 4) Yes false \N NONE -double_col DOUBLE Yes false \N NONE -float_col FLOAT Yes false \N NONE -int_col INT Yes true \N -list_double_col ARRAY Yes false \N NONE -list_string_col ARRAY Yes false \N NONE -p1_col VARCHAR(65533) No false \N NONE -p2_col VARCHAR(65533) No false \N NONE -smallint_col SMALLINT Yes true \N -string_col TEXT Yes false \N NONE -timestamp_col DATETIME(6) Yes false \N NONE -tinyint_col TINYINT Yes true \N -varchar_col TEXT Yes false \N NONE +bigint_col bigint Yes false \N NONE +binary_col text Yes false \N NONE +boolean_col boolean Yes false \N NONE +char_col text Yes false \N NONE +date_col date Yes false \N NONE +decimal_col decimal(12,4) Yes false \N NONE +double_col double Yes false \N NONE +float_col float Yes false \N NONE +int_col int Yes true \N +list_double_col array Yes false \N NONE +list_string_col array Yes false \N NONE +p1_col varchar(65533) No false \N NONE +p2_col varchar(65533) No false \N NONE +smallint_col smallint Yes true \N +string_col text Yes false \N NONE +timestamp_col datetime(6) Yes false \N NONE +tinyint_col tinyint Yes true \N +varchar_col text Yes false \N NONE -- !select -- 1 \N \N 757403305318104467 false 3.26199968E8 1.0049111235672792E17 Consolidate iron breakfast inhibit obesity mount hearing. Limitation bite sibling creation between sound. Plus1 layer injury favourable detain. Learn pronounced entrepreneur personnel wool strive. Pose curiosity spite absolutely combination right. \N 2022-08-11T10:09:31 996888.8617 desktops bigint_col 2015-08-24 [5.084045411017597e+17, 3.942856911182207e+17, 8.38109720690003e+17, 5.0079271855467546e+17] ["NRcqedH", "JIkT", "JXw", "JLvj"] desktops bigint_col @@ -91,22 +91,22 @@ varchar_col TEXT Yes false \N NONE 3 99 778108157 61873080930551778 true 9.8627565E8 \N Technology gene shame stock grandfather initiate cluster. Sympathy including grind right. Colleague pour interference vanish eligible. Campaign fold poison various between. Formal proper prize ray do1. \N 2022-08-29T19:43:46 908171.0209 desktops bigint_col 2020-02-29 [8.289095771326624e+17, 1.9573475208108093e+17, 6.703456714526179e+17, 7.245677936816932e+17] ["zJldV", "BWhpggYvPlozXm", "bAbglLACbIPnJXpyjDIa"] desktops bigint_col -- !desc_2 -- -bigint_col BIGINT Yes false \N NONE -binary_col TEXT Yes false \N NONE -boolean_col BOOLEAN Yes false \N NONE -char_col CHAR(50) Yes false \N NONE -date_col DATE Yes false \N NONE -decimal_col DECIMAL(12, 4) Yes false \N NONE -double_col DOUBLE Yes false \N NONE -float_col FLOAT Yes false \N NONE -int_col INT Yes true \N -list_double_col ARRAY Yes false \N NONE -list_string_col ARRAY Yes false \N NONE -smallint_col SMALLINT Yes true \N -string_col TEXT Yes false \N NONE -timestamp_col DATETIME(6) Yes false \N NONE -tinyint_col TINYINT Yes true \N -varchar_col TEXT Yes false \N NONE +bigint_col bigint Yes false \N NONE +binary_col text Yes false \N NONE +boolean_col boolean Yes false \N NONE +char_col char(50) Yes false \N NONE +date_col date Yes false \N NONE +decimal_col decimal(12,4) Yes false \N NONE +double_col double Yes false \N NONE +float_col float Yes false \N NONE +int_col int Yes true \N +list_double_col array Yes false \N NONE +list_string_col array Yes false \N NONE +smallint_col smallint Yes true \N +string_col text Yes false \N NONE +timestamp_col datetime(6) Yes false \N NONE +tinyint_col tinyint Yes true \N +varchar_col text Yes false \N NONE -- !select_2 -- 1 \N \N 757403305318104467 false 3.26199968E8 1.0049111235672792E17 Consolidate iron breakfast inhibit obesity mount hearing. Limitation bite sibling creation between sound. Plus1 layer injury favourable detain. Learn pronounced entrepreneur personnel wool strive. Pose curiosity spite absolutely combination right. \N 2022-08-11T10:09:31 996888.8617 desktops bigint_col 2015-08-24 [5.084045411017597e+17, 3.942856911182207e+17, 8.38109720690003e+17, 5.0079271855467546e+17] ["NRcqedH", "JIkT", "JXw", "JLvj"] @@ -180,22 +180,22 @@ varchar_col TEXT Yes false \N NONE 3 99 778108157 61873080930551778 true 9.8627565E8 \N Technology gene shame stock grandfather initiate cluster. Sympathy including grind right. Colleague pour interference vanish eligible. Campaign fold poison various between. Formal proper prize ray do1. \N 2022-08-29T19:43:46 908171.0209 desktops bigint_col 2020-02-29 [8.289095771326624e+17, 1.9573475208108093e+17, 6.703456714526179e+17, 7.245677936816932e+17] ["zJldV", "BWhpggYvPlozXm", "bAbglLACbIPnJXpyjDIa"] -- !desc_3 -- -bigint_col BIGINT Yes false \N NONE -binary_col TEXT Yes false \N NONE -boolean_col BOOLEAN Yes false \N NONE -char_col TEXT Yes false \N NONE -date_col DATE Yes false \N NONE -decimal_col DECIMAL(12, 4) Yes false \N NONE -double_col DOUBLE Yes false \N NONE -float_col FLOAT Yes false \N NONE -int_col INT Yes true \N -list_double_col ARRAY Yes false \N NONE -list_string_col ARRAY Yes false \N NONE -smallint_col SMALLINT Yes true \N -string_col TEXT Yes false \N NONE -timestamp_col DATETIME(6) Yes false \N NONE -tinyint_col TINYINT Yes true \N -varchar_col TEXT Yes false \N NONE +bigint_col bigint Yes false \N NONE +binary_col text Yes false \N NONE +boolean_col boolean Yes false \N NONE +char_col text Yes false \N NONE +date_col date Yes false \N NONE +decimal_col decimal(12,4) Yes false \N NONE +double_col double Yes false \N NONE +float_col float Yes false \N NONE +int_col int Yes true \N +list_double_col array Yes false \N NONE +list_string_col array Yes false \N NONE +smallint_col smallint Yes true \N +string_col text Yes false \N NONE +timestamp_col datetime(6) Yes false \N NONE +tinyint_col tinyint Yes true \N +varchar_col text Yes false \N NONE -- !select_3 -- 1 \N \N 757403305318104467 false 3.26199968E8 1.0049111235672792E17 Consolidate iron breakfast inhibit obesity mount hearing. Limitation bite sibling creation between sound. Plus1 layer injury favourable detain. Learn pronounced entrepreneur personnel wool strive. Pose curiosity spite absolutely combination right. \N 2022-08-11T10:09:31 996888.8617 desktops bigint_col 2015-08-24 [5.084045411017597e+17, 3.942856911182207e+17, 8.38109720690003e+17, 5.0079271855467546e+17] ["NRcqedH", "JIkT", "JXw", "JLvj"] @@ -269,46 +269,46 @@ varchar_col TEXT Yes false \N NONE 3 99 778108157 61873080930551778 true 9.8627565E8 \N Technology gene shame stock grandfather initiate cluster. Sympathy including grind right. Colleague pour interference vanish eligible. Campaign fold poison various between. Formal proper prize ray do1. \N 2022-08-29T19:43:46 908171.0209 desktops bigint_col 2020-02-29 [8.289095771326624e+17, 1.9573475208108093e+17, 6.703456714526179e+17, 7.245677936816932e+17] ["zJldV", "BWhpggYvPlozXm", "bAbglLACbIPnJXpyjDIa"] -- !desc_4 -- -bigint_col BIGINT Yes false \N NONE -binary_col TEXT Yes false \N NONE -boolean_col BOOLEAN Yes false \N NONE -char_col TEXT Yes false \N NONE -date_col DATE Yes false \N NONE -decimal_col DECIMAL(12, 4) Yes false \N NONE -double_col DOUBLE Yes false \N NONE -float_col FLOAT Yes false \N NONE -int_col INT Yes true \N -list_double_col ARRAY Yes false \N NONE -list_string_col ARRAY Yes false \N NONE -smallint_col SMALLINT Yes true \N -string_col VARCHAR(65533) Yes false \N NONE -timestamp_col DATETIME(6) Yes false \N NONE -tinyint_col TINYINT Yes true \N -varchar_col TEXT Yes false \N NONE +bigint_col bigint Yes false \N NONE +binary_col text Yes false \N NONE +boolean_col boolean Yes false \N NONE +char_col text Yes false \N NONE +date_col date Yes false \N NONE +decimal_col decimal(12,4) Yes false \N NONE +double_col double Yes false \N NONE +float_col float Yes false \N NONE +int_col int Yes true \N +list_double_col array Yes false \N NONE +list_string_col array Yes false \N NONE +smallint_col smallint Yes true \N +string_col varchar(65533) Yes false \N NONE +timestamp_col datetime(6) Yes false \N NONE +tinyint_col tinyint Yes true \N +varchar_col text Yes false \N NONE -- !select_4 -- 5 10 775197769 782563338151880185 true 3.2961472E7 1.991161785844132E15 Width activation annoying. Speaker senator cultivate convention silence price second1. Ok personal formulate princess. Screening debt salary reluctant have circulate exclusion. Shy immigrant trousers fifteen cat opponent. virtue commander away soak cup 2022-09-05T05:48:47 295491.8278 desktops bigint_col 2020-07-13 [9.146835345997748e+17, 6.733257341227244e+17] ["IusVsK", "ccDDSRdDmaEijQ", "yolElQ", "DbubJwBeNUWSvwTP"] 6 10 645804272 655670909733732612 true 6.3032851E8 9.5434476277711334E17 Merge fulfil authentic. Paint honest keyboard wave live2. Involvement fighting suppose freeze investigate hers glass. Marriage celebrity shut philosophical. studio frequency asylum 2022-08-15T14:15 775744.0766 desktops bigint_col 2015-01-02 [] ["cNHvLdsDvCtx", "lwk", "UXJKknrjYcBvgwRLKUT", "UENYKcHqOaDmjbSQo", "mUjCFTiMpKbc", "FgTQKJloNrGXwCYhBRmQ"] -- !desc5 -- -bigint_col BIGINT Yes false \N NONE -binary_col TEXT Yes false \N NONE -boolean_col BOOLEAN Yes false \N NONE -char_col TEXT Yes false \N NONE -date_col DATE Yes false \N NONE -decimal_col DECIMAL(12, 4) Yes false \N NONE -double_col DOUBLE Yes false \N NONE -float_col FLOAT Yes false \N NONE -int_col INT Yes true \N -list_double_col ARRAY Yes false \N NONE -list_string_col ARRAY Yes false \N NONE -p1_col VARCHAR(65533) No false \N NONE -p2_col TEXT No false \N NONE -smallint_col SMALLINT Yes true \N -string_col TEXT Yes false \N NONE -timestamp_col DATETIME(6) Yes false \N NONE -tinyint_col TINYINT Yes true \N -varchar_col TEXT Yes false \N NONE +bigint_col bigint Yes false \N NONE +binary_col text Yes false \N NONE +boolean_col boolean Yes false \N NONE +char_col text Yes false \N NONE +date_col date Yes false \N NONE +decimal_col decimal(12,4) Yes false \N NONE +double_col double Yes false \N NONE +float_col float Yes false \N NONE +int_col int Yes true \N +list_double_col array Yes false \N NONE +list_string_col array Yes false \N NONE +p1_col varchar(65533) No false \N NONE +p2_col text No false \N NONE +smallint_col smallint Yes true \N +string_col text Yes false \N NONE +timestamp_col datetime(6) Yes false \N NONE +tinyint_col tinyint Yes true \N +varchar_col text Yes false \N NONE -- !select5 -- 1 \N \N 757403305318104467 false 3.26199968E8 1.0049111235672792E17 Consolidate iron breakfast inhibit obesity mount hearing. Limitation bite sibling creation between sound. Plus1 layer injury favourable detain. Learn pronounced entrepreneur personnel wool strive. Pose curiosity spite absolutely combination right. \N 2022-08-11T10:09:31 996888.8617 desktops bigint_col 2015-08-24 [5.084045411017597e+17, 3.942856911182207e+17, 8.38109720690003e+17, 5.0079271855467546e+17] ["NRcqedH", "JIkT", "JXw", "JLvj"] desktops bigint_col diff --git a/regression-test/data/external_table_p0/tvf/test_hdfs_tvf.out b/regression-test/data/external_table_p0/tvf/test_hdfs_tvf.out index 91e2ec2d3305fb..68e310c5a4f71e 100644 --- a/regression-test/data/external_table_p0/tvf/test_hdfs_tvf.out +++ b/regression-test/data/external_table_p0/tvf/test_hdfs_tvf.out @@ -348,13 +348,13 @@ 4 shenzhen 2345674 -- !desc -- -s_suppkey INT Yes false \N NONE -s_name TEXT Yes false \N NONE -s_address TEXT Yes false \N NONE -s_nationkey INT Yes false \N NONE -s_phone TEXT Yes false \N NONE -s_acctbal DECIMAL(12, 2) Yes false \N NONE -s_comment TEXT Yes false \N NONE +s_suppkey int Yes false \N NONE +s_name text Yes false \N NONE +s_address text Yes false \N NONE +s_nationkey int Yes false \N NONE +s_phone text Yes false \N NONE +s_acctbal decimal(12,2) Yes false \N NONE +s_comment text Yes false \N NONE -- !hdfs_compatible -- 0 2 3 4 5 6.6 7.7 8.8 abc def ghiaaaaaa 2020-10-10 2020-10-10 11:12:59 @@ -601,17 +601,17 @@ s_comment TEXT Yes false \N NONE 99 2 3 4 5 6.6 7.7 8.80000 abc abc abc 2020-10-10 2020-10-10T11:12:59 -- !hdfs_desc_csv_schema -- -bigint_col BIGINT Yes false \N NONE -date_col DATE Yes false \N NONE -datetime_col DATETIME(3) Yes false \N NONE -decimal_col DECIMAL(10, 5) Yes false \N NONE -double_col DOUBLE Yes false \N NONE -float_col FLOAT Yes false \N NONE -id INT Yes false \N NONE -largeint_col LARGEINT Yes false \N NONE -smallint_col SMALLINT Yes false \N NONE -string_col TEXT Yes false \N NONE -string_col TEXT Yes false \N NONE -string_col TEXT Yes false \N NONE -tinyint_col TINYINT Yes false \N NONE +bigint_col bigint Yes false \N NONE +date_col date Yes false \N NONE +datetime_col datetime(3) Yes false \N NONE +decimal_col decimal(10,5) Yes false \N NONE +double_col double Yes false \N NONE +float_col float Yes false \N NONE +id int Yes false \N NONE +largeint_col largeint Yes false \N NONE +smallint_col smallint Yes false \N NONE +string_col text Yes false \N NONE +string_col text Yes false \N NONE +string_col text Yes false \N NONE +tinyint_col tinyint Yes false \N NONE diff --git a/regression-test/data/external_table_p0/tvf/test_hdfs_tvf_compression.out b/regression-test/data/external_table_p0/tvf/test_hdfs_tvf_compression.out index 6d92ffffc2fa52..afc3507a5481da 100644 --- a/regression-test/data/external_table_p0/tvf/test_hdfs_tvf_compression.out +++ b/regression-test/data/external_table_p0/tvf/test_hdfs_tvf_compression.out @@ -22,139 +22,139 @@ 4612375222398980929 1 İzmir United Japonser внедорождение и фото, купить кс 1.6i (16Gb BlackSitesi 1 2014-03-22 01:13:34 2014-03-22 109805 3167240916 5f2b3e46159990d40601b0ee3260e2fe 11424 -- !gz_2 -- -c1 TEXT Yes false \N NONE -c2 TEXT Yes false \N NONE -c3 TEXT Yes false \N NONE -c4 TEXT Yes false \N NONE -c5 TEXT Yes false \N NONE -c6 TEXT Yes false \N NONE -c7 TEXT Yes false \N NONE -c8 TEXT Yes false \N NONE -c9 TEXT Yes false \N NONE -c10 TEXT Yes false \N NONE -c11 TEXT Yes false \N NONE -c12 TEXT Yes false \N NONE -c13 TEXT Yes false \N NONE -c14 TEXT Yes false \N NONE -c15 TEXT Yes false \N NONE -c16 TEXT Yes false \N NONE -c17 TEXT Yes false \N NONE -c18 TEXT Yes false \N NONE -c19 TEXT Yes false \N NONE -c20 TEXT Yes false \N NONE -c21 TEXT Yes false \N NONE -c22 TEXT Yes false \N NONE -c23 TEXT Yes false \N NONE -c24 TEXT Yes false \N NONE -c25 TEXT Yes false \N NONE -c26 TEXT Yes false \N NONE -c27 TEXT Yes false \N NONE -c28 TEXT Yes false \N NONE -c29 TEXT Yes false \N NONE -c30 TEXT Yes false \N NONE -c31 TEXT Yes false \N NONE -c32 TEXT Yes false \N NONE -c33 TEXT Yes false \N NONE -c34 TEXT Yes false \N NONE -c35 TEXT Yes false \N NONE -c36 TEXT Yes false \N NONE -c37 TEXT Yes false \N NONE -c38 TEXT Yes false \N NONE -c39 TEXT Yes false \N NONE -c40 TEXT Yes false \N NONE -c41 TEXT Yes false \N NONE -c42 TEXT Yes false \N NONE -c43 TEXT Yes false \N NONE -c44 TEXT Yes false \N NONE -c45 TEXT Yes false \N NONE -c46 TEXT Yes false \N NONE -c47 TEXT Yes false \N NONE -c48 TEXT Yes false \N NONE -c49 TEXT Yes false \N NONE -c50 TEXT Yes false \N NONE -c51 TEXT Yes false \N NONE -c52 TEXT Yes false \N NONE -c53 TEXT Yes false \N NONE -c54 TEXT Yes false \N NONE -c55 TEXT Yes false \N NONE -c56 TEXT Yes false \N NONE -c57 TEXT Yes false \N NONE -c58 TEXT Yes false \N NONE -c59 TEXT Yes false \N NONE -c60 TEXT Yes false \N NONE -c61 TEXT Yes false \N NONE -c62 TEXT Yes false \N NONE -c63 TEXT Yes false \N NONE -c64 TEXT Yes false \N NONE -c65 TEXT Yes false \N NONE -c66 TEXT Yes false \N NONE -c67 TEXT Yes false \N NONE -c68 TEXT Yes false \N NONE -c69 TEXT Yes false \N NONE -c70 TEXT Yes false \N NONE -c71 TEXT Yes false \N NONE -c72 TEXT Yes false \N NONE -c73 TEXT Yes false \N NONE -c74 TEXT Yes false \N NONE -c75 TEXT Yes false \N NONE -c76 TEXT Yes false \N NONE -c77 TEXT Yes false \N NONE -c78 TEXT Yes false \N NONE -c79 TEXT Yes false \N NONE -c80 TEXT Yes false \N NONE -c81 TEXT Yes false \N NONE -c82 TEXT Yes false \N NONE -c83 TEXT Yes false \N NONE -c84 TEXT Yes false \N NONE -c85 TEXT Yes false \N NONE -c86 TEXT Yes false \N NONE -c87 TEXT Yes false \N NONE -c88 TEXT Yes false \N NONE -c89 TEXT Yes false \N NONE -c90 TEXT Yes false \N NONE -c91 TEXT Yes false \N NONE -c92 TEXT Yes false \N NONE -c93 TEXT Yes false \N NONE -c94 TEXT Yes false \N NONE -c95 TEXT Yes false \N NONE -c96 TEXT Yes false \N NONE -c97 TEXT Yes false \N NONE -c98 TEXT Yes false \N NONE -c99 TEXT Yes false \N NONE -c100 TEXT Yes false \N NONE -c101 TEXT Yes false \N NONE -c102 TEXT Yes false \N NONE -c103 TEXT Yes false \N NONE -c104 TEXT Yes false \N NONE -c105 TEXT Yes false \N NONE -c106 TEXT Yes false \N NONE -c107 TEXT Yes false \N NONE -c108 TEXT Yes false \N NONE -c109 TEXT Yes false \N NONE -c110 TEXT Yes false \N NONE -c111 TEXT Yes false \N NONE -c112 TEXT Yes false \N NONE -c113 TEXT Yes false \N NONE -c114 TEXT Yes false \N NONE -c115 TEXT Yes false \N NONE -c116 TEXT Yes false \N NONE -c117 TEXT Yes false \N NONE -c118 TEXT Yes false \N NONE -c119 TEXT Yes false \N NONE -c120 TEXT Yes false \N NONE -c121 TEXT Yes false \N NONE -c122 TEXT Yes false \N NONE -c123 TEXT Yes false \N NONE -c124 TEXT Yes false \N NONE -c125 TEXT Yes false \N NONE -c126 TEXT Yes false \N NONE -c127 TEXT Yes false \N NONE -c128 TEXT Yes false \N NONE -c129 TEXT Yes false \N NONE -c130 TEXT Yes false \N NONE -c131 TEXT Yes false \N NONE -c132 TEXT Yes false \N NONE -c133 TEXT Yes false \N NONE +c1 text Yes false \N NONE +c2 text Yes false \N NONE +c3 text Yes false \N NONE +c4 text Yes false \N NONE +c5 text Yes false \N NONE +c6 text Yes false \N NONE +c7 text Yes false \N NONE +c8 text Yes false \N NONE +c9 text Yes false \N NONE +c10 text Yes false \N NONE +c11 text Yes false \N NONE +c12 text Yes false \N NONE +c13 text Yes false \N NONE +c14 text Yes false \N NONE +c15 text Yes false \N NONE +c16 text Yes false \N NONE +c17 text Yes false \N NONE +c18 text Yes false \N NONE +c19 text Yes false \N NONE +c20 text Yes false \N NONE +c21 text Yes false \N NONE +c22 text Yes false \N NONE +c23 text Yes false \N NONE +c24 text Yes false \N NONE +c25 text Yes false \N NONE +c26 text Yes false \N NONE +c27 text Yes false \N NONE +c28 text Yes false \N NONE +c29 text Yes false \N NONE +c30 text Yes false \N NONE +c31 text Yes false \N NONE +c32 text Yes false \N NONE +c33 text Yes false \N NONE +c34 text Yes false \N NONE +c35 text Yes false \N NONE +c36 text Yes false \N NONE +c37 text Yes false \N NONE +c38 text Yes false \N NONE +c39 text Yes false \N NONE +c40 text Yes false \N NONE +c41 text Yes false \N NONE +c42 text Yes false \N NONE +c43 text Yes false \N NONE +c44 text Yes false \N NONE +c45 text Yes false \N NONE +c46 text Yes false \N NONE +c47 text Yes false \N NONE +c48 text Yes false \N NONE +c49 text Yes false \N NONE +c50 text Yes false \N NONE +c51 text Yes false \N NONE +c52 text Yes false \N NONE +c53 text Yes false \N NONE +c54 text Yes false \N NONE +c55 text Yes false \N NONE +c56 text Yes false \N NONE +c57 text Yes false \N NONE +c58 text Yes false \N NONE +c59 text Yes false \N NONE +c60 text Yes false \N NONE +c61 text Yes false \N NONE +c62 text Yes false \N NONE +c63 text Yes false \N NONE +c64 text Yes false \N NONE +c65 text Yes false \N NONE +c66 text Yes false \N NONE +c67 text Yes false \N NONE +c68 text Yes false \N NONE +c69 text Yes false \N NONE +c70 text Yes false \N NONE +c71 text Yes false \N NONE +c72 text Yes false \N NONE +c73 text Yes false \N NONE +c74 text Yes false \N NONE +c75 text Yes false \N NONE +c76 text Yes false \N NONE +c77 text Yes false \N NONE +c78 text Yes false \N NONE +c79 text Yes false \N NONE +c80 text Yes false \N NONE +c81 text Yes false \N NONE +c82 text Yes false \N NONE +c83 text Yes false \N NONE +c84 text Yes false \N NONE +c85 text Yes false \N NONE +c86 text Yes false \N NONE +c87 text Yes false \N NONE +c88 text Yes false \N NONE +c89 text Yes false \N NONE +c90 text Yes false \N NONE +c91 text Yes false \N NONE +c92 text Yes false \N NONE +c93 text Yes false \N NONE +c94 text Yes false \N NONE +c95 text Yes false \N NONE +c96 text Yes false \N NONE +c97 text Yes false \N NONE +c98 text Yes false \N NONE +c99 text Yes false \N NONE +c100 text Yes false \N NONE +c101 text Yes false \N NONE +c102 text Yes false \N NONE +c103 text Yes false \N NONE +c104 text Yes false \N NONE +c105 text Yes false \N NONE +c106 text Yes false \N NONE +c107 text Yes false \N NONE +c108 text Yes false \N NONE +c109 text Yes false \N NONE +c110 text Yes false \N NONE +c111 text Yes false \N NONE +c112 text Yes false \N NONE +c113 text Yes false \N NONE +c114 text Yes false \N NONE +c115 text Yes false \N NONE +c116 text Yes false \N NONE +c117 text Yes false \N NONE +c118 text Yes false \N NONE +c119 text Yes false \N NONE +c120 text Yes false \N NONE +c121 text Yes false \N NONE +c122 text Yes false \N NONE +c123 text Yes false \N NONE +c124 text Yes false \N NONE +c125 text Yes false \N NONE +c126 text Yes false \N NONE +c127 text Yes false \N NONE +c128 text Yes false \N NONE +c129 text Yes false \N NONE +c130 text Yes false \N NONE +c131 text Yes false \N NONE +c132 text Yes false \N NONE +c133 text Yes false \N NONE -- !bz2_1 -- 4611713315956779722 0 Сайт gorodGeev.net | Haberleri | SmotriSpor, Burjuvaz - NOI.MD 1 2014-03-22 20:14:35 2014-03-22 31098674 1128592963 62804a701301960f8b52d59872fa8477 166 diff --git a/regression-test/data/external_table_p0/tvf/test_hdfs_tvf_error_uri.out b/regression-test/data/external_table_p0/tvf/test_hdfs_tvf_error_uri.out index 115f42f2a0e23f..19c16df7f1394f 100644 --- a/regression-test/data/external_table_p0/tvf/test_hdfs_tvf_error_uri.out +++ b/regression-test/data/external_table_p0/tvf/test_hdfs_tvf_error_uri.out @@ -2,5 +2,5 @@ -- !select1 -- -- !desc1 -- -__dummy_col TEXT Yes false \N NONE +__dummy_col text Yes false \N NONE diff --git a/regression-test/data/external_table_p0/tvf/test_hms_partitions_tvf.out b/regression-test/data/external_table_p0/tvf/test_hms_partitions_tvf.out index 8a0f5c5521bc68..482aed03201863 100644 --- a/regression-test/data/external_table_p0/tvf/test_hms_partitions_tvf.out +++ b/regression-test/data/external_table_p0/tvf/test_hms_partitions_tvf.out @@ -1,6 +1,6 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !desc -- -Partition TEXT No false \N NONE +Partition text No false \N NONE -- !partitions -- part_col=20230101 diff --git a/regression-test/data/external_table_p0/tvf/test_partitions_tvf.out b/regression-test/data/external_table_p0/tvf/test_partitions_tvf.out index e68f6bf2beeaca..afc87c82420995 100644 --- a/regression-test/data/external_table_p0/tvf/test_partitions_tvf.out +++ b/regression-test/data/external_table_p0/tvf/test_partitions_tvf.out @@ -1,23 +1,23 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !desc -- -Buckets INT No false \N NONE -CooldownTime TEXT No false \N NONE -DataSize TEXT No false \N NONE -DistributionKey TEXT No false \N NONE -IsInMemory BOOLEAN No false \N NONE -IsMutable BOOLEAN No false \N NONE -LastConsistencyCheckTime TEXT No false \N NONE -PartitionId BIGINT No false \N NONE -PartitionKey TEXT No false \N NONE -PartitionName TEXT No false \N NONE -Range TEXT No false \N NONE -RemoteStoragePolicy TEXT No false \N NONE -ReplicaAllocation TEXT No false \N NONE -ReplicationNum INT No false \N NONE -State TEXT No false \N NONE -StorageMedium TEXT No false \N NONE -SyncWithBaseTables BOOLEAN No false \N NONE -UnsyncTables TEXT No false \N NONE -VisibleVersion BIGINT No false \N NONE -VisibleVersionTime TEXT No false \N NONE +Buckets int No false \N NONE +CooldownTime text No false \N NONE +DataSize text No false \N NONE +DistributionKey text No false \N NONE +IsInMemory boolean No false \N NONE +IsMutable boolean No false \N NONE +LastConsistencyCheckTime text No false \N NONE +PartitionId bigint No false \N NONE +PartitionKey text No false \N NONE +PartitionName text No false \N NONE +Range text No false \N NONE +RemoteStoragePolicy text No false \N NONE +ReplicaAllocation text No false \N NONE +ReplicationNum int No false \N NONE +State text No false \N NONE +StorageMedium text No false \N NONE +SyncWithBaseTables boolean No false \N NONE +UnsyncTables text No false \N NONE +VisibleVersion bigint No false \N NONE +VisibleVersionTime text No false \N NONE diff --git a/regression-test/data/index_p0/test_bitmap_index.out b/regression-test/data/index_p0/test_bitmap_index.out index 185008e78166c7..07d56bef6eddee 100644 --- a/regression-test/data/index_p0/test_bitmap_index.out +++ b/regression-test/data/index_p0/test_bitmap_index.out @@ -1,73 +1,73 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -k1 TINYINT Yes true \N -k2 SMALLINT Yes true \N -k3 INT Yes true \N -k4 BIGINT Yes false \N NONE -k5 CHAR(1) Yes false \N NONE -k6 VARCHAR(1) Yes false \N NONE -k7 DATE Yes false \N NONE -k8 DATETIME Yes false \N NONE -k9 LARGEINT Yes false \N NONE -k10 DECIMAL(38, 9) Yes false \N NONE -k11 BOOLEAN Yes false \N NONE -k12 DATE Yes false \N NONE -k13 DATETIME Yes false \N NONE -k14 DATETIME(3) Yes false \N NONE -k15 DATETIME(6) Yes false \N NONE +k1 tinyint Yes true \N +k2 smallint Yes true \N +k3 int Yes true \N +k4 bigint Yes false \N NONE +k5 char(1) Yes false \N NONE +k6 varchar(1) Yes false \N NONE +k7 date Yes false \N NONE +k8 datetime Yes false \N NONE +k9 largeint Yes false \N NONE +k10 decimal(38,9) Yes false \N NONE +k11 boolean Yes false \N NONE +k12 date Yes false \N NONE +k13 datetime Yes false \N NONE +k14 datetime(3) Yes false \N NONE +k15 datetime(6) Yes false \N NONE -- !sql -- 1 1 1 1 1 1 2022-05-31 2022-05-31T10:00 1 1.000000000 true 2022-05-31 2022-05-31T10:00 2022-05-31T10:00:00.111 2022-05-31T10:00:00.111111 -- !sql -- -k1 TINYINT Yes true \N -k2 SMALLINT Yes true \N -k3 INT Yes true \N -k4 BIGINT Yes true \N -k5 CHAR(1) Yes true \N -k6 VARCHAR(1) Yes true \N -k7 DATE Yes true \N -k8 DATETIME Yes true \N -k9 LARGEINT Yes true \N -k10 DECIMAL(38, 9) Yes true \N -k11 BOOLEAN Yes true \N -k12 DATE Yes true \N -k13 DATETIME Yes true \N -k14 DATETIME(3) Yes true \N -k15 DATETIME(6) Yes true \N -v1 INT Yes false \N SUM +k1 tinyint Yes true \N +k2 smallint Yes true \N +k3 int Yes true \N +k4 bigint Yes true \N +k5 char(1) Yes true \N +k6 varchar(1) Yes true \N +k7 date Yes true \N +k8 datetime Yes true \N +k9 largeint Yes true \N +k10 decimal(38,9) Yes true \N +k11 boolean Yes true \N +k12 date Yes true \N +k13 datetime Yes true \N +k14 datetime(3) Yes true \N +k15 datetime(6) Yes true \N +v1 int Yes false \N SUM -- !sql -- 1 1 1 1 1 1 2022-05-31 2022-05-31T10:00 1 1.000000000 true 2022-05-31 2022-05-31T10:00 2022-05-31T10:00:00.111 2022-05-31T10:00:00.111111 1 -- !sql -- -k1 TINYINT Yes true \N -k2 SMALLINT Yes true \N -k3 INT Yes true \N -k4 BIGINT Yes true \N -k5 CHAR(1) Yes true \N -k6 VARCHAR(1) Yes true \N -k7 DATE Yes true \N -k8 DATETIME Yes true \N -k9 LARGEINT Yes true \N -k10 DECIMAL(38, 9) Yes true \N -k11 BOOLEAN Yes true \N -k12 DATE Yes false \N NONE -k13 DATETIME Yes false \N NONE -k14 DATETIME(3) Yes false \N NONE -k15 DATETIME(6) Yes false \N NONE -v1 INT Yes false \N NONE +k1 tinyint Yes true \N +k2 smallint Yes true \N +k3 int Yes true \N +k4 bigint Yes true \N +k5 char(1) Yes true \N +k6 varchar(1) Yes true \N +k7 date Yes true \N +k8 datetime Yes true \N +k9 largeint Yes true \N +k10 decimal(38,9) Yes true \N +k11 boolean Yes true \N +k12 date Yes false \N NONE +k13 datetime Yes false \N NONE +k14 datetime(3) Yes false \N NONE +k15 datetime(6) Yes false \N NONE +v1 int Yes false \N NONE -- !sql -- 1 1 1 1 1 1 2022-05-31 2022-05-31T10:00 1 1.000000000 true 2022-05-31 2022-05-31T10:00 2022-05-31T10:00:00.111 2022-05-31T10:00:00.111111 1 -- !sql -- -create_time DATETIME No true \N -vid VARCHAR(64) No true \N -report_time DATETIME Yes true \N -block_version INT Yes false \N REPLACE -vehicle_mode INT Yes false \N REPLACE -usage_mode INT Yes false \N REPLACE +create_time datetime No true \N +vid varchar(64) No true \N +report_time datetime Yes true \N +block_version int Yes false \N REPLACE +vehicle_mode int Yes false \N REPLACE +usage_mode int Yes false \N REPLACE -- !sql -- 2 @@ -86,12 +86,12 @@ usage_mode INT Yes false \N REPLACE 2023-08-25T11:00 123 2023-08-25T11:00 2 2 2 -- !sql -- -create_time DATETIME No true \N -vid VARCHAR(64) No true \N -report_time DATETIME Yes true \N -block_version INT Yes false \N NONE -vehicle_mode INT Yes false \N NONE -usage_mode INT Yes false \N NONE +create_time datetime No true \N +vid varchar(64) No true \N +report_time datetime Yes true \N +block_version int Yes false \N NONE +vehicle_mode int Yes false \N NONE +usage_mode int Yes false \N NONE -- !sql -- 2 diff --git a/regression-test/data/index_p0/test_decimal_bitmap_index_multi_page.out b/regression-test/data/index_p0/test_decimal_bitmap_index_multi_page.out index aeb0972b318654..4a01d21fc2ed88 100644 --- a/regression-test/data/index_p0/test_decimal_bitmap_index_multi_page.out +++ b/regression-test/data/index_p0/test_decimal_bitmap_index_multi_page.out @@ -1,6 +1,6 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -a DECIMAL(12, 6) No true \N +a decimal(12,6) No true \N -- !sql -- 0.000001 diff --git a/regression-test/data/inverted_index_p0/test_bitmap_index.out b/regression-test/data/inverted_index_p0/test_bitmap_index.out index a01ef6a147fc5c..614feed67d8e7d 100644 --- a/regression-test/data/inverted_index_p0/test_bitmap_index.out +++ b/regression-test/data/inverted_index_p0/test_bitmap_index.out @@ -1,50 +1,50 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -k1 TINYINT Yes true \N -k2 SMALLINT Yes true \N -k3 INT Yes true \N -k4 BIGINT Yes false \N NONE -k5 CHAR(1) Yes false \N NONE -k6 VARCHAR(1) Yes false \N NONE -k7 DATE Yes false \N NONE -k8 DATETIME Yes false \N NONE -k9 LARGEINT Yes false \N NONE -k10 DECIMAL(38, 9) Yes false \N NONE -k11 BOOLEAN Yes false \N NONE +k1 tinyint Yes true \N +k2 smallint Yes true \N +k3 int Yes true \N +k4 bigint Yes false \N NONE +k5 char(1) Yes false \N NONE +k6 varchar(1) Yes false \N NONE +k7 date Yes false \N NONE +k8 datetime Yes false \N NONE +k9 largeint Yes false \N NONE +k10 decimal(38,9) Yes false \N NONE +k11 boolean Yes false \N NONE -- !sql -- 1 1 1 1 1 1 2022-05-31 2022-05-31T10:00 1 1.000000000 true -- !sql -- -k1 TINYINT Yes true \N -k2 SMALLINT Yes true \N -k3 INT Yes true \N -k4 BIGINT Yes true \N -k5 CHAR(1) Yes true \N -k6 VARCHAR(1) Yes true \N -k7 DATE Yes true \N -k8 DATETIME Yes true \N -k9 LARGEINT Yes true \N -k10 DECIMAL(38, 9) Yes true \N -k11 BOOLEAN Yes true \N -v1 INT Yes false \N SUM +k1 tinyint Yes true \N +k2 smallint Yes true \N +k3 int Yes true \N +k4 bigint Yes true \N +k5 char(1) Yes true \N +k6 varchar(1) Yes true \N +k7 date Yes true \N +k8 datetime Yes true \N +k9 largeint Yes true \N +k10 decimal(38,9) Yes true \N +k11 boolean Yes true \N +v1 int Yes false \N SUM -- !sql -- 1 1 1 1 1 1 2022-05-31 2022-05-31T10:00 1 1.000000000 true 1 -- !sql -- -k1 TINYINT Yes true \N -k2 SMALLINT Yes true \N -k3 INT Yes true \N -k4 BIGINT Yes true \N -k5 CHAR(1) Yes true \N -k6 VARCHAR(1) Yes true \N -k7 DATE Yes true \N -k8 DATETIME Yes true \N -k9 LARGEINT Yes true \N -k10 DECIMAL(38, 9) Yes true \N -k11 BOOLEAN Yes true \N -v1 INT Yes false \N NONE +k1 tinyint Yes true \N +k2 smallint Yes true \N +k3 int Yes true \N +k4 bigint Yes true \N +k5 char(1) Yes true \N +k6 varchar(1) Yes true \N +k7 date Yes true \N +k8 datetime Yes true \N +k9 largeint Yes true \N +k10 decimal(38,9) Yes true \N +k11 boolean Yes true \N +v1 int Yes false \N NONE -- !sql -- 1 1 1 1 1 1 2022-05-31 2022-05-31T10:00 1 1.000000000 true 1 diff --git a/regression-test/data/inverted_index_p0/test_inverted_index.out b/regression-test/data/inverted_index_p0/test_inverted_index.out index 242dbac2b8f001..56414cdcb5acae 100644 --- a/regression-test/data/inverted_index_p0/test_inverted_index.out +++ b/regression-test/data/inverted_index_p0/test_inverted_index.out @@ -1,62 +1,62 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -k1 TINYINT Yes true \N -k2 SMALLINT Yes true \N -k3 INT Yes true \N -k4 BIGINT Yes false \N NONE -k5 CHAR(1) Yes false \N NONE -k6 VARCHAR(1) Yes false \N NONE -k7 DATE Yes false \N NONE -k8 DATETIME Yes false \N NONE -k9 LARGEINT Yes false \N NONE -k10 DECIMAL(38, 9) Yes false \N NONE -k11 BOOLEAN Yes false \N NONE -k12 DATE Yes false \N NONE -k13 DATETIME Yes false \N NONE -k14 DATETIME(3) Yes false \N NONE -k15 DATETIME(6) Yes false \N NONE +k1 tinyint Yes true \N +k2 smallint Yes true \N +k3 int Yes true \N +k4 bigint Yes false \N NONE +k5 char(1) Yes false \N NONE +k6 varchar(1) Yes false \N NONE +k7 date Yes false \N NONE +k8 datetime Yes false \N NONE +k9 largeint Yes false \N NONE +k10 decimal(38,9) Yes false \N NONE +k11 boolean Yes false \N NONE +k12 date Yes false \N NONE +k13 datetime Yes false \N NONE +k14 datetime(3) Yes false \N NONE +k15 datetime(6) Yes false \N NONE -- !sql -- 1 1 1 1 1 1 2022-05-31 2022-05-31T10:00 1 1.000000000 true 2022-05-31 2022-05-31T10:00 2022-05-31T10:00:00.111 2022-05-31T10:00:00.111111 -- !sql -- -k1 TINYINT Yes true \N -k2 SMALLINT Yes true \N -k3 INT Yes true \N -k4 BIGINT Yes true \N -k5 CHAR(1) Yes true \N -k6 VARCHAR(1) Yes true \N -k7 DATE Yes true \N -k8 DATETIME Yes true \N -k9 LARGEINT Yes true \N -k10 DECIMAL(38, 9) Yes true \N -k11 BOOLEAN Yes true \N -k12 DATE Yes true \N -k13 DATETIME Yes true \N -k14 DATETIME(3) Yes true \N -k15 DATETIME(6) Yes true \N -v1 INT Yes false \N SUM +k1 tinyint Yes true \N +k2 smallint Yes true \N +k3 int Yes true \N +k4 bigint Yes true \N +k5 char(1) Yes true \N +k6 varchar(1) Yes true \N +k7 date Yes true \N +k8 datetime Yes true \N +k9 largeint Yes true \N +k10 decimal(38,9) Yes true \N +k11 boolean Yes true \N +k12 date Yes true \N +k13 datetime Yes true \N +k14 datetime(3) Yes true \N +k15 datetime(6) Yes true \N +v1 int Yes false \N SUM -- !sql -- 1 1 1 1 1 1 2022-05-31 2022-05-31T10:00 1 1.000000000 true 2022-05-31 2022-05-31T10:00 2022-05-31T10:00:00.111 2022-05-31T10:00:00.111111 1 -- !sql -- -k1 TINYINT Yes true \N -k2 SMALLINT Yes true \N -k3 INT Yes true \N -k4 BIGINT Yes true \N -k5 CHAR(1) Yes true \N -k6 VARCHAR(1) Yes true \N -k7 DATE Yes true \N -k8 DATETIME Yes true \N -k9 LARGEINT Yes true \N -k10 DECIMAL(38, 9) Yes true \N -k11 BOOLEAN Yes true \N -k12 DATE Yes false \N NONE -k13 DATETIME Yes false \N NONE -k14 DATETIME(3) Yes false \N NONE -k15 DATETIME(6) Yes false \N NONE -v1 INT Yes false \N NONE +k1 tinyint Yes true \N +k2 smallint Yes true \N +k3 int Yes true \N +k4 bigint Yes true \N +k5 char(1) Yes true \N +k6 varchar(1) Yes true \N +k7 date Yes true \N +k8 datetime Yes true \N +k9 largeint Yes true \N +k10 decimal(38,9) Yes true \N +k11 boolean Yes true \N +k12 date Yes false \N NONE +k13 datetime Yes false \N NONE +k14 datetime(3) Yes false \N NONE +k15 datetime(6) Yes false \N NONE +v1 int Yes false \N NONE -- !sql -- 1 1 1 1 1 1 2022-05-31 2022-05-31T10:00 1 1.000000000 true 2022-05-31 2022-05-31T10:00 2022-05-31T10:00:00.111 2022-05-31T10:00:00.111111 1 diff --git a/regression-test/data/load_p0/tvf/test_tvf_empty_file.out b/regression-test/data/load_p0/tvf/test_tvf_empty_file.out index 59822770e2cd0c..282bf3356110b8 100644 --- a/regression-test/data/load_p0/tvf/test_tvf_empty_file.out +++ b/regression-test/data/load_p0/tvf/test_tvf_empty_file.out @@ -2,7 +2,7 @@ -- !select -- -- !desc -- -__dummy_col TEXT Yes false \N NONE +__dummy_col text Yes false \N NONE -- !select2 -- 1 doris 18 @@ -11,7 +11,7 @@ __dummy_col TEXT Yes false \N NONE 4 yyy 21 -- !des2 -- -c1 TEXT Yes false \N NONE -c2 TEXT Yes false \N NONE -c3 TEXT Yes false \N NONE +c1 text Yes false \N NONE +c2 text Yes false \N NONE +c3 text Yes false \N NONE diff --git a/regression-test/data/load_p0/tvf/test_tvf_error_url.out b/regression-test/data/load_p0/tvf/test_tvf_error_url.out index 468a50ff85d073..07739567b70ed2 100644 --- a/regression-test/data/load_p0/tvf/test_tvf_error_url.out +++ b/regression-test/data/load_p0/tvf/test_tvf_error_url.out @@ -2,10 +2,10 @@ -- !select -- -- !desc -- -__dummy_col TEXT Yes false \N NONE +__dummy_col text Yes false \N NONE -- !select2 -- -- !desc2 -- -__dummy_col TEXT Yes false \N NONE +__dummy_col text Yes false \N NONE diff --git a/regression-test/data/mtmv_p0/test_build_mtmv.out b/regression-test/data/mtmv_p0/test_build_mtmv.out index 5e5632511f42ce..9205ec9a160802 100644 --- a/regression-test/data/mtmv_p0/test_build_mtmv.out +++ b/regression-test/data/mtmv_p0/test_build_mtmv.out @@ -61,7 +61,7 @@ zhangsang 200 11 111 -- !desc_mv -- -field_1 VARCHAR(16) No true \N +field_1 varchar(16) No true \N -- !query_mv_with_cte -- 2 3 diff --git a/regression-test/data/mtmv_p0/test_create_with_null_type.out b/regression-test/data/mtmv_p0/test_create_with_null_type.out index ec90732f163510..6dc0a1586c2ac3 100644 --- a/regression-test/data/mtmv_p0/test_create_with_null_type.out +++ b/regression-test/data/mtmv_p0/test_create_with_null_type.out @@ -3,11 +3,11 @@ \N -- !desc -- -test_create_with_null_type DUP_KEYS __literal_0 TINYINT TINYINT Yes true \N true +test_create_with_null_type DUP_KEYS __literal_0 tinyint tinyint Yes true \N true -- !select -- \N -- !desc -- -test_create_with_null_type DUP_KEYS id TINYINT TINYINT Yes true \N true +test_create_with_null_type DUP_KEYS id tinyint tinyint Yes true \N true diff --git a/regression-test/data/mv_p0/varchar_length/varchar_length.out b/regression-test/data/mv_p0/varchar_length/varchar_length.out index 2943852ba7bcdd..eec81428080116 100644 --- a/regression-test/data/mv_p0/varchar_length/varchar_length.out +++ b/regression-test/data/mv_p0/varchar_length/varchar_length.out @@ -1,8 +1,8 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !select_exp -- -test1 UNIQUE_KEYS vid VARCHAR(1) VARCHAR(1) No true \N true - report_time INT INT No true \N true +test1 UNIQUE_KEYS vid varchar(1) varchar(1) No true \N true + report_time int int No true \N true -mv_test UNIQUE_KEYS mv_report_time INT INT No true \N true `report_time` - mv_vid VARCHAR(65533) VARCHAR(65533) No true \N NONE true `vid` +mv_test UNIQUE_KEYS mv_report_time int int No true \N true `report_time` + mv_vid varchar(65533) varchar(65533) No true \N NONE true `vid` diff --git a/regression-test/data/nereids_p0/create_table/test_create_blocked.out b/regression-test/data/nereids_p0/create_table/test_create_blocked.out index 2a89d34218f47b..1d63a26d7d3ca6 100644 --- a/regression-test/data/nereids_p0/create_table/test_create_blocked.out +++ b/regression-test/data/nereids_p0/create_table/test_create_blocked.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/nereids_p0/create_table/test_ctas.out b/regression-test/data/nereids_p0/create_table/test_ctas.out index 7d3765477d9704..4064188ddeb3e0 100644 --- a/regression-test/data/nereids_p0/create_table/test_ctas.out +++ b/regression-test/data/nereids_p0/create_table/test_ctas.out @@ -22,8 +22,8 @@ r2 {"title":"Amount","value":2.1} 2.1 2.20000 2.3 2.400000 2.500000 2.600000 -- !desc -- -__substring_0 VARCHAR(30) Yes true \N +__substring_0 varchar(30) Yes true \N -- !desc -- -__substring_0 VARCHAR(30) Yes true \N +__substring_0 varchar(30) Yes true \N diff --git a/regression-test/data/nereids_syntax_p0/rollup/agg.out b/regression-test/data/nereids_syntax_p0/rollup/agg.out index 5ad3bc29ce0339..3b238708f990c1 100644 --- a/regression-test/data/nereids_syntax_p0/rollup/agg.out +++ b/regression-test/data/nereids_syntax_p0/rollup/agg.out @@ -1,15 +1,15 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -test_rollup_agg1 AGG_KEYS siteid INT INT No true \N true - citycode SMALLINT SMALLINT No true \N true - username VARCHAR(32) VARCHAR(32) No true \N true - pv BIGINT BIGINT No false 0 SUM true - uv BIGINT BIGINT No false 0 SUM true - vv BIGINT BIGINT Yes false 0 SUM true +test_rollup_agg1 AGG_KEYS siteid int int No true \N true + citycode smallint smallint No true \N true + username varchar(32) varchar(32) No true \N true + pv bigint bigint No false 0 SUM true + uv bigint bigint No false 0 SUM true + vv bigint bigint Yes false 0 SUM true -rollup_city AGG_KEYS citycode SMALLINT SMALLINT No true \N true - pv BIGINT BIGINT No false 0 SUM true - vv BIGINT BIGINT Yes false 0 SUM true +rollup_city AGG_KEYS citycode smallint smallint No true \N true + pv bigint bigint No false 0 SUM true + vv bigint bigint Yes false 0 SUM true -- !sql -- 1 300 diff --git a/regression-test/data/nereids_syntax_p0/rollup/agg_date.out b/regression-test/data/nereids_syntax_p0/rollup/agg_date.out index 17fc18fae25d1d..3c85f24c2e69b8 100644 --- a/regression-test/data/nereids_syntax_p0/rollup/agg_date.out +++ b/regression-test/data/nereids_syntax_p0/rollup/agg_date.out @@ -1,23 +1,23 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -test_rollup_agg_date1 AGG_KEYS datek1 DATE DATEV2 Yes true \N true - datetimek1 DATETIME DATETIMEV2(0) Yes true \N true - datetimek2 DATETIME(3) DATETIMEV2(3) Yes true \N true - datetimek3 DATETIME(6) DATETIMEV2(6) Yes true \N true - datev1 DATE DATEV2 No false \N MAX true - datetimev1 DATETIME DATETIMEV2(0) No false \N MAX true - datetimev2 DATETIME(3) DATETIMEV2(3) No false \N MAX true - datetimev3 DATETIME(6) DATETIMEV2(6) No false \N MAX true - datetimev4 DATETIME(3) DATETIMEV2(3) Yes false \N MAX true +test_rollup_agg_date1 AGG_KEYS datek1 DATE datev2 Yes true \N true + datetimek1 DATETIME datetimev2(0) Yes true \N true + datetimek2 DATETIME(3) datetimev2(3) Yes true \N true + datetimek3 DATETIME(6) datetimev2(6) Yes true \N true + datev1 DATE datev2 No false \N MAX true + datetimev1 DATETIME datetimev2(0) No false \N MAX true + datetimev2 DATETIME(3) datetimev2(3) No false \N MAX true + datetimev3 DATETIME(6) datetimev2(6) No false \N MAX true + datetimev4 DATETIME(3) datetimev2(3) Yes false \N MAX true -rollup_date AGG_KEYS datek1 DATE DATEV2 Yes true \N true - datetimek2 DATETIME(3) DATETIMEV2(3) Yes true \N true - datetimek1 DATETIME DATETIMEV2(0) Yes true \N true - datetimek3 DATETIME(6) DATETIMEV2(6) Yes true \N true - datev1 DATE DATEV2 No false \N MAX true - datetimev1 DATETIME DATETIMEV2(0) No false \N MAX true - datetimev2 DATETIME(3) DATETIMEV2(3) No false \N MAX true - datetimev3 DATETIME(6) DATETIMEV2(6) No false \N MAX true +rollup_date AGG_KEYS datek1 DATE datev2 Yes true \N true + datetimek2 DATETIME(3) datetimev2(3) Yes true \N true + datetimek1 DATETIME datetimev2(0) Yes true \N true + datetimek3 DATETIME(6) datetimev2(6) Yes true \N true + datev1 DATE datev2 No false \N MAX true + datetimev1 DATETIME datetimev2(0) No false \N MAX true + datetimev2 DATETIME(3) datetimev2(3) No false \N MAX true + datetimev3 DATETIME(6) datetimev2(6) No false \N MAX true -- !sql -- 2022-08-23 2022-08-23T11:11:11 2022-08-23T11:11:11.111 2022-08-23T11:11:11.111111 2022-08-23 2022-08-23T11:11:11 2022-08-23T11:11:11.111 2022-08-23T11:11:11.111111 diff --git a/regression-test/data/nereids_syntax_p0/rollup/hll/hll.out b/regression-test/data/nereids_syntax_p0/rollup/hll/hll.out index 28ee1fc66c35b9..28613c99b80a7f 100644 --- a/regression-test/data/nereids_syntax_p0/rollup/hll/hll.out +++ b/regression-test/data/nereids_syntax_p0/rollup/hll/hll.out @@ -3,12 +3,12 @@ 1 1 -- !sql -- -test_materialized_view_hll1 DUP_KEYS record_id INT INT Yes true \N true - seller_id INT INT Yes true \N true - store_id INT INT Yes true \N true - sale_date DATE DATEV2 Yes false \N NONE true - sale_amt BIGINT BIGINT Yes false \N NONE true +test_materialized_view_hll1 DUP_KEYS record_id int int Yes true \N true + seller_id int int Yes true \N true + store_id int int Yes true \N true + sale_date DATE datev2 Yes false \N NONE true + sale_amt bigint bigint Yes false \N NONE true -amt_count AGG_KEYS mv_store_id INT INT Yes true \N true `store_id` - mva_HLL_UNION__hll_hash(CAST(`sale_amt` AS VARCHAR(65533))) HLL HLL No false \N HLL_UNION true hll_hash(CAST(`sale_amt` AS VARCHAR(65533))) +amt_count AGG_KEYS mv_store_id int int Yes true \N true `store_id` + mva_HLL_UNION__hll_hash(CAST(`sale_amt` AS varchar(65533))) hll hll No false \N HLL_UNION true hll_hash(CAST(`sale_amt` AS varchar(65533))) diff --git a/regression-test/data/nereids_syntax_p0/rollup/hll_with_light_sc/hll_with_light_sc.out b/regression-test/data/nereids_syntax_p0/rollup/hll_with_light_sc/hll_with_light_sc.out index 4018c44c9389c8..b348514c97bf52 100644 --- a/regression-test/data/nereids_syntax_p0/rollup/hll_with_light_sc/hll_with_light_sc.out +++ b/regression-test/data/nereids_syntax_p0/rollup/hll_with_light_sc/hll_with_light_sc.out @@ -1,13 +1,13 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -test_materialized_view_hll_with_light_sc1 DUP_KEYS record_id INT INT Yes true \N true - seller_id INT INT Yes true \N true - store_id INT INT Yes true \N true - sale_date DATE DATEV2 Yes false \N NONE true - sale_amt BIGINT BIGINT Yes false \N NONE true +test_materialized_view_hll_with_light_sc1 DUP_KEYS record_id int int Yes true \N true + seller_id int int Yes true \N true + store_id int int Yes true \N true + sale_date DATE datev2 Yes false \N NONE true + sale_amt bigint bigint Yes false \N NONE true -amt_count1 AGG_KEYS mv_store_id INT INT Yes true \N true `store_id` - mva_HLL_UNION__hll_hash(CAST(`sale_amt` AS VARCHAR(65533))) HLL HLL No false \N HLL_UNION true hll_hash(CAST(`sale_amt` AS VARCHAR(65533))) +amt_count1 AGG_KEYS mv_store_id int int Yes true \N true `store_id` + mva_HLL_UNION__hll_hash(CAST(`sale_amt` AS varchar(65533))) hll hll No false \N HLL_UNION true hll_hash(CAST(`sale_amt` AS varchar(65533))) -- !sql -- 1 1 diff --git a/regression-test/data/query_p0/system/test_metadata_name_ids.out b/regression-test/data/query_p0/system/test_metadata_name_ids.out index 4dc532f4d21ec2..66902cb74e39cc 100644 --- a/regression-test/data/query_p0/system/test_metadata_name_ids.out +++ b/regression-test/data/query_p0/system/test_metadata_name_ids.out @@ -1,11 +1,11 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !desc -- -CATALOG_ID BIGINT Yes false \N -CATALOG_NAME VARCHAR(512) Yes false \N -DATABASE_ID BIGINT Yes false \N -DATABASE_NAME VARCHAR(64) Yes false \N -TABLE_ID BIGINT Yes false \N -TABLE_NAME VARCHAR(64) Yes false \N +CATALOG_ID bigint Yes false \N +CATALOG_NAME varchar(512) Yes false \N +DATABASE_ID bigint Yes false \N +DATABASE_NAME varchar(64) Yes false \N +TABLE_ID bigint Yes false \N +TABLE_NAME varchar(64) Yes false \N -- !select2 -- internal demo test_metadata_name_ids diff --git a/regression-test/data/query_p0/system/test_query_sys_rowsets.out b/regression-test/data/query_p0/system/test_query_sys_rowsets.out index 2f91c9028dc330..d9e5a070d1c65e 100644 --- a/regression-test/data/query_p0/system/test_query_sys_rowsets.out +++ b/regression-test/data/query_p0/system/test_query_sys_rowsets.out @@ -1,18 +1,18 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !desc_rowsets -- -BACKEND_ID BIGINT Yes false \N -ROWSET_ID VARCHAR(64) Yes false \N -TABLET_ID BIGINT Yes false \N -ROWSET_NUM_ROWS BIGINT Yes false \N -TXN_ID BIGINT Yes false \N -NUM_SEGMENTS BIGINT Yes false \N -START_VERSION BIGINT Yes false \N -END_VERSION BIGINT Yes false \N -INDEX_DISK_SIZE BIGINT Yes false \N -DATA_DISK_SIZE BIGINT Yes false \N -CREATION_TIME DATETIME Yes false \N -NEWEST_WRITE_TIMESTAMP DATETIME Yes false \N -SCHEMA_VERSION INT Yes false \N +BACKEND_ID bigint Yes false \N +ROWSET_ID varchar(64) Yes false \N +TABLET_ID bigint Yes false \N +ROWSET_NUM_ROWS bigint Yes false \N +TXN_ID bigint Yes false \N +NUM_SEGMENTS bigint Yes false \N +START_VERSION bigint Yes false \N +END_VERSION bigint Yes false \N +INDEX_DISK_SIZE bigint Yes false \N +DATA_DISK_SIZE bigint Yes false \N +CREATION_TIME datetime Yes false \N +NEWEST_WRITE_TIMESTAMP datetime Yes false \N +SCHEMA_VERSION int Yes false \N -- !rowsets1 -- 0 1 diff --git a/regression-test/data/query_p0/system/test_query_sys_tables.out b/regression-test/data/query_p0/system/test_query_sys_tables.out index 74574ae818ba62..3073ae0bf53e74 100644 --- a/regression-test/data/query_p0/system/test_query_sys_tables.out +++ b/regression-test/data/query_p0/system/test_query_sys_tables.out @@ -20,83 +20,83 @@ internal ccc 3 int int(11) 10 internal ddd 4 smallint smallint(6) 5 -- !desc_files -- -FILE_ID BIGINT Yes false \N -FILE_NAME TEXT Yes false \N -FILE_TYPE VARCHAR(256) Yes false \N -TABLESPACE_NAME VARCHAR(256) Yes false \N -TABLE_CATALOG CHAR(16) Yes false \N -TABLE_SCHEMA TEXT Yes false \N -TABLE_NAME TEXT Yes false \N -LOGFILE_GROUP_NAME VARCHAR(256) Yes false \N -LOGFILE_GROUP_NUMBER BIGINT Yes false \N -ENGINE VARCHAR(64) Yes false \N -FULLTEXT_KEYS TEXT Yes false \N -DELETED_ROWS TEXT Yes false \N -UPDATE_COUNT TEXT Yes false \N -FREE_EXTENTS BIGINT Yes false \N -TOTAL_EXTENTS BIGINT Yes false \N -EXTENT_SIZE BIGINT Yes false \N -INITIAL_SIZE BIGINT Yes false \N -MAXIMUM_SIZE BIGINT Yes false \N -AUTOEXTEND_SIZE BIGINT Yes false \N -CREATION_TIME TEXT Yes false \N -LAST_UPDATE_TIME TEXT Yes false \N -LAST_ACCESS_TIME TEXT Yes false \N -RECOVER_TIME TEXT Yes false \N -TRANSACTION_COUNTER TEXT Yes false \N -VERSION BIGINT Yes false \N -ROW_FORMAT VARCHAR(256) Yes false \N -TABLE_ROWS TEXT Yes false \N -AVG_ROW_LENGTH TEXT Yes false \N -DATA_LENGTH TEXT Yes false \N -MAX_DATA_LENGTH TEXT Yes false \N -INDEX_LENGTH TEXT Yes false \N -DATA_FREE BIGINT Yes false \N -CREATE_TIME TEXT Yes false \N -UPDATE_TIME TEXT Yes false \N -CHECK_TIME TEXT Yes false \N -CHECKSUM TEXT Yes false \N -STATUS VARCHAR(256) Yes false \N -EXTRA VARCHAR(256) Yes false \N +FILE_ID bigint Yes false \N +FILE_NAME text Yes false \N +FILE_TYPE varchar(256) Yes false \N +TABLESPACE_NAME varchar(256) Yes false \N +TABLE_CATALOG char(16) Yes false \N +TABLE_SCHEMA text Yes false \N +TABLE_NAME text Yes false \N +LOGFILE_GROUP_NAME varchar(256) Yes false \N +LOGFILE_GROUP_NUMBER bigint Yes false \N +ENGINE varchar(64) Yes false \N +FULLTEXT_KEYS text Yes false \N +DELETED_ROWS text Yes false \N +UPDATE_COUNT text Yes false \N +FREE_EXTENTS bigint Yes false \N +TOTAL_EXTENTS bigint Yes false \N +EXTENT_SIZE bigint Yes false \N +INITIAL_SIZE bigint Yes false \N +MAXIMUM_SIZE bigint Yes false \N +AUTOEXTEND_SIZE bigint Yes false \N +CREATION_TIME text Yes false \N +LAST_UPDATE_TIME text Yes false \N +LAST_ACCESS_TIME text Yes false \N +RECOVER_TIME text Yes false \N +TRANSACTION_COUNTER text Yes false \N +VERSION bigint Yes false \N +ROW_FORMAT varchar(256) Yes false \N +TABLE_ROWS text Yes false \N +AVG_ROW_LENGTH text Yes false \N +DATA_LENGTH text Yes false \N +MAX_DATA_LENGTH text Yes false \N +INDEX_LENGTH text Yes false \N +DATA_FREE bigint Yes false \N +CREATE_TIME text Yes false \N +UPDATE_TIME text Yes false \N +CHECK_TIME text Yes false \N +CHECKSUM text Yes false \N +STATUS varchar(256) Yes false \N +EXTRA varchar(256) Yes false \N -- !query_files -- -- !desc_statistics -- -TABLE_CATALOG VARCHAR(512) Yes false \N -TABLE_SCHEMA VARCHAR(64) Yes false \N -TABLE_NAME VARCHAR(64) Yes false \N -NON_UNIQUE BIGINT Yes false \N -INDEX_SCHEMA VARCHAR(64) Yes false \N -INDEX_NAME VARCHAR(64) Yes false \N -SEQ_IN_INDEX BIGINT Yes false \N -COLUMN_NAME VARCHAR(64) Yes false \N -COLLATION VARCHAR(1) Yes false \N -CARDINALITY BIGINT Yes false \N -SUB_PART BIGINT Yes false \N -PACKED VARCHAR(10) Yes false \N -NULLABLE VARCHAR(3) Yes false \N -INDEX_TYPE VARCHAR(16) Yes false \N -COMMENT VARCHAR(16) Yes false \N -INDEX_COMMENT VARCHAR(1024) Yes false \N +TABLE_CATALOG varchar(512) Yes false \N +TABLE_SCHEMA varchar(64) Yes false \N +TABLE_NAME varchar(64) Yes false \N +NON_UNIQUE bigint Yes false \N +INDEX_SCHEMA varchar(64) Yes false \N +INDEX_NAME varchar(64) Yes false \N +SEQ_IN_INDEX bigint Yes false \N +COLUMN_NAME varchar(64) Yes false \N +COLLATION varchar(1) Yes false \N +CARDINALITY bigint Yes false \N +SUB_PART bigint Yes false \N +PACKED varchar(10) Yes false \N +NULLABLE varchar(3) Yes false \N +INDEX_TYPE varchar(16) Yes false \N +COMMENT varchar(16) Yes false \N +INDEX_COMMENT varchar(1024) Yes false \N -- !query_statistics -- -- !desc_statistics -- -CONSTRAINT_CATALOG VARCHAR(512) Yes false \N -CONSTRAINT_SCHEMA VARCHAR(64) Yes false \N -CONSTRAINT_NAME VARCHAR(64) Yes false \N -TABLE_SCHEMA VARCHAR(64) Yes false \N -TABLE_NAME VARCHAR(64) Yes false \N -CONSTRAINT_TYPE VARCHAR(64) Yes false \N +CONSTRAINT_CATALOG varchar(512) Yes false \N +CONSTRAINT_SCHEMA varchar(64) Yes false \N +CONSTRAINT_NAME varchar(64) Yes false \N +TABLE_SCHEMA varchar(64) Yes false \N +TABLE_NAME varchar(64) Yes false \N +CONSTRAINT_TYPE varchar(64) Yes false \N -- !query_table_constraints -- -- !desc_schema_privileges -- -GRANTEE VARCHAR(81) Yes false \N -TABLE_CATALOG VARCHAR(512) Yes false \N -TABLE_SCHEMA VARCHAR(64) Yes false \N -PRIVILEGE_TYPE VARCHAR(64) Yes false \N -IS_GRANTABLE VARCHAR(3) Yes false \N +GRANTEE varchar(81) Yes false \N +TABLE_CATALOG varchar(512) Yes false \N +TABLE_SCHEMA varchar(64) Yes false \N +PRIVILEGE_TYPE varchar(64) Yes false \N +IS_GRANTABLE varchar(3) Yes false \N -- !schema_privileges1 -- 'root'@'%' def mysql SELECT NO @@ -107,12 +107,12 @@ IS_GRANTABLE VARCHAR(3) Yes false \N -- !schema_privileges3 -- -- !desc_table_privileges -- -GRANTEE VARCHAR(81) Yes false \N -TABLE_CATALOG VARCHAR(512) Yes false \N -TABLE_SCHEMA VARCHAR(64) Yes false \N -TABLE_NAME VARCHAR(64) Yes false \N -PRIVILEGE_TYPE VARCHAR(64) Yes false \N -IS_GRANTABLE VARCHAR(3) Yes false \N +GRANTEE varchar(81) Yes false \N +TABLE_CATALOG varchar(512) Yes false \N +TABLE_SCHEMA varchar(64) Yes false \N +TABLE_NAME varchar(64) Yes false \N +PRIVILEGE_TYPE varchar(64) Yes false \N +IS_GRANTABLE varchar(3) Yes false \N -- !table_privileges -- @@ -126,31 +126,31 @@ IS_GRANTABLE VARCHAR(3) Yes false \N 'cywtable'@'%' def table_privileges_demo test_table_privileges INSERT NO -- !desc_partitions -- -TABLE_CATALOG VARCHAR(64) Yes false \N -TABLE_SCHEMA VARCHAR(64) Yes false \N -TABLE_NAME VARCHAR(64) Yes false \N -PARTITION_NAME VARCHAR(64) Yes false \N -SUBPARTITION_NAME VARCHAR(64) Yes false \N -PARTITION_ORDINAL_POSITION INT Yes false \N -SUBPARTITION_ORDINAL_POSITION INT Yes false \N -PARTITION_METHOD VARCHAR(13) Yes false \N -SUBPARTITION_METHOD VARCHAR(13) Yes false \N -PARTITION_EXPRESSION VARCHAR(2048) Yes false \N -SUBPARTITION_EXPRESSION VARCHAR(2048) Yes false \N -PARTITION_DESCRIPTION TEXT Yes false \N -TABLE_ROWS BIGINT Yes false \N -AVG_ROW_LENGTH BIGINT Yes false \N -DATA_LENGTH BIGINT Yes false \N -MAX_DATA_LENGTH BIGINT Yes false \N -INDEX_LENGTH BIGINT Yes false \N -DATA_FREE BIGINT Yes false \N -CREATE_TIME BIGINT Yes false \N -UPDATE_TIME DATETIME Yes false \N -CHECK_TIME DATETIME Yes false \N -CHECKSUM BIGINT Yes false \N -PARTITION_COMMENT TEXT Yes false \N -NODEGROUP VARCHAR(256) Yes false \N -TABLESPACE_NAME VARCHAR(268) Yes false \N +TABLE_CATALOG varchar(64) Yes false \N +TABLE_SCHEMA varchar(64) Yes false \N +TABLE_NAME varchar(64) Yes false \N +PARTITION_NAME varchar(64) Yes false \N +SUBPARTITION_NAME varchar(64) Yes false \N +PARTITION_ORDINAL_POSITION int Yes false \N +SUBPARTITION_ORDINAL_POSITION int Yes false \N +PARTITION_METHOD varchar(13) Yes false \N +SUBPARTITION_METHOD varchar(13) Yes false \N +PARTITION_EXPRESSION varchar(2048) Yes false \N +SUBPARTITION_EXPRESSION varchar(2048) Yes false \N +PARTITION_DESCRIPTION text Yes false \N +TABLE_ROWS bigint Yes false \N +AVG_ROW_LENGTH bigint Yes false \N +DATA_LENGTH bigint Yes false \N +MAX_DATA_LENGTH bigint Yes false \N +INDEX_LENGTH bigint Yes false \N +DATA_FREE bigint Yes false \N +CREATE_TIME bigint Yes false \N +UPDATE_TIME datetime Yes false \N +CHECK_TIME datetime Yes false \N +CHECKSUM bigint Yes false \N +PARTITION_COMMENT text Yes false \N +NODEGROUP varchar(256) Yes false \N +TABLESPACE_NAME varchar(268) Yes false \N -- !select_partitions -- diff --git a/regression-test/data/rollup/test_materialized_view_hll.out b/regression-test/data/rollup/test_materialized_view_hll.out index 9721b8612c6d76..99dcf35a1ce41a 100644 --- a/regression-test/data/rollup/test_materialized_view_hll.out +++ b/regression-test/data/rollup/test_materialized_view_hll.out @@ -1,13 +1,13 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -test_materialized_view_hll DUP_KEYS record_id INT INT Yes true \N true - seller_id INT INT Yes true \N true - store_id INT INT Yes true \N true - sale_date DATE DATEV2 Yes false \N NONE true - sale_amt BIGINT BIGINT Yes false \N NONE true +test_materialized_view_hll DUP_KEYS record_id int int Yes true \N true + seller_id int int Yes true \N true + store_id int int Yes true \N true + sale_date DATE datev2 Yes false \N NONE true + sale_amt bigint bigint Yes false \N NONE true -amt_count AGG_KEYS mv_store_id INT INT Yes true \N true `store_id` - mva_HLL_UNION__hll_hash(CAST(`sale_amt` AS VARCHAR(65533))) HLL HLL No false \N HLL_UNION true hll_hash(CAST(`sale_amt` AS VARCHAR(65533))) +amt_count AGG_KEYS mv_store_id int int Yes true \N true `store_id` + mva_HLL_UNION__hll_hash(CAST(`sale_amt` AS varchar(65533))) hll hll No false \N HLL_UNION true hll_hash(CAST(`sale_amt` AS varchar(65533))) -- !sql -- 1 1 diff --git a/regression-test/data/rollup/test_materialized_view_hll_with_light_sc.out b/regression-test/data/rollup/test_materialized_view_hll_with_light_sc.out index bdc8e1cd81f629..1cbbfd15953b83 100644 --- a/regression-test/data/rollup/test_materialized_view_hll_with_light_sc.out +++ b/regression-test/data/rollup/test_materialized_view_hll_with_light_sc.out @@ -1,13 +1,13 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -test_materialized_view_hll_with_light_sc DUP_KEYS record_id INT INT Yes true \N true - seller_id INT INT Yes true \N true - store_id INT INT Yes true \N true - sale_date DATE DATEV2 Yes false \N NONE true - sale_amt BIGINT BIGINT Yes false \N NONE true +test_materialized_view_hll_with_light_sc DUP_KEYS record_id int int Yes true \N true + seller_id int int Yes true \N true + store_id int int Yes true \N true + sale_date DATE datev2 Yes false \N NONE true + sale_amt bigint bigint Yes false \N NONE true -amt_count1 AGG_KEYS mv_store_id INT INT Yes true \N true `store_id` - mva_HLL_UNION__hll_hash(CAST(`sale_amt` AS VARCHAR(65533))) HLL HLL No false \N HLL_UNION true hll_hash(CAST(`sale_amt` AS VARCHAR(65533))) +amt_count1 AGG_KEYS mv_store_id int int Yes true \N true `store_id` + mva_HLL_UNION__hll_hash(CAST(`sale_amt` AS varchar(65533))) hll hll No false \N HLL_UNION true hll_hash(CAST(`sale_amt` AS varchar(65533))) -- !sql -- 1 1 diff --git a/regression-test/data/rollup_p0/test_materialized_view.out b/regression-test/data/rollup_p0/test_materialized_view.out index 7caf3713fe743c..ee9cdda99a3a7b 100644 --- a/regression-test/data/rollup_p0/test_materialized_view.out +++ b/regression-test/data/rollup_p0/test_materialized_view.out @@ -1,24 +1,24 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -test_materialized_view1 DUP_KEYS record_id INT INT Yes true \N true - seller_id INT INT Yes true \N true - store_id INT INT Yes true \N true - sale_date DATE DATEV2 Yes false \N NONE true - sale_amt BIGINT BIGINT Yes false \N NONE true +test_materialized_view1 DUP_KEYS record_id int int Yes true \N true + seller_id int int Yes true \N true + store_id int int Yes true \N true + sale_date DATE datev2 Yes false \N NONE true + sale_amt bigint bigint Yes false \N NONE true -amt_sum AGG_KEYS mv_store_id INT INT Yes true \N true `store_id` - mva_SUM__`sale_amt` BIGINT BIGINT Yes false \N SUM true `sale_amt` +amt_sum AGG_KEYS mv_store_id int int Yes true \N true `store_id` + mva_SUM__`sale_amt` bigint bigint Yes false \N SUM true `sale_amt` -- !sql -- -test_materialized_view2 DUP_KEYS record_id INT INT Yes true \N true - seller_id INT INT Yes true \N true - store_id INT INT Yes true \N true - sale_date DATE DATEV2 Yes false \N NONE true - sale_amt BIGINT BIGINT Yes false \N NONE true +test_materialized_view2 DUP_KEYS record_id int int Yes true \N true + seller_id int int Yes true \N true + store_id int int Yes true \N true + sale_date DATE datev2 Yes false \N NONE true + sale_amt bigint bigint Yes false \N NONE true -seller_id_order DUP_KEYS mv_store_id INT INT Yes true \N true `store_id` - mv_seller_id INT INT Yes true \N true `seller_id` - mv_sale_amt BIGINT BIGINT Yes false \N NONE true `sale_amt` +seller_id_order DUP_KEYS mv_store_id int int Yes true \N true `store_id` + mv_seller_id int int Yes true \N true `seller_id` + mv_sale_amt bigint bigint Yes false \N NONE true `sale_amt` -- !sql -- 1 1 1 2020-05-30 100 @@ -37,15 +37,15 @@ seller_id_order DUP_KEYS mv_store_id INT INT Yes true \N true `store_id` -- !sql -- - mva_SUM__CASE WHEN `sale_amt` IS NULL THEN 0 ELSE 1 END BIGINT BIGINT No false \N SUM true CASE WHEN `sale_amt` IS NULL THEN 0 ELSE 1 END - mva_SUM__`sale_amt` BIGINT BIGINT Yes false \N SUM true `sale_amt` - sale_amt BIGINT BIGINT Yes false \N NONE true - sale_date DATE DATEV2 Yes false \N NONE true - seller_id INT INT Yes true \N true - store_id INT INT Yes true \N true -amt_count AGG_KEYS mv_store_id INT INT Yes true \N true `store_id` -amt_sum AGG_KEYS mv_store_id INT INT Yes true \N true `store_id` -test_materialized_view1 DUP_KEYS record_id INT INT Yes true \N true + mva_SUM__CASE WHEN `sale_amt` IS NULL THEN 0 ELSE 1 END bigint bigint No false \N SUM true CASE WHEN `sale_amt` IS NULL THEN 0 ELSE 1 END + mva_SUM__`sale_amt` bigint bigint Yes false \N SUM true `sale_amt` + sale_amt bigint bigint Yes false \N NONE true + sale_date DATE datev2 Yes false \N NONE true + seller_id int int Yes true \N true + store_id int int Yes true \N true +amt_count AGG_KEYS mv_store_id int int Yes true \N true `store_id` +amt_sum AGG_KEYS mv_store_id int int Yes true \N true `store_id` +test_materialized_view1 DUP_KEYS record_id int int Yes true \N true -- !sql -- 1 2 diff --git a/regression-test/data/rollup_p0/test_rollup_agg.out b/regression-test/data/rollup_p0/test_rollup_agg.out index 5c6b6fb49c6861..6ef029d60bfd44 100644 --- a/regression-test/data/rollup_p0/test_rollup_agg.out +++ b/regression-test/data/rollup_p0/test_rollup_agg.out @@ -1,15 +1,15 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -test_rollup_agg AGG_KEYS siteid INT INT No true \N true - citycode SMALLINT SMALLINT No true \N true - username VARCHAR(32) VARCHAR(32) No true \N true - pv BIGINT BIGINT No false 0 SUM true - uv BIGINT BIGINT No false 0 SUM true - vv BIGINT BIGINT Yes false 0 SUM true +test_rollup_agg AGG_KEYS siteid int int No true \N true + citycode smallint smallint No true \N true + username varchar(32) varchar(32) No true \N true + pv bigint bigint No false 0 SUM true + uv bigint bigint No false 0 SUM true + vv bigint bigint Yes false 0 SUM true -rollup_city AGG_KEYS citycode SMALLINT SMALLINT No true \N true - pv BIGINT BIGINT No false 0 SUM true - vv BIGINT BIGINT Yes false 0 SUM true +rollup_city AGG_KEYS citycode smallint smallint No true \N true + pv bigint bigint No false 0 SUM true + vv bigint bigint Yes false 0 SUM true -- !sql -- 1 300 diff --git a/regression-test/data/rollup_p0/test_rollup_agg_date.out b/regression-test/data/rollup_p0/test_rollup_agg_date.out index c1b9d49855aa6e..dddd46df900644 100644 --- a/regression-test/data/rollup_p0/test_rollup_agg_date.out +++ b/regression-test/data/rollup_p0/test_rollup_agg_date.out @@ -1,23 +1,23 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -test_rollup_agg_date AGG_KEYS datek1 DATE DATEV2 Yes true \N true - datetimek1 DATETIME DATETIMEV2(0) Yes true \N true - datetimek2 DATETIME(3) DATETIMEV2(3) Yes true \N true - datetimek3 DATETIME(6) DATETIMEV2(6) Yes true \N true - datev1 DATE DATEV2 No false \N MAX true - datetimev1 DATETIME DATETIMEV2(0) No false \N MAX true - datetimev2 DATETIME(3) DATETIMEV2(3) No false \N MAX true - datetimev3 DATETIME(6) DATETIMEV2(6) No false \N MAX true - datetimev4 DATETIME(3) DATETIMEV2(3) Yes false \N MAX true +test_rollup_agg_date AGG_KEYS datek1 DATE datev2 Yes true \N true + datetimek1 DATETIME datetimev2(0) Yes true \N true + datetimek2 DATETIME(3) datetimev2(3) Yes true \N true + datetimek3 DATETIME(6) datetimev2(6) Yes true \N true + datev1 DATE datev2 No false \N MAX true + datetimev1 DATETIME datetimev2(0) No false \N MAX true + datetimev2 DATETIME(3) datetimev2(3) No false \N MAX true + datetimev3 DATETIME(6) datetimev2(6) No false \N MAX true + datetimev4 DATETIME(3) datetimev2(3) Yes false \N MAX true -rollup_date AGG_KEYS datek1 DATE DATEV2 Yes true \N true - datetimek2 DATETIME(3) DATETIMEV2(3) Yes true \N true - datetimek1 DATETIME DATETIMEV2(0) Yes true \N true - datetimek3 DATETIME(6) DATETIMEV2(6) Yes true \N true - datev1 DATE DATEV2 No false \N MAX true - datetimev1 DATETIME DATETIMEV2(0) No false \N MAX true - datetimev2 DATETIME(3) DATETIMEV2(3) No false \N MAX true - datetimev3 DATETIME(6) DATETIMEV2(6) No false \N MAX true +rollup_date AGG_KEYS datek1 DATE datev2 Yes true \N true + datetimek2 DATETIME(3) datetimev2(3) Yes true \N true + datetimek1 DATETIME datetimev2(0) Yes true \N true + datetimek3 DATETIME(6) datetimev2(6) Yes true \N true + datev1 DATE datev2 No false \N MAX true + datetimev1 DATETIME datetimev2(0) No false \N MAX true + datetimev2 DATETIME(3) datetimev2(3) No false \N MAX true + datetimev3 DATETIME(6) datetimev2(6) No false \N MAX true -- !sql -- 2022-08-23 2022-08-23T11:11:11 2022-08-23T11:11:11.111 2022-08-23T11:11:11.111111 2022-08-23 2022-08-23T11:11:11 2022-08-23T11:11:11.111 2022-08-23T11:11:11.111111 diff --git a/regression-test/data/schema_change_p0/modify_col_type_agg/schema_change_modify_mv_column_type_agg.out b/regression-test/data/schema_change_p0/modify_col_type_agg/schema_change_modify_mv_column_type_agg.out index 2de215cbd500ac..c86341a56862c3 100644 --- a/regression-test/data/schema_change_p0/modify_col_type_agg/schema_change_modify_mv_column_type_agg.out +++ b/regression-test/data/schema_change_p0/modify_col_type_agg/schema_change_modify_mv_column_type_agg.out @@ -1,55 +1,55 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -tbl_scalar_types_agg AGG_KEYS k1 BIGINT BIGINT Yes true \N true - k2 BIGINT BIGINT Yes true \N true - c_bool BOOLEAN BOOLEAN Yes false \N REPLACE true - c_tinyint TINYINT TINYINT Yes false \N MIN true - c_smallint SMALLINT SMALLINT Yes false \N MAX true - c_int INT INT Yes false \N MAX true - c_bigint BIGINT BIGINT Yes false \N SUM true - c_largeint LARGEINT LARGEINT Yes false \N MIN true - c_float FLOAT FLOAT Yes false \N MIN true - c_double DOUBLE DOUBLE Yes false \N MAX true - c_decimal DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N SUM true - c_decimalv3 DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N SUM true - c_date DATE DATEV2 Yes false \N REPLACE true - c_datetime DATETIME DATETIMEV2(0) Yes false \N REPLACE true - c_datev2 DATE DATEV2 Yes false \N REPLACE true - c_datetimev2 DATETIME DATETIMEV2(0) Yes false \N REPLACE true - c_char CHAR(15) CHAR(15) Yes false \N REPLACE true - c_varchar VARCHAR(100) VARCHAR(100) Yes false \N REPLACE true - c_string TEXT TEXT Yes false \N REPLACE true +tbl_scalar_types_agg AGG_KEYS k1 bigint bigint Yes true \N true + k2 bigint bigint Yes true \N true + c_bool boolean boolean Yes false \N REPLACE true + c_tinyint tinyint tinyint Yes false \N MIN true + c_smallint smallint smallint Yes false \N MAX true + c_int int int Yes false \N MAX true + c_bigint bigint bigint Yes false \N SUM true + c_largeint largeint largeint Yes false \N MIN true + c_float float float Yes false \N MIN true + c_double double double Yes false \N MAX true + c_decimal DECIMAL(20, 3) decimalv3(20,3) Yes false \N SUM true + c_decimalv3 DECIMAL(20, 3) decimalv3(20,3) Yes false \N SUM true + c_date DATE datev2 Yes false \N REPLACE true + c_datetime DATETIME datetimev2(0) Yes false \N REPLACE true + c_datev2 DATE datev2 Yes false \N REPLACE true + c_datetimev2 DATETIME datetimev2(0) Yes false \N REPLACE true + c_char char(15) char(15) Yes false \N REPLACE true + c_varchar varchar(100) varchar(100) Yes false \N REPLACE true + c_string text text Yes false \N REPLACE true -mv_tbl_scalar_types_agg_1 AGG_KEYS mv_k2 BIGINT BIGINT Yes true \N true `k2` - mv_k1 BIGINT BIGINT Yes true \N true `k1` - mva_MAX__`c_int` INT INT Yes false \N MAX true `c_int` +mv_tbl_scalar_types_agg_1 AGG_KEYS mv_k2 bigint bigint Yes true \N true `k2` + mv_k1 bigint bigint Yes true \N true `k1` + mva_MAX__`c_int` int int Yes false \N MAX true `c_int` -- !sql -- -- !sql -- -- !sql -- -tbl_scalar_types_agg AGG_KEYS k1 BIGINT BIGINT Yes true \N true - k2 BIGINT BIGINT Yes true \N true - c_bool BOOLEAN BOOLEAN Yes false \N REPLACE true - c_tinyint TINYINT TINYINT Yes false \N MIN true - c_smallint SMALLINT SMALLINT Yes false \N MAX true - c_int BIGINT BIGINT Yes false \N MAX true - c_bigint BIGINT BIGINT Yes false \N SUM true - c_largeint LARGEINT LARGEINT Yes false \N MIN true - c_float FLOAT FLOAT Yes false \N MIN true - c_double DOUBLE DOUBLE Yes false \N MAX true - c_decimal DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N SUM true - c_decimalv3 DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N SUM true - c_date DATE DATEV2 Yes false \N REPLACE true - c_datetime DATETIME DATETIMEV2(0) Yes false \N REPLACE true - c_datev2 DATE DATEV2 Yes false \N REPLACE true - c_datetimev2 DATETIME DATETIMEV2(0) Yes false \N REPLACE true - c_char CHAR(15) CHAR(15) Yes false \N REPLACE true - c_varchar VARCHAR(100) VARCHAR(100) Yes false \N REPLACE true - c_string TEXT TEXT Yes false \N REPLACE true +tbl_scalar_types_agg AGG_KEYS k1 bigint bigint Yes true \N true + k2 bigint bigint Yes true \N true + c_bool boolean boolean Yes false \N REPLACE true + c_tinyint tinyint tinyint Yes false \N MIN true + c_smallint smallint smallint Yes false \N MAX true + c_int bigint bigint Yes false \N MAX true + c_bigint bigint bigint Yes false \N SUM true + c_largeint largeint largeint Yes false \N MIN true + c_float float float Yes false \N MIN true + c_double double double Yes false \N MAX true + c_decimal DECIMAL(20, 3) decimalv3(20,3) Yes false \N SUM true + c_decimalv3 DECIMAL(20, 3) decimalv3(20,3) Yes false \N SUM true + c_date DATE datev2 Yes false \N REPLACE true + c_datetime DATETIME datetimev2(0) Yes false \N REPLACE true + c_datev2 DATE datev2 Yes false \N REPLACE true + c_datetimev2 DATETIME datetimev2(0) Yes false \N REPLACE true + c_char char(15) char(15) Yes false \N REPLACE true + c_varchar varchar(100) varchar(100) Yes false \N REPLACE true + c_string text text Yes false \N REPLACE true -mv_tbl_scalar_types_agg_1 AGG_KEYS mv_k2 BIGINT BIGINT Yes true \N true `k2` - mv_k1 BIGINT BIGINT Yes true \N true `k1` - mva_MAX__`c_int` BIGINT BIGINT Yes false \N MAX true `c_int` +mv_tbl_scalar_types_agg_1 AGG_KEYS mv_k2 bigint bigint Yes true \N true `k2` + mv_k1 bigint bigint Yes true \N true `k1` + mva_MAX__`c_int` bigint bigint Yes false \N MAX true `c_int` diff --git a/regression-test/data/schema_change_p0/modify_col_type_dup/schema_change_modify_mv_column_type.out b/regression-test/data/schema_change_p0/modify_col_type_dup/schema_change_modify_mv_column_type.out index 1cf151dc70c8bf..e7d4c675477048 100644 --- a/regression-test/data/schema_change_p0/modify_col_type_dup/schema_change_modify_mv_column_type.out +++ b/regression-test/data/schema_change_p0/modify_col_type_dup/schema_change_modify_mv_column_type.out @@ -1,42 +1,42 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -tbl_scalar_types_dup DUP_KEYS k1 BIGINT BIGINT Yes true \N true - c_bool BOOLEAN BOOLEAN Yes false \N NONE true - c_tinyint TINYINT TINYINT Yes false \N NONE true - c_smallint SMALLINT SMALLINT Yes false \N NONE true - c_int INT INT Yes false \N NONE true - c_bigint BIGINT BIGINT Yes false \N NONE true - c_largeint LARGEINT LARGEINT Yes false \N NONE true - c_float FLOAT FLOAT Yes false \N NONE true - c_double DOUBLE DOUBLE Yes false \N NONE true - c_decimal DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N NONE true - c_decimalv3 DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N NONE true - c_date DATE DATEV2 Yes false \N NONE true - c_datetime DATETIME DATETIMEV2(0) Yes false \N NONE true - c_datev2 DATE DATEV2 Yes false \N NONE true - c_datetimev2 DATETIME DATETIMEV2(0) Yes false \N NONE true - c_char CHAR(15) CHAR(15) Yes false \N NONE true - c_varchar VARCHAR(100) VARCHAR(100) Yes false \N NONE true - c_string TEXT TEXT Yes false \N NONE true +tbl_scalar_types_dup DUP_KEYS k1 bigint bigint Yes true \N true + c_bool boolean boolean Yes false \N NONE true + c_tinyint tinyint tinyint Yes false \N NONE true + c_smallint smallint smallint Yes false \N NONE true + c_int int int Yes false \N NONE true + c_bigint bigint bigint Yes false \N NONE true + c_largeint largeint largeint Yes false \N NONE true + c_float float float Yes false \N NONE true + c_double double double Yes false \N NONE true + c_decimal DECIMAL(20, 3) decimalv3(20,3) Yes false \N NONE true + c_decimalv3 DECIMAL(20, 3) decimalv3(20,3) Yes false \N NONE true + c_date DATE datev2 Yes false \N NONE true + c_datetime DATETIME datetimev2(0) Yes false \N NONE true + c_datev2 DATE datev2 Yes false \N NONE true + c_datetimev2 DATETIME datetimev2(0) Yes false \N NONE true + c_char char(15) char(15) Yes false \N NONE true + c_varchar varchar(100) varchar(100) Yes false \N NONE true + c_string text text Yes false \N NONE true -mv_tbl_scalar_types_dup_1 DUP_KEYS mv_c_tinyint TINYINT TINYINT Yes true \N true `c_tinyint` - mv_c_bool BOOLEAN BOOLEAN Yes true \N true `c_bool` - mv_k1 BIGINT BIGINT Yes true \N true `k1` - mv_c_smallint SMALLINT SMALLINT Yes false \N NONE true `c_smallint` - mv_c_int INT INT Yes false \N NONE true `c_int` - mv_c_bigint BIGINT BIGINT Yes false \N NONE true `c_bigint` - mv_c_largeint LARGEINT LARGEINT Yes false \N NONE true `c_largeint` - mv_c_float FLOAT FLOAT Yes false \N NONE true `c_float` - mv_c_double DOUBLE DOUBLE Yes false \N NONE true `c_double` - mv_c_decimal DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N NONE true `c_decimal` - mv_c_decimalv3 DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N NONE true `c_decimalv3` - mv_c_date DATE DATEV2 Yes false \N NONE true `c_date` - mv_c_datetime DATETIME DATETIMEV2(0) Yes false \N NONE true `c_datetime` - mv_c_datev2 DATE DATEV2 Yes false \N NONE true `c_datev2` - mv_c_datetimev2 DATETIME DATETIMEV2(0) Yes false \N NONE true `c_datetimev2` - mv_c_char CHARACTER(255) CHARACTER(255) Yes false \N NONE true `c_char` - mv_c_varchar VARCHAR(65533) VARCHAR(65533) Yes false \N NONE true `c_varchar` - mv_c_string TEXT TEXT Yes false \N NONE true `c_string` +mv_tbl_scalar_types_dup_1 DUP_KEYS mv_c_tinyint tinyint tinyint Yes true \N true `c_tinyint` + mv_c_bool boolean boolean Yes true \N true `c_bool` + mv_k1 bigint bigint Yes true \N true `k1` + mv_c_smallint smallint smallint Yes false \N NONE true `c_smallint` + mv_c_int int int Yes false \N NONE true `c_int` + mv_c_bigint bigint bigint Yes false \N NONE true `c_bigint` + mv_c_largeint largeint largeint Yes false \N NONE true `c_largeint` + mv_c_float float float Yes false \N NONE true `c_float` + mv_c_double double double Yes false \N NONE true `c_double` + mv_c_decimal DECIMAL(20, 3) decimalv3(20,3) Yes false \N NONE true `c_decimal` + mv_c_decimalv3 DECIMAL(20, 3) decimalv3(20,3) Yes false \N NONE true `c_decimalv3` + mv_c_date DATE datev2 Yes false \N NONE true `c_date` + mv_c_datetime DATETIME datetimev2(0) Yes false \N NONE true `c_datetime` + mv_c_datev2 DATE datev2 Yes false \N NONE true `c_datev2` + mv_c_datetimev2 DATETIME datetimev2(0) Yes false \N NONE true `c_datetimev2` + mv_c_char character(255) character(255) Yes false \N NONE true `c_char` + mv_c_varchar varchar(65533) varchar(65533) Yes false \N NONE true `c_varchar` + mv_c_string text text Yes false \N NONE true `c_string` -- !sql -- -2147475406 true 45 23794 -11023 915989078 2115356192 15927.068 1.392557423391501E9 45951348783208518.810 8340516346665031.310 2022-01-26 2022-04-13T11:13:48 2022-01-31 2022-02-16T06:07:21 130.50.6.0 DeniseMatthews@Yozio.mil Londonderry Alley 61 @@ -63,41 +63,41 @@ mv_tbl_scalar_types_dup_1 DUP_KEYS mv_c_tinyint TINYINT TINYINT Yes true \N tru -2102307005 true 10 -23674 24613 -1810828490 -47095409 -14686.167 2.072108685694799E9 39847820962230526.125 584354832299375.156 2022-03-27 2022-02-11T13:46:06 2022-12-25 2022-11-28T09:37:49 213.146.33.250 JuliaSimmons@Zazio.info Eagle Crest Terrace 84 -- !sql -- -tbl_scalar_types_dup DUP_KEYS k1 BIGINT BIGINT Yes true \N true - c_bool BOOLEAN BOOLEAN Yes false \N NONE true - c_tinyint TINYINT TINYINT Yes false \N NONE true - c_smallint SMALLINT SMALLINT Yes false \N NONE true - c_int BIGINT BIGINT Yes false \N NONE true - c_bigint BIGINT BIGINT Yes false \N NONE true - c_largeint LARGEINT LARGEINT Yes false \N NONE true - c_float FLOAT FLOAT Yes false \N NONE true - c_double DOUBLE DOUBLE Yes false \N NONE true - c_decimal DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N NONE true - c_decimalv3 DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N NONE true - c_date DATE DATEV2 Yes false \N NONE true - c_datetime DATETIME DATETIMEV2(0) Yes false \N NONE true - c_datev2 DATE DATEV2 Yes false \N NONE true - c_datetimev2 DATETIME DATETIMEV2(0) Yes false \N NONE true - c_char CHAR(15) CHAR(15) Yes false \N NONE true - c_varchar VARCHAR(100) VARCHAR(100) Yes false \N NONE true - c_string TEXT TEXT Yes false \N NONE true +tbl_scalar_types_dup DUP_KEYS k1 bigint bigint Yes true \N true + c_bool boolean boolean Yes false \N NONE true + c_tinyint tinyint tinyint Yes false \N NONE true + c_smallint smallint smallint Yes false \N NONE true + c_int bigint bigint Yes false \N NONE true + c_bigint bigint bigint Yes false \N NONE true + c_largeint largeint largeint Yes false \N NONE true + c_float float float Yes false \N NONE true + c_double double double Yes false \N NONE true + c_decimal DECIMAL(20, 3) decimalv3(20,3) Yes false \N NONE true + c_decimalv3 DECIMAL(20, 3) decimalv3(20,3) Yes false \N NONE true + c_date DATE datev2 Yes false \N NONE true + c_datetime DATETIME datetimev2(0) Yes false \N NONE true + c_datev2 DATE datev2 Yes false \N NONE true + c_datetimev2 DATETIME datetimev2(0) Yes false \N NONE true + c_char char(15) char(15) Yes false \N NONE true + c_varchar varchar(100) varchar(100) Yes false \N NONE true + c_string text text Yes false \N NONE true -mv_tbl_scalar_types_dup_1 DUP_KEYS mv_c_tinyint TINYINT TINYINT Yes true \N true `c_tinyint` - mv_c_bool BOOLEAN BOOLEAN Yes true \N true `c_bool` - mv_k1 BIGINT BIGINT Yes true \N true `k1` - mv_c_smallint SMALLINT SMALLINT Yes false \N NONE true `c_smallint` - mv_c_int BIGINT BIGINT Yes false \N NONE true `c_int` - mv_c_bigint BIGINT BIGINT Yes false \N NONE true `c_bigint` - mv_c_largeint LARGEINT LARGEINT Yes false \N NONE true `c_largeint` - mv_c_float FLOAT FLOAT Yes false \N NONE true `c_float` - mv_c_double DOUBLE DOUBLE Yes false \N NONE true `c_double` - mv_c_decimal DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N NONE true `c_decimal` - mv_c_decimalv3 DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N NONE true `c_decimalv3` - mv_c_date DATE DATEV2 Yes false \N NONE true `c_date` - mv_c_datetime DATETIME DATETIMEV2(0) Yes false \N NONE true `c_datetime` - mv_c_datev2 DATE DATEV2 Yes false \N NONE true `c_datev2` - mv_c_datetimev2 DATETIME DATETIMEV2(0) Yes false \N NONE true `c_datetimev2` - mv_c_char CHARACTER(255) CHARACTER(255) Yes false \N NONE true `c_char` - mv_c_varchar VARCHAR(65533) VARCHAR(65533) Yes false \N NONE true `c_varchar` - mv_c_string TEXT TEXT Yes false \N NONE true `c_string` +mv_tbl_scalar_types_dup_1 DUP_KEYS mv_c_tinyint tinyint tinyint Yes true \N true `c_tinyint` + mv_c_bool boolean boolean Yes true \N true `c_bool` + mv_k1 bigint bigint Yes true \N true `k1` + mv_c_smallint smallint smallint Yes false \N NONE true `c_smallint` + mv_c_int bigint bigint Yes false \N NONE true `c_int` + mv_c_bigint bigint bigint Yes false \N NONE true `c_bigint` + mv_c_largeint largeint largeint Yes false \N NONE true `c_largeint` + mv_c_float float float Yes false \N NONE true `c_float` + mv_c_double double double Yes false \N NONE true `c_double` + mv_c_decimal DECIMAL(20, 3) decimalv3(20,3) Yes false \N NONE true `c_decimal` + mv_c_decimalv3 DECIMAL(20, 3) decimalv3(20,3) Yes false \N NONE true `c_decimalv3` + mv_c_date DATE datev2 Yes false \N NONE true `c_date` + mv_c_datetime DATETIME datetimev2(0) Yes false \N NONE true `c_datetime` + mv_c_datev2 DATE datev2 Yes false \N NONE true `c_datev2` + mv_c_datetimev2 DATETIME datetimev2(0) Yes false \N NONE true `c_datetimev2` + mv_c_char character(255) character(255) Yes false \N NONE true `c_char` + mv_c_varchar varchar(65533) varchar(65533) Yes false \N NONE true `c_varchar` + mv_c_string text text Yes false \N NONE true `c_string` diff --git a/regression-test/data/schema_change_p0/modify_col_type_dup2/schema_change_modify_mv_column_type2.out b/regression-test/data/schema_change_p0/modify_col_type_dup2/schema_change_modify_mv_column_type2.out index e8f586247cb840..287d1366a4badd 100644 --- a/regression-test/data/schema_change_p0/modify_col_type_dup2/schema_change_modify_mv_column_type2.out +++ b/regression-test/data/schema_change_p0/modify_col_type_dup2/schema_change_modify_mv_column_type2.out @@ -1,28 +1,28 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -tbl_scalar_types_dup DUP_KEYS k1 BIGINT BIGINT Yes true \N true - c_bool BOOLEAN BOOLEAN Yes false \N NONE true - c_tinyint TINYINT TINYINT Yes false \N NONE true - c_smallint SMALLINT SMALLINT Yes false \N NONE true - c_int INT INT Yes false \N NONE true - c_bigint BIGINT BIGINT Yes false \N NONE true - c_largeint LARGEINT LARGEINT Yes false \N NONE true - c_float FLOAT FLOAT Yes false \N NONE true - c_double DOUBLE DOUBLE Yes false \N NONE true - c_decimal DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N NONE true - c_decimalv3 DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N NONE true - c_date DATE DATEV2 Yes false \N NONE true - c_datetime DATETIME DATETIMEV2(0) Yes false \N NONE true - c_datev2 DATE DATEV2 Yes false \N NONE true - c_datetimev2 DATETIME DATETIMEV2(0) Yes false \N NONE true - c_char CHAR(15) CHAR(15) Yes false \N NONE true - c_varchar VARCHAR(100) VARCHAR(100) Yes false \N NONE true - c_string TEXT TEXT Yes false \N NONE true +tbl_scalar_types_dup DUP_KEYS k1 bigint bigint Yes true \N true + c_bool boolean boolean Yes false \N NONE true + c_tinyint tinyint tinyint Yes false \N NONE true + c_smallint smallint smallint Yes false \N NONE true + c_int int int Yes false \N NONE true + c_bigint bigint bigint Yes false \N NONE true + c_largeint largeint largeint Yes false \N NONE true + c_float float float Yes false \N NONE true + c_double double double Yes false \N NONE true + c_decimal DECIMAL(20, 3) decimalv3(20,3) Yes false \N NONE true + c_decimalv3 DECIMAL(20, 3) decimalv3(20,3) Yes false \N NONE true + c_date DATE datev2 Yes false \N NONE true + c_datetime DATETIME datetimev2(0) Yes false \N NONE true + c_datev2 DATE datev2 Yes false \N NONE true + c_datetimev2 DATETIME datetimev2(0) Yes false \N NONE true + c_char char(15) char(15) Yes false \N NONE true + c_varchar varchar(100) varchar(100) Yes false \N NONE true + c_string text text Yes false \N NONE true -mv_tbl_scalar_types_dup_2 AGG_KEYS mv_k1 BIGINT BIGINT Yes true \N true `k1` - mva_SUM__CAST(`c_int` AS BIGINT) BIGINT BIGINT Yes false \N SUM true CAST(`c_int` AS BIGINT) - mva_MAX__`c_int` INT INT Yes false \N MAX true `c_int` - mva_MIN__`c_int` INT INT Yes false \N MIN true `c_int` +mv_tbl_scalar_types_dup_2 AGG_KEYS mv_k1 bigint bigint Yes true \N true `k1` + mva_SUM__CAST(`c_int` AS bigint) bigint bigint Yes false \N SUM true CAST(`c_int` AS bigint) + mva_MAX__`c_int` int int Yes false \N MAX true `c_int` + mva_MIN__`c_int` int int Yes false \N MIN true `c_int` -- !sql -- -2147475406 true 45 23794 -11023 915989078 2115356192 15927.068 1.392557423391501E9 45951348783208518.810 8340516346665031.310 2022-01-26 2022-04-13T11:13:48 2022-01-31 2022-02-16T06:07:21 130.50.6.0 DeniseMatthews@Yozio.mil Londonderry Alley 61 @@ -49,27 +49,27 @@ mv_tbl_scalar_types_dup_2 AGG_KEYS mv_k1 BIGINT BIGINT Yes true \N true `k1` -2102307005 true 10 -23674 24613 -1810828490 -47095409 -14686.167 2.072108685694799E9 39847820962230526.125 584354832299375.156 2022-03-27 2022-02-11T13:46:06 2022-12-25 2022-11-28T09:37:49 213.146.33.250 JuliaSimmons@Zazio.info Eagle Crest Terrace 84 -- !sql -- -tbl_scalar_types_dup DUP_KEYS k1 BIGINT BIGINT Yes true \N true - c_bool BOOLEAN BOOLEAN Yes false \N NONE true - c_tinyint TINYINT TINYINT Yes false \N NONE true - c_smallint SMALLINT SMALLINT Yes false \N NONE true - c_int BIGINT BIGINT Yes false \N NONE true - c_bigint BIGINT BIGINT Yes false \N NONE true - c_largeint LARGEINT LARGEINT Yes false \N NONE true - c_float FLOAT FLOAT Yes false \N NONE true - c_double DOUBLE DOUBLE Yes false \N NONE true - c_decimal DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N NONE true - c_decimalv3 DECIMAL(20, 3) DECIMALV3(20, 3) Yes false \N NONE true - c_date DATE DATEV2 Yes false \N NONE true - c_datetime DATETIME DATETIMEV2(0) Yes false \N NONE true - c_datev2 DATE DATEV2 Yes false \N NONE true - c_datetimev2 DATETIME DATETIMEV2(0) Yes false \N NONE true - c_char CHAR(15) CHAR(15) Yes false \N NONE true - c_varchar VARCHAR(100) VARCHAR(100) Yes false \N NONE true - c_string TEXT TEXT Yes false \N NONE true +tbl_scalar_types_dup DUP_KEYS k1 bigint bigint Yes true \N true + c_bool boolean boolean Yes false \N NONE true + c_tinyint tinyint tinyint Yes false \N NONE true + c_smallint smallint smallint Yes false \N NONE true + c_int bigint bigint Yes false \N NONE true + c_bigint bigint bigint Yes false \N NONE true + c_largeint largeint largeint Yes false \N NONE true + c_float float float Yes false \N NONE true + c_double double double Yes false \N NONE true + c_decimal DECIMAL(20, 3) decimalv3(20,3) Yes false \N NONE true + c_decimalv3 DECIMAL(20, 3) decimalv3(20,3) Yes false \N NONE true + c_date DATE datev2 Yes false \N NONE true + c_datetime DATETIME datetimev2(0) Yes false \N NONE true + c_datev2 DATE datev2 Yes false \N NONE true + c_datetimev2 DATETIME datetimev2(0) Yes false \N NONE true + c_char char(15) char(15) Yes false \N NONE true + c_varchar varchar(100) varchar(100) Yes false \N NONE true + c_string text text Yes false \N NONE true -mv_tbl_scalar_types_dup_2 AGG_KEYS mv_k1 BIGINT BIGINT Yes true \N true `k1` - mva_SUM__CAST(`c_int` AS BIGINT) BIGINT BIGINT Yes false \N SUM true CAST(`c_int` AS BIGINT) - mva_MAX__`c_int` BIGINT BIGINT Yes false \N MAX true `c_int` - mva_MIN__`c_int` BIGINT BIGINT Yes false \N MIN true `c_int` +mv_tbl_scalar_types_dup_2 AGG_KEYS mv_k1 bigint bigint Yes true \N true `k1` + mva_SUM__CAST(`c_int` AS bigint) bigint bigint Yes false \N SUM true CAST(`c_int` AS bigint) + mva_MAX__`c_int` bigint bigint Yes false \N MAX true `c_int` + mva_MIN__`c_int` bigint bigint Yes false \N MIN true `c_int` diff --git a/regression-test/data/schema_change_p0/test_alter_table_add_columns.out b/regression-test/data/schema_change_p0/test_alter_table_add_columns.out index 809993434adc3b..a305a5ff6487c0 100644 --- a/regression-test/data/schema_change_p0/test_alter_table_add_columns.out +++ b/regression-test/data/schema_change_p0/test_alter_table_add_columns.out @@ -18,14 +18,14 @@ 6 6 yyy 6 6 6 -- !sql -- -siteid INT Yes true 10 -citycode SMALLINT Yes true \N -username VARCHAR(32) Yes true test -new_k1 INT Yes true 1 -new_k2 INT Yes true 2 -pv BIGINT Yes false 0 SUM -new_v1 INT Yes false 1 MAX -new_v2 INT Yes false 2 MAX +siteid int Yes true 10 +citycode smallint Yes true \N +username varchar(32) Yes true test +new_k1 int Yes true 1 +new_k2 int Yes true 2 +pv bigint Yes false 0 SUM +new_v1 int Yes false 1 MAX +new_v2 int Yes false 2 MAX -- !order -- 1 1 xxx 1 2 1 1 2 diff --git a/regression-test/data/schema_change_p0/test_alter_table_column.out b/regression-test/data/schema_change_p0/test_alter_table_column.out index f01d5d28edc730..1698ac7440d6ef 100644 --- a/regression-test/data/schema_change_p0/test_alter_table_column.out +++ b/regression-test/data/schema_change_p0/test_alter_table_column.out @@ -1,29 +1,29 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -k1 INT Yes true \N -k2 INT Yes true \N -value1 INT Yes false \N NONE -value2 INT Yes false \N NONE +k1 int Yes true \N +k2 int Yes true \N +value1 int Yes false \N NONE +value2 int Yes false \N NONE -- !sql -- 1 1 10 20 1 1 30 40 -- !sql -- -k1 INT Yes true \N -k2 INT Yes true \N -value1 INT Yes false \N SUM -value2 INT Yes false \N SUM +k1 int Yes true \N +k2 int Yes true \N +value1 int Yes false \N SUM +value2 int Yes false \N SUM -- !sql -- 1 1 40 60 -- !sql -- -k1 INT Yes true \N -value1 INT Yes false \N NONE -value2 ARRAY Yes false [] NONE -value3 ARRAY Yes false \N NONE -value4 ARRAY No false [] NONE +k1 int Yes true \N +value1 int Yes false \N NONE +value2 array Yes false [] NONE +value3 array Yes false \N NONE +value4 array No false [] NONE -- !sql -- 1 2 [] \N [] diff --git a/regression-test/data/schema_change_p0/test_rename_column.out b/regression-test/data/schema_change_p0/test_rename_column.out index d273f1ce1dbb3f..801c0887ad1ede 100644 Binary files a/regression-test/data/schema_change_p0/test_rename_column.out and b/regression-test/data/schema_change_p0/test_rename_column.out differ diff --git a/regression-test/data/schema_change_p0/test_rename_rollup.out b/regression-test/data/schema_change_p0/test_rename_rollup.out index 789964e9277e55..6e406ff098f520 100644 Binary files a/regression-test/data/schema_change_p0/test_rename_rollup.out and b/regression-test/data/schema_change_p0/test_rename_rollup.out differ diff --git a/regression-test/data/schema_change_p0/test_schema_change.out b/regression-test/data/schema_change_p0/test_schema_change.out index 43857c0a3935b7..0c4fce805417e7 100644 --- a/regression-test/data/schema_change_p0/test_schema_change.out +++ b/regression-test/data/schema_change_p0/test_schema_change.out @@ -1,10 +1,10 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !desc_uniq_table -- -event_day DATE Yes true \N -siteid INT Yes true 10 -citycode TEXT Yes false \N NONE -username VARCHAR(32) Yes false NONE -pv BIGINT Yes false 0 NONE +event_day date Yes true \N +siteid int Yes true 10 +citycode text Yes false \N NONE +username varchar(32) Yes false NONE +pv bigint Yes false 0 NONE -- !sql -- 2021-11-01 1 1 用户A 3 diff --git a/regression-test/data/schema_change_p0/test_uniq_delete_sign_schema_change.out b/regression-test/data/schema_change_p0/test_uniq_delete_sign_schema_change.out index 6cf125562278e0..b1e0214451a417 100644 --- a/regression-test/data/schema_change_p0/test_uniq_delete_sign_schema_change.out +++ b/regression-test/data/schema_change_p0/test_uniq_delete_sign_schema_change.out @@ -15,13 +15,13 @@ 4 4 4 4 0 6 -- !sql -- -k1 INT Yes true \N -value1 INT Yes false \N NONE -value2 INT Yes false \N NONE -value3 INT Yes false \N NONE -value4 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 +value1 int Yes false \N NONE +value2 int Yes false \N NONE +value3 int Yes false \N NONE +value4 int Yes false \N NONE +__DORIS_DELETE_SIGN__ tinyint No false 0 NONE +__DORIS_VERSION_COL__ bigint No false 0 NONE -- !sql -- 1 1 1 1 \N 1 7 @@ -46,11 +46,11 @@ __DORIS_VERSION_COL__ BIGINT No false 0 NONE 6 6 6 6 6 0 9 -- !sql -- -k1 INT Yes true \N -value2 INT Yes false \N NONE -value4 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 +value2 int Yes false \N NONE +value4 int Yes false \N NONE +__DORIS_DELETE_SIGN__ tinyint No false 0 NONE +__DORIS_VERSION_COL__ bigint No false 0 NONE -- !sql -- 1 1 \N 1 7 diff --git a/regression-test/data/show_p0/test_show_create_table_and_views.out b/regression-test/data/show_p0/test_show_create_table_and_views.out index 5b7e6de278de95..c5885f8b004e9d 100644 --- a/regression-test/data/show_p0/test_show_create_table_and_views.out +++ b/regression-test/data/show_p0/test_show_create_table_and_views.out @@ -1,6 +1,6 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !show -- -show_create_table_and_views_table CREATE TABLE `show_create_table_and_views_table` (\n `user_id` LARGEINT NOT NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); +show_create_table_and_views_table CREATE TABLE `show_create_table_and_views_table` (\n `user_id` largeint NOT NULL,\n `good_id` largeint NOT NULL,\n `cost` bigint SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); -- !select -- 1 1 30 @@ -36,11 +36,11 @@ show_create_table_and_views_view CREATE VIEW `show_create_table_and_views_view` 300 1 -- !show -- -show_create_table_and_views_table CREATE TABLE `show_create_table_and_views_table` (\n `user_id` LARGEINT NOT NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); +show_create_table_and_views_table CREATE TABLE `show_create_table_and_views_table` (\n `user_id` largeint NOT NULL,\n `good_id` largeint NOT NULL,\n `cost` bigint SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); -- !show -- -show_create_table_and_views_like CREATE TABLE `show_create_table_and_views_like` (\n `user_id` LARGEINT NOT NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); +show_create_table_and_views_like CREATE TABLE `show_create_table_and_views_like` (\n `user_id` largeint NOT NULL,\n `good_id` largeint NOT NULL,\n `cost` bigint SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); -- !show -- -show_create_table_and_views_like_with_rollup CREATE TABLE `show_create_table_and_views_like_with_rollup` (\n `user_id` LARGEINT NOT NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); +show_create_table_and_views_like_with_rollup CREATE TABLE `show_create_table_and_views_like_with_rollup` (\n `user_id` largeint NOT NULL,\n `good_id` largeint NOT NULL,\n `cost` bigint SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); diff --git a/regression-test/data/show_p0/test_show_create_table_and_views_nereids.out b/regression-test/data/show_p0/test_show_create_table_and_views_nereids.out index 9cd4d121c5b85a..e939df97230361 100644 --- a/regression-test/data/show_p0/test_show_create_table_and_views_nereids.out +++ b/regression-test/data/show_p0/test_show_create_table_and_views_nereids.out @@ -1,6 +1,6 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !show -- -show_create_table_and_views_nereids_table CREATE TABLE `show_create_table_and_views_nereids_table` (\n `user_id` LARGEINT NOT NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); +show_create_table_and_views_nereids_table CREATE TABLE `show_create_table_and_views_nereids_table` (\n `user_id` largeint NOT NULL,\n `good_id` largeint NOT NULL,\n `cost` bigint SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); -- !select -- 1 1 30 @@ -36,11 +36,11 @@ show_create_table_and_views_nereids_view CREATE VIEW `show_create_table_and_view 300 1 -- !show -- -show_create_table_and_views_nereids_table CREATE TABLE `show_create_table_and_views_nereids_table` (\n `user_id` LARGEINT NOT NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); +show_create_table_and_views_nereids_table CREATE TABLE `show_create_table_and_views_nereids_table` (\n `user_id` largeint NOT NULL,\n `good_id` largeint NOT NULL,\n `cost` bigint SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); -- !show -- -show_create_table_and_views_nereids_like CREATE TABLE `show_create_table_and_views_nereids_like` (\n `user_id` LARGEINT NOT NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); +show_create_table_and_views_nereids_like CREATE TABLE `show_create_table_and_views_nereids_like` (\n `user_id` largeint NOT NULL,\n `good_id` largeint NOT NULL,\n `cost` bigint SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); -- !show -- -show_create_table_and_views_nereids_like_with_rollup CREATE TABLE `show_create_table_and_views_nereids_like_with_rollup` (\n `user_id` LARGEINT NOT NULL,\n `good_id` LARGEINT NOT NULL,\n `cost` BIGINT SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); +show_create_table_and_views_nereids_like_with_rollup CREATE TABLE `show_create_table_and_views_nereids_like_with_rollup` (\n `user_id` largeint NOT NULL,\n `good_id` largeint NOT NULL,\n `cost` bigint SUM NULL DEFAULT "0",\n INDEX index_user_id (`user_id`) USING INVERTED COMMENT 'test index comment',\n INDEX index_good_id (`good_id`) USING INVERTED COMMENT 'test index\\" comment'\n) ENGINE=OLAP\nAGGREGATE KEY(`user_id`, `good_id`)\nPARTITION BY RANGE(`good_id`)\n(PARTITION p1 VALUES [("-170141183460469231731687303715884105728"), ("100")),\nPARTITION p2 VALUES [("100"), ("200")),\nPARTITION p3 VALUES [("200"), ("300")),\nPARTITION p4 VALUES [("300"), ("400")),\nPARTITION p5 VALUES [("400"), ("500")),\nPARTITION p6 VALUES [("500"), ("600")),\nPARTITION p7 VALUES [("600"), (MAXVALUE)))\nDISTRIBUTED BY HASH(`user_id`) BUCKETS 2\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"min_load_replica_num" = "-1",\n"is_being_synced" = "false",\n"storage_medium" = "hdd",\n"storage_format" = "V2",\n"inverted_index_storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "86400",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"group_commit_interval_ms" = "10000",\n"group_commit_data_bytes" = "134217728"\n); diff --git a/regression-test/data/update/test_update_mow.out b/regression-test/data/update/test_update_mow.out index 0cc8c448555357..625e827526fcdd 100644 --- a/regression-test/data/update/test_update_mow.out +++ b/regression-test/data/update/test_update_mow.out @@ -8,10 +8,10 @@ 2 2 1 1998-01-01 -- !desc_uniq_table -- -k INT Yes true \N -value1 INT Yes false \N NONE -value2 INT Yes false \N NONE -date_value DATE Yes false \N NONE +k int Yes true \N +value1 int Yes false \N NONE +value2 int Yes false \N NONE +date_value date Yes false \N NONE -- !complex_update -- 1 10 1 1000.0 2000-01-01 diff --git a/regression-test/data/update/test_update_unique.out b/regression-test/data/update/test_update_unique.out index 615ee7b07dd25c..c79767d0657f46 100644 --- a/regression-test/data/update/test_update_unique.out +++ b/regression-test/data/update/test_update_unique.out @@ -8,10 +8,10 @@ 2 2 1 1998-01-01 -- !desc_uniq_table -- -k INT Yes true \N -value1 INT Yes false \N NONE -value2 INT Yes false \N NONE -date_value DATE Yes false \N NONE +k int Yes true \N +value1 int Yes false \N NONE +value2 int Yes false \N NONE +date_value date Yes false \N NONE -- !complex_update -- 1 10 1 1000.0 2000-01-01 diff --git a/regression-test/data/variant_p0/desc.out b/regression-test/data/variant_p0/desc.out index b3ebce2b887835..0f7aadb0ff5c33 100644 --- a/regression-test/data/variant_p0/desc.out +++ b/regression-test/data/variant_p0/desc.out @@ -1,208 +1,208 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql_1 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.xxxx TEXT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.xxxx text Yes false \N NONE -- !sql_2 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.ddd.aaa TINYINT Yes false \N NONE -v.ddd.mxmxm JSON Yes false \N NONE -v.xxxx TEXT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.ddd.aaa tinyint Yes false \N NONE +v.ddd.mxmxm json Yes false \N NONE +v.xxxx text Yes false \N NONE -- !sql_3 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.b JSON Yes false \N NONE -v.c.c SMALLINT Yes false \N NONE -v.c.e DOUBLE Yes false \N NONE -v.xxxx TEXT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.b json Yes false \N NONE +v.c.c smallint Yes false \N NONE +v.c.e double Yes false \N NONE +v.xxxx text Yes false \N NONE -- !sql_6_1 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.ddd.aaa TINYINT Yes false \N NONE -v.ddd.mxmxm JSON Yes false \N NONE -v.xxxx TEXT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.ddd.aaa tinyint Yes false \N NONE +v.ddd.mxmxm json Yes false \N NONE +v.xxxx text Yes false \N NONE -- !sql_6_2 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.xxxx TEXT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.xxxx text Yes false \N NONE -- !sql_6_3 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.b JSON Yes false \N NONE -v.c.c SMALLINT Yes false \N NONE -v.c.e DOUBLE Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.b json Yes false \N NONE +v.c.c smallint Yes false \N NONE +v.c.e double Yes false \N NONE -- !sql_6 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.b JSON Yes false \N NONE -v.c.c SMALLINT Yes false \N NONE -v.c.e DOUBLE Yes false \N NONE -v.ddd.aaa TINYINT Yes false \N NONE -v.ddd.mxmxm JSON Yes false \N NONE -v.xxxx TEXT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.b json Yes false \N NONE +v.c.c smallint Yes false \N NONE +v.c.e double Yes false \N NONE +v.ddd.aaa tinyint Yes false \N NONE +v.ddd.mxmxm json Yes false \N NONE +v.xxxx text Yes false \N NONE -- !sql_7 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.b JSON Yes false \N NONE -v.c.c SMALLINT Yes false \N NONE -v.c.e DOUBLE Yes false \N NONE -v.xxxx TEXT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.b json Yes false \N NONE +v.c.c smallint Yes false \N NONE +v.c.e double Yes false \N NONE +v.xxxx text Yes false \N NONE -- !sql_7_1 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.xxxx TEXT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.xxxx text Yes false \N NONE -- !sql_7_2 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.b JSON Yes false \N NONE -v.c.c SMALLINT Yes false \N NONE -v.c.e DOUBLE Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.b json Yes false \N NONE +v.c.c smallint Yes false \N NONE +v.c.e double Yes false \N NONE -- !sql_7_3 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.b JSON Yes false \N NONE -v.c.c SMALLINT Yes false \N NONE -v.c.e DOUBLE Yes false \N NONE -v.xxxx TEXT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.b json Yes false \N NONE +v.c.c smallint Yes false \N NONE +v.c.e double Yes false \N NONE +v.xxxx text Yes false \N NONE -- !sql_8 -- -k BIGINT Yes true \N -v1 VARIANT Yes false \N NONE -v2 VARIANT Yes false \N NONE -v3 VARIANT Yes false \N NONE -v1.a SMALLINT Yes false \N NONE -v1.b JSON Yes false \N NONE -v1.c.c SMALLINT Yes false \N NONE -v1.c.e DOUBLE Yes false \N NONE -v1.oooo.xxxx.xxx TINYINT Yes false \N NONE -v2.a SMALLINT Yes false \N NONE -v2.xxxx TEXT Yes false \N NONE -v3.a SMALLINT Yes false \N NONE -v3.b JSON Yes false \N NONE -v3.c.c SMALLINT Yes false \N NONE -v3.c.e DOUBLE Yes false \N NONE +k bigint Yes true \N +v1 variant Yes false \N NONE +v2 variant Yes false \N NONE +v3 variant Yes false \N NONE +v1.a smallint Yes false \N NONE +v1.b json Yes false \N NONE +v1.c.c smallint Yes false \N NONE +v1.c.e double Yes false \N NONE +v1.oooo.xxxx.xxx tinyint Yes false \N NONE +v2.a smallint Yes false \N NONE +v2.xxxx text Yes false \N NONE +v3.a smallint Yes false \N NONE +v3.b json Yes false \N NONE +v3.c.c smallint Yes false \N NONE +v3.c.e double Yes false \N NONE -- !sql_9 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE -- !sql_9_1 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.b JSON Yes false \N NONE -v.c.c SMALLINT Yes false \N NONE -v.c.e DOUBLE Yes false \N NONE -v.oooo.xxxx.xxx TINYINT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.b json Yes false \N NONE +v.c.c smallint Yes false \N NONE +v.c.e double Yes false \N NONE +v.oooo.xxxx.xxx tinyint Yes false \N NONE -- !sql_10 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.k1 TINYINT Yes false \N NONE -v.k2 TEXT Yes false \N NONE -v.k3 ARRAY Yes false [] NONE -v.k4 DOUBLE Yes false \N NONE -v.k5 JSON Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.k1 tinyint Yes false \N NONE +v.k2 text Yes false \N NONE +v.k3 array Yes false [] NONE +v.k4 double Yes false \N NONE +v.k5 json Yes false \N NONE -- !sql_10_1 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v2 VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.b JSON Yes false \N NONE -v.c.c SMALLINT Yes false \N NONE -v.c.e DOUBLE Yes false \N NONE -v.k1 TINYINT Yes false \N NONE -v.k2 TEXT Yes false \N NONE -v.k3 ARRAY Yes false [] NONE -v.k4 DOUBLE Yes false \N NONE -v.k5 JSON Yes false \N NONE -v.oooo.xxxx.xxx TINYINT Yes false \N NONE -v2.a SMALLINT Yes false \N NONE -v2.b JSON Yes false \N NONE -v2.c.c SMALLINT Yes false \N NONE -v2.c.e DOUBLE Yes false \N NONE -v2.oooo.xxxx.xxx TINYINT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v2 variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.b json Yes false \N NONE +v.c.c smallint Yes false \N NONE +v.c.e double Yes false \N NONE +v.k1 tinyint Yes false \N NONE +v.k2 text Yes false \N NONE +v.k3 array Yes false [] NONE +v.k4 double Yes false \N NONE +v.k5 json Yes false \N NONE +v.oooo.xxxx.xxx tinyint Yes false \N NONE +v2.a smallint Yes false \N NONE +v2.b json Yes false \N NONE +v2.c.c smallint Yes false \N NONE +v2.c.e double Yes false \N NONE +v2.oooo.xxxx.xxx tinyint Yes false \N NONE -- !sql_10_2 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.b JSON Yes false \N NONE -v.c.c SMALLINT Yes false \N NONE -v.c.e DOUBLE Yes false \N NONE -v.k1 TINYINT Yes false \N NONE -v.k2 TEXT Yes false \N NONE -v.k3 ARRAY Yes false [] NONE -v.k4 DOUBLE Yes false \N NONE -v.k5 JSON Yes false \N NONE -v.oooo.xxxx.xxx TINYINT Yes false \N NONE -v2.a SMALLINT Yes false \N NONE -v2.b JSON Yes false \N NONE -v2.c.c SMALLINT Yes false \N NONE -v2.c.e DOUBLE Yes false \N NONE -v2.oooo.xxxx.xxx TINYINT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.b json Yes false \N NONE +v.c.c smallint Yes false \N NONE +v.c.e double Yes false \N NONE +v.k1 tinyint Yes false \N NONE +v.k2 text Yes false \N NONE +v.k3 array Yes false [] NONE +v.k4 double Yes false \N NONE +v.k5 json Yes false \N NONE +v.oooo.xxxx.xxx tinyint Yes false \N NONE +v2.a smallint Yes false \N NONE +v2.b json Yes false \N NONE +v2.c.c smallint Yes false \N NONE +v2.c.e double Yes false \N NONE +v2.oooo.xxxx.xxx tinyint Yes false \N NONE -- !sql_10_3 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v3 VARIANT Yes false \N NONE -v.a SMALLINT Yes false \N NONE -v.b JSON Yes false \N NONE -v.c.c SMALLINT Yes false \N NONE -v.c.e DOUBLE Yes false \N NONE -v.k1 TINYINT Yes false \N NONE -v.k2 TEXT Yes false \N NONE -v.k3 ARRAY Yes false [] NONE -v.k4 DOUBLE Yes false \N NONE -v.k5 JSON Yes false \N NONE -v.oooo.xxxx.xxx TINYINT Yes false \N NONE -v3.a SMALLINT Yes false \N NONE -v3.b JSON Yes false \N NONE -v3.c.c SMALLINT Yes false \N NONE -v3.c.e DOUBLE Yes false \N NONE -v3.oooo.xxxx.xxx TINYINT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v3 variant Yes false \N NONE +v.a smallint Yes false \N NONE +v.b json Yes false \N NONE +v.c.c smallint Yes false \N NONE +v.c.e double Yes false \N NONE +v.k1 tinyint Yes false \N NONE +v.k2 text Yes false \N NONE +v.k3 array Yes false [] NONE +v.k4 double Yes false \N NONE +v.k5 json Yes false \N NONE +v.oooo.xxxx.xxx tinyint Yes false \N NONE +v3.a smallint Yes false \N NONE +v3.b json Yes false \N NONE +v3.c.c smallint Yes false \N NONE +v3.c.e double Yes false \N NONE +v3.oooo.xxxx.xxx tinyint Yes false \N NONE -- !sql_11 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.!@#^&*() TEXT Yes false \N NONE -v.名字 TEXT Yes false \N NONE -v.画像.丬文 TEXT Yes false \N NONE -v.画像.地址 TEXT Yes false \N NONE -v.金额 SMALLINT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.!@#^&*() text Yes false \N NONE +v.名字 text Yes false \N NONE +v.画像.丬文 text Yes false \N NONE +v.画像.地址 text Yes false \N NONE +v.金额 smallint Yes false \N NONE -- !sql_12 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE -- !sql15 -- -k BIGINT Yes true \N -v VARIANT Yes false \N NONE -v.a TINYINT Yes false \N NONE -v.b TINYINT Yes false \N NONE -v.c TINYINT Yes false \N NONE -v.d TINYINT Yes false \N NONE +k bigint Yes true \N +v variant Yes false \N NONE +v.a tinyint Yes false \N NONE +v.b tinyint Yes false \N NONE +v.c tinyint Yes false \N NONE +v.d tinyint Yes false \N NONE diff --git a/regression-test/data/view_p0/create_view_star_except_and_cast_to_sql.out b/regression-test/data/view_p0/create_view_star_except_and_cast_to_sql.out index 99c21f04934d78..ede8faef76f8d7 100644 --- a/regression-test/data/view_p0/create_view_star_except_and_cast_to_sql.out +++ b/regression-test/data/view_p0/create_view_star_except_and_cast_to_sql.out @@ -10,5 +10,5 @@ v_mal_old_create_view CREATE VIEW `v_mal_old_create_view` AS SELECT `regression_test_view_p0`.`mal_old_create_view`.`pk` AS `pk`, `regression_test_view_p0`.`mal_old_create_view`.`b` AS `b` FROM `regression_test_view_p0`.`mal_old_create_view`; utf8mb4 utf8mb4_0900_bin -- !test_sql -- -v_mal_old_create_view2 CREATE VIEW `v_mal_old_create_view2` AS SELECT CAST(CAST(`a` AS TEXT) AS TIME(0)) AS `__cast_expr_0` FROM `regression_test_view_p0`.`mal_old_create_view`; utf8mb4 utf8mb4_0900_bin +v_mal_old_create_view2 CREATE VIEW `v_mal_old_create_view2` AS SELECT CAST(CAST(`a` AS text) AS time(0)) AS `__cast_expr_0` FROM `regression_test_view_p0`.`mal_old_create_view`; utf8mb4 utf8mb4_0900_bin diff --git a/regression-test/suites/alter_p0/test_alter_muti_modify_column.groovy b/regression-test/suites/alter_p0/test_alter_muti_modify_column.groovy index 864d99b122580d..c987ae8b53d02a 100644 --- a/regression-test/suites/alter_p0/test_alter_muti_modify_column.groovy +++ b/regression-test/suites/alter_p0/test_alter_muti_modify_column.groovy @@ -68,8 +68,8 @@ suite('test_alter_muti_modify_column') { // Check table structure after ALTER TABLE def resultCreate = sql """ SHOW CREATE TABLE ${tbl} """ def createTbl = resultCreate[0][1].toString() - assertTrue(createTbl.indexOf("`v2` VARCHAR(512) NULL") > 0) - assertTrue(createTbl.indexOf("`v3` VARCHAR(512) NULL") > 0) + assertTrue(createTbl.indexOf("`v2` varchar(512) NULL") > 0) + assertTrue(createTbl.indexOf("`v3` varchar(512) NULL") > 0) // Check data after ALTER TABLE def resultAfter = sql """ SELECT * FROM ${tbl} ORDER BY id """ diff --git a/regression-test/suites/correctness_p0/test_cast_decimal.groovy b/regression-test/suites/correctness_p0/test_cast_decimal.groovy index ec9a8434c468f0..17575fa0aa16ad 100644 --- a/regression-test/suites/correctness_p0/test_cast_decimal.groovy +++ b/regression-test/suites/correctness_p0/test_cast_decimal.groovy @@ -18,7 +18,7 @@ suite("test_cast_decimal") { explain { sql """select cast(32123.34212456734 as decimal(3,2));""" - contains "CAST(32123.34212456734 AS DECIMALV3(3, 2))" + contains "CAST(32123.34212456734 AS decimalv3(3,2))" } sql """drop table if exists test_ttt""" diff --git a/regression-test/suites/correctness_p0/test_current_timestamp.groovy b/regression-test/suites/correctness_p0/test_current_timestamp.groovy index f1ec942356ff3c..2eab76dbf64907 100644 --- a/regression-test/suites/correctness_p0/test_current_timestamp.groovy +++ b/regression-test/suites/correctness_p0/test_current_timestamp.groovy @@ -195,7 +195,7 @@ suite("test_current_timestamp") { DISTRIBUTED BY HASH(id) PROPERTIES("replication_num" = "1"); """ - exception "errCode = 2, detailMessage = default value precision: CURRENT_TIMESTAMP(3) can not be greater than type precision: DATETIME(1)" + exception "errCode = 2, detailMessage = default value precision: CURRENT_TIMESTAMP(3) can not be greater than type precision: datetimev2(1)" } // test create diff --git a/regression-test/suites/datatype_p0/agg_state/max/test_agg_state_max.groovy b/regression-test/suites/datatype_p0/agg_state/max/test_agg_state_max.groovy index 7f48df72a7e8e9..983f51beed1f3c 100644 --- a/regression-test/suites/datatype_p0/agg_state/max/test_agg_state_max.groovy +++ b/regression-test/suites/datatype_p0/agg_state/max/test_agg_state_max.groovy @@ -30,7 +30,7 @@ suite("test_agg_state_max") { test { sql "insert into a_table values(100,max_state(null));" - exception "can not cast from origin type AGG_STATE" + exception "can not cast from origin type agg_state" } sql """insert into a_table diff --git a/regression-test/suites/ddl_p0/test_create_table_like_nereids.groovy b/regression-test/suites/ddl_p0/test_create_table_like_nereids.groovy index 8f95f1cbb169a3..4ebaf980f4cce8 100644 --- a/regression-test/suites/ddl_p0/test_create_table_like_nereids.groovy +++ b/regression-test/suites/ddl_p0/test_create_table_like_nereids.groovy @@ -109,7 +109,7 @@ suite("test_create_table_like_nereids") { create table new_char_255 like test_create_table_like_char_255; """ def res1 = sql "show create table new_char_255" - mustContain(res1[0][1], "CHARACTER(255)") + mustContain(res1[0][1], "character(255)") sql "insert into new_char_255 values(123,'abcdddddd')" qt_select "select * from new_char_255" diff --git a/regression-test/suites/delete_p0/test_array_column_delete.groovy b/regression-test/suites/delete_p0/test_array_column_delete.groovy index 6dc2d1d982bfe0..3235791e76bbc2 100644 --- a/regression-test/suites/delete_p0/test_array_column_delete.groovy +++ b/regression-test/suites/delete_p0/test_array_column_delete.groovy @@ -23,7 +23,7 @@ suite("test_array_column_delete") { sql """ insert into ${tableName} values(1, NULL),(2,[12,3]),(3,[]),(4,NULL),(5,NULL) """ test { sql """ DELETE FROM ${tableName} WHERE c_array is NULL """ - exception("Can not apply delete condition to column type: ARRAY") + exception("Can not apply delete condition to column type: array") } sql """ DELETE FROM ${tableName} WHERE id = 1; """ qt_sql """ SELECT * FROM ${tableName} order by id """ diff --git a/regression-test/suites/delete_p0/test_delete.groovy b/regression-test/suites/delete_p0/test_delete.groovy index 77e54fe29153f6..0b8623e7f52911 100644 --- a/regression-test/suites/delete_p0/test_delete.groovy +++ b/regression-test/suites/delete_p0/test_delete.groovy @@ -515,7 +515,7 @@ suite("test_delete") { test { sql "delete from table_bitmap where user_id is null" - exception "Can not apply delete condition to column type: BITMAP" + exception "Can not apply delete condition to column type: bitmap" } // delete decimal diff --git a/regression-test/suites/delete_p0/test_map_column_delete.groovy b/regression-test/suites/delete_p0/test_map_column_delete.groovy index ce00b77f1534df..b53b326e4bb5ad 100644 --- a/regression-test/suites/delete_p0/test_map_column_delete.groovy +++ b/regression-test/suites/delete_p0/test_map_column_delete.groovy @@ -24,7 +24,7 @@ suite("test_map_column_delete") { sql """ insert into ${tableName} values(1, {1:'a', 2:"doris"}),(2,{}),(3,NULL),(4,NULL),(5,NULL) """ test { sql """ DELETE FROM ${tableName} WHERE m_map is NULL """ - exception("Can not apply delete condition to column type: MAP") + exception("Can not apply delete condition to column type: map") } sql """ DELETE FROM ${tableName} WHERE id = 1; """ qt_sql """ SELECT * FROM ${tableName} order by id """ diff --git a/regression-test/suites/delete_p0/test_struct_column_delete.groovy b/regression-test/suites/delete_p0/test_struct_column_delete.groovy index 7b82cda668cc15..539f15e1a2a51c 100644 --- a/regression-test/suites/delete_p0/test_struct_column_delete.groovy +++ b/regression-test/suites/delete_p0/test_struct_column_delete.groovy @@ -23,7 +23,7 @@ suite("test_struct_column_delete") { sql """ insert into ${tableName} values(1, {1, 'a'}),(2,NULL),(3,NULL),(4,NULL),(5,NULL) """ test { sql """ DELETE FROM ${tableName} WHERE s_struct is NULL """ - exception("Can not apply delete condition to column type: STRUCT") + exception("Can not apply delete condition to column type: struct") } sql """ DELETE FROM ${tableName} WHERE id = 1; """ qt_sql """ SELECT * FROM ${tableName} order by id """ diff --git a/regression-test/suites/external_table_p0/hive/ddl/test_hive_ddl.groovy b/regression-test/suites/external_table_p0/hive/ddl/test_hive_ddl.groovy index e7de4478a425a5..b88809f3a6c5d8 100644 --- a/regression-test/suites/external_table_p0/hive/ddl/test_hive_ddl.groovy +++ b/regression-test/suites/external_table_p0/hive/ddl/test_hive_ddl.groovy @@ -648,7 +648,7 @@ suite("test_hive_ddl", "p0,external,hive,external_docker,external_docker_hive") 'file_format'='${file_format}' ) """ - exception "errCode = 2, detailMessage = errCode = 2, detailMessage = failed to create table from hms client. reason: org.apache.doris.datasource.hive.HMSClientException: Unsupported primitive type conversion of LARGEINT" + exception "errCode = 2, detailMessage = errCode = 2, detailMessage = failed to create table from hms client. reason: org.apache.doris.datasource.hive.HMSClientException: Unsupported primitive type conversion of largeint" } test { diff --git a/regression-test/suites/nereids_p0/aggregate/agg_nullable.groovy b/regression-test/suites/nereids_p0/aggregate/agg_nullable.groovy index 0b4789e9c97647..147750f8fdddc1 100644 --- a/regression-test/suites/nereids_p0/aggregate/agg_nullable.groovy +++ b/regression-test/suites/nereids_p0/aggregate/agg_nullable.groovy @@ -53,811 +53,811 @@ suite("agg_nullable") { qt_select_any_value """select any_value(kint) from agg_nullable_test;""" explain { sql("verbose select any_value(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_any_value2 """select any_value(kint) from agg_nullable_test group by id;""" explain { sql("verbose select any_value(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_any_value_n """select any_value(knint) from agg_nullable_test;""" explain { sql("verbose select any_value(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_sum_foreach """select sum_foreach(kaint) from agg_nullable_test;""" explain { sql("verbose select sum_foreach(kaint) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=true" + contains "colUniqueId=null, type=array, nullable=true" } qt_select_sum_foreach2 """select sum_foreach(kaint) from agg_nullable_test group by id;""" explain { sql("verbose select sum_foreach(kaint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_sum_foreach_n """select sum_foreach(knaint) from agg_nullable_test;""" explain { sql("verbose select sum_foreach(knaint) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=true" + contains "colUniqueId=null, type=array, nullable=true" } qt_select_approx_count_distinct """select approx_count_distinct(kint) from agg_nullable_test;""" explain { sql("verbose select approx_count_distinct(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_approx_count_distinct2 """select approx_count_distinct(kint) from agg_nullable_test group by id;""" explain { sql("verbose select approx_count_distinct(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_approx_count_distinct_n """select approx_count_distinct(knint) from agg_nullable_test;""" explain { sql("verbose select approx_count_distinct(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_collect_set """select collect_set(kint) from agg_nullable_test;""" explain { sql("verbose select collect_set(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_collect_set2 """select collect_set(kint) from agg_nullable_test group by id;""" explain { sql("verbose select collect_set(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_collect_set_n """select collect_set(knint) from agg_nullable_test;""" explain { sql("verbose select collect_set(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_collect_list """select collect_list(kint) from agg_nullable_test;""" explain { sql("verbose select collect_list(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_collect_list2 """select collect_list(kint) from agg_nullable_test group by id;""" explain { sql("verbose select collect_list(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_collect_list_n """select collect_list(knint) from agg_nullable_test;""" explain { sql("verbose select collect_list(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_corr """select corr(kint, kbint) from agg_nullable_test;""" explain { sql("verbose select corr(kint, kbint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_corr2 """select corr(kint, kbint) from agg_nullable_test group by id;""" explain { sql("verbose select corr(kint, kbint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_corr_n """select corr(knint, knbint) from agg_nullable_test;""" explain { sql("verbose select corr(knint, knbint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile_array """select percentile_array(kint, [0.5,0.55,0.805]) from agg_nullable_test;""" explain { sql("verbose select percentile_array(kint, [0.5,0.55,0.805]) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_percentile_array2 """select percentile_array(kint, [0.5,0.55,0.805]) from agg_nullable_test group by id;""" explain { sql("verbose select percentile_array(kint, [0.5,0.55,0.805]) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_percentile_array_n """select percentile_array(knint, [0.5,0.55,0.805]) from agg_nullable_test;""" explain { sql("verbose select percentile_array(knint, [0.5,0.55,0.805]) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_quantile_union """select quantile_union(to_quantile_state(kbint, 2048)) from agg_nullable_test;""" explain { sql("verbose select quantile_union(to_quantile_state(kbint, 2048)) from agg_nullable_test;") - contains "colUniqueId=null, type=QUANTILE_STATE, nullable=false" + contains "colUniqueId=null, type=quantile_state, nullable=false" } qt_select_quantile_union2 """select quantile_union(to_quantile_state(kbint, 2048)) from agg_nullable_test group by id;""" explain { sql("verbose select quantile_union(to_quantile_state(kbint, 2048)) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=QUANTILE_STATE, nullable=false" + contains "colUniqueId=null, type=quantile_state, nullable=false" } qt_select_quantile_union_n """select quantile_union(to_quantile_state(knbint, 2048)) from agg_nullable_test;""" explain { sql("verbose select quantile_union(to_quantile_state(knbint, 2048)) from agg_nullable_test;") - contains "colUniqueId=null, type=QUANTILE_STATE, nullable=false" + contains "colUniqueId=null, type=quantile_state, nullable=false" } qt_select_count_by_enum """select count_by_enum(kstr) from agg_nullable_test;""" explain { sql("verbose select count_by_enum(kstr) from agg_nullable_test;") - contains "colUniqueId=null, type=TEXT, nullable=false" + contains "colUniqueId=null, type=text, nullable=false" } qt_select_count_by_enum2 """select count_by_enum(kstr) from agg_nullable_test group by id;""" explain { sql("verbose select count_by_enum(kstr) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=TEXT, nullable=false" + contains "colUniqueId=null, type=text, nullable=false" } qt_select_count_by_enum_n """select count_by_enum(knstr) from agg_nullable_test;""" explain { sql("verbose select count_by_enum(knstr) from agg_nullable_test;") - contains "colUniqueId=null, type=TEXT, nullable=false" + contains "colUniqueId=null, type=text, nullable=false" } qt_select_avg_weighted """select avg_weighted(ktint, kdbl) from agg_nullable_test;""" explain { sql("verbose select avg_weighted(ktint, kdbl) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_avg_weighted2 """select avg_weighted(ktint, kdbl) from agg_nullable_test group by id;""" explain { sql("verbose select avg_weighted(ktint, kdbl) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_avg_weighted_n """select avg_weighted(kntint, kndbl) from agg_nullable_test;""" explain { sql("verbose select avg_weighted(kntint, kndbl) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_bitmap_intersect """select bitmap_intersect(bitmap_hash(kbint)) from agg_nullable_test;""" explain { sql("verbose select bitmap_intersect(bitmap_hash(kbint)) from agg_nullable_test;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_intersect2 """select bitmap_intersect(bitmap_hash(kbint)) from agg_nullable_test group by id;""" explain { sql("verbose select bitmap_intersect(bitmap_hash(kbint)) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_intersect_n """select bitmap_intersect(bitmap_hash(knbint)) from agg_nullable_test;""" explain { sql("verbose select bitmap_intersect(bitmap_hash(knbint)) from agg_nullable_test;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_agg """select bitmap_agg(kint) from agg_nullable_test;""" explain { sql("verbose select bitmap_agg(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_agg2 """select bitmap_agg(kint) from agg_nullable_test group by id;""" explain { sql("verbose select bitmap_agg(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_agg_n """select bitmap_agg(kbint) from agg_nullable_test;""" explain { sql("verbose select bitmap_agg(kbint) from agg_nullable_test;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_union """select bitmap_union(bitmap_hash(kbint)) from agg_nullable_test;""" explain { sql("verbose select bitmap_union(bitmap_hash(kbint)) from agg_nullable_test;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_union2 """select bitmap_union(bitmap_hash(kbint)) from agg_nullable_test group by id;""" explain { sql("verbose select bitmap_union(bitmap_hash(kbint)) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_union_n """select bitmap_union(bitmap_hash(knbint)) from agg_nullable_test;""" explain { sql("verbose select bitmap_union(bitmap_hash(knbint)) from agg_nullable_test;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_union_count """select bitmap_union_count(bitmap_hash(kbint)) from agg_nullable_test;""" explain { sql("verbose select bitmap_union_count(bitmap_hash(kbint)) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_bitmap_union_count2 """select bitmap_union_count(bitmap_hash(kbint)) from agg_nullable_test group by id;""" explain { sql("verbose select bitmap_union_count(bitmap_hash(kbint)) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_bitmap_union_count_n """select bitmap_union_count(bitmap_hash(knbint)) from agg_nullable_test;""" explain { sql("verbose select bitmap_union_count(bitmap_hash(knbint)) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_bitmap_union_int """select bitmap_union_int(kint) from agg_nullable_test;""" explain { sql("verbose select bitmap_union_int(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_bitmap_union_int2 """select bitmap_union_int(kint) from agg_nullable_test group by id;""" explain { sql("verbose select bitmap_union_int(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_bitmap_union_int_n """select bitmap_union_int(knint) from agg_nullable_test;""" explain { sql("verbose select bitmap_union_int(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_group_array_intersect """select group_array_intersect(kaint) from agg_nullable_test;""" explain { sql("verbose select group_array_intersect(kaint) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_group_array_intersect2 """select group_array_intersect(kaint) from agg_nullable_test group by id;""" explain { sql("verbose select group_array_intersect(kaint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_group_array_intersect_n """select group_array_intersect(knaint) from agg_nullable_test;""" explain { sql("verbose select group_array_intersect(knaint) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_group_bit_and """select group_bit_and(kint) from agg_nullable_test;""" explain { sql("verbose select group_bit_and(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_group_bit_and2 """select group_bit_and(kint) from agg_nullable_test group by id;""" explain { sql("verbose select group_bit_and(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_group_bit_and_n """select group_bit_and(knint) from agg_nullable_test;""" explain { sql("verbose select group_bit_and(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_group_bit_or """select group_bit_or(kint) from agg_nullable_test;""" explain { sql("verbose select group_bit_or(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_group_bit_or2 """select group_bit_or(kint) from agg_nullable_test group by id;""" explain { sql("verbose select group_bit_or(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_group_bit_or_n """select group_bit_or(knint) from agg_nullable_test;""" explain { sql("verbose select group_bit_or(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_group_bit_xor """select group_bit_xor(kint) from agg_nullable_test;""" explain { sql("verbose select group_bit_xor(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_group_bit_xor2 """select group_bit_xor(kint) from agg_nullable_test group by id;""" explain { sql("verbose select group_bit_xor(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_group_bit_xor_n """select group_bit_xor(knint) from agg_nullable_test;""" explain { sql("verbose select group_bit_xor(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_group_bitmap_xor """select group_bitmap_xor(bitmap_hash(kbint)) from agg_nullable_test;""" explain { sql("verbose select group_bitmap_xor(bitmap_hash(kbint)) from agg_nullable_test;") - contains "colUniqueId=null, type=BITMAP, nullable=true" + contains "colUniqueId=null, type=bitmap, nullable=true" } qt_select_group_bitmap_xor2 """select group_bitmap_xor(bitmap_hash(kbint)) from agg_nullable_test group by id;""" explain { sql("verbose select group_bitmap_xor(bitmap_hash(kbint)) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_group_bitmap_xor_n """select group_bitmap_xor(bitmap_hash(knbint)) from agg_nullable_test;""" explain { sql("verbose select group_bitmap_xor(bitmap_hash(knbint)) from agg_nullable_test;") - contains "colUniqueId=null, type=BITMAP, nullable=true" + contains "colUniqueId=null, type=bitmap, nullable=true" } qt_select_hll_union_agg """select hll_union_agg(hll_hash(kbint)) from agg_nullable_test;""" explain { sql("verbose select hll_union_agg(hll_hash(kbint)) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_hll_union_agg2 """select hll_union_agg(hll_hash(kbint)) from agg_nullable_test group by id;""" explain { sql("verbose select hll_union_agg(hll_hash(kbint)) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_hll_union_agg_n """select hll_union_agg(hll_hash(knbint)) from agg_nullable_test;""" explain { sql("verbose select hll_union_agg(hll_hash(knbint)) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_hll_union """select hll_union(hll_hash(kbint)) from agg_nullable_test;""" explain { sql("verbose select hll_union(hll_hash(kbint)) from agg_nullable_test;") - contains "colUniqueId=null, type=HLL, nullable=false" + contains "colUniqueId=null, type=hll, nullable=false" } qt_select_hll_union2 """select hll_union(hll_hash(kbint)) from agg_nullable_test group by id;""" explain { sql("verbose select hll_union(hll_hash(kbint)) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=HLL, nullable=false" + contains "colUniqueId=null, type=hll, nullable=false" } qt_select_hll_union_n """select hll_union(hll_hash(knbint)) from agg_nullable_test;""" explain { sql("verbose select hll_union(hll_hash(knbint)) from agg_nullable_test;") - contains "colUniqueId=null, type=HLL, nullable=false" + contains "colUniqueId=null, type=hll, nullable=false" } qt_select_intersect_count """select intersect_count(bitmap_hash(kbint), kint, 3, 4) from agg_nullable_test;""" explain { sql("verbose select intersect_count(bitmap_hash(kbint), kint, 3, 4) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_intersect_count2 """select intersect_count(bitmap_hash(kbint), kint, 3, 4) from agg_nullable_test group by id;""" explain { sql("verbose select intersect_count(bitmap_hash(kbint), kint, 3, 4) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_intersect_count_n """select intersect_count(bitmap_hash(knbint), knint, 3, 4) from agg_nullable_test;""" explain { sql("verbose select intersect_count(bitmap_hash(knbint), knint, 3, 4) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_group_concat """select group_concat(kvchrs1) from agg_nullable_test;""" explain { sql("verbose select group_concat(kvchrs1) from agg_nullable_test;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=true" + contains "colUniqueId=null, type=varchar(65533), nullable=true" } qt_select_group_concat2 """select group_concat(kvchrs1) from agg_nullable_test group by id;""" explain { sql("verbose select group_concat(kvchrs1) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=false" + contains "colUniqueId=null, type=varchar(65533), nullable=false" } qt_select_group_concat_n """select group_concat(knvchrs1) from agg_nullable_test;""" explain { sql("verbose select group_concat(knvchrs1) from agg_nullable_test;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=true" + contains "colUniqueId=null, type=varchar(65533), nullable=true" } qt_select_multi_distinct_group_concat """select multi_distinct_group_concat(kvchrs1) from agg_nullable_test;""" explain { sql("verbose select multi_distinct_group_concat(kvchrs1) from agg_nullable_test;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=true" + contains "colUniqueId=null, type=varchar(65533), nullable=true" } qt_select_multi_distinct_group_concat2 """select multi_distinct_group_concat(kvchrs1) from agg_nullable_test group by id;""" explain { sql("verbose select multi_distinct_group_concat(kvchrs1) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=false" + contains "colUniqueId=null, type=varchar(65533), nullable=false" } qt_select_multi_distinct_group_concat_n """select multi_distinct_group_concat(knvchrs1) from agg_nullable_test;""" explain { sql("verbose select multi_distinct_group_concat(knvchrs1) from agg_nullable_test;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=true" + contains "colUniqueId=null, type=varchar(65533), nullable=true" } qt_select_multi_distinct_sum0 """select multi_distinct_sum0(kint) from agg_nullable_test;""" explain { sql("verbose select multi_distinct_sum0(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_multi_distinct_sum02 """select multi_distinct_sum0(kint) from agg_nullable_test group by id;""" explain { sql("verbose select multi_distinct_sum0(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_multi_distinct_sum0_n """select multi_distinct_sum0(knint) from agg_nullable_test;""" explain { sql("verbose select multi_distinct_sum0(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_multi_distinct_sum """select multi_distinct_sum(kint) from agg_nullable_test;""" explain { sql("verbose select multi_distinct_sum(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=true" + contains "colUniqueId=null, type=bigint, nullable=true" } qt_select_multi_distinct_sum2 """select multi_distinct_sum(kint) from agg_nullable_test group by id;""" explain { sql("verbose select multi_distinct_sum(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_multi_distinct_sum_n """select multi_distinct_sum(knint) from agg_nullable_test;""" explain { sql("verbose select multi_distinct_sum(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=true" + contains "colUniqueId=null, type=bigint, nullable=true" } qt_select_histogram """select histogram(kint) from agg_nullable_test;""" explain { sql("verbose select histogram(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=false" + contains "colUniqueId=null, type=varchar(65533), nullable=false" } qt_select_histogram2 """select histogram(kint) from agg_nullable_test group by id;""" explain { sql("verbose select histogram(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=false" + contains "colUniqueId=null, type=varchar(65533), nullable=false" } qt_select_histogram_n """select histogram(knint) from agg_nullable_test;""" explain { sql("verbose select histogram(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=false" + contains "colUniqueId=null, type=varchar(65533), nullable=false" } qt_select_max_by """select max_by(kint, kint) from agg_nullable_test;""" explain { sql("verbose select max_by(kint, kint) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_max_by2 """select max_by(kint, kint) from agg_nullable_test group by id;""" explain { sql("verbose select max_by(kint, kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_max_by_n """select max_by(knint, knint) from agg_nullable_test;""" explain { sql("verbose select max_by(knint, knint) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_min_by """select min_by(kint, kint) from agg_nullable_test;""" explain { sql("verbose select min_by(kint, kint) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_min_by2 """select min_by(kint, kint) from agg_nullable_test group by id;""" explain { sql("verbose select min_by(kint, kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_min_by_n """select min_by(knint, knint) from agg_nullable_test;""" explain { sql("verbose select min_by(knint, knint) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_multi_distinct_count """select multi_distinct_count(kint) from agg_nullable_test;""" explain { sql("verbose select multi_distinct_count(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_multi_distinct_count2 """select multi_distinct_count(kint) from agg_nullable_test group by id;""" explain { sql("verbose select multi_distinct_count(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_multi_distinct_count_n """select multi_distinct_count(knint) from agg_nullable_test;""" explain { sql("verbose select multi_distinct_count(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_ndv """select ndv(kint) from agg_nullable_test;""" explain { sql("verbose select ndv(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_ndv2 """select ndv(kint) from agg_nullable_test group by id;""" explain { sql("verbose select ndv(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_ndv_n """select ndv(knint) from agg_nullable_test;""" explain { sql("verbose select ndv(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_covar """select covar(kint, kint) from agg_nullable_test;""" explain { sql("verbose select covar(kint, kint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_covar2 """select covar(kint, kint) from agg_nullable_test group by id;""" explain { sql("verbose select covar(kint, kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_covar_n """select covar(knint, knint) from agg_nullable_test;""" explain { sql("verbose select covar(knint, knint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_covar_samp """select covar_samp(kint, kint) from agg_nullable_test;""" explain { sql("verbose select covar_samp(kint, kint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_covar_samp2 """select covar_samp(kint, kint) from agg_nullable_test group by id;""" explain { sql("verbose select covar_samp(kint, kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_covar_samp_n """select covar_samp(knint, knint) from agg_nullable_test;""" explain { sql("verbose select covar_samp(knint, knint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile """select percentile(kbint, 0.6) from agg_nullable_test;""" explain { sql("verbose select percentile(kbint, 0.6) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile2 """select percentile(kbint, 0.6) from agg_nullable_test group by id;""" explain { sql("verbose select percentile(kbint, 0.6) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_percentile_n """select percentile(knbint, 0.6) from agg_nullable_test;""" explain { sql("verbose select percentile(knbint, 0.6) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile_approx """select percentile_approx(kbint, 0.6) from agg_nullable_test;""" explain { sql("verbose select percentile_approx(kbint, 0.6) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile_approx2 """select percentile_approx(kbint, 0.6) from agg_nullable_test group by id;""" explain { sql("verbose select percentile_approx(kbint, 0.6) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_percentile_approx_n """select percentile_approx(knbint, 0.6) from agg_nullable_test;""" explain { sql("verbose select percentile_approx(knbint, 0.6) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile_approx_weighted """select percentile_approx_weighted(kint, kbint, 0.6) from agg_nullable_test;""" explain { sql("verbose select percentile_approx_weighted(kint, kbint, 0.6) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile_approx_weighted2 """select percentile_approx_weighted(kint, kbint, 0.6) from agg_nullable_test group by id;""" explain { sql("verbose select percentile_approx_weighted(kint, kbint, 0.6) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_percentile_approx_weighted_n """select percentile_approx_weighted(knint, knbint, 0.6) from agg_nullable_test;""" explain { sql("verbose select percentile_approx_weighted(knint, knbint, 0.6) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_sequence_count """select sequence_count('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test;""" explain { sql("verbose select sequence_count('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_sequence_count2 """select sequence_count('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test group by id;""" explain { sql("verbose select sequence_count('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_sequence_count_n """select sequence_count('(?1)(?2)', kndtv2, knint = 1, knint = 2) from agg_nullable_test;""" explain { sql("verbose select sequence_count('(?1)(?2)', kndtv2, knint = 1, knint = 2) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_sequence_match """select sequence_match('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test;""" explain { sql("verbose select sequence_match('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test;") - contains "colUniqueId=null, type=BOOLEAN, nullable=true" + contains "colUniqueId=null, type=boolean, nullable=true" } qt_select_sequence_match2 """select sequence_match('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test group by id;""" explain { sql("verbose select sequence_match('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BOOLEAN, nullable=false" + contains "colUniqueId=null, type=boolean, nullable=false" } qt_select_sequence_match_n """select sequence_match('(?1)(?2)', kndtv2, knint = 1, knint = 2) from agg_nullable_test;""" explain { sql("verbose select sequence_match('(?1)(?2)', kndtv2, knint = 1, knint = 2) from agg_nullable_test;") - contains "colUniqueId=null, type=BOOLEAN, nullable=true" + contains "colUniqueId=null, type=boolean, nullable=true" } qt_select_stddev """select stddev(kint) from agg_nullable_test;""" explain { sql("verbose select stddev(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_stddev2 """select stddev(kint) from agg_nullable_test group by id;""" explain { sql("verbose select stddev(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_stddev_n """select stddev(knint) from agg_nullable_test;""" explain { sql("verbose select stddev(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_stddev_pop """select stddev_pop(kint) from agg_nullable_test;""" explain { sql("verbose select stddev_pop(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_stddev_pop2 """select stddev_pop(kint) from agg_nullable_test group by id;""" explain { sql("verbose select stddev_pop(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_stddev_pop_n """select stddev_pop(knint) from agg_nullable_test;""" explain { sql("verbose select stddev_pop(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_stddev_samp """select stddev_samp(kint) from agg_nullable_test;""" explain { sql("verbose select stddev_samp(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_stddev_samp2 """select stddev_samp(kint) from agg_nullable_test group by id;""" explain { sql("verbose select stddev_samp(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_stddev_samp_n """select stddev_samp(knint) from agg_nullable_test;""" explain { sql("verbose select stddev_samp(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_sum0 """select sum0(kint) from agg_nullable_test;""" explain { sql("verbose select sum0(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_sum02 """select sum0(kint) from agg_nullable_test group by id;""" explain { sql("verbose select sum0(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_sum0_n """select sum0(knint) from agg_nullable_test;""" explain { sql("verbose select sum0(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_topn """select topn(kvchrs1, 3) from agg_nullable_test;""" explain { sql("verbose select topn(kvchrs1, 3) from agg_nullable_test;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=true" + contains "colUniqueId=null, type=varchar(65533), nullable=true" } qt_select_topn2 """select topn(kvchrs1, 3) from agg_nullable_test group by id;""" explain { sql("verbose select topn(kvchrs1, 3) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=false" + contains "colUniqueId=null, type=varchar(65533), nullable=false" } qt_select_topn_n """select topn(knvchrs1, 3) from agg_nullable_test;""" explain { sql("verbose select topn(knvchrs1, 3) from agg_nullable_test;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=true" + contains "colUniqueId=null, type=varchar(65533), nullable=true" } qt_select_topn_array """select topn_array(kvchrs1, 3) from agg_nullable_test;""" explain { sql("verbose select topn_array(kvchrs1, 3) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=true" + contains "colUniqueId=null, type=array, nullable=true" } qt_select_topn_array2 """select topn_array(kvchrs1, 3) from agg_nullable_test group by id;""" explain { sql("verbose select topn_array(kvchrs1, 3) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_topn_array_n """select topn_array(knvchrs1, 3) from agg_nullable_test;""" explain { sql("verbose select topn_array(knvchrs1, 3) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=true" + contains "colUniqueId=null, type=array, nullable=true" } qt_select_topn_weighted """select topn_weighted(kvchrs1, ktint, 3) from agg_nullable_test;""" @@ -881,144 +881,144 @@ suite("agg_nullable") { qt_select_variance """select variance(kint) from agg_nullable_test;""" explain { sql("verbose select variance(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_variance2 """select variance(kint) from agg_nullable_test group by id;""" explain { sql("verbose select variance(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_variance_n """select variance(knint) from agg_nullable_test;""" explain { sql("verbose select variance(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_var_pop """select var_pop(kint) from agg_nullable_test;""" explain { sql("verbose select var_pop(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_var_pop2 """select var_pop(kint) from agg_nullable_test group by id;""" explain { sql("verbose select var_pop(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_var_pop_n """select var_pop(knint) from agg_nullable_test;""" explain { sql("verbose select var_pop(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_variance_samp """select variance_samp(kint) from agg_nullable_test;""" explain { sql("verbose select variance_samp(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_variance_samp2 """select variance_samp(kint) from agg_nullable_test group by id;""" explain { sql("verbose select variance_samp(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_variance_samp_n """select variance_samp(knint) from agg_nullable_test;""" explain { sql("verbose select variance_samp(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_var_samp """select var_samp(kint) from agg_nullable_test;""" explain { sql("verbose select var_samp(kint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_var_samp2 """select var_samp(kint) from agg_nullable_test group by id;""" explain { sql("verbose select var_samp(kint) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_var_samp_n """select var_samp(knint) from agg_nullable_test;""" explain { sql("verbose select var_samp(knint) from agg_nullable_test;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_window_funnel """select window_funnel(3600 * 3, 'default', kdtm, kint = 1, kint = 2) from agg_nullable_test;""" explain { sql("verbose select window_funnel(3600 * 3, 'default', kdtm, kint = 1, kint = 2) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_window_funnel2 """select window_funnel(3600 * 3, 'default', kdtm, kint = 1, kint = 2) from agg_nullable_test group by id;""" explain { sql("verbose select window_funnel(3600 * 3, 'default', kdtm, kint = 1, kint = 2) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_window_funnel_n """select window_funnel(3600 * 3, 'default', kndtm, knint = 1, knint = 2) from agg_nullable_test;""" explain { sql("verbose select window_funnel(3600 * 3, 'default', kndtm, knint = 1, knint = 2) from agg_nullable_test;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_map_agg """select map_agg(kint, kstr) from agg_nullable_test;""" explain { sql("verbose select map_agg(kint, kstr) from agg_nullable_test;") - contains "colUniqueId=null, type=MAP, nullable=false" + contains "colUniqueId=null, type=map, nullable=false" } qt_select_map_agg2 """select map_agg(kint, kstr) from agg_nullable_test group by id;""" explain { sql("verbose select map_agg(kint, kstr) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=MAP, nullable=false" + contains "colUniqueId=null, type=map, nullable=false" } qt_select_map_agg_n """select map_agg(knint, knstr) from agg_nullable_test;""" explain { sql("verbose select map_agg(knint, knstr) from agg_nullable_test;") - contains "colUniqueId=null, type=MAP, nullable=false" + contains "colUniqueId=null, type=map, nullable=false" } qt_select_array_agg """select array_agg(kstr) from agg_nullable_test;""" explain { sql("verbose select array_agg(kstr) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_array_agg2 """select array_agg(kstr) from agg_nullable_test group by id;""" explain { sql("verbose select array_agg(kstr) from agg_nullable_test group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_array_agg_n """select array_agg(knstr) from agg_nullable_test;""" explain { sql("verbose select array_agg(knstr) from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_retention """select retention(kdtm = '2012-03-11', kdtm = '2012-03-12') from agg_nullable_test;""" explain { sql("verbose select retention(kdtm = '2012-03-11', kdtm = '2012-03-12') from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=true" + contains "colUniqueId=null, type=array, nullable=true" } qt_select_retention2 """select retention(kdtm = '2012-03-11', kdtm = '2012-03-12') from agg_nullable_test group by id;""" explain { sql("verbose select retention(kdtm = '2012-03-11', kdtm = '2012-03-12') from agg_nullable_test group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_retention_n """select retention(kndtm = '2012-03-11', kndtm = '2012-03-12') from agg_nullable_test;""" explain { sql("verbose select retention(kndtm = '2012-03-11', kndtm = '2012-03-12') from agg_nullable_test;") - contains "colUniqueId=null, type=ARRAY, nullable=true" + contains "colUniqueId=null, type=array, nullable=true" } } diff --git a/regression-test/suites/nereids_p0/aggregate/agg_nullable_2.groovy b/regression-test/suites/nereids_p0/aggregate/agg_nullable_2.groovy index c5eb61b646b842..42c24815a9ace5 100644 --- a/regression-test/suites/nereids_p0/aggregate/agg_nullable_2.groovy +++ b/regression-test/suites/nereids_p0/aggregate/agg_nullable_2.groovy @@ -64,811 +64,811 @@ suite("agg_nullable_2") { qt_select_any_value """select any_value(kint) from agg_nullable_test_2;""" explain { sql("verbose select any_value(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_any_value2 """select any_value(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select any_value(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_any_value_n """select any_value(knint) from agg_nullable_test_2;""" explain { sql("verbose select any_value(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_sum_foreach """select sum_foreach(kaint) from agg_nullable_test_2;""" explain { sql("verbose select sum_foreach(kaint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=true" + contains "colUniqueId=null, type=array, nullable=true" } qt_select_sum_foreach2 """select sum_foreach(kaint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select sum_foreach(kaint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_sum_foreach_n """select sum_foreach(knaint) from agg_nullable_test_2;""" explain { sql("verbose select sum_foreach(knaint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=true" + contains "colUniqueId=null, type=array, nullable=true" } qt_select_approx_count_distinct """select approx_count_distinct(kint) from agg_nullable_test_2;""" explain { sql("verbose select approx_count_distinct(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_approx_count_distinct2 """select approx_count_distinct(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select approx_count_distinct(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_approx_count_distinct_n """select approx_count_distinct(knint) from agg_nullable_test_2;""" explain { sql("verbose select approx_count_distinct(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_collect_set """select collect_set(kint) from agg_nullable_test_2;""" explain { sql("verbose select collect_set(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_collect_set2 """select collect_set(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select collect_set(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_collect_set_n """select collect_set(knint) from agg_nullable_test_2;""" explain { sql("verbose select collect_set(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_collect_list """select collect_list(kint) from agg_nullable_test_2;""" explain { sql("verbose select collect_list(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_collect_list2 """select collect_list(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select collect_list(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_collect_list_n """select collect_list(knint) from agg_nullable_test_2;""" explain { sql("verbose select collect_list(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_corr """select corr(kint, kbint) from agg_nullable_test_2;""" explain { sql("verbose select corr(kint, kbint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_corr2 """select corr(kint, kbint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select corr(kint, kbint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_corr_n """select corr(knint, knbint) from agg_nullable_test_2;""" explain { sql("verbose select corr(knint, knbint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile_array """select percentile_array(kint, [0.5,0.55,0.805]) from agg_nullable_test_2;""" explain { sql("verbose select percentile_array(kint, [0.5,0.55,0.805]) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_percentile_array2 """select percentile_array(kint, [0.5,0.55,0.805]) from agg_nullable_test_2 group by id;""" explain { sql("verbose select percentile_array(kint, [0.5,0.55,0.805]) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_percentile_array_n """select percentile_array(knint, [0.5,0.55,0.805]) from agg_nullable_test_2;""" explain { sql("verbose select percentile_array(knint, [0.5,0.55,0.805]) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_quantile_union """select quantile_union(to_quantile_state(kbint, 2048)) from agg_nullable_test_2;""" explain { sql("verbose select quantile_union(to_quantile_state(kbint, 2048)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=QUANTILE_STATE, nullable=false" + contains "colUniqueId=null, type=quantile_state, nullable=false" } qt_select_quantile_union2 """select quantile_union(to_quantile_state(kbint, 2048)) from agg_nullable_test_2 group by id;""" explain { sql("verbose select quantile_union(to_quantile_state(kbint, 2048)) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=QUANTILE_STATE, nullable=false" + contains "colUniqueId=null, type=quantile_state, nullable=false" } qt_select_quantile_union_n """select quantile_union(to_quantile_state(knbint, 2048)) from agg_nullable_test_2;""" explain { sql("verbose select quantile_union(to_quantile_state(knbint, 2048)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=QUANTILE_STATE, nullable=false" + contains "colUniqueId=null, type=quantile_state, nullable=false" } qt_select_count_by_enum """select count_by_enum(kstr) from agg_nullable_test_2;""" explain { sql("verbose select count_by_enum(kstr) from agg_nullable_test_2;") - contains "colUniqueId=null, type=TEXT, nullable=false" + contains "colUniqueId=null, type=text, nullable=false" } qt_select_count_by_enum2 """select count_by_enum(kstr) from agg_nullable_test_2 group by id;""" explain { sql("verbose select count_by_enum(kstr) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=TEXT, nullable=false" + contains "colUniqueId=null, type=text, nullable=false" } qt_select_count_by_enum_n """select count_by_enum(knstr) from agg_nullable_test_2;""" explain { sql("verbose select count_by_enum(knstr) from agg_nullable_test_2;") - contains "colUniqueId=null, type=TEXT, nullable=false" + contains "colUniqueId=null, type=text, nullable=false" } qt_select_avg_weighted """select avg_weighted(ktint, kdbl) from agg_nullable_test_2;""" explain { sql("verbose select avg_weighted(ktint, kdbl) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_avg_weighted2 """select avg_weighted(ktint, kdbl) from agg_nullable_test_2 group by id;""" explain { sql("verbose select avg_weighted(ktint, kdbl) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_avg_weighted_n """select avg_weighted(kntint, kndbl) from agg_nullable_test_2;""" explain { sql("verbose select avg_weighted(kntint, kndbl) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_bitmap_intersect """select bitmap_intersect(bitmap_hash(kbint)) from agg_nullable_test_2;""" explain { sql("verbose select bitmap_intersect(bitmap_hash(kbint)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_intersect2 """select bitmap_intersect(bitmap_hash(kbint)) from agg_nullable_test_2 group by id;""" explain { sql("verbose select bitmap_intersect(bitmap_hash(kbint)) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_intersect_n """select bitmap_intersect(bitmap_hash(knbint)) from agg_nullable_test_2;""" explain { sql("verbose select bitmap_intersect(bitmap_hash(knbint)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_agg """select bitmap_agg(kint) from agg_nullable_test_2;""" explain { sql("verbose select bitmap_agg(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_agg2 """select bitmap_agg(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select bitmap_agg(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_agg_n """select bitmap_agg(kbint) from agg_nullable_test_2;""" explain { sql("verbose select bitmap_agg(kbint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_union """select bitmap_union(bitmap_hash(kbint)) from agg_nullable_test_2;""" explain { sql("verbose select bitmap_union(bitmap_hash(kbint)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_union2 """select bitmap_union(bitmap_hash(kbint)) from agg_nullable_test_2 group by id;""" explain { sql("verbose select bitmap_union(bitmap_hash(kbint)) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_union_n """select bitmap_union(bitmap_hash(knbint)) from agg_nullable_test_2;""" explain { sql("verbose select bitmap_union(bitmap_hash(knbint)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_bitmap_union_count """select bitmap_union_count(bitmap_hash(kbint)) from agg_nullable_test_2;""" explain { sql("verbose select bitmap_union_count(bitmap_hash(kbint)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_bitmap_union_count2 """select bitmap_union_count(bitmap_hash(kbint)) from agg_nullable_test_2 group by id;""" explain { sql("verbose select bitmap_union_count(bitmap_hash(kbint)) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_bitmap_union_count_n """select bitmap_union_count(bitmap_hash(knbint)) from agg_nullable_test_2;""" explain { sql("verbose select bitmap_union_count(bitmap_hash(knbint)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_bitmap_union_int """select bitmap_union_int(kint) from agg_nullable_test_2;""" explain { sql("verbose select bitmap_union_int(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_bitmap_union_int2 """select bitmap_union_int(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select bitmap_union_int(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_bitmap_union_int_n """select bitmap_union_int(knint) from agg_nullable_test_2;""" explain { sql("verbose select bitmap_union_int(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_group_array_intersect """select group_array_intersect(kaint) from agg_nullable_test_2;""" explain { sql("verbose select group_array_intersect(kaint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_group_array_intersect2 """select group_array_intersect(kaint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select group_array_intersect(kaint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_group_array_intersect_n """select group_array_intersect(knaint) from agg_nullable_test_2;""" explain { sql("verbose select group_array_intersect(knaint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_group_bit_and """select group_bit_and(kint) from agg_nullable_test_2;""" explain { sql("verbose select group_bit_and(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_group_bit_and2 """select group_bit_and(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select group_bit_and(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_group_bit_and_n """select group_bit_and(knint) from agg_nullable_test_2;""" explain { sql("verbose select group_bit_and(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_group_bit_or """select group_bit_or(kint) from agg_nullable_test_2;""" explain { sql("verbose select group_bit_or(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_group_bit_or2 """select group_bit_or(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select group_bit_or(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_group_bit_or_n """select group_bit_or(knint) from agg_nullable_test_2;""" explain { sql("verbose select group_bit_or(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_group_bit_xor """select group_bit_xor(kint) from agg_nullable_test_2;""" explain { sql("verbose select group_bit_xor(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_group_bit_xor2 """select group_bit_xor(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select group_bit_xor(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_group_bit_xor_n """select group_bit_xor(knint) from agg_nullable_test_2;""" explain { sql("verbose select group_bit_xor(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_group_bitmap_xor """select group_bitmap_xor(bitmap_hash(kbint)) from agg_nullable_test_2;""" explain { sql("verbose select group_bitmap_xor(bitmap_hash(kbint)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BITMAP, nullable=true" + contains "colUniqueId=null, type=bitmap, nullable=true" } qt_select_group_bitmap_xor2 """select group_bitmap_xor(bitmap_hash(kbint)) from agg_nullable_test_2 group by id;""" explain { sql("verbose select group_bitmap_xor(bitmap_hash(kbint)) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BITMAP, nullable=false" + contains "colUniqueId=null, type=bitmap, nullable=false" } qt_select_group_bitmap_xor_n """select group_bitmap_xor(bitmap_hash(knbint)) from agg_nullable_test_2;""" explain { sql("verbose select group_bitmap_xor(bitmap_hash(knbint)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BITMAP, nullable=true" + contains "colUniqueId=null, type=bitmap, nullable=true" } qt_select_hll_union_agg """select hll_union_agg(hll_hash(kbint)) from agg_nullable_test_2;""" explain { sql("verbose select hll_union_agg(hll_hash(kbint)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_hll_union_agg2 """select hll_union_agg(hll_hash(kbint)) from agg_nullable_test_2 group by id;""" explain { sql("verbose select hll_union_agg(hll_hash(kbint)) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_hll_union_agg_n """select hll_union_agg(hll_hash(knbint)) from agg_nullable_test_2;""" explain { sql("verbose select hll_union_agg(hll_hash(knbint)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_hll_union """select hll_union(hll_hash(kbint)) from agg_nullable_test_2;""" explain { sql("verbose select hll_union(hll_hash(kbint)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=HLL, nullable=false" + contains "colUniqueId=null, type=hll, nullable=false" } qt_select_hll_union2 """select hll_union(hll_hash(kbint)) from agg_nullable_test_2 group by id;""" explain { sql("verbose select hll_union(hll_hash(kbint)) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=HLL, nullable=false" + contains "colUniqueId=null, type=hll, nullable=false" } qt_select_hll_union_n """select hll_union(hll_hash(knbint)) from agg_nullable_test_2;""" explain { sql("verbose select hll_union(hll_hash(knbint)) from agg_nullable_test_2;") - contains "colUniqueId=null, type=HLL, nullable=false" + contains "colUniqueId=null, type=hll, nullable=false" } qt_select_intersect_count """select intersect_count(bitmap_hash(kbint), kint, 3, 4) from agg_nullable_test_2;""" explain { sql("verbose select intersect_count(bitmap_hash(kbint), kint, 3, 4) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_intersect_count2 """select intersect_count(bitmap_hash(kbint), kint, 3, 4) from agg_nullable_test_2 group by id;""" explain { sql("verbose select intersect_count(bitmap_hash(kbint), kint, 3, 4) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_intersect_count_n """select intersect_count(bitmap_hash(knbint), knint, 3, 4) from agg_nullable_test_2;""" explain { sql("verbose select intersect_count(bitmap_hash(knbint), knint, 3, 4) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_group_concat """select group_concat(kvchrs1) from agg_nullable_test_2;""" explain { sql("verbose select group_concat(kvchrs1) from agg_nullable_test_2;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=true" + contains "colUniqueId=null, type=varchar(65533), nullable=true" } qt_select_group_concat2 """select group_concat(kvchrs1) from agg_nullable_test_2 group by id;""" explain { sql("verbose select group_concat(kvchrs1) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=false" + contains "colUniqueId=null, type=varchar(65533), nullable=false" } qt_select_group_concat_n """select group_concat(knvchrs1) from agg_nullable_test_2;""" explain { sql("verbose select group_concat(knvchrs1) from agg_nullable_test_2;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=true" + contains "colUniqueId=null, type=varchar(65533), nullable=true" } qt_select_multi_distinct_group_concat """select multi_distinct_group_concat(kvchrs1) from agg_nullable_test_2;""" explain { sql("verbose select multi_distinct_group_concat(kvchrs1) from agg_nullable_test_2;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=true" + contains "colUniqueId=null, type=varchar(65533), nullable=true" } qt_select_multi_distinct_group_concat2 """select multi_distinct_group_concat(kvchrs1) from agg_nullable_test_2 group by id;""" explain { sql("verbose select multi_distinct_group_concat(kvchrs1) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=false" + contains "colUniqueId=null, type=varchar(65533), nullable=false" } qt_select_multi_distinct_group_concat_n """select multi_distinct_group_concat(knvchrs1) from agg_nullable_test_2;""" explain { sql("verbose select multi_distinct_group_concat(knvchrs1) from agg_nullable_test_2;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=true" + contains "colUniqueId=null, type=varchar(65533), nullable=true" } qt_select_multi_distinct_sum0 """select multi_distinct_sum0(kint) from agg_nullable_test_2;""" explain { sql("verbose select multi_distinct_sum0(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_multi_distinct_sum02 """select multi_distinct_sum0(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select multi_distinct_sum0(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_multi_distinct_sum0_n """select multi_distinct_sum0(knint) from agg_nullable_test_2;""" explain { sql("verbose select multi_distinct_sum0(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_multi_distinct_sum """select multi_distinct_sum(kint) from agg_nullable_test_2;""" explain { sql("verbose select multi_distinct_sum(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=true" + contains "colUniqueId=null, type=bigint, nullable=true" } qt_select_multi_distinct_sum2 """select multi_distinct_sum(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select multi_distinct_sum(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_multi_distinct_sum_n """select multi_distinct_sum(knint) from agg_nullable_test_2;""" explain { sql("verbose select multi_distinct_sum(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=true" + contains "colUniqueId=null, type=bigint, nullable=true" } qt_select_histogram """select histogram(kint) from agg_nullable_test_2;""" explain { sql("verbose select histogram(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=false" + contains "colUniqueId=null, type=varchar(65533), nullable=false" } qt_select_histogram2 """select histogram(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select histogram(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=false" + contains "colUniqueId=null, type=varchar(65533), nullable=false" } qt_select_histogram_n """select histogram(knint) from agg_nullable_test_2;""" explain { sql("verbose select histogram(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=false" + contains "colUniqueId=null, type=varchar(65533), nullable=false" } qt_select_max_by """select max_by(kint, kint) from agg_nullable_test_2;""" explain { sql("verbose select max_by(kint, kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_max_by2 """select max_by(kint, kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select max_by(kint, kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_max_by_n """select max_by(knint, knint) from agg_nullable_test_2;""" explain { sql("verbose select max_by(knint, knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_min_by """select min_by(kint, kint) from agg_nullable_test_2;""" explain { sql("verbose select min_by(kint, kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_min_by2 """select min_by(kint, kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select min_by(kint, kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_min_by_n """select min_by(knint, knint) from agg_nullable_test_2;""" explain { sql("verbose select min_by(knint, knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_multi_distinct_count """select multi_distinct_count(kint) from agg_nullable_test_2;""" explain { sql("verbose select multi_distinct_count(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_multi_distinct_count2 """select multi_distinct_count(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select multi_distinct_count(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_multi_distinct_count_n """select multi_distinct_count(knint) from agg_nullable_test_2;""" explain { sql("verbose select multi_distinct_count(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_ndv """select ndv(kint) from agg_nullable_test_2;""" explain { sql("verbose select ndv(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_ndv2 """select ndv(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select ndv(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_ndv_n """select ndv(knint) from agg_nullable_test_2;""" explain { sql("verbose select ndv(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_covar """select covar(kint, kint) from agg_nullable_test_2;""" explain { sql("verbose select covar(kint, kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_covar2 """select covar(kint, kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select covar(kint, kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_covar_n """select covar(knint, knint) from agg_nullable_test_2;""" explain { sql("verbose select covar(knint, knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_covar_samp """select covar_samp(kint, kint) from agg_nullable_test_2;""" explain { sql("verbose select covar_samp(kint, kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_covar_samp2 """select covar_samp(kint, kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select covar_samp(kint, kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_covar_samp_n """select covar_samp(knint, knint) from agg_nullable_test_2;""" explain { sql("verbose select covar_samp(knint, knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile """select percentile(kbint, 0.6) from agg_nullable_test_2;""" explain { sql("verbose select percentile(kbint, 0.6) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile2 """select percentile(kbint, 0.6) from agg_nullable_test_2 group by id;""" explain { sql("verbose select percentile(kbint, 0.6) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_percentile_n """select percentile(knbint, 0.6) from agg_nullable_test_2;""" explain { sql("verbose select percentile(knbint, 0.6) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile_approx """select percentile_approx(kbint, 0.6) from agg_nullable_test_2;""" explain { sql("verbose select percentile_approx(kbint, 0.6) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile_approx2 """select percentile_approx(kbint, 0.6) from agg_nullable_test_2 group by id;""" explain { sql("verbose select percentile_approx(kbint, 0.6) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_percentile_approx_n """select percentile_approx(knbint, 0.6) from agg_nullable_test_2;""" explain { sql("verbose select percentile_approx(knbint, 0.6) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile_approx_weighted """select percentile_approx_weighted(kint, kbint, 0.6) from agg_nullable_test_2;""" explain { sql("verbose select percentile_approx_weighted(kint, kbint, 0.6) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_percentile_approx_weighted2 """select percentile_approx_weighted(kint, kbint, 0.6) from agg_nullable_test_2 group by id;""" explain { sql("verbose select percentile_approx_weighted(kint, kbint, 0.6) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_percentile_approx_weighted_n """select percentile_approx_weighted(knint, knbint, 0.6) from agg_nullable_test_2;""" explain { sql("verbose select percentile_approx_weighted(knint, knbint, 0.6) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_sequence_count """select sequence_count('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test_2;""" explain { sql("verbose select sequence_count('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_sequence_count2 """select sequence_count('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test_2 group by id;""" explain { sql("verbose select sequence_count('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_sequence_count_n """select sequence_count('(?1)(?2)', kndtv2, knint = 1, knint = 2) from agg_nullable_test_2;""" explain { sql("verbose select sequence_count('(?1)(?2)', kndtv2, knint = 1, knint = 2) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_sequence_match """select sequence_match('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test_2;""" explain { sql("verbose select sequence_match('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BOOLEAN, nullable=true" + contains "colUniqueId=null, type=boolean, nullable=true" } qt_select_sequence_match2 """select sequence_match('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test_2 group by id;""" explain { sql("verbose select sequence_match('(?1)(?2)', kdtv2, kint = 1, kint = 2) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BOOLEAN, nullable=false" + contains "colUniqueId=null, type=boolean, nullable=false" } qt_select_sequence_match_n """select sequence_match('(?1)(?2)', kndtv2, knint = 1, knint = 2) from agg_nullable_test_2;""" explain { sql("verbose select sequence_match('(?1)(?2)', kndtv2, knint = 1, knint = 2) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BOOLEAN, nullable=true" + contains "colUniqueId=null, type=boolean, nullable=true" } qt_select_stddev """select stddev(kint) from agg_nullable_test_2;""" explain { sql("verbose select stddev(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_stddev2 """select stddev(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select stddev(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_stddev_n """select stddev(knint) from agg_nullable_test_2;""" explain { sql("verbose select stddev(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_stddev_pop """select stddev_pop(kint) from agg_nullable_test_2;""" explain { sql("verbose select stddev_pop(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_stddev_pop2 """select stddev_pop(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select stddev_pop(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_stddev_pop_n """select stddev_pop(knint) from agg_nullable_test_2;""" explain { sql("verbose select stddev_pop(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_stddev_samp """select stddev_samp(kint) from agg_nullable_test_2;""" explain { sql("verbose select stddev_samp(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_stddev_samp2 """select stddev_samp(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select stddev_samp(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_stddev_samp_n """select stddev_samp(knint) from agg_nullable_test_2;""" explain { sql("verbose select stddev_samp(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_sum0 """select sum0(kint) from agg_nullable_test_2;""" explain { sql("verbose select sum0(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_sum02 """select sum0(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select sum0(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_sum0_n """select sum0(knint) from agg_nullable_test_2;""" explain { sql("verbose select sum0(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=BIGINT, nullable=false" + contains "colUniqueId=null, type=bigint, nullable=false" } qt_select_topn """select topn(kvchrs1, 3) from agg_nullable_test_2;""" explain { sql("verbose select topn(kvchrs1, 3) from agg_nullable_test_2;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=true" + contains "colUniqueId=null, type=varchar(65533), nullable=true" } qt_select_topn2 """select topn(kvchrs1, 3) from agg_nullable_test_2 group by id;""" explain { sql("verbose select topn(kvchrs1, 3) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=false" + contains "colUniqueId=null, type=varchar(65533), nullable=false" } qt_select_topn_n """select topn(knvchrs1, 3) from agg_nullable_test_2;""" explain { sql("verbose select topn(knvchrs1, 3) from agg_nullable_test_2;") - contains "colUniqueId=null, type=VARCHAR(65533), nullable=true" + contains "colUniqueId=null, type=varchar(65533), nullable=true" } qt_select_topn_array """select topn_array(kvchrs1, 3) from agg_nullable_test_2;""" explain { sql("verbose select topn_array(kvchrs1, 3) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=true" + contains "colUniqueId=null, type=array, nullable=true" } qt_select_topn_array2 """select topn_array(kvchrs1, 3) from agg_nullable_test_2 group by id;""" explain { sql("verbose select topn_array(kvchrs1, 3) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_topn_array_n """select topn_array(knvchrs1, 3) from agg_nullable_test_2;""" explain { sql("verbose select topn_array(knvchrs1, 3) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=true" + contains "colUniqueId=null, type=array, nullable=true" } qt_select_topn_weighted """select topn_weighted(kvchrs1, ktint, 3) from agg_nullable_test_2;""" @@ -892,144 +892,144 @@ suite("agg_nullable_2") { qt_select_variance """select variance(kint) from agg_nullable_test_2;""" explain { sql("verbose select variance(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_variance2 """select variance(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select variance(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_variance_n """select variance(knint) from agg_nullable_test_2;""" explain { sql("verbose select variance(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_var_pop """select var_pop(kint) from agg_nullable_test_2;""" explain { sql("verbose select var_pop(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_var_pop2 """select var_pop(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select var_pop(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_var_pop_n """select var_pop(knint) from agg_nullable_test_2;""" explain { sql("verbose select var_pop(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_variance_samp """select variance_samp(kint) from agg_nullable_test_2;""" explain { sql("verbose select variance_samp(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_variance_samp2 """select variance_samp(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select variance_samp(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_variance_samp_n """select variance_samp(knint) from agg_nullable_test_2;""" explain { sql("verbose select variance_samp(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_var_samp """select var_samp(kint) from agg_nullable_test_2;""" explain { sql("verbose select var_samp(kint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_var_samp2 """select var_samp(kint) from agg_nullable_test_2 group by id;""" explain { sql("verbose select var_samp(kint) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=DOUBLE, nullable=false" + contains "colUniqueId=null, type=double, nullable=false" } qt_select_var_samp_n """select var_samp(knint) from agg_nullable_test_2;""" explain { sql("verbose select var_samp(knint) from agg_nullable_test_2;") - contains "colUniqueId=null, type=DOUBLE, nullable=true" + contains "colUniqueId=null, type=double, nullable=true" } qt_select_window_funnel """select window_funnel(3600 * 3, 'default', kdtm, kint = 1, kint = 2) from agg_nullable_test_2;""" explain { sql("verbose select window_funnel(3600 * 3, 'default', kdtm, kint = 1, kint = 2) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_window_funnel2 """select window_funnel(3600 * 3, 'default', kdtm, kint = 1, kint = 2) from agg_nullable_test_2 group by id;""" explain { sql("verbose select window_funnel(3600 * 3, 'default', kdtm, kint = 1, kint = 2) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=INT, nullable=false" + contains "colUniqueId=null, type=int, nullable=false" } qt_select_window_funnel_n """select window_funnel(3600 * 3, 'default', kndtm, knint = 1, knint = 2) from agg_nullable_test_2;""" explain { sql("verbose select window_funnel(3600 * 3, 'default', kndtm, knint = 1, knint = 2) from agg_nullable_test_2;") - contains "colUniqueId=null, type=INT, nullable=true" + contains "colUniqueId=null, type=int, nullable=true" } qt_select_map_agg """select map_agg(kint, kstr) from agg_nullable_test_2;""" explain { sql("verbose select map_agg(kint, kstr) from agg_nullable_test_2;") - contains "colUniqueId=null, type=MAP, nullable=false" + contains "colUniqueId=null, type=map, nullable=false" } qt_select_map_agg2 """select map_agg(kint, kstr) from agg_nullable_test_2 group by id;""" explain { sql("verbose select map_agg(kint, kstr) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=MAP, nullable=false" + contains "colUniqueId=null, type=map, nullable=false" } qt_select_map_agg_n """select map_agg(knint, knstr) from agg_nullable_test_2;""" explain { sql("verbose select map_agg(knint, knstr) from agg_nullable_test_2;") - contains "colUniqueId=null, type=MAP, nullable=false" + contains "colUniqueId=null, type=map, nullable=false" } qt_select_array_agg """select array_agg(kstr) from agg_nullable_test_2;""" explain { sql("verbose select array_agg(kstr) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_array_agg2 """select array_agg(kstr) from agg_nullable_test_2 group by id;""" explain { sql("verbose select array_agg(kstr) from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_array_agg_n """select array_agg(knstr) from agg_nullable_test_2;""" explain { sql("verbose select array_agg(knstr) from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_retention """select retention(kdtm = '2012-03-11', kdtm = '2012-03-12') from agg_nullable_test_2;""" explain { sql("verbose select retention(kdtm = '2012-03-11', kdtm = '2012-03-12') from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=true" + contains "colUniqueId=null, type=array, nullable=true" } qt_select_retention2 """select retention(kdtm = '2012-03-11', kdtm = '2012-03-12') from agg_nullable_test_2 group by id;""" explain { sql("verbose select retention(kdtm = '2012-03-11', kdtm = '2012-03-12') from agg_nullable_test_2 group by id;") - contains "colUniqueId=null, type=ARRAY, nullable=false" + contains "colUniqueId=null, type=array, nullable=false" } qt_select_retention_n """select retention(kndtm = '2012-03-11', kndtm = '2012-03-12') from agg_nullable_test_2;""" explain { sql("verbose select retention(kndtm = '2012-03-11', kndtm = '2012-03-12') from agg_nullable_test_2;") - contains "colUniqueId=null, type=ARRAY, nullable=true" + contains "colUniqueId=null, type=array, nullable=true" } } diff --git a/regression-test/suites/nereids_p0/datatype/test_cast.groovy b/regression-test/suites/nereids_p0/datatype/test_cast.groovy index e359135c41dcca..8d657f73cf3f91 100644 --- a/regression-test/suites/nereids_p0/datatype/test_cast.groovy +++ b/regression-test/suites/nereids_p0/datatype/test_cast.groovy @@ -113,6 +113,6 @@ suite("test_cast") { """ explain { sql """select k0 from table_decimal38_4 union all select k0 from table_decimal27_9;""" - contains """AS DECIMALV3(38, 4)""" + contains """AS decimalv3(38,4)""" } } diff --git a/regression-test/suites/nereids_p0/datatype/test_date_implicit_cast.groovy b/regression-test/suites/nereids_p0/datatype/test_date_implicit_cast.groovy index 35c8f7f1e57849..2880b0634a0dd1 100644 --- a/regression-test/suites/nereids_p0/datatype/test_date_implicit_cast.groovy +++ b/regression-test/suites/nereids_p0/datatype/test_date_implicit_cast.groovy @@ -35,10 +35,10 @@ suite("test_date_implicit_cast") { result = sql " desc verbose select if(k1='2020-12-12', k1, '2020-12-12 12:12:12.123') from d4nn " for (String value : result) { - if (value.contains("col=k1, colUniqueId=0, type=DATETIMEV2(4)")) { + if (value.contains("col=k1, colUniqueId=0, type=datetimev2(4)")) { contain0 = true; } - if (value.contains("col=null, colUniqueId=null, type=DATETIMEV2(4)")) { + if (value.contains("col=null, colUniqueId=null, type=datetimev2(4)")) { contain1 = true; } } @@ -47,10 +47,10 @@ suite("test_date_implicit_cast") { result = sql " desc verbose select if(k1='2020-12-12', k1, cast('2020-12-12 12:12:12.123' as datetimev2(3))) from d4nn; " for (String value : result) { - if (value.contains("col=k1, colUniqueId=0, type=DATETIMEV2(4)")) { + if (value.contains("col=k1, colUniqueId=0, type=datetimev2(4)")) { contain0 = true; } - if (value.contains("col=null, colUniqueId=null, type=DATETIMEV2(4)")) { + if (value.contains("col=null, colUniqueId=null, type=datetimev2(4)")) { contain1 = true; } } @@ -58,10 +58,10 @@ suite("test_date_implicit_cast") { result = sql " desc verbose select if(k1='2012-12-12 12:12:12.1235', k1, '2020-12-12 12:12:12.12345') from d4nn; " for (String value : result) { - if (value.contains("col=k1, colUniqueId=0, type=DATETIMEV2(4)")) { + if (value.contains("col=k1, colUniqueId=0, type=datetimev2(4)")) { contain0 = true; } - if (value.contains("col=null, colUniqueId=null, type=DATETIMEV2(5)")) { + if (value.contains("col=null, colUniqueId=null, type=datetimev2(5)")) { contain1 = true; } } @@ -77,10 +77,10 @@ suite("test_date_implicit_cast") { result = sql " desc verbose select if(k1='2020-12-12 12:12:12.12345', k1, '2020-12-12 12:12:12.33333') from d6; " for (String value : result) { - if (value.contains("col=k1, colUniqueId=0, type=DATETIMEV2(6)")) { + if (value.contains("col=k1, colUniqueId=0, type=datetimev2(6)")) { contain0 = true; } - if (value.contains("col=null, colUniqueId=null, type=DATETIMEV2(6)")) { + if (value.contains("col=null, colUniqueId=null, type=datetimev2(6)")) { contain1 = true; } } diff --git a/regression-test/suites/nereids_rules_p0/expression/simplify_arithmetic/test_simplify_arithmetic.groovy b/regression-test/suites/nereids_rules_p0/expression/simplify_arithmetic/test_simplify_arithmetic.groovy index e0abc3f16c8446..bc1fc20ee8fe9b 100644 --- a/regression-test/suites/nereids_rules_p0/expression/simplify_arithmetic/test_simplify_arithmetic.groovy +++ b/regression-test/suites/nereids_rules_p0/expression/simplify_arithmetic/test_simplify_arithmetic.groovy @@ -30,7 +30,7 @@ suite("test_simplify_arithmetic") { explain { sql """ select -3 - (7 + id) from test_simplify_arithmetic""" verbose true - contains """type=BIGINT""" + contains """type=bigint""" } qt_return_type_after_projection_should_be_bigint """ diff --git a/regression-test/suites/nereids_syntax_p0/explain.groovy b/regression-test/suites/nereids_syntax_p0/explain.groovy index 0e599b1beaa156..fb6af28dd443f4 100644 --- a/regression-test/suites/nereids_syntax_p0/explain.groovy +++ b/regression-test/suites/nereids_syntax_p0/explain.groovy @@ -63,7 +63,7 @@ suite("nereids_explain") { when 1>1 then cast(1 as float) else 0.0 end; """ - contains "SlotDescriptor{id=0, col=null, colUniqueId=null, type=DOUBLE, nullable=false, isAutoIncrement=false, subColPath=null}" + contains "SlotDescriptor{id=0, col=null, colUniqueId=null, type=double, nullable=false, isAutoIncrement=false, subColPath=null}" } def explainStr = sql("select sum(if(lo_tax=1,lo_tax,0)) from lineorder where false").toString() diff --git a/regression-test/suites/nereids_syntax_p0/test_simplify_comparison.groovy b/regression-test/suites/nereids_syntax_p0/test_simplify_comparison.groovy index a5b3ef28e4dea9..cb756c9173d936 100644 --- a/regression-test/suites/nereids_syntax_p0/test_simplify_comparison.groovy +++ b/regression-test/suites/nereids_syntax_p0/test_simplify_comparison.groovy @@ -100,7 +100,7 @@ suite("test_simplify_comparison") { explain { sql "verbose select * from simple_test_table_t where e = cast(1.1 as double);" - contains "CAST(e[#4] AS DOUBLE) = 1.1" + contains "CAST(e[#4] AS double) = 1.1" } explain { @@ -113,7 +113,7 @@ suite("test_simplify_comparison") { explain { sql "verbose select * from simple_test_table_t where e > cast(1.1 as double);" - contains "CAST(e[#4] AS DOUBLE) > 1.1" + contains "CAST(e[#4] AS double) > 1.1" } explain { @@ -126,7 +126,7 @@ suite("test_simplify_comparison") { explain { sql "verbose select * from simple_test_table_t where e < cast(1.1 as double);" - contains "CAST(e[#4] AS DOUBLE) < 1.1" + contains "CAST(e[#4] AS double) < 1.1" } explain { @@ -139,7 +139,7 @@ suite("test_simplify_comparison") { explain { sql "verbose select * from simple_test_table_t where e >= cast(1.1 as double);" - contains "CAST(e[#4] AS DOUBLE) >= 1.1" + contains "CAST(e[#4] AS double) >= 1.1" } explain { @@ -152,7 +152,7 @@ suite("test_simplify_comparison") { explain { sql "verbose select * from simple_test_table_t where e <= cast(1.1 as double);" - contains "CAST(e[#4] AS DOUBLE) <= 1.1" + contains "CAST(e[#4] AS double) <= 1.1" } explain { @@ -216,7 +216,7 @@ suite("test_simplify_comparison") { explain { sql "verbose select * from simple_test_table_t where e = 1.1;" - contains "CAST(e[#4] AS DOUBLE) = 1.1" + contains "CAST(e[#4] AS double) = 1.1" } explain { @@ -229,7 +229,7 @@ suite("test_simplify_comparison") { explain { sql "verbose select * from simple_test_table_t where e > 1.1;" - contains "CAST(e[#4] AS DOUBLE) > 1.1" + contains "CAST(e[#4] AS double) > 1.1" } explain { @@ -242,7 +242,7 @@ suite("test_simplify_comparison") { explain { sql "verbose select * from simple_test_table_t where e < 1.1;" - contains "CAST(e[#4] AS DOUBLE) < 1.1" + contains "CAST(e[#4] AS double) < 1.1" } explain { @@ -255,7 +255,7 @@ suite("test_simplify_comparison") { explain { sql "verbose select * from simple_test_table_t where e >= 1.1;" - contains "CAST(e[#4] AS DOUBLE) >= 1.1" + contains "CAST(e[#4] AS double) >= 1.1" } explain { @@ -268,7 +268,7 @@ suite("test_simplify_comparison") { explain { sql "verbose select * from simple_test_table_t where e <= 1.1;" - contains "CAST(e[#4] AS DOUBLE) <= 1.1" + contains "CAST(e[#4] AS double) <= 1.1" } qt_select1 """select * from simple_test_table_t where cast(a as decimal(5,1)) = 10.0;""" qt_select2 """select a.col1, cast(a.col1 as decimal(7,2)) col3, case when a.col1 is null then 15 when cast(a.col1 as decimal(7,2)) < -99997.99 then 18 when cast(a.col1 as decimal(7,2)) < 1.001 then 3 else -55 end col2 from (select 1 as col1) a;""" diff --git a/regression-test/suites/partition_p0/list_partition/test_list_partition_datatype.groovy b/regression-test/suites/partition_p0/list_partition/test_list_partition_datatype.groovy index 94d07c40291173..d678930d31ae1a 100644 --- a/regression-test/suites/partition_p0/list_partition/test_list_partition_datatype.groovy +++ b/regression-test/suites/partition_p0/list_partition/test_list_partition_datatype.groovy @@ -264,7 +264,7 @@ suite("test_list_partition_datatype", "p0") { DISTRIBUTED BY HASH(k1) BUCKETS 5 PROPERTIES ("replication_allocation" = "tag.location.default: 1") """ - exception "Invalid list value format: errCode = 2, detailMessage = Number out of range[2147483648]. type: INT" + exception "Invalid list value format: errCode = 2, detailMessage = Number out of range[2147483648]. type: int" } test { sql """ diff --git a/regression-test/suites/partition_p0/multi_partition/test_multi_column_partition.groovy b/regression-test/suites/partition_p0/multi_partition/test_multi_column_partition.groovy index 511ae23ae9b134..e63350591613ad 100644 --- a/regression-test/suites/partition_p0/multi_partition/test_multi_column_partition.groovy +++ b/regression-test/suites/partition_p0/multi_partition/test_multi_column_partition.groovy @@ -217,7 +217,7 @@ suite("test_multi_partition_key", "p0") { test { sql "ALTER TABLE test_multi_col_test_partition_add ADD PARTITION partition_add VALUES LESS THAN ('30', '1000') " + "DISTRIBUTED BY hash(k1) BUCKETS 5" - exception "Cannot assign hash distribution with different distribution cols. new is: [`k1` TINYINT NOT NULL] default is: [`k1` TINYINT NOT NULL, `k2` SMALLINT NOT NULL, `k3` INT NOT NULL]" + exception "Cannot assign hash distribution with different distribution cols. new is: [`k1` tinyint NOT NULL] default is: [`k1` tinyint NOT NULL, `k2` smallint NOT NULL, `k3` int NOT NULL]" } sql "ALTER TABLE test_multi_col_test_partition_add ADD PARTITION partition_add VALUES LESS THAN ('30', '1000') " diff --git a/regression-test/suites/partition_p0/test_partition_table_err_msg.groovy b/regression-test/suites/partition_p0/test_partition_table_err_msg.groovy index 7099e967822c93..a746b65c150a51 100644 --- a/regression-test/suites/partition_p0/test_partition_table_err_msg.groovy +++ b/regression-test/suites/partition_p0/test_partition_table_err_msg.groovy @@ -129,7 +129,7 @@ suite("test_partition_table_err_msg", "p0") { PARTITION partition_d VALUES LESS THAN ("3000") ) DISTRIBUTED BY HASH(k1) BUCKETS 13 """ - exception "Invalid range value format： errCode = 2, detailMessage = Number out of range[3000]. type: TINYINT" + exception "Invalid range value format： errCode = 2, detailMessage = Number out of range[3000]. type: tinyint" } test { sql """ diff --git a/regression-test/suites/rollup_p0/test_materialized_view_array.groovy b/regression-test/suites/rollup_p0/test_materialized_view_array.groovy index a4acde9294691e..dad735a76ce61e 100644 --- a/regression-test/suites/rollup_p0/test_materialized_view_array.groovy +++ b/regression-test/suites/rollup_p0/test_materialized_view_array.groovy @@ -67,7 +67,7 @@ suite("test_materialized_view_array", "rollup") { create_test_table.call(tableName) test { sql "CREATE MATERIALIZED VIEW idx AS select k2,k1, k3, k4, k5 from ${tableName}" - exception "errCode = 2, detailMessage = The ARRAY column[`mv_k2` ARRAY NULL] not support to create materialized view" + exception "errCode = 2, detailMessage = The ARRAY column[`mv_k2` array NULL] not support to create materialized view" } } finally { try_sql("DROP TABLE IF EXISTS ${tableName}") diff --git a/regression-test/suites/rollup_p0/test_materialized_view_struct.groovy b/regression-test/suites/rollup_p0/test_materialized_view_struct.groovy index b44500af811d76..61e8415cacc68b 100644 --- a/regression-test/suites/rollup_p0/test_materialized_view_struct.groovy +++ b/regression-test/suites/rollup_p0/test_materialized_view_struct.groovy @@ -59,7 +59,7 @@ suite("test_materialized_view_struct", "rollup") { create_test_table.call(tableName) test { sql "CREATE MATERIALIZED VIEW idx AS select k2,k1, k3, k4, k5 from ${tableName}" - exception "errCode = 2, detailMessage = The STRUCT column[`mv_k2` STRUCT NULL] not support to create materialized view" + exception "errCode = 2, detailMessage = The STRUCT column[`mv_k2` struct NULL] not support to create materialized view" } } finally { try_sql("DROP TABLE IF EXISTS ${tableName}") diff --git a/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify.groovy b/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify.groovy index 76f67820afb0c2..d3d5d790a8d466 100644 --- a/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify.groovy +++ b/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify.groovy @@ -889,7 +889,7 @@ suite("test_dup_schema_key_change_modify","p0") { sql """ DROP TABLE IF EXISTS ${tbName1} """ //Test the dup model by modify a key type from INT to VARCHAR - errorMessage = "errCode = 2, detailMessage = Can not change from wider type INT to narrower type VARCHAR(2)" + errorMessage = "errCode = 2, detailMessage = Can not change from wider type int to narrower type varchar(2)" expectException({ sql initTable sql initTableData @@ -1081,7 +1081,7 @@ suite("test_dup_schema_key_change_modify","p0") { sql """ DROP TABLE IF EXISTS ${tbName1} """ //Test the dup model by modify a key type from BIGINT to VARCHAR - errorMessage = "errCode = 2, detailMessage = Can not change from wider type BIGINT to narrower type VARCHAR(2)" + errorMessage = "errCode = 2, detailMessage = Can not change from wider type bigint to narrower type varchar(2)" expectException({ sql initTable sql initTableData diff --git a/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify1.groovy b/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify1.groovy index ecce4c04f6ea7d..37c86b314686c3 100644 --- a/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify1.groovy +++ b/regression-test/suites/schema_change_p0/test_dup_schema_key_change_modify1.groovy @@ -253,7 +253,7 @@ suite("test_dup_schema_key_change_modify1","p0") { //TODO Test the dup model by modify a key type from LARGEINT to VARCHAR //Test the dup model by modify a key type from LARGEINT to VARCHAR - errorMessage = "errCode = 2, detailMessage = Can not change from wider type LARGEINT to narrower type VARCHAR(2)" + errorMessage = "errCode = 2, detailMessage = Can not change from wider type largeint to narrower type varchar(2)" expectException({ sql initTable sql initTableData diff --git a/regression-test/suites/schema_change_p0/test_dup_schema_value_modify.groovy b/regression-test/suites/schema_change_p0/test_dup_schema_value_modify.groovy index 34e4617637eb00..83d1307f3c97e1 100644 --- a/regression-test/suites/schema_change_p0/test_dup_schema_value_modify.groovy +++ b/regression-test/suites/schema_change_p0/test_dup_schema_value_modify.groovy @@ -1298,7 +1298,7 @@ suite("test_dup_schema_value_modify","p0") { //Test the unique model by modify a value type from INT to VARCHAR - errorMessage = "errCode = 2, detailMessage = Can not change from wider type INT to narrower type VARCHAR(2)" + errorMessage = "errCode = 2, detailMessage = Can not change from wider type int to narrower type varchar(2)" expectException({ sql initTable sql initTableData @@ -1643,7 +1643,7 @@ suite("test_dup_schema_value_modify","p0") { //Test the unique model by modify a value type from BIGINT to VARCHAR(2) - errorMessage = "errCode = 2, detailMessage = Can not change from wider type BIGINT to narrower type VARCHAR(2)" + errorMessage = "errCode = 2, detailMessage = Can not change from wider type bigint to narrower type varchar(2)" expectException({ sql initTable sql initTableData @@ -1957,7 +1957,7 @@ suite("test_dup_schema_value_modify","p0") { //Test the unique model by modify a value type from LARGEINT to VARCHAR(2) - errorMessage="errCode = 2, detailMessage = Can not change from wider type LARGEINT to narrower type VARCHAR(2)" + errorMessage="errCode = 2, detailMessage = Can not change from wider type largeint to narrower type varchar(2)" expectException({ sql initTable sql initTableData diff --git a/regression-test/suites/schema_change_p0/test_unique_schema_key_change_modify.groovy b/regression-test/suites/schema_change_p0/test_unique_schema_key_change_modify.groovy index 790c2ebd692773..925e880a4e5bec 100644 --- a/regression-test/suites/schema_change_p0/test_unique_schema_key_change_modify.groovy +++ b/regression-test/suites/schema_change_p0/test_unique_schema_key_change_modify.groovy @@ -691,7 +691,7 @@ suite("test_unique_schema_key_change_modify","p0") { }, insertSql, true, "${tbName}") //Test the unique model by modify a key type from INT to VARCHAR - errorMessage = "errCode = 2, detailMessage = Can not change from wider type INT to narrower type VARCHAR(2)" + errorMessage = "errCode = 2, detailMessage = Can not change from wider type int to narrower type varchar(2)" expectException({ sql initTable sql initTableData @@ -882,7 +882,7 @@ suite("test_unique_schema_key_change_modify","p0") { }, insertSql, true, "${tbName}") //Test the unique model by modify a key type from BIGINT to VARCHAR - errorMessage = "errCode = 2, detailMessage = Can not change from wider type BIGINT to narrower type VARCHAR(2)" + errorMessage = "errCode = 2, detailMessage = Can not change from wider type bigint to narrower type varchar(2)" expectException({ sql initTable sql initTableData @@ -1111,7 +1111,7 @@ suite("test_unique_schema_key_change_modify","p0") { //TODO Test the unique model by modify a key type from LARGEINT to VARCHAR //Test the unique model by modify a key type from LARGEINT to VARCHAR - errorMessage = "errCode = 2, detailMessage = Can not change from wider type LARGEINT to narrower type VARCHAR(2)" + errorMessage = "errCode = 2, detailMessage = Can not change from wider type largeint to narrower type varchar(2)" expectException({ sql initTable sql initTableData diff --git a/regression-test/suites/schema_change_p0/test_unique_schema_value_modify.groovy b/regression-test/suites/schema_change_p0/test_unique_schema_value_modify.groovy index 8ab4374a3e9b74..2091c8e915faf5 100644 --- a/regression-test/suites/schema_change_p0/test_unique_schema_value_modify.groovy +++ b/regression-test/suites/schema_change_p0/test_unique_schema_value_modify.groovy @@ -710,7 +710,7 @@ suite("test_unique_schema_value_modify","p0") { }, insertSql, true, "${tbName}") //Test the unique model by modify a value type from INT to VARCHAR - errorMessage="errCode = 2, detailMessage = Can not change from wider type INT to narrower type VARCHAR(2)" + errorMessage="errCode = 2, detailMessage = Can not change from wider type int to narrower type varchar(2)" expectException({ sql initTable sql initTableData @@ -889,7 +889,7 @@ suite("test_unique_schema_value_modify","p0") { //Test the unique model by modify a value type from BIGINT to VARCHAR(2) - errorMessage="errCode = 2, detailMessage = Can not change from wider type BIGINT to narrower type VARCHAR(2)" + errorMessage="errCode = 2, detailMessage = Can not change from wider type bigint to narrower type varchar(2)" expectException({ sql initTable sql initTableData @@ -1072,7 +1072,7 @@ suite("test_unique_schema_value_modify","p0") { //Test the unique model by modify a value type from LARGEINT to VARCHAR(2) - errorMessage="errCode = 2, detailMessage = Can not change from wider type LARGEINT to narrower type VARCHAR(2)" + errorMessage="errCode = 2, detailMessage = Can not change from wider type largeint to narrower type varchar(2)" expectException({ sql initTable sql initTableData diff --git a/regression-test/suites/statistics/test_analyze_mv.groovy b/regression-test/suites/statistics/test_analyze_mv.groovy index 7e456d01f51edf..3f74d2266f4853 100644 --- a/regression-test/suites/statistics/test_analyze_mv.groovy +++ b/regression-test/suites/statistics/test_analyze_mv.groovy @@ -186,9 +186,9 @@ suite("test_analyze_mv") { verify_column_stats(result_all, result_sample[1]) verify_column_stats(result_all_cached, result_sample[1]) - result_sample = sql """show column stats mvTestDup(`mva_SUM__CAST(``value1`` AS BIGINT)`)""" + result_sample = sql """show column stats mvTestDup(`mva_SUM__CAST(``value1`` AS bigint)`)""" assertEquals(1, result_sample.size()) - assertEquals("mva_SUM__CAST(`value1` AS BIGINT)", result_sample[0][0]) + assertEquals("mva_SUM__CAST(`value1` AS bigint)", result_sample[0][0]) assertEquals("mv3", result_sample[0][1]) assertEquals("4.0", result_sample[0][2]) assertEquals("4.0", result_sample[0][3]) @@ -500,16 +500,16 @@ suite("test_analyze_mv") { assertEquals("SAMPLE", result_sample[0][9]) assertEquals("MANUAL", result_sample[0][11]) - result_sample = sql """show column stats mvTestDup(`mva_SUM__CAST(``value1`` AS BIGINT)`)""" + result_sample = sql """show column stats mvTestDup(`mva_SUM__CAST(``value1`` AS bigint)`)""" logger.info("result " + result_sample) if ("MANUAL" != result_sample[0][11]) { logger.info("Overwrite by auto analyze, analyze it again.") sql """analyze table mvTestDup with sync with sample rows 4000000""" - result_sample = sql """show column stats mvTestDup(`mva_SUM__CAST(``value1`` AS BIGINT)`)""" + result_sample = sql """show column stats mvTestDup(`mva_SUM__CAST(``value1`` AS bigint)`)""" logger.info("result after reanalyze " + result_sample) } assertEquals(1, result_sample.size()) - assertEquals("mva_SUM__CAST(`value1` AS BIGINT)", result_sample[0][0]) + assertEquals("mva_SUM__CAST(`value1` AS bigint)", result_sample[0][0]) assertEquals("mv3", result_sample[0][1]) assertEquals("4.0", result_sample[0][2]) assertEquals("4.0", result_sample[0][3]) @@ -577,13 +577,13 @@ suite("test_analyze_mv") { verifyTaskStatus(result_sample, "mv_key2", "mv3") verifyTaskStatus(result_sample, "mva_MAX__`value2`", "mv3") verifyTaskStatus(result_sample, "mva_MIN__`value3`", "mv3") - verifyTaskStatus(result_sample, "mva_SUM__CAST(`value1` AS BIGINT)", "mv3") + verifyTaskStatus(result_sample, "mva_SUM__CAST(`value1` AS bigint)", "mv3") // Test alter column stats sql """drop stats mvTestDup""" sql """alter table mvTestDup modify column key1 set stats ('ndv'='1', 'num_nulls'='1', 'min_value'='10', 'max_value'='40', 'row_count'='50');""" sql """alter table mvTestDup index mv3 modify column mv_key1 set stats ('ndv'='5', 'num_nulls'='0', 'min_value'='0', 'max_value'='4', 'row_count'='5');""" - sql """alter table mvTestDup index mv3 modify column `mva_SUM__CAST(``value1`` AS BIGINT)` set stats ('ndv'='10', 'num_nulls'='2', 'min_value'='1', 'max_value'='5', 'row_count'='11');""" + sql """alter table mvTestDup index mv3 modify column `mva_SUM__CAST(``value1`` AS bigint)` set stats ('ndv'='10', 'num_nulls'='2', 'min_value'='1', 'max_value'='5', 'row_count'='11');""" def result = sql """show column cached stats mvTestDup(key1)""" assertEquals(1, result.size()) @@ -609,9 +609,9 @@ suite("test_analyze_mv") { assertEquals("0", result[0][7]) assertEquals("4", result[0][8]) - result = sql """show column cached stats mvTestDup(`mva_SUM__CAST(``value1`` AS BIGINT)`)""" + result = sql """show column cached stats mvTestDup(`mva_SUM__CAST(``value1`` AS bigint)`)""" assertEquals(1, result.size()) - assertEquals("mva_SUM__CAST(`value1` AS BIGINT)", result[0][0]) + assertEquals("mva_SUM__CAST(`value1` AS bigint)", result[0][0]) assertEquals("mv3", result[0][1]) assertEquals("11.0", result[0][2]) assertEquals("10.0", result[0][3])