Skip to content

[hive] Avoid treating empty partitioned tables as unpartitioned during migration #8100

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
JingsongLi merged 2 commits into from
Jun 3, 2026
+23 −6
Merged

[hive] Avoid treating empty partitioned tables as unpartitioned during migration #8100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31a1907
[hive] Fix migration for empty partitioned tables
huangxiaopingRD Jun 3, 2026
1ea527a
Merge branch 'apache:master' into fix-migration-empty-partiiton-tables
huangxiaopingRD Jun 3, 2026
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
14 changes: 8 additions & 6 deletions ...n-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/migrate/HiveMigrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,20 +165,22 @@ public void executeMigrate() throws Exception {
FileStoreTable paimonTable = (FileStoreTable) hiveCatalog.getTable(identifier);
checkPaimonTable(paimonTable);

List<Partition> partitions =
client.listPartitions(sourceDatabase, sourceTable, Short.MAX_VALUE);
checkCompatible(sourceHiveTable, paimonTable);

List<MigrateTask> tasks = new ArrayList<>();
Map<Path, Path> rollBack = new ConcurrentHashMap<>();
if (partitions.isEmpty()) {
if (sourceHiveTable.getPartitionKeys().isEmpty()) {
tasks.add(
importUnPartitionedTableTask(
fileIO, sourceHiveTable, paimonTable, rollBack));
} else {
tasks.addAll(
importPartitionedTableTask(
fileIO, partitions, sourceHiveTable, paimonTable, rollBack));
List<Partition> partitions =
client.listPartitions(sourceDatabase, sourceTable, Short.MAX_VALUE);
if (!partitions.isEmpty()) {
tasks.addAll(
importPartitionedTableTask(
fileIO, partitions, sourceHiveTable, paimonTable, rollBack));
}
}

List<Future<CommitMessage>> futures =
Expand Down
15 changes: 15 additions & 0 deletions ...spark-ut/src/test/scala/org/apache/paimon/spark/procedure/MigrateTableProcedureTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,21 @@ class MigrateTableProcedureTest extends PaimonHiveTestBase {
}
})

test("Paimon migrate table procedure: migrate empty partitioned table") {
withTable(s"hive_tbl$random") {
spark.sql(s"""
|CREATE TABLE hive_tbl$random (id STRING, name STRING, pt STRING)
|USING parquet
|PARTITIONED BY (pt)
|""".stripMargin)

spark.sql(
s"CALL sys.migrate_table(source_type => 'hive', table => '$hiveDbName.hive_tbl$random', options => 'file.format=parquet')")

checkAnswer(spark.sql(s"SELECT * FROM hive_tbl$random"), Nil)
}
}

test(s"Paimon migrate table procedure: migrate partitioned table with null partition") {
withTable(s"hive_tbl$random") {
// create hive table
Expand Down