From 57e248e09b9c929cd4a0e52e198e11ca84c928ef Mon Sep 17 00:00:00 2001 From: Xin Liao Date: Mon, 24 Oct 2022 21:16:38 +0800 Subject: [PATCH] [feature-wip](unique-key-merge-on-write) check whether the partition column is a key column when create table for MOW table (#13490) --- .../java/org/apache/doris/analysis/PartitionDesc.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionDesc.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionDesc.java index d9ffa793b2..37130c41eb 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionDesc.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionDesc.java @@ -24,6 +24,7 @@ import org.apache.doris.catalog.PartitionType; import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.DdlException; +import org.apache.doris.common.util.PropertyAnalyzer; import org.apache.doris.qe.ConnectContext; import com.google.common.collect.Lists; @@ -63,6 +64,13 @@ public class PartitionDesc { throw new AnalysisException("No partition columns."); } + // `analyzeUniqueKeyMergeOnWrite` would modify `properties`, which will be used later, + // so we just clone a properties map here. + boolean enableUniqueKeyMergeOnWrite = false; + if (otherProperties != null) { + enableUniqueKeyMergeOnWrite = + PropertyAnalyzer.analyzeUniqueKeyMergeOnWrite(Maps.newHashMap(otherProperties)); + } Set partColNames = Sets.newTreeSet(String.CASE_INSENSITIVE_ORDER); for (String partitionCol : partitionColNames) { if (!partColNames.add(partitionCol)) { @@ -72,7 +80,8 @@ public class PartitionDesc { boolean found = false; for (ColumnDef columnDef : columnDefs) { if (columnDef.getName().equals(partitionCol)) { - if (!columnDef.isKey() && columnDef.getAggregateType() != AggregateType.NONE) { + if (!columnDef.isKey() && (columnDef.getAggregateType() != AggregateType.NONE + || enableUniqueKeyMergeOnWrite)) { throw new AnalysisException("The partition column could not be aggregated column"); } if (columnDef.getType().isFloatingPointType()) {