[core] new column exception shows the specific column name (apache#2746)

tongcheng-elong · Jan 20, 2024 · e26e6b5 · e26e6b5
1 parent 52d0aa2
commit e26e6b5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/docs/content/program-api/java-api.md b/docs/content/program-api/java-api.md
@@ -310,7 +310,7 @@ public class RenameTable {
 
 You can use the catalog to alter a table, but you need to pay attention to the following points.
 
-- Add column cannot specify NOT NULL.
+- Column %s cannot specify NOT NULL in the %s table.
 - Cannot update partition column type in the table.
 - Cannot change nullability of primary key.
 - If the type of the column is nested row type, update the column type is not supported.

diff --git a/paimon-core/src/main/java/org/apache/paimon/schema/SchemaManager.java b/paimon-core/src/main/java/org/apache/paimon/schema/SchemaManager.java
@@ -189,7 +189,9 @@ public TableSchema commitChanges(List<SchemaChange> changes)
                     }
                     Preconditions.checkArgument(
                             addColumn.dataType().isNullable(),
-                            "ADD COLUMN cannot specify NOT NULL.");
+                            "Column %s cannot specify NOT NULL in the %s table.",
+                            addColumn.fieldName(),
+                            fromPath(tableRoot.toString(), true).getFullName());
                     int id = highestFieldId.incrementAndGet();
                     DataType dataType =
                             ReassignFieldId.reassign(addColumn.dataType(), highestFieldId);

diff --git a/paimon-core/src/test/java/org/apache/paimon/table/SchemaEvolutionTest.java b/paimon-core/src/test/java/org/apache/paimon/table/SchemaEvolutionTest.java
@@ -264,7 +264,10 @@ public void testAddField() throws Exception {
                                                         null,
                                                         null))))
                 .isInstanceOf(IllegalArgumentException.class)
-                .hasMessage("ADD COLUMN cannot specify NOT NULL.");
+                .hasMessage(
+                        String.format(
+                                "Column %s cannot specify NOT NULL in the %s table.",
+                                "f4", identifier.getFullName()));
     }
 
     @Test

diff --git a/...imon-flink-cdc/src/main/java/org/apache/paimon/flink/action/cdc/CdcActionCommonUtils.java b/...imon-flink-cdc/src/main/java/org/apache/paimon/flink/action/cdc/CdcActionCommonUtils.java
@@ -221,8 +221,9 @@ public static Schema buildPaimonSchema(
             for (String key : specifiedPrimaryKeys) {
                 checkArgument(
                         sourceColumns.contains(key),
-                        "Specified primary key '%s' does not exist in source tables or computed columns.",
-                        key);
+                        "Specified primary key '%s' does not exist in source tables or computed columns %s.",
+                        key,
+                        sourceColumns);
             }
             builder.primaryKey(listCaseConvert(specifiedPrimaryKeys, caseSensitive));
         } else if (!sourceSchema.primaryKeys().isEmpty()) {

diff --git a/...dc/src/test/java/org/apache/paimon/flink/action/cdc/mysql/MySqlSyncTableActionITCase.java b/...dc/src/test/java/org/apache/paimon/flink/action/cdc/mysql/MySqlSyncTableActionITCase.java
@@ -667,7 +667,7 @@ public void testInvalidPrimaryKey() {
                 .satisfies(
                         anyCauseMatches(
                                 IllegalArgumentException.class,
-                                "Specified primary key 'pk' does not exist in source tables or computed columns."));
+                                "Specified primary key 'pk' does not exist in source tables or computed columns [pt, _id, v1]."));
     }
 
     @Test

diff --git a/...paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkSchemaEvolutionITCase.java b/...paimon-spark-common/src/test/java/org/apache/paimon/spark/SparkSchemaEvolutionITCase.java
@@ -101,7 +101,7 @@ public void testAddNotNullColumn() {
                 .satisfies(
                         anyCauseMatches(
                                 IllegalArgumentException.class,
-                                "ADD COLUMN cannot specify NOT NULL."));
+                                "Column d cannot specify NOT NULL in the default.testAddNotNullColumn table."));
     }
 
     @Test