fix testMergeOnReadSnapshotRelationWithDeltaLogsFallback()(TestParque…

…tColumnProjection) and Test Call repair_overwrite_hoodie_props Procedure
apache · Oct 17, 2024 · 9119372 · 9119372
1 parent 25897cb
commit 9119372
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...ce/hudi-spark/src/test/scala/org/apache/hudi/functional/TestParquetColumnProjection.scala b/...ce/hudi-spark/src/test/scala/org/apache/hudi/functional/TestParquetColumnProjection.scala
@@ -18,7 +18,7 @@
 package org.apache.hudi.functional
 
 import org.apache.hudi.HoodieBaseRelation.projectSchema
-import org.apache.hudi.common.config.{HoodieMetadataConfig, HoodieStorageConfig}
+import org.apache.hudi.common.config.{HoodieMetadataConfig, HoodieStorageConfig, RecordMergeMode}
 import org.apache.hudi.common.model.{HoodieRecord, OverwriteNonDefaultsWithLatestAvroPayload}
 import org.apache.hudi.common.table.HoodieTableConfig
 import org.apache.hudi.common.testutils.{HadoopMapRedUtils, HoodieTestDataGenerator}
@@ -183,6 +183,7 @@ class TestParquetColumnProjection extends SparkClientFunctionalTestHarness with
  // being queried by the Spark, and we currently have no way figuring out what these fields are, therefore
  // we fallback to read whole row
  val overriddenOpts = defaultWriteOpts ++ Map(
+ HoodieWriteConfig.RECORD_MERGE_MODE.key() -> RecordMergeMode.CUSTOM.name(),
  HoodieWriteConfig.WRITE_PAYLOAD_CLASS_NAME.key -> classOf[OverwriteNonDefaultsWithLatestAvroPayload].getName
  )
 

diff --git a/.../hudi-spark/src/test/scala/org/apache/spark/sql/hudi/procedure/TestRepairsProcedure.scala b/.../hudi-spark/src/test/scala/org/apache/spark/sql/hudi/procedure/TestRepairsProcedure.scala
@@ -135,10 +135,12 @@ class TestRepairsProcedure extends HoodieSparkProcedureTestBase {
  // overwrite hoodie props
  val expectedOutput ="""
  |[hoodie.archivelog.folder,archived,archive]
+ |[hoodie.compaction.payload.class,org.apache.hudi.common.model.DefaultHoodieRecordPayload,null]
  |[hoodie.database.name,default,null]
  |[hoodie.datasource.write.drop.partition.columns,false,false]
  |[hoodie.datasource.write.hive_style_partitioning,true,null]
  |[hoodie.datasource.write.partitionpath.urlencode,false,null]
+ |[hoodie.record.merge.custom.strategy,eeb8d96f-b1e4-49fd-bbf8-28ac514178e5,null]
  |[hoodie.record.merge.mode,EVENT_TIME_ORDERING,null]
  |[hoodie.table.checksum,,]
  |[hoodie.table.create.schema,,]