fix more tests

apache · Oct 17, 2024 · 143dfa7 · 143dfa7
1 parent 709a37a
commit 143dfa7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/hudi-spark-datasource/hudi-spark-common/src/main/java/org/apache/hudi/DataSourceUtils.java b/hudi-spark-datasource/hudi-spark-common/src/main/java/org/apache/hudi/DataSourceUtils.java
@@ -192,10 +192,6 @@ public static HoodieWriteConfig createHoodieConfig(String schemaStr, String base
  return builder.forTable(tblName)
  .withCompactionConfig(HoodieCompactionConfig.newBuilder()
  .withInlineCompaction(inlineCompact).build())
- .withPayloadConfig(HoodiePayloadConfig.newBuilder()
- .withPayloadClass(parameters.get(DataSourceWriteOptions.PAYLOAD_CLASS_NAME().key()))
- .withPayloadOrderingField(parameters.get(DataSourceWriteOptions.PRECOMBINE_FIELD().key()))
- .build())
  // override above with Hoodie configs specified as options.
  .withProps(parameters).build();
  }

diff --git a/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/TestDataSourceUtils.java b/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/TestDataSourceUtils.java
@@ -21,6 +21,7 @@
 import org.apache.hudi.avro.HoodieAvroUtils;
 import org.apache.hudi.client.SparkRDDWriteClient;
 import org.apache.hudi.common.config.TypedProperties;
+import org.apache.hudi.common.model.DefaultHoodieRecordPayload;
 import org.apache.hudi.common.model.HoodieColumnRangeMetadata;
 import org.apache.hudi.common.model.HoodieRecord;
 import org.apache.hudi.common.model.HoodieRecordPayload;
@@ -221,8 +222,7 @@ public void testCreateHoodieConfigWithAsyncClustering() {
  asyncClusteringKeyValues.stream().forEach(pair -> {
  HashMap<String, String> params = new HashMap<>(3);
  params.put(DataSourceWriteOptions.TABLE_TYPE().key(), DataSourceWriteOptions.TABLE_TYPE().defaultValue());
- params.put(DataSourceWriteOptions.RECORD_MERGE_MODE().key(),
- DataSourceWriteOptions.RECORD_MERGE_MODE().defaultValue());
+ params.put(DataSourceWriteOptions.PAYLOAD_CLASS_NAME().key(), DefaultHoodieRecordPayload.class.getName());
  params.put(pair.left, pair.right.toString());
  HoodieWriteConfig hoodieConfig = DataSourceUtils
  .createHoodieConfig(avroSchemaString, config.getBasePath(), "test", params);

diff --git a/...lities/src/test/java/org/apache/hudi/utilities/deltastreamer/TestHoodieDeltaStreamer.java b/...lities/src/test/java/org/apache/hudi/utilities/deltastreamer/TestHoodieDeltaStreamer.java
@@ -1621,10 +1621,9 @@ public void testPayloadClassUpdateWithCOWTable() throws Exception {
  props.load(inputStream);
  }
 
- //will use merge mode by default
- assertFalse(props.containsKey(HoodieTableConfig.PAYLOAD_CLASS_NAME.key()));
-
-
+ assertTrue(props.containsKey(HoodieTableConfig.PAYLOAD_CLASS_NAME.key()));
+ assertTrue(props.containsKey(HoodieTableConfig.RECORD_MERGE_MODE.key()));
+ assertTrue(props.containsKey(HoodieTableConfig.RECORD_MERGER_STRATEGY.key()));
 
  //now create one more deltaStreamer instance and update payload class
  cfg = TestHelpers.makeConfig(dataSetBasePath, WriteOperationType.BULK_INSERT,