This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 7212e860ea3 [refactor](catalog) decouple Column from Non-essential
classes (#61816)
7212e860ea3 is described below
commit 7212e860ea33bb48afbcb49de24af15e8ddebd61
Author: morrySnow <[email protected]>
AuthorDate: Sat Mar 28 17:31:42 2026 +0800
[refactor](catalog) decouple Column from Non-essential classes (#61816)
---
.../main/java/org/apache/doris/catalog/Column.java | 33 ++------------
.../apache/doris/catalog/GeneratedColumnInfo.java | 34 ++------------
.../java/org/apache/doris/info/TableNameInfo.java | 17 +------
.../apache/doris/mysql/MysqlHandshakePacket.java | 4 --
.../trees/plans/commands/info/CreateTableInfo.java | 7 ---
.../plans/commands/info/GeneratedColumnDesc.java | 7 +--
.../java/org/apache/doris/nereids/util/Utils.java | 2 +-
.../java/org/apache/doris/qe/GlobalVariable.java | 8 +++-
.../doris/common/proc/IndexSchemaProcNodeTest.java | 1 -
.../plans/commands/AlterTableCommandTest.java | 53 ++++++++++++----------
.../data/nereids_syntax_p0/constraint.out | 4 +-
11 files changed, 49 insertions(+), 121 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java
index d62dafa5858..94a46864eb9 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java
@@ -19,9 +19,7 @@ package org.apache.doris.catalog;
import org.apache.doris.analysis.DefaultValueExprDef;
import org.apache.doris.analysis.Expr;
-import org.apache.doris.analysis.ExprToSqlVisitor;
import org.apache.doris.analysis.SlotRef;
-import org.apache.doris.analysis.ToSqlParams;
import org.apache.doris.common.CaseSensibility;
import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
@@ -77,15 +75,11 @@ public class Column implements GsonPostProcessable {
// NOTE: you should name hidden column start with '__DORIS_'
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
private static final String COLUMN_ARRAY_CHILDREN = "item";
- private static final String COLUMN_STRUCT_CHILDREN = "field";
private static final String COLUMN_AGG_ARGUMENT_CHILDREN = "argument";
public static final int COLUMN_UNIQUE_ID_INIT_VALUE = -1;
private static final String COLUMN_MAP_KEY = "key";
private static final String COLUMN_MAP_VALUE = "value";
- public static final Column UNSUPPORTED_COLUMN = new Column("unknown",
Type.UNSUPPORTED, true, null, true, -1,
- null, "invalid", true, null, -1, null);
-
@SerializedName(value = "name")
private String name;
@SerializedName(value = "type")
@@ -281,8 +275,8 @@ public class Column implements GsonPostProcessable {
}
this.sessionVariables = sessionVariables;
- if (type.isAggStateType()) {
- AggStateType aggState = (AggStateType) type;
+ if (this.type.isAggStateType()) {
+ AggStateType aggState = (AggStateType) (this.type);
for (int i = 0; i < aggState.getSubTypes().size(); i++) {
Column c = new Column(COLUMN_AGG_ARGUMENT_CHILDREN,
aggState.getSubTypes().get(i));
c.setIsAllowNull(aggState.getSubTypeNullables().get(i));
@@ -385,10 +379,6 @@ public class Column implements GsonPostProcessable {
this.children.add(column);
}
- public void setDefineName(String defineName) {
- this.defineName = defineName;
- }
-
public String getDefineName() {
if (defineName != null) {
return defineName;
@@ -415,25 +405,9 @@ public class Column implements GsonPostProcessable {
}
public String getDisplayName() {
- if (defineExpr == null) {
- return name;
- } else {
- return MaterializedIndexMeta.normalizeName(
- defineExpr.accept(ExprToSqlVisitor.INSTANCE,
ToSqlParams.WITHOUT_TABLE));
- }
- }
-
- public String getNameWithoutPrefix(String prefix) {
- if (isNameWithPrefix(prefix)) {
- return name.substring(prefix.length());
- }
return name;
}
- public boolean isNameWithPrefix(String prefix) {
- return this.name.startsWith(prefix);
- }
-
public void setIsKey(boolean isKey) {
// column is key, aggregationType is always null,
isAggregationTypeImplicit is always false.
if (isKey) {
@@ -1081,8 +1055,7 @@ public class Column implements GsonPostProcessable {
sb.append(" ").append(aggregationType.toSql());
}
if (generatedColumnInfo != null) {
- sb.append(" AS (").append(generatedColumnInfo.getExpr()
- .accept(ExprToSqlVisitor.INSTANCE,
ToSqlParams.WITH_TABLE)).append(")");
+ sb.append(" AS
(").append(generatedColumnInfo.getExprSql()).append(")");
}
if (isAllowNull) {
sb.append(" NULL");
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/GeneratedColumnInfo.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/GeneratedColumnInfo.java
index eff55fc8a47..24545662242 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/GeneratedColumnInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/GeneratedColumnInfo.java
@@ -18,11 +18,10 @@
package org.apache.doris.catalog;
import org.apache.doris.analysis.Expr;
-import org.apache.doris.analysis.ExprToSqlVisitor;
-import org.apache.doris.analysis.ToSqlParams;
import com.google.gson.annotations.SerializedName;
-import jline.internal.Nullable;
+
+import java.util.Objects;
/**GeneratedColumnInfo*/
public class GeneratedColumnInfo {
@@ -39,26 +38,11 @@ public class GeneratedColumnInfo {
@SerializedName(value = "e")
private final Expr expr;
- /* e.g. a,b,c=a+b,d=c+1 -> a,b,c=a+b,d=a+b+1
- e.g. this is column d generated column info
- expr is c+1, expandExprForLoad is a+b+1
- expandExprForLoad is used in streamload, routineload, mysqlload, etc */
- @SerializedName(value = "efl")
- private Expr expandExprForLoad;
-
/** constructor */
- public GeneratedColumnInfo(@Nullable String exprSql, Expr expr) {
- this(exprSql, expr, null);
- }
-
- public GeneratedColumnInfo(@Nullable String exprSql, Expr expr, Expr
expandExprForLoad) {
- if (exprSql != null) {
- this.exprSql = exprSql;
- } else {
- this.exprSql = expr.accept(ExprToSqlVisitor.INSTANCE,
ToSqlParams.WITHOUT_TABLE);
- }
+ public GeneratedColumnInfo(String exprSql, Expr expr) {
+ Objects.requireNonNull(exprSql, "exprSql is null");
+ this.exprSql = exprSql;
this.expr = expr;
- this.expandExprForLoad = expandExprForLoad;
this.type = GeneratedColumnType.STORED;
}
@@ -69,12 +53,4 @@ public class GeneratedColumnInfo {
public Expr getExpr() {
return expr;
}
-
- public Expr getExpandExprForLoad() {
- return expandExprForLoad;
- }
-
- public void setExpandExprForLoad(Expr expandExprForLoad) {
- this.expandExprForLoad = expandExprForLoad;
- }
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/info/TableNameInfo.java
b/fe/fe-core/src/main/java/org/apache/doris/info/TableNameInfo.java
index c4a1d5989c5..0f349f56529 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/info/TableNameInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/info/TableNameInfo.java
@@ -250,7 +250,7 @@ public class TableNameInfo {
@Override
public String toString() {
StringBuilder stringBuilder = new StringBuilder();
- if (ctl != null && !ctl.equals(InternalCatalog.INTERNAL_CATALOG_NAME))
{
+ if (ctl != null) {
stringBuilder.append(ctl).append(".");
}
if (db != null) {
@@ -279,21 +279,6 @@ public class TableNameInfo {
* toSql
*/
public String toSql() {
- StringBuilder stringBuilder = new StringBuilder();
- if (ctl != null && !ctl.equals(InternalCatalog.INTERNAL_CATALOG_NAME))
{
- stringBuilder.append("`").append(ctl).append("`.");
- }
- if (db != null) {
- stringBuilder.append("`").append(db).append("`.");
- }
- stringBuilder.append("`").append(tbl).append("`");
- return stringBuilder.toString();
- }
-
- /**
- * toFullyQualified
- */
- public String toFullyQualified() {
StringBuilder stringBuilder = new StringBuilder();
if (ctl != null) {
stringBuilder.append("`").append(ctl).append("`.");
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlHandshakePacket.java
b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlHandshakePacket.java
index 34ea8f7ee0b..b4a4ff60fbe 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlHandshakePacket.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlHandshakePacket.java
@@ -24,10 +24,6 @@ public class MysqlHandshakePacket extends MysqlPacket {
private static final int SCRAMBLE_LENGTH = 20;
// Version of handshake packet, since MySQL 3.21.0, Handshake of protocol
10 is used
private static final int PROTOCOL_VERSION = 10;
- // JDBC uses this version to check which protocol the server support
- // Set the patch version to 99 to prevent the vulnerability scanning tool
from
- // falsely reporting MySQL vulnerabilities
- public static final String DEFAULT_SERVER_VERSION = "5.7.99";
// 33 stands for UTF-8 character set
private static final int CHARACTER_SET = 33;
// use default capability for all
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
index aee236f7392..3051ae9a800 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
@@ -1224,13 +1224,6 @@ public class CreateTableInfo {
// expand expr
GeneratedColumnUtil.rewriteColumns(exprAndNames);
- for (ExprAndName exprAndname : exprAndNames) {
- if (nameToColumnDefinition.containsKey(exprAndname.getName())) {
- ColumnDefinition columnDefinition =
nameToColumnDefinition.get(exprAndname.getName());
- Optional<GeneratedColumnDesc> info =
columnDefinition.getGeneratedColumnDesc();
- info.ifPresent(genCol ->
genCol.setExpandExprForLoad(exprAndname.getExpr()));
- }
- }
}
private static class SlotReplacer extends
DefaultExpressionRewriter<Map<String, Slot>> {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/GeneratedColumnDesc.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/GeneratedColumnDesc.java
index 6175389dcdd..5639859bbd7 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/GeneratedColumnDesc.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/GeneratedColumnDesc.java
@@ -32,7 +32,6 @@ public class GeneratedColumnDesc {
private final GeneratedColumnType type;
private final String exprSql;
private Expr expr;
- private Expr expandExprForLoad;
private final Expression expression;
/** constructor */
@@ -50,15 +49,11 @@ public class GeneratedColumnDesc {
this.expr = expr;
}
- public void setExpandExprForLoad(Expr expandExprForLoad) {
- this.expandExprForLoad = expandExprForLoad;
- }
-
public Expression getExpression() {
return expression;
}
public GeneratedColumnInfo translateToInfo() {
- return new GeneratedColumnInfo(exprSql, expr, expandExprForLoad);
+ return new GeneratedColumnInfo(exprSql, expr);
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/util/Utils.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/util/Utils.java
index fe5fc88284f..a5b6080cb06 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/util/Utils.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/util/Utils.java
@@ -635,7 +635,7 @@ public class Utils {
for (AliasInfo aliasInfo : selectList) {
columnJoiner.add(aliasInfo.toString());
}
- String sql = "SELECT " + columnJoiner.toString() + " FROM " +
tableName.toFullyQualified() + " " + whereClause;
+ String sql = "SELECT " + columnJoiner + " FROM " + tableName.toSql() +
" " + whereClause;
return new NereidsParser().parseSingle(sql);
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
index d304c78ded4..3eb035bf747 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
@@ -20,7 +20,6 @@ package org.apache.doris.qe;
import org.apache.doris.common.Config;
import org.apache.doris.common.Version;
import org.apache.doris.common.util.TimeUtils;
-import org.apache.doris.mysql.MysqlHandshakePacket;
import com.google.common.collect.Lists;
@@ -33,6 +32,11 @@ import java.util.List;
// NOTE: If you want access your variable safe, please hold VariableMgr's lock
before access.
public final class GlobalVariable {
+ // JDBC uses this version to check which protocol the server support
+ // Set the patch version to 99 to prevent the vulnerability scanning tool
from
+ // falsely reporting MySQL vulnerabilities
+ public static final String DEFAULT_SERVER_VERSION = "5.7.99";
+
public static final int VARIABLE_VERSION_0 = 0;
public static final int VARIABLE_VERSION_100 = 100;
public static final int VARIABLE_VERSION_101 = 101;
@@ -98,7 +102,7 @@ public final class GlobalVariable {
+ (Config.isCloudMode() ? " (Cloud Mode)" : "");
@VariableMgr.VarAttr(name = VERSION)
- public static String version = MysqlHandshakePacket.DEFAULT_SERVER_VERSION;
+ public static String version = DEFAULT_SERVER_VERSION;
// 0: table names are stored as specified and comparisons are case
sensitive.
// 1: table names are stored in lowercase on disk and comparisons are not
case sensitive.
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/common/proc/IndexSchemaProcNodeTest.java
b/fe/fe-core/src/test/java/org/apache/doris/common/proc/IndexSchemaProcNodeTest.java
index d67b88f5880..3d4e1b8f573 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/common/proc/IndexSchemaProcNodeTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/common/proc/IndexSchemaProcNodeTest.java
@@ -49,7 +49,6 @@ public class IndexSchemaProcNodeTest {
ProcResult procResult = indexSchemaProcNode.fetchResult();
Assert.assertEquals(2, procResult.getRows().size());
Assert.assertTrue(procResult.getRows().get(1).contains(column2.getDisplayName()));
-
Assert.assertFalse(procResult.getRows().get(1).contains(column2.getName()));
Assert.assertEquals("The column size should be 6", 6,
procResult.getColumnNames().size());
Assert.assertEquals("The row size should be 6", 6,
procResult.getRows().get(1).size());
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/commands/AlterTableCommandTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/commands/AlterTableCommandTest.java
index 9ca8cf4cc95..2a07c4114af 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/commands/AlterTableCommandTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/plans/commands/AlterTableCommandTest.java
@@ -38,21 +38,22 @@ public class AlterTableCommandTest {
List<AlterTableOp> ops = new ArrayList<>();
ops.add(new EnableFeatureOp("BATCH_DELETE"));
AlterTableCommand alterTableCommand = new AlterTableCommand(new
TableNameInfo("db", "test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(), "ALTER TABLE
`db`.`test` ENABLE FEATURE \"BATCH_DELETE\"");
+ Assertions.assertEquals("ALTER TABLE `internal`.`db`.`test` ENABLE
FEATURE \"BATCH_DELETE\"", alterTableCommand.toSql());
ops.clear();
ops.add(new EnableFeatureOp("UPDATE_FLEXIBLE_COLUMNS"));
alterTableCommand = new AlterTableCommand(new TableNameInfo("db",
"test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(),
- "ALTER TABLE `db`.`test` ENABLE FEATURE
\"UPDATE_FLEXIBLE_COLUMNS\"");
+ Assertions.assertEquals("ALTER TABLE `internal`.`db`.`test` ENABLE
FEATURE \"UPDATE_FLEXIBLE_COLUMNS\"",
+ alterTableCommand.toSql());
ops.clear();
Map<String, String> properties = new HashMap<>();
properties.put("function_column.sequence_type", "int");
ops.add(new EnableFeatureOp("SEQUENCE_LOAD", properties));
alterTableCommand = new AlterTableCommand(new TableNameInfo("db",
"test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(),
- "ALTER TABLE `db`.`test` ENABLE FEATURE \"SEQUENCE_LOAD\" WITH
PROPERTIES (\"function_column.sequence_type\" = \"int\")");
+ Assertions.assertEquals(
+ "ALTER TABLE `internal`.`db`.`test` ENABLE FEATURE
\"SEQUENCE_LOAD\" WITH PROPERTIES (\"function_column.sequence_type\" =
\"int\")",
+ alterTableCommand.toSql());
}
@Test
@@ -60,24 +61,25 @@ public class AlterTableCommandTest {
List<AlterTableOp> ops = new ArrayList<>();
ops.add(new AddPartitionFieldOp("bucket", 16, "id", null));
AlterTableCommand alterTableCommand = new AlterTableCommand(new
TableNameInfo("db", "test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(), "ALTER TABLE
`db`.`test` ADD PARTITION KEY bucket(16, id)");
+ Assertions.assertEquals("ALTER TABLE `internal`.`db`.`test` ADD
PARTITION KEY bucket(16, id)", alterTableCommand.toSql());
ops.clear();
ops.add(new AddPartitionFieldOp("year", null, "ts", null));
alterTableCommand = new AlterTableCommand(new TableNameInfo("db",
"test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(), "ALTER TABLE
`db`.`test` ADD PARTITION KEY year(ts)");
+ Assertions.assertEquals("ALTER TABLE `internal`.`db`.`test` ADD
PARTITION KEY year(ts)",
+ alterTableCommand.toSql());
ops.clear();
ops.add(new AddPartitionFieldOp(null, null, "category", null));
alterTableCommand = new AlterTableCommand(new TableNameInfo("db",
"test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(), "ALTER TABLE
`db`.`test` ADD PARTITION KEY category");
+ Assertions.assertEquals("ALTER TABLE `internal`.`db`.`test` ADD
PARTITION KEY category", alterTableCommand.toSql());
// Test with custom partition field name
ops.clear();
ops.add(new AddPartitionFieldOp("day", null, "ts", "ts_day"));
alterTableCommand = new AlterTableCommand(new TableNameInfo("db",
"test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(),
- "ALTER TABLE `db`.`test` ADD PARTITION KEY day(ts) AS ts_day");
+ Assertions.assertEquals("ALTER TABLE `internal`.`db`.`test` ADD
PARTITION KEY day(ts) AS ts_day",
+ alterTableCommand.toSql());
}
@Test
@@ -85,17 +87,19 @@ public class AlterTableCommandTest {
List<AlterTableOp> ops = new ArrayList<>();
ops.add(new DropPartitionFieldOp("id_bucket_16"));
AlterTableCommand alterTableCommand = new AlterTableCommand(new
TableNameInfo("db", "test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(), "ALTER TABLE
`db`.`test` DROP PARTITION KEY id_bucket_16");
+ Assertions.assertEquals("ALTER TABLE `internal`.`db`.`test` DROP
PARTITION KEY id_bucket_16",
+ alterTableCommand.toSql());
ops.clear();
ops.add(new DropPartitionFieldOp("ts_year"));
alterTableCommand = new AlterTableCommand(new TableNameInfo("db",
"test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(), "ALTER TABLE
`db`.`test` DROP PARTITION KEY ts_year");
+ Assertions.assertEquals("ALTER TABLE `internal`.`db`.`test` DROP
PARTITION KEY ts_year",
+ alterTableCommand.toSql());
ops.clear();
ops.add(new DropPartitionFieldOp("category"));
alterTableCommand = new AlterTableCommand(new TableNameInfo("db",
"test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(), "ALTER TABLE
`db`.`test` DROP PARTITION KEY category");
+ Assertions.assertEquals("ALTER TABLE `internal`.`db`.`test` DROP
PARTITION KEY category", alterTableCommand.toSql());
}
@Test
@@ -115,37 +119,40 @@ public class AlterTableCommandTest {
ops.add(new ReplacePartitionFieldOp("ts_year", null, null, null,
"month", null, "ts", null));
AlterTableCommand alterTableCommand = new AlterTableCommand(new
TableNameInfo("db", "test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(),
- "ALTER TABLE `db`.`test` REPLACE PARTITION KEY ts_year WITH
month(ts)");
+ Assertions.assertEquals("ALTER TABLE `internal`.`db`.`test` REPLACE
PARTITION KEY ts_year WITH month(ts)",
+ alterTableCommand.toSql());
ops.clear();
ops.add(new ReplacePartitionFieldOp("id_bucket_10", null, null, null,
"bucket", 16, "id", null));
alterTableCommand = new AlterTableCommand(new TableNameInfo("db",
"test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(),
- "ALTER TABLE `db`.`test` REPLACE PARTITION KEY id_bucket_10
WITH bucket(16, id)");
+ Assertions.assertEquals(
+ "ALTER TABLE `internal`.`db`.`test` REPLACE PARTITION KEY
id_bucket_10 WITH bucket(16, id)",
+ alterTableCommand.toSql());
ops.clear();
ops.add(new ReplacePartitionFieldOp("category", null, null, null,
"bucket", 8, "id", null));
alterTableCommand = new AlterTableCommand(new TableNameInfo("db",
"test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(),
- "ALTER TABLE `db`.`test` REPLACE PARTITION KEY category WITH
bucket(8, id)");
+ Assertions.assertEquals("ALTER TABLE `internal`.`db`.`test` REPLACE
PARTITION KEY category WITH bucket(8, id)",
+ alterTableCommand.toSql());
// Test with custom partition field name
ops.clear();
ops.add(new ReplacePartitionFieldOp("ts_year", null, null, null,
"day", null, "ts", "day_of_ts"));
alterTableCommand = new AlterTableCommand(new TableNameInfo("db",
"test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(),
- "ALTER TABLE `db`.`test` REPLACE PARTITION KEY ts_year WITH
day(ts) AS day_of_ts");
+ Assertions.assertEquals(
+ "ALTER TABLE `internal`.`db`.`test` REPLACE PARTITION KEY
ts_year WITH day(ts) AS day_of_ts",
+ alterTableCommand.toSql());
// Test with old partition expression
ops.clear();
ops.add(new ReplacePartitionFieldOp(null, "bucket", 16, "id",
"truncate", 5, "code", "code_trunc"));
alterTableCommand = new AlterTableCommand(new TableNameInfo("db",
"test"), ops);
- Assertions.assertEquals(alterTableCommand.toSql(),
- "ALTER TABLE `db`.`test` REPLACE PARTITION KEY bucket(16, id)
WITH truncate(5, code) AS code_trunc");
+ Assertions.assertEquals(
+ "ALTER TABLE `internal`.`db`.`test` REPLACE PARTITION KEY
bucket(16, id) WITH truncate(5, code) AS code_trunc",
+ alterTableCommand.toSql());
}
}
diff --git a/regression-test/data/nereids_syntax_p0/constraint.out
b/regression-test/data/nereids_syntax_p0/constraint.out
index cfb38f34dd4..9f56e82e050 100644
--- a/regression-test/data/nereids_syntax_p0/constraint.out
+++ b/regression-test/data/nereids_syntax_p0/constraint.out
@@ -7,12 +7,12 @@ pk PRIMARY KEY PRIMARY KEY (id)
uk UNIQUE UNIQUE (id)
-- !add_foreign --
-fk1 FOREIGN KEY FOREIGN KEY (id) REFERENCES
regression_test_nereids_syntax_p0.t2 (id)
+fk1 FOREIGN KEY FOREIGN KEY (id) REFERENCES
internal.regression_test_nereids_syntax_p0.t2 (id)
pk PRIMARY KEY PRIMARY KEY (id)
uk UNIQUE UNIQUE (id)
-- !drop_uk --
-fk1 FOREIGN KEY FOREIGN KEY (id) REFERENCES
regression_test_nereids_syntax_p0.t2 (id)
+fk1 FOREIGN KEY FOREIGN KEY (id) REFERENCES
internal.regression_test_nereids_syntax_p0.t2 (id)
pk PRIMARY KEY PRIMARY KEY (id)
-- !drop_fk --
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
