Make naming consistent

Author: aokolnychyi

sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/constraints/BaseConstraint.java

@@ -77,7 +77,7 @@ public String toString() {
     return toDDL();
   }
 
-  protected String toSQL(NamedReference[] columns) {
+  protected String toDDL(NamedReference[] columns) {
     StringJoiner joiner = new StringJoiner(", ");
 
     for (NamedReference column : columns) {

sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/constraints/Check.java

@@ -44,26 +44,26 @@
  */
 public class Check extends BaseConstraint {
 
-  private final String predicateSQL;
+  private final String predicateSql;
   private final Predicate predicate;
 
   private Check(
       String name,
-      String predicateSQL,
+      String predicateSql,
       Predicate predicate,
       boolean enforced,
       ValidationStatus validationStatus,
       boolean rely) {
     super(name, enforced, validationStatus, rely);
-    this.predicateSQL = predicateSQL;
+    this.predicateSql = predicateSql;
     this.predicate = predicate;
   }
 
   /**
    * Returns the SQL representation of the search condition (Spark SQL dialect).
    */
-  public String predicateSQL() {
-    return predicateSQL;
+  public String predicateSql() {
+    return predicateSql;
   }
 
   /**
@@ -75,7 +75,7 @@ public Predicate predicate() {
 
   @Override
   protected String definition() {
-    return String.format("CHECK (%s)", predicateSQL != null ? predicateSQL : predicate);
+    return String.format("CHECK (%s)", predicateSql != null ? predicateSql : predicate);
   }
 
   @Override
@@ -84,7 +84,7 @@ public boolean equals(Object other) {
     if (other == null || getClass() != other.getClass()) return false;
     Check that = (Check) other;
     return Objects.equals(name(), that.name()) &&
-        Objects.equals(predicateSQL, that.predicateSQL) &&
+        Objects.equals(predicateSql, that.predicateSql) &&
         Objects.equals(predicate, that.predicate) &&
         enforced() == that.enforced() &&
         Objects.equals(validationStatus(), that.validationStatus()) &&
@@ -93,12 +93,12 @@ public boolean equals(Object other) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(name(), predicateSQL, predicate, enforced(), validationStatus(), rely());
+    return Objects.hash(name(), predicateSql, predicate, enforced(), validationStatus(), rely());
   }
 
   public static class Builder extends BaseConstraint.Builder<Builder, Check> {
 
-    private String predicateSQL;
+    private String predicateSql;
     private Predicate predicate;
 
     Builder(String name) {
@@ -110,8 +110,8 @@ protected Builder self() {
       return this;
     }
 
-    public Builder predicateSQL(String sql) {
-      this.predicateSQL = sql;
+    public Builder predicateSql(String sql) {
+      this.predicateSql = sql;
       return this;
     }
 
@@ -121,12 +121,12 @@ public Builder predicate(Predicate predicate) {
     }
 
     public Check build() {
-      if (predicateSQL == null && predicate == null) {
+      if (predicateSql == null && predicate == null) {
         throw new SparkIllegalArgumentException(
             "INTERNAL_ERROR",
             Map.of("message", "Predicate SQL and expression can't be both null in CHECK"));
       }
-      return new Check(name(), predicateSQL, predicate, enforced(), validationStatus(), rely());
+      return new Check(name(), predicateSql, predicate, enforced(), validationStatus(), rely());
     }
   }
 }

sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/constraints/ForeignKey.java

@@ -85,9 +85,9 @@ public NamedReference[] referencedColumns() {
   protected String definition() {
     return String.format(
         "FOREIGN KEY (%s) REFERENCES %s (%s)",
-        toSQL(columns),
+        toDDL(columns),
         refTable,
-        toSQL(refColumns));
+        toDDL(refColumns));
   }
 
   @Override

sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/constraints/PrimaryKey.java

@@ -61,7 +61,7 @@ public NamedReference[] columns() {
 
   @Override
   protected String definition() {
-    return String.format("PRIMARY KEY (%s)", toSQL(columns));
+    return String.format("PRIMARY KEY (%s)", toDDL(columns));
   }
 
   @Override

sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/constraints/Unique.java

@@ -59,7 +59,7 @@ public NamedReference[] columns() {
 
   @Override
   protected String definition() {
-    return String.format("UNIQUE (%s)", toSQL(columns));
+    return String.format("UNIQUE (%s)", toDDL(columns));
   }
 
   @Override

sql/catalyst/src/test/scala/org/apache/spark/sql/connector/catalog/ConstraintSuite.scala

@@ -28,7 +28,7 @@ class ConstraintSuite extends SparkFunSuite {
 
   test("CHECK constraint toDDL") {
     val con1 = Constraint.check("con1")
-      .predicateSQL("id > 10")
+      .predicateSql("id > 10")
       .enforced(true)
       .validationStatus(ValidationStatus.VALID)
       .rely(true)
@@ -49,7 +49,7 @@ class ConstraintSuite extends SparkFunSuite {
     assert(con2.toDDL == "CONSTRAINT con2 CHECK (a.`b.c`.d = 1) NOT ENFORCED VALID RELY")
 
     val con3 = Constraint.check("con3")
-      .predicateSQL("a.b.c <=> 1")
+      .predicateSql("a.b.c <=> 1")
       .predicate(
         new Predicate(
           "<=>",
@@ -62,7 +62,7 @@ class ConstraintSuite extends SparkFunSuite {
       .build()
     assert(con3.toDDL == "CONSTRAINT con3 CHECK (a.b.c <=> 1) NOT ENFORCED INVALID NORELY")
 
-    val con4 = Constraint.check("con4").predicateSQL("a = 1").build()
+    val con4 = Constraint.check("con4").predicateSql("a = 1").build()
     assert(con4.toDDL == "CONSTRAINT con4 CHECK (a = 1) ENFORCED UNVALIDATED NORELY")
   }