lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

fix NPE when run schdule using spark-sql if the commits time < hoodie.compact.inline.max.delta.commits (#4976)

Browse Source 
* Update CompactionHoodiePathCommand.scala

fix NPE when run schdule using spark-sql if the commits time < hoodie.compact.inline.max.delta.commits

* Update CompactionHoodiePathCommand.scala

fix IndexOutOfBoundsException when there`s no schedule for compaction

* Update CompactionHoodiePathCommand.scala

fix CI issue
This commit is contained in:
peanut-chenzhong
2022-03-14 16:40:38 +08:00
committed by GitHub
parent 465d553df8
commit 4b75cb6f23
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hudi-spark-datasource/hudi-spark/src/main/scala/org/apache/spark/sql/hudi/command/CompactionHoodiePathCommand.scala
View File

@@ -50,7 +50,7 @@ case class CompactionHoodiePathCommand(path: String,
if (client.scheduleCompactionAtInstant(instantTime, HOption.empty[java.util.Map[String, String]])) { if (client.scheduleCompactionAtInstant(instantTime, HOption.empty[java.util.Map[String, String]])) {
Seq(Row(instantTime)) Seq(Row(instantTime))
} else { } else {
Seq(Row(null)) Seq.empty[Row]
} }
case RUN => case RUN =>
// Do compaction // Do compaction
@@ -64,8 +64,12 @@ case class CompactionHoodiePathCommand(path: String,
pendingCompactionInstants pendingCompactionInstants
} else { // If there are no pending compaction, schedule to generate one. } else { // If there are no pending compaction, schedule to generate one.
// CompactionHoodiePathCommand will return instanceTime for SCHEDULE. // CompactionHoodiePathCommand will return instanceTime for SCHEDULE.
Seq(CompactionHoodiePathCommand(path, CompactionOperation.SCHEDULE) val scheduleSeq = CompactionHoodiePathCommand(path, CompactionOperation.SCHEDULE).run(sparkSession)
.run(sparkSession).take(1).get(0).getString(0)).filter(_ != null) if (scheduleSeq.isEmpty) {
Seq.empty
} else {
Seq(scheduleSeq.take(1).get(0).getString(0)).filter(_ != null)
}
} }
} else { } else {
// Check if the compaction timestamp has exists in the pending compaction // Check if the compaction timestamp has exists in the pending compaction