move table description retain logic

apache · May 29, 2024 · c022769 · c022769
1 parent 5ea1d43
commit c022769
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/aws/src/main/java/org/apache/iceberg/aws/glue/GlueTableOperations.java b/aws/src/main/java/org/apache/iceberg/aws/glue/GlueTableOperations.java
@@ -316,9 +316,6 @@ void persistGlueTable(
               .skipArchive(awsProperties.glueCatalogSkipArchive())
               .tableInput(
                   TableInput.builder()
-                      // Call description before applyMutation so that applyMutation overwrites the
-                      // description with the comment specified in the query
-                      .description(glueTable.description())
                       .applyMutation(
                           builder ->
                               IcebergToGlueConverter.setTableInputInformation(

diff --git a/aws/src/main/java/org/apache/iceberg/aws/glue/IcebergToGlueConverter.java b/aws/src/main/java/org/apache/iceberg/aws/glue/IcebergToGlueConverter.java
@@ -255,8 +255,12 @@ static void setTableInputInformation(
                 .collect(Collectors.toSet()));
       }
 
-      Optional.ofNullable(properties.get(GLUE_DESCRIPTION_KEY))
-          .ifPresent(tableInputBuilder::description);
+      String description = properties.get(GLUE_DESCRIPTION_KEY);
+      if (description != null) {
+        tableInputBuilder.description(description);
+      } else if (existingTable != null) {
+        Optional.ofNullable(existingTable.description()).ifPresent(tableInputBuilder::description);
+      }
 
       List<Column> columns = toColumns(metadata);
       if (existingTable != null) {