support update

herefree · Aug 23, 2024 · 0af6e30 · 0af6e30
1 parent 17d7f05
commit 0af6e30
Show file tree

Hide file tree

Showing 2 changed files with 100 additions and 20 deletions.
diff --git a/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalog.java b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalog.java
@@ -819,6 +819,20 @@ private void updateHmsTable(Table table, Identifier identifier, TableSchema sche
     private void updateHmsTablePars(Table table, TableSchema schema) {
         if (syncAllProperties()) {
             table.getParameters().putAll(schema.options());
+            if (!schema.primaryKeys().isEmpty()) {
+                table.getParameters()
+                        .put(CoreOptions.PRIMARY_KEY.key(), String.join(",", schema.primaryKeys()));
+            }
+            if (!schema.partitionKeys().isEmpty()) {
+                table.getParameters()
+                        .put(CoreOptions.PARTITION.key(), String.join(",", schema.partitionKeys()));
+            }
+            if (!schema.bucketKeys().isEmpty()) {
+                table.getParameters()
+                        .put(CoreOptions.BUCKET_KEY.key(), String.join(",", schema.bucketKeys()));
+            }
+            table.getParameters()
+                    .put(CoreOptions.BUCKET.key(), String.valueOf(schema.numBuckets()));
         } else {
             table.getParameters()
                     .putAll(convertToPropertiesPrefixKey(schema.options(), HIVE_PREFIX));

diff --git a/...mon-hive-connector-common/src/test/java/org/apache/paimon/hive/HiveCatalogITCaseBase.java b/...mon-hive-connector-common/src/test/java/org/apache/paimon/hive/HiveCatalogITCaseBase.java
@@ -75,6 +75,7 @@
 import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -413,20 +414,6 @@ public void testCreateCatalogWithSyncTblProperties() throws Exception {
                                 .contains("\tbucket              \t3                   "))
                 .isTrue();
 
-        tEnv.executeSql("ALTER TABLE t01 SET ( 'file.format' = 'parquet' )").await();
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t01")
-                                .contains("\tfile.format         \tparquet             "))
-                .isTrue();
-
-        tEnv.executeSql("ALTER TABLE t01 SET ('owner' = 'hive')").await();
-        assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t01")
-                                .contains("\towner               \thive                "))
-                .isTrue();
-
         tEnv.executeSql(
                         String.join(
                                 "\n",
@@ -478,19 +465,98 @@ public void testCreateCatalogWithSyncTblProperties() throws Exception {
                                 .contains("\tbucket              \t3                   "))
                 .isFalse();
 
-        tEnv.executeSql("ALTER TABLE t02 SET ( 'file.format' = 'parquet' )").await();
+    }
+
+    @Test
+    public void alterTableWithWithSyncTblProperties()
+            throws ExecutionException, InterruptedException {
+        tEnv.executeSql(
+                        String.join(
+                                "\n",
+                                "CREATE CATALOG paimon_catalog_03 WITH (",
+                                "  'type' = 'paimon',",
+                                "  'metastore' = 'hive',",
+                                "  'uri' = '',",
+                                "  'warehouse' = '" + path + "',",
+                                "  'lock.enabled' = 'true',",
+                                "  'table.type' = 'EXTERNAL'",
+                                ")"))
+                .await();
+        tEnv.executeSql("USE CATALOG paimon_catalog_03").await();
+        tEnv.executeSql("USE test_db").await();
+        tEnv.executeSql(
+                        "CREATE TABLE t03 ( aa INT, bb STRING, cc STRING, PRIMARY KEY (cc, aa) NOT ENFORCED) PARTITIONED BY (cc) WITH ('file.format' = 'avro', 'bucket' = '3')")
+                .await();
+
+        tEnv.executeSql("ALTER TABLE t03 SET ( 'file.format' = 'parquet' )").await();
         assertThat(
                         hiveShell
-                                .executeQuery("DESC FORMATTED t02")
+                                .executeQuery("DESC FORMATTED t03")
                                 .contains("\tfile.format         \tparquet             "))
                 .isFalse();
 
-        tEnv.executeSql("ALTER TABLE t02 SET ('owner' = 'hive')").await();
         assertThat(
-                        hiveShell
-                                .executeQuery("DESC FORMATTED t02")
-                                .contains("\towner               \thive                "))
+                hiveShell
+                        .executeQuery("DESC FORMATTED t03")
+                        .contains("\tprimary-key         \tcc,aa               "))
+                .isFalse();
+
+        assertThat(
+                hiveShell
+                        .executeQuery("DESC FORMATTED t03")
+                        .contains("\tpartition           \tcc                  "))
                 .isFalse();
+
+        tEnv.executeSql(
+                        String.join(
+                                "\n",
+                                "CREATE CATALOG paimon_catalog_03_syn WITH (",
+                                "  'type' = 'paimon',",
+                                "  'metastore' = 'hive',",
+                                "  'uri' = '',",
+                                "  'warehouse' = '" + path + "',",
+                                "  'lock.enabled' = 'true',",
+                                "  'table.type' = 'EXTERNAL',",
+                                "  'sync-all-properties' = 'true'",
+                                ")"))
+                .await();
+
+        tEnv.executeSql("USE CATALOG paimon_catalog_03_syn").await();
+        tEnv.executeSql("USE test_db").await();
+
+        tEnv.executeSql("ALTER TABLE t03 SET ( 'file.format' = 'parquet' )").await();
+
+        hiveShell.executeQuery("DESC FORMATTED t03").stream().forEach(System.out::println);
+        assertThat(
+                hiveShell
+                        .executeQuery("DESC FORMATTED t03")
+                        .contains("\tfile.format         \tparquet             "))
+                .isTrue();
+
+        assertThat(
+                hiveShell
+                        .executeQuery("DESC FORMATTED t03")
+                        .contains("\tprimary-key         \tcc,aa               "))
+                .isTrue();
+
+        assertThat(
+                hiveShell
+                        .executeQuery("DESC FORMATTED t03")
+                        .contains("\tpartition           \tcc                  "))
+                .isTrue();
+
+        assertThat(
+                hiveShell
+                        .executeQuery("DESC FORMATTED t03")
+                        .contains("\tbucket-key          \taa                  "))
+                .isTrue();
+
+        tEnv.executeSql("ALTER TABLE t03 SET ('owner' = 'test')").await();
+        assertThat(
+                hiveShell
+                        .executeQuery("DESC FORMATTED t03")
+                        .contains("\towner               \ttest                "))
+                .isTrue();
     }
 
     @Test