Skip to content

[HUDI-5057][FOLLOWUP] Fix msck repair hudi table #7084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YannByron merged 1 commit into from
Oct 29, 2022
Merged

[HUDI-5057][FOLLOWUP] Fix msck repair hudi table #7084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...rk-common/src/main/scala/org/apache/spark/sql/hudi/command/RepairHoodieTableCommand.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ case class RepairHoodieTableCommand(tableName: TableIdentifier,
logInfo(s"Recover all the partitions in $root")

val hoodieCatalogTable = HoodieCatalogTable(spark, table.identifier)
val isHiveStyledPartitioning = hoodieCatalogTable.catalogProperties.
getOrElse(HoodieTableConfig.HIVE_STYLE_PARTITIONING_ENABLE.key, "true").toBoolean
val isHiveStyledPartitioning = hoodieCatalogTable.tableConfig.getHiveStylePartitioningEnable.toBoolean

val partitionSpecsAndLocs: Seq[(TablePartitionSpec, Path)] = hoodieCatalogTable.
getPartitionPaths.map(partitionPath => {
Expand Down
34 changes: 34 additions & 0 deletions ...park-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/TestRepairTable.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,40 @@ class TestRepairTable extends HoodieSparkSqlTestBase {
}
}

test("Test msck repair external partitioned table") {
Seq("true", "false").foreach { hiveStylePartitionEnable =>
withTempDir { tmp =>
val tableName = generateTableName
val basePath = s"${tmp.getCanonicalPath}/$tableName"

import spark.implicits._
val df = Seq((1, "a1", 1000, "2022-10-06", "11"), (2, "a2", 1001, "2022-10-06", "12"))
.toDF("id", "name", "ts", "dt", "hh")
df.write.format("hudi")
.option(TBL_NAME.key(), tableName)
.option(RECORDKEY_FIELD.key, "id")
.option(PRECOMBINE_FIELD.key, "ts")
.option(PARTITIONPATH_FIELD.key, "dt, hh")
.option(HIVE_STYLE_PARTITIONING_ENABLE.key, hiveStylePartitionEnable)
.mode(SaveMode.Append)
.save(basePath)

spark.sql(
s"""
| create table $tableName
| using hudi
| location '$basePath'
""".stripMargin)
val table = spark.sessionState.sqlParser.parseTableIdentifier(tableName)

assertResult(Seq())(spark.sessionState.catalog.listPartitionNames(table))
spark.sql(s"msck repair table $tableName")
assertResult(Seq("dt=2022-10-06/hh=11", "dt=2022-10-06/hh=12"))(
spark.sessionState.catalog.listPartitionNames(table))
}
}
}

test("Test msck repair partitioned table [add/drop/sync] partitions") {
if (HoodieSparkUtils.gteqSpark3_2) {
Seq("true", "false").foreach { hiveStylePartitionEnable =>
Expand Down