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

[fix](nereids)need validate auto partition columns in DDL (#29985)

Browse Source
This commit is contained in:
starocean999
2024-01-16 11:37:30 +08:00
committed by yiguolei
parent 779ed25972
commit ce2e84e9a6
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
View File

@ -139,7 +139,6 @@ public class CreateTableInfo {
this.autoPartitionExprs = autoPartitionExprs;
this.partitionType = partitionType;
this.partitionColumns = partitionColumns;
appendColumnFromExprs();
this.partitions = partitions;
this.distribution = distribution;
this.rollups = Utils.copyRequiredList(rollups);
@ -175,7 +174,6 @@ public class CreateTableInfo {
this.autoPartitionExprs = autoPartitionExprs;
this.partitionType = partitionType;
this.partitionColumns = partitionColumns;
appendColumnFromExprs();
this.partitions = partitions;
this.distribution = distribution;
this.rollups = Utils.copyRequiredList(rollups);
@ -459,6 +457,12 @@ public class CreateTableInfo {
}
});
if (isAutoPartition) {
partitionColumns = ExpressionUtils
.collectAll(autoPartitionExprs, UnboundSlot.class::isInstance).stream()
.map(slot -> ((UnboundSlot) slot).getName()).collect(Collectors.toList());
}
if (partitionColumns != null) {
partitionColumns.forEach(p -> {
if (!columnMap.containsKey(p)) {
@ -636,7 +640,7 @@ public class CreateTableInfo {
throw new AnalysisException("odbc, mysql and broker table is no longer supported."
+ " For odbc and mysql external table, use jdbc table or jdbc catalog instead."
+ " For broker table, use table valued function instead."
+ ". Or you can temporarily set 'disable_odbc_mysql_broker_table=false'"
+ ". Or you can temporarily set 'enable_odbc_mysql_broker_table=true'"
+ " in fe.conf to reopen this feature.");
}
}
@ -796,11 +800,6 @@ public class CreateTableInfo {
* translate to catalog create table stmt
*/
public CreateTableStmt translateToLegacyStmt() {
if (isAutoPartition) {
partitionColumns = ExpressionUtils
.collectAll(autoPartitionExprs, UnboundSlot.class::isInstance).stream()
.map(slot -> ((UnboundSlot) slot).getName()).collect(Collectors.toList());
}
PartitionDesc partitionDesc = null;
if (partitionColumns != null || isAutoPartition) {
List<AllPartitionDesc> partitionDescs =
@ -894,14 +893,4 @@ public class CreateTableInfo {
}
}).collect(Collectors.toList());
}
private void appendColumnFromExprs() {
for (Expression autoExpr : autoPartitionExprs) {
for (Expression child : autoExpr.children()) {
if (child instanceof UnboundSlot) {
partitionColumns.add(((UnboundSlot) child).getName());
}
}
}
}
}