From 1fda9ee9bb100d78638467965d2d6dc09f3f07dc Mon Sep 17 00:00:00 2001 From: superche <73096722+hechao-ustc@users.noreply.github.com> Date: Mon, 25 Jul 2022 18:40:23 +0800 Subject: [PATCH] [HUDI-4071] Match ROLLBACK_USING_MARKERS_ENABLE in sql as datasource (#6206) Co-authored-by: superche --- .../spark/sql/hudi/command/procedures/BaseProcedure.scala | 1 - .../command/procedures/RollbackToInstantTimeProcedure.scala | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/BaseProcedure.scala b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/BaseProcedure.scala index 876bb503e..99e488784 100644 --- a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/BaseProcedure.scala +++ b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/BaseProcedure.scala @@ -50,7 +50,6 @@ abstract class BaseProcedure extends Procedure { HoodieWriteConfig.newBuilder .withPath(basePath) .withIndexConfig(HoodieIndexConfig.newBuilder.withIndexType(IndexType.BLOOM).build) - .withRollbackUsingMarkers(false) .build } diff --git a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/RollbackToInstantTimeProcedure.scala b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/RollbackToInstantTimeProcedure.scala index f17efe244..f802e1e78 100644 --- a/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/RollbackToInstantTimeProcedure.scala +++ b/hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/procedures/RollbackToInstantTimeProcedure.scala @@ -21,6 +21,7 @@ import org.apache.hudi.common.table.HoodieTableMetaClient import org.apache.hudi.common.table.timeline.HoodieTimeline import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion import org.apache.hudi.common.util.Option +import org.apache.hudi.config.HoodieWriteConfig.ROLLBACK_USING_MARKERS_ENABLE import org.apache.hudi.exception.HoodieException import org.apache.spark.sql.Row import org.apache.spark.sql.catalyst.TableIdentifier @@ -51,6 +52,7 @@ class RollbackToInstantTimeProcedure extends BaseProcedure with ProcedureBuilder val hoodieCatalogTable = HoodieCatalogTable(sparkSession, new TableIdentifier(table)) val basePath = hoodieCatalogTable.tableLocation val client = createHoodieClient(jsc, basePath) + client.getConfig.setValue(ROLLBACK_USING_MARKERS_ENABLE, "false") val config = getWriteConfig(basePath) val metaClient = HoodieTableMetaClient.builder .setConf(jsc.hadoopConfiguration)