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

[fix](plan) fix wrong result for random distributed agg table with all keys not null (#36271)

Browse Source
This commit is contained in:
camby
2024-06-18 11:25:31 +08:00
committed by GitHub
parent 4a117800ca
commit e2350403a6
4 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
View File

@ -868,6 +868,10 @@ public class OlapTable extends Table implements MTMVRelatedTableIf {
return distributionColumnNames;
}
public boolean isRandomDistribution() {
return defaultDistributionInfo instanceof RandomDistributionInfo;
}
public void renamePartition(String partitionName, String newPartitionName) {
if (partitionInfo.getType() == PartitionType.UNPARTITIONED) {
// bug fix

23
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalCatalogRelation.java
View File

@ -137,18 +137,21 @@ public abstract class LogicalCatalogRelation extends LogicalRelation implements
@Override
public void computeUnique(FunctionalDependencies.Builder fdBuilder) {
Set<Slot> outputSet = Utils.fastToImmutableSet(getOutputSet());
if (table instanceof OlapTable && ((OlapTable) table).getKeysType().isAggregationFamily()) {
ImmutableSet.Builder<Slot> uniqSlots = ImmutableSet.builderWithExpectedSize(outputSet.size());
for (Slot slot : outputSet) {
if (!(slot instanceof SlotReference)) {
continue;
}
SlotReference slotRef = (SlotReference) slot;
if (slotRef.getColumn().isPresent() && slotRef.getColumn().get().isKey()) {
uniqSlots.add(slot);
if (table instanceof OlapTable) {
OlapTable olapTable = (OlapTable) table;
if (olapTable.getKeysType().isAggregationFamily() && !olapTable.isRandomDistribution()) {
ImmutableSet.Builder<Slot> uniqSlots = ImmutableSet.builderWithExpectedSize(outputSet.size());
for (Slot slot : outputSet) {
if (!(slot instanceof SlotReference)) {
continue;
}
SlotReference slotRef = (SlotReference) slot;
if (slotRef.getColumn().isPresent() && slotRef.getColumn().get().isKey()) {
uniqSlots.add(slot);
}
}
fdBuilder.addUniqueSlot(uniqSlots.build());
}
fdBuilder.addUniqueSlot(uniqSlots.build());
}
for (PrimaryKeyConstraint c : table.getPrimaryKeyConstraints()) {