fix other issue with hudi partitiong when iceberg is source, and fix UT

Author: rahil-c

xtable-service/src/main/java/org/apache/xtable/service/ConversionService.java

@@ -192,10 +192,8 @@ public ConvertTableResponse convertTable(ConvertTableRequest convertTableRequest
     Properties sourceProperties = new Properties();
     if (convertTableRequest.getConfigurations() != null) {
       String partitionSpec =
-          convertTableRequest.getConfigurations().getOrDefault("partition-spec", null);
-      if (partitionSpec != null
-          && (HUDI.equals(convertTableRequest.getSourceFormat())
-              || convertTableRequest.getTargetFormats().contains(HUDI))) {
+              convertTableRequest.getConfigurations().getOrDefault("partition-spec", null);
+      if (partitionSpec != null) {
         sourceProperties.put(PARTITION_FIELD_SPEC_CONFIG, partitionSpec);
       }
     }
@@ -204,6 +202,7 @@ public ConvertTableResponse convertTable(ConvertTableRequest convertTableRequest
         SourceTable.builder()
             .name(convertTableRequest.getSourceTableName())
             .basePath(convertTableRequest.getSourceTablePath())
+            .dataPath(convertTableRequest.getSourceDataPath())
             .formatName(convertTableRequest.getSourceFormat())
             .additionalProperties(sourceProperties)
             .build();
@@ -213,7 +212,8 @@ public ConvertTableResponse convertTable(ConvertTableRequest convertTableRequest
       TargetTable targetTable =
           TargetTable.builder()
               .name(convertTableRequest.getSourceTableName())
-              .basePath(convertTableRequest.getSourceTablePath())
+              // set the metadata path to the data path as the default (required by Hudi)
+              .basePath(convertTableRequest.getSourceDataPath())
               .formatName(targetFormat)
               .additionalProperties(sourceProperties)
               .build();

xtable-service/src/main/java/org/apache/xtable/service/models/ConvertTableRequest.java

@@ -39,6 +39,9 @@ public class ConvertTableRequest {
   @JsonProperty("source-table-path")
   private String sourceTablePath;
 
+  @JsonProperty("source-data-path")
+  private String sourceDataPath;
+
   @JsonProperty("target-formats")
   private List<String> targetFormats;
 
@@ -52,12 +55,14 @@ public ConvertTableRequest(
       @JsonProperty("source-format") String sourceFormat,
       @JsonProperty("source-table-name") String sourceTableName,
       @JsonProperty("source-table-path") String sourceTablePath,
+      @JsonProperty("source-data-path") String sourceDataPath,
       @JsonProperty("target-format") List<String> targetFormat,
       @JsonProperty("configurations") Map<String, String> configurations) {
 
     this.sourceFormat = sourceFormat;
     this.sourceTableName = sourceTableName;
     this.sourceTablePath = sourceTablePath;
+    this.sourceDataPath = sourceDataPath;
     this.targetFormats = targetFormat;
     this.configurations = configurations;
   }

xtable-service/src/test/java/org/apache/xtable/service/TestConversionService.java

@@ -59,6 +59,7 @@
 class TestConversionService {
   private static final String SOURCE_NAME = "users";
   private static final String SOURCE_PATH = "s3://bucket/tables/users";
+  private static final String SOURCE_DATA_PATH = "s3://bucket/tables/users/data";
   private static final String HUDI_META_PATH = "s3://bucket/tables/users/.hoodie";
   private static final String ICEBERG_META_PATH =
       "s3://bucket/tables/users/metadata/v1.metadata.json";
@@ -111,6 +112,7 @@ void convertToTargetHudi() {
             .sourceFormat(TableFormat.DELTA)
             .sourceTableName(SOURCE_NAME)
             .sourceTablePath(SOURCE_PATH)
+            .sourceDataPath(SOURCE_DATA_PATH)
             .targetFormats(Collections.singletonList(TableFormat.HUDI))
             .build();
 
@@ -120,7 +122,7 @@ void convertToTargetHudi() {
       when(provider.getConversionSourceInstance(any())).thenReturn(conversionSrc);
       when(conversionSrc.getCurrentTable()).thenReturn(internalTbl);
 
-      when(internalTbl.getName()).thenReturn(TableFormat.HUDI);
+      when(internalTbl.getTableFormat()).thenReturn(TableFormat.HUDI);
       when(internalTbl.getLatestMetdataPath()).thenReturn(HUDI_META_PATH);
       when(internalTbl.getReadSchema()).thenReturn(internalSchema);
 
@@ -146,6 +148,7 @@ void convertToTargetIceberg() {
             .sourceFormat(TableFormat.DELTA)
             .sourceTableName(SOURCE_NAME)
             .sourceTablePath(SOURCE_PATH)
+            .sourceDataPath(SOURCE_DATA_PATH)
             .targetFormats(Collections.singletonList(TableFormat.ICEBERG))
             .build();
 
@@ -157,7 +160,7 @@ void convertToTargetIceberg() {
       when(provider.getConversionSourceInstance(any())).thenReturn(conversionSrc);
       when(conversionSrc.getCurrentTable()).thenReturn(internalTbl);
 
-      when(internalTbl.getName()).thenReturn(TableFormat.ICEBERG);
+      when(internalTbl.getTableFormat()).thenReturn(TableFormat.ICEBERG);
       when(internalTbl.getLatestMetdataPath()).thenReturn(ICEBERG_META_PATH);
       when(internalTbl.getReadSchema()).thenReturn(internalSchema);
 
@@ -185,6 +188,7 @@ void convertToTargetDelta() {
             .sourceFormat(TableFormat.ICEBERG)
             .sourceTableName(SOURCE_NAME)
             .sourceTablePath(SOURCE_PATH)
+            .sourceDataPath(SOURCE_DATA_PATH)
             .targetFormats(Collections.singletonList(TableFormat.DELTA))
             .build();
 
@@ -194,7 +198,7 @@ void convertToTargetDelta() {
       when(provider.getConversionSourceInstance(any())).thenReturn(conversionSrc);
       when(conversionSrc.getCurrentTable()).thenReturn(internalTbl);
 
-      when(internalTbl.getName()).thenReturn(TableFormat.DELTA);
+      when(internalTbl.getTableFormat()).thenReturn(TableFormat.DELTA);
       when(internalTbl.getLatestMetdataPath()).thenReturn(DELTA_META_PATH);
       when(internalTbl.getReadSchema()).thenReturn(internalSchema);