(incubator-xtable) branch main updated: Remove parameters from Glue partition columns (#697)

[vinish]

This is an automated email from the ASF dual-hosted git repository.

vinish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-xtable.git


The following commit(s) were added to refs/heads/main by this push:
     new 62814422 Remove parameters from Glue partition columns (#697)
62814422 is described below

commit 62814422118d807ad829be5d0aae44b879d20c72
Author: Roushan Kumar <roushankumar....@gmail.com>
AuthorDate: Thu Apr 17 02:48:39 2025 +0530

    Remove parameters from Glue partition columns (#697)
    
    * Remove parameters from partition columns in Glue
    
    * fix tests
---
 .../src/main/java/org/apache/xtable/spi/sync/CatalogSync.java    | 3 ++-
 .../main/java/org/apache/xtable/glue/GlueSchemaExtractor.java    | 9 +++++++--
 .../java/org/apache/xtable/glue/GlueCatalogSyncTestBase.java     | 2 +-
 .../java/org/apache/xtable/glue/TestGlueSchemaExtractor.java     | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git 
a/xtable-api/src/main/java/org/apache/xtable/spi/sync/CatalogSync.java 
b/xtable-api/src/main/java/org/apache/xtable/spi/sync/CatalogSync.java
index ce25628c..9bdd9bdc 100644
--- a/xtable-api/src/main/java/org/apache/xtable/spi/sync/CatalogSync.java
+++ b/xtable-api/src/main/java/org/apache/xtable/spi/sync/CatalogSync.java
@@ -69,7 +69,8 @@ public class CatalogSync {
                 tableIdentifier.getId(),
                 table.getBasePath(),
                 table.getTableFormat(),
-                catalogSyncClient.getClass().getName());
+                catalogSyncClient.getClass().getName(),
+                e);
             results.add(
                 getCatalogSyncFailureStatus(
                     catalogSyncClient.getCatalogId(), 
catalogSyncClient.getClass().getName(), e));
diff --git 
a/xtable-aws/src/main/java/org/apache/xtable/glue/GlueSchemaExtractor.java 
b/xtable-aws/src/main/java/org/apache/xtable/glue/GlueSchemaExtractor.java
index 24da6ea4..c60317f6 100644
--- a/xtable-aws/src/main/java/org/apache/xtable/glue/GlueSchemaExtractor.java
+++ b/xtable-aws/src/main/java/org/apache/xtable/glue/GlueSchemaExtractor.java
@@ -250,8 +250,13 @@ public class GlueSchemaExtractor {
      */
     return getPartitionKeys(table).stream()
         .map(
-            pKey ->
-                columnsMap.getOrDefault(pKey, 
Column.builder().name(pKey).type("string").build()))
+            pKey -> {
+              Column column = columnsMap.get(pKey);
+              return Column.builder()
+                  .name(pKey)
+                  .type(column != null ? column.type() : "string")
+                  .build();
+            })
         .collect(Collectors.toList());
   }
 
diff --git 
a/xtable-aws/src/test/java/org/apache/xtable/glue/GlueCatalogSyncTestBase.java 
b/xtable-aws/src/test/java/org/apache/xtable/glue/GlueCatalogSyncTestBase.java
index a1f5e73c..b812e307 100644
--- 
a/xtable-aws/src/test/java/org/apache/xtable/glue/GlueCatalogSyncTestBase.java
+++ 
b/xtable-aws/src/test/java/org/apache/xtable/glue/GlueCatalogSyncTestBase.java
@@ -96,7 +96,7 @@ public class GlueCatalogSyncTestBase {
                   getInternalField("booleanField", "boolean", 
InternalType.BOOLEAN)))
           .build();
   protected static final List<Column> PARTITION_KEYS =
-      Collections.singletonList(getColumn(TableFormat.DELTA, "partitionField", 
"string"));
+      Collections.singletonList(getColumn("partitionField", "string"));
   protected static final List<Column> DELTA_GLUE_SCHEMA =
       Arrays.asList(
           getColumn(TableFormat.DELTA, "intField", "int"),
diff --git 
a/xtable-aws/src/test/java/org/apache/xtable/glue/TestGlueSchemaExtractor.java 
b/xtable-aws/src/test/java/org/apache/xtable/glue/TestGlueSchemaExtractor.java
index fd084ee7..51a13c0a 100644
--- 
a/xtable-aws/src/test/java/org/apache/xtable/glue/TestGlueSchemaExtractor.java
+++ 
b/xtable-aws/src/test/java/org/apache/xtable/glue/TestGlueSchemaExtractor.java
@@ -92,7 +92,7 @@ public class TestGlueSchemaExtractor extends 
TestSchemaExtractorBase {
           .partitionFieldNames(Collections.singletonList("dateOfBirth"))
           .build();
 
-  private static Column getColumn(String name, String type) {
+  public static Column getColumn(String name, String type) {
     return Column.builder().name(name).type(type).build();
   }