update

apache · Oct 11, 2024 · 92d147b · 92d147b
1 parent 630cf67
commit 92d147b
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 33 deletions.
diff --git a/...ain/java/org/apache/gravitino/catalog/lakehouse/paimon/PaimonTablePropertiesMetadata.java b/...ain/java/org/apache/gravitino/catalog/lakehouse/paimon/PaimonTablePropertiesMetadata.java
@@ -18,6 +18,7 @@
  */
 package org.apache.gravitino.catalog.lakehouse.paimon;
 
+import static org.apache.gravitino.connector.PropertyEntry.stringImmutablePropertyEntry;
 import static org.apache.gravitino.connector.PropertyEntry.stringReservedPropertyEntry;
 
 import com.google.common.collect.ImmutableList;
@@ -51,9 +52,12 @@ public class PaimonTablePropertiesMetadata extends BasePropertiesMetadata {
             stringReservedPropertyEntry(COMMENT, "The table comment", true),
             stringReservedPropertyEntry(OWNER, "The table owner", false),
             stringReservedPropertyEntry(BUCKET_KEY, "The table bucket key", false),
-            stringReservedPropertyEntry(MERGE_ENGINE, "The table merge engine", false),
-            stringReservedPropertyEntry(SEQUENCE_FIELD, "The table sequence field", false),
-            stringReservedPropertyEntry(ROWKIND_FIELD, "The table rowkind field", false),
+            stringImmutablePropertyEntry(
+                MERGE_ENGINE, "The table merge engine", false, null, false, false),
+            stringImmutablePropertyEntry(
+                SEQUENCE_FIELD, "The table sequence field", false, null, false, false),
+            stringImmutablePropertyEntry(
+                ROWKIND_FIELD, "The table rowkind field", false, null, false, false),
             stringReservedPropertyEntry(PRIMARY_KEY, "The table primary key", false),
             stringReservedPropertyEntry(PARTITION, "The table partition", false));
     PROPERTIES_METADATA = Maps.uniqueIndex(propertyEntries, PropertyEntry::getName);

diff --git a/...src/test/java/org/apache/gravitino/catalog/lakehouse/paimon/TestGravitinoPaimonTable.java b/...src/test/java/org/apache/gravitino/catalog/lakehouse/paimon/TestGravitinoPaimonTable.java
@@ -382,43 +382,60 @@ void testTableProperty() {
     try (PaimonCatalogOperations ops = new PaimonCatalogOperations()) {
       ops.initialize(
           initBackendCatalogProperties(), entity.toCatalogInfo(), PAIMON_PROPERTIES_METADATA);
-      Map<String, String> map = Maps.newHashMap();
-      map.put(PaimonTablePropertiesMetadata.COMMENT, "test");
-      map.put(PaimonTablePropertiesMetadata.OWNER, "test");
-      map.put(PaimonTablePropertiesMetadata.BUCKET_KEY, "test");
-      map.put(PaimonTablePropertiesMetadata.MERGE_ENGINE, "test");
-      map.put(PaimonTablePropertiesMetadata.SEQUENCE_FIELD, "test");
-      map.put(PaimonTablePropertiesMetadata.ROWKIND_FIELD, "test");
-      map.put(PaimonTablePropertiesMetadata.PRIMARY_KEY, "test");
-      map.put(PaimonTablePropertiesMetadata.PARTITION, "test");
-      for (Map.Entry<String, String> entry : map.entrySet()) {
+      HashMap<String, String> reservedProps =
+          new HashMap<String, String>() {
+            {
+              put(PaimonTablePropertiesMetadata.COMMENT, "test");
+              put(PaimonTablePropertiesMetadata.OWNER, "test");
+              put(PaimonTablePropertiesMetadata.BUCKET_KEY, "test");
+              put(PaimonTablePropertiesMetadata.PRIMARY_KEY, "test");
+              put(PaimonTablePropertiesMetadata.PARTITION, "test");
+            }
+          };
+      Assertions.assertThrows(
+          IllegalArgumentException.class,
+          () ->
+              PropertiesMetadataHelpers.validatePropertyForCreate(
+                  paimonCatalog.tablePropertiesMetadata(), reservedProps));
+      Assertions.assertThrows(
+          IllegalArgumentException.class,
+          () ->
+              PropertiesMetadataHelpers.validatePropertyForAlter(
+                  paimonCatalog.tablePropertiesMetadata(), reservedProps, Collections.emptyMap()));
+      Assertions.assertThrows(
+          IllegalArgumentException.class,
+          () ->
+              PropertiesMetadataHelpers.validatePropertyForAlter(
+                  paimonCatalog.tablePropertiesMetadata(), Collections.emptyMap(), reservedProps));
+
+      Map<String, String> immutableProps =
+          new HashMap<String, String>() {
+            {
+              put(PaimonTablePropertiesMetadata.MERGE_ENGINE, "test");
+              put(PaimonTablePropertiesMetadata.SEQUENCE_FIELD, "test");
+              put(PaimonTablePropertiesMetadata.ROWKIND_FIELD, "test");
+            }
+          };
+      for (Map.Entry<String, String> entry : immutableProps.entrySet()) {
         HashMap<String, String> properties =
             new HashMap<String, String>() {
               {
                 put(entry.getKey(), entry.getValue());
               }
             };
         PropertiesMetadata metadata = paimonCatalog.tablePropertiesMetadata();
+        Assertions.assertDoesNotThrow(
+            () -> PropertiesMetadataHelpers.validatePropertyForCreate(metadata, properties));
         Assertions.assertThrows(
             IllegalArgumentException.class,
-            () -> PropertiesMetadataHelpers.validatePropertyForCreate(metadata, properties));
-      }
-
-      map = Maps.newHashMap();
-      map.put("key1", "val1");
-      map.put("key2", "val2");
-      for (Map.Entry<String, String> entry : map.entrySet()) {
-        HashMap<String, String> properties =
-            new HashMap<String, String>() {
-              {
-                put(entry.getKey(), entry.getValue());
-              }
-            };
-        PropertiesMetadata metadata = paimonCatalog.tablePropertiesMetadata();
-        Assertions.assertDoesNotThrow(
-            () -> {
-              PropertiesMetadataHelpers.validatePropertyForCreate(metadata, properties);
-            });
+            () ->
+                PropertiesMetadataHelpers.validatePropertyForAlter(
+                    metadata, properties, Collections.emptyMap()));
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                PropertiesMetadataHelpers.validatePropertyForAlter(
+                    metadata, Collections.emptyMap(), properties));
       }
     }
   }

diff --git a/docs/lakehouse-paimon-catalog.md b/docs/lakehouse-paimon-catalog.md
@@ -168,11 +168,16 @@ The Gravitino server doesn't allow passing the following reserved fields.
 | `comment`                          | The table comment.                                           |
 | `owner`                            | The table owner.                                             |
 | `bucket-key`                       | The table bucket-key.                                        |
+| `primary-key`                      | The table primary-key.                                       |
+| `partition`                        | The table partition.                                         |
+
+The Gravitino server doesn't allow the following immutable fields to be modified, but allows them to be specified when creating a new table.
+
+| Configuration item                 | Description                                                  |
+|------------------------------------|--------------------------------------------------------------|
 | `merge-engine`                     | The table merge-engine.                                      |
 | `sequence.field`                   | The table sequence.field.                                    |
 | `rowkind.field`                    | The table rowkind.field.                                     |
-| `primary-key`                      | The table primary-key.                                       |
-| `partition`                        | The table partition.                                         |
 
 ### Table operations