Skip to content

branch-4.0: [fix](constraint) avoid throw exception for upgrade compatibility #61664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 1 commit into from
Mar 25, 2026
+13 −17
Merged

branch-4.0: [fix](constraint) avoid throw exception for upgrade compatibility #61664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/constraint/PrimaryKeyConstraint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,16 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.gson.annotations.SerializedName;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.HashSet;
import java.util.List;
import java.util.Set;

public class PrimaryKeyConstraint extends Constraint {
public static final Logger LOG = LogManager.getLogger(PrimaryKeyConstraint.class);

@SerializedName(value = "cols")
private final Set<String> columns;

Expand All @@ -55,9 +59,15 @@ public void addForeignTable(TableIf table) {
}

public List<TableIf> getForeignTables() {
return foreignTables.stream()
.map(TableIdentifier::toTableIf)
.collect(ImmutableList.toImmutableList());
ImmutableList.Builder<TableIf> tableIfBuilder = ImmutableList.builder();
for (TableIdentifier tableIdentifier : foreignTables) {
try {
tableIfBuilder.add(tableIdentifier.toTableIf());
} catch (Exception e) {
LOG.warn("get foreign table failed", e);
}
}
return tableIfBuilder.build();
}

public void removeForeignTable(TableIdentifier tableIdentifier) {
Expand Down
14 changes: 0 additions & 14 deletions ...re/src/main/java/org/apache/doris/nereids/trees/plans/commands/DropConstraintCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

import org.apache.doris.catalog.TableIf;
import org.apache.doris.catalog.constraint.Constraint;
import org.apache.doris.catalog.constraint.ForeignKeyConstraint;
import org.apache.doris.catalog.constraint.PrimaryKeyConstraint;
import org.apache.doris.nereids.NereidsPlanner;
import org.apache.doris.nereids.exceptions.AnalysisException;
import org.apache.doris.nereids.properties.PhysicalProperties;
Expand All @@ -33,11 +31,9 @@
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.StmtExecutor;

import com.google.common.collect.Lists;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.List;
import java.util.Set;

/**
Expand All @@ -58,16 +54,6 @@ public DropConstraintCommand(String name, LogicalPlan plan) {
this.plan = plan;
}

private static List<TableIf> getConstraintRelatedTables(Constraint constraint) {
List<TableIf> tables = Lists.newArrayList();
if (constraint instanceof PrimaryKeyConstraint) {
tables.addAll(((PrimaryKeyConstraint) constraint).getForeignTables());
} else if (constraint instanceof ForeignKeyConstraint) {
tables.add(((ForeignKeyConstraint) constraint).getReferencedTable());
}
return tables;
}

@Override
public void run(ConnectContext ctx, StmtExecutor executor) throws Exception {
TableIf table = extractTable(ctx, plan);
Expand Down
Loading