yuqi1129 commented on code in PR #14609:
URL: https://github.com/apache/gravitino/pull/14609#discussion_r4467117166


##########
spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/SparkTableChangeConverter.java:
##########
@@ -93,13 +99,37 @@ public org.apache.gravitino.rel.TableChange 
toGravitinoTableChange(TableChange c
           (TableChange.UpdateColumnDefaultValue) change;
       return org.apache.gravitino.rel.TableChange.updateColumnDefaultValue(
           updateColumnDefaultValue.fieldNames(),
-          Literals.stringLiteral(updateColumnDefaultValue.newDefaultValue()));
+          convertDefaultValue(updateColumnDefaultValue.newDefaultValue()));
     } else {
       throw new UnsupportedOperationException(
           String.format("Unsupported table change %s", 
change.getClass().getName()));
     }
   }
 
+  private Expression convertDefaultValue(String sql) {
+    // Spark uses an empty SQL string for DROP DEFAULT; a string literal 
containing no characters
+    // is represented by two quote characters instead.
+    if (sql.isEmpty()) {
+      return Column.DEFAULT_VALUE_NOT_SET;
+    }
+    try {
+      org.apache.spark.sql.catalyst.expressions.Expression parsed =
+          CatalystSqlParser$.MODULE$.parseExpression(sql);
+      boolean literal =
+          parsed instanceof Literal
+              || (parsed instanceof UnaryMinus && ((UnaryMinus) 
parsed).child() instanceof Literal);
+      Preconditions.checkArgument(
+          literal && parsed.resolved() && parsed.foldable(),
+          "Only literal column defaults are supported: %s",
+          sql);
+      Object value = parsed.eval(null);
+      return SparkPartitionUtils.toGravitinoLiteral(

Review Comment:
   Fixed in 31af3fb and 798188fc. Added explicit conversions for TIMESTAMP/LTZ, 
TIMESTAMP_NTZ, and binary literals. Zoned timestamps preserve the parsed 
instant; NTZ values preserve local fields. Binary bytes now also survive REST 
serialization and JDBC default rendering.
   
   Regression tests pass on Spark 3.5.3 and 4.0.3, covering time zones, 
microseconds, pre-epoch timestamps, and empty/NUL/high-bit binary values. 
PostgreSQL binary and MySQL timestamp CREATE/ALTER default inserts are also 
verified against actual databases. Provider/version restrictions are 
documented; all 174 related tests passed locally.



##########
spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/SparkTableChangeConverter.java:
##########
@@ -93,13 +99,37 @@ public org.apache.gravitino.rel.TableChange 
toGravitinoTableChange(TableChange c
           (TableChange.UpdateColumnDefaultValue) change;
       return org.apache.gravitino.rel.TableChange.updateColumnDefaultValue(
           updateColumnDefaultValue.fieldNames(),
-          Literals.stringLiteral(updateColumnDefaultValue.newDefaultValue()));
+          convertDefaultValue(updateColumnDefaultValue.newDefaultValue()));
     } else {
       throw new UnsupportedOperationException(
           String.format("Unsupported table change %s", 
change.getClass().getName()));
     }
   }
 
+  private Expression convertDefaultValue(String sql) {
+    // Spark uses an empty SQL string for DROP DEFAULT; a string literal 
containing no characters
+    // is represented by two quote characters instead.
+    if (sql.isEmpty()) {
+      return Column.DEFAULT_VALUE_NOT_SET;
+    }
+    try {
+      org.apache.spark.sql.catalyst.expressions.Expression parsed =
+          CatalystSqlParser$.MODULE$.parseExpression(sql);
+      boolean literal =
+          parsed instanceof Literal
+              || (parsed instanceof UnaryMinus && ((UnaryMinus) 
parsed).child() instanceof Literal);

Review Comment:
   Fixed in 31af3fb (included in current head 798188fc). UnaryPositive with a 
literal child is now accepted consistently with UnaryMinus. Regression tests 
for +42, +42L, and +12.34 pass on Spark 3.5.3 and 4.0.3; arithmetic expressions 
and unsupported unary operands remain rejected.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to