Skip to content

[SPARK-56652][SQL] Always emit RELY/NORELY in DESCRIBE EXTENDED constraint output #55590

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

Closed
yyanyy wants to merge 2 commits into from
Closed

[SPARK-56652][SQL] Always emit RELY/NORELY in DESCRIBE EXTENDED constraint output #55590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0dc632
[SPARK-XXXXX][SQL] Always emit RELY/NORELY in DESCRIBE EXTENDED const…
yyanyy Apr 28, 2026
1e3e911
Address review: simplify toDDL to delegate to toDescription
yyanyy Apr 29, 2026
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
17 changes: 5 additions & 12 deletions ...lyst/src/main/java/org/apache/spark/sql/connector/catalog/constraints/BaseConstraint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,24 +65,17 @@ public boolean rely() {
public String toDDL() {
// The validation status is not included in the DDL output as it's not part of
// the Spark SQL syntax for constraints.
return "CONSTRAINT " + name + " " + toDescription();
}

public String toDescription() {
Copy link
Copy Markdown
Member

@gengliangwang gengliangwang Apr 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this PR establishes the invariant toDDL == "CONSTRAINT " + name + " " + toDescription, consider implementing it structurally so the two methods can't drift apart, e.g. simplify toDDL above to:

@Override
public String toDDL() {
  // The validation status is not included in the DDL output as it's not part of
  // the Spark SQL syntax for constraints.
  return "CONSTRAINT " + name + " " + toDescription();
}

This also removes the duplicated String.format template.

Copy link
Copy Markdown
Contributor Author

@yyanyy yyanyy Apr 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good point, updated, thanks!

return String.format(
"CONSTRAINT %s %s %s %s",
name,
"%s %s %s",
definition(),
enforced ? "ENFORCED" : "NOT ENFORCED",
rely ? "RELY" : "NORELY");
}

public String toDescription() {
StringJoiner joiner = new StringJoiner(" ");
joiner.add(definition());
joiner.add(enforced ? "ENFORCED" : "NOT ENFORCED");
if (rely) {
joiner.add("RELY");
}
return joiner.toString();
}

@Override
public String toString() {
return toDDL();
Expand Down
15 changes: 7 additions & 8 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/command/v2/DescribeTableSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,21 +360,20 @@ class DescribeTableSuite extends command.DescribeTableSuiteBase
|$defaultUsing
""".stripMargin)

// Skipped showing NORELY since it is the default value.
// ENFORCED/NOT ENFORCED and RELY/NORELY are always emitted to match SHOW CREATE TABLE.
var expectedConstraintsDdl = Array(
"# Constraints,,",
"pk_table_pk,PRIMARY KEY (id) NOT ENFORCED,",
"pk_table_pk,PRIMARY KEY (id) NOT ENFORCED NORELY,",
s"fk_a,FOREIGN KEY (a) REFERENCES $fkTable (id) NOT ENFORCED RELY,",
"uk_b,UNIQUE (b) NOT ENFORCED,",
"uk_a_c,UNIQUE (a, c) NOT ENFORCED,",
"c1,CHECK (c IS NOT NULL) ENFORCED,",
"c2,CHECK (id > 0) ENFORCED,"
"uk_b,UNIQUE (b) NOT ENFORCED NORELY,",
"uk_a_c,UNIQUE (a, c) NOT ENFORCED NORELY,",
"c1,CHECK (c IS NOT NULL) ENFORCED NORELY,",
"c2,CHECK (id > 0) ENFORCED NORELY,"
)
var descDdL = sql(s"DESCRIBE EXTENDED $tbl").collect().map(_.mkString(","))
.dropWhile(_ != "# Constraints,,")
assert(descDdL === expectedConstraintsDdl)

// Show non-default value for RELY.
sql(s"ALTER TABLE $tbl ADD CONSTRAINT c3 CHECK (b IS NOT NULL) RELY")
descDdL = sql(s"DESCRIBE EXTENDED $tbl").collect().map(_.mkString(","))
.dropWhile(_ != "# Constraints,,")
Expand All @@ -386,7 +385,7 @@ class DescribeTableSuite extends command.DescribeTableSuiteBase
descDdL = sql(s"DESCRIBE EXTENDED $tbl").collect().map(_.mkString(","))
.dropWhile(_ != "# Constraints,,")
assert(descDdL === expectedConstraintsDdl
.filter(_ != "c1,CHECK (c IS NOT NULL) ENFORCED,"))
.filter(_ != "c1,CHECK (c IS NOT NULL) ENFORCED NORELY,"))
}
}
}
Expand Down