Skip to content

[HUDI-4344] fix use of HoodieDataBlock#getRecordIterator #6005

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
xushiyan merged 1 commit into from
Jun 29, 2022
Merged

[HUDI-4344] fix use of HoodieDataBlock#getRecordIterator #6005

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
9 changes: 6 additions & 3 deletions ...src/main/scala/org/apache/spark/sql/hudi/command/procedures/ExportInstantsProcedure.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

package org.apache.spark.sql.hudi.command.procedures

import org.apache.avro.generic.GenericRecord
import org.apache.avro.generic.{GenericRecord, IndexedRecord}
import org.apache.avro.specific.SpecificData
import org.apache.hadoop.fs.{FileStatus, FileSystem, Path}
import org.apache.hudi.avro.HoodieAvroUtils
import org.apache.hudi.avro.model.HoodieArchivedMetaEntry
import org.apache.hudi.common.fs.FSUtils
import org.apache.hudi.common.model.HoodieLogFile
import org.apache.hudi.common.model.{HoodieAvroIndexedRecord, HoodieLogFile, HoodieRecord}
import org.apache.hudi.common.table.HoodieTableMetaClient
import org.apache.hudi.common.table.log.HoodieLogFormat
import org.apache.hudi.common.table.log.block.HoodieAvroDataBlock
Expand Down Expand Up @@ -123,7 +123,10 @@ class ExportInstantsProcedure extends BaseProcedure with ProcedureBuilder with L
}) {
val blk = reader.next.asInstanceOf[HoodieAvroDataBlock]
try {
val recordItr = blk.getRecordIterator
val mapper = new HoodieRecord.Mapper() {
override def apply(data: IndexedRecord) = new HoodieAvroIndexedRecord(data)
}
val recordItr = blk.getRecordIterator(mapper)
try while ( {
recordItr.hasNext
}) {
Expand Down
8 changes: 6 additions & 2 deletions ...ala/org/apache/spark/sql/hudi/command/procedures/ShowHoodieLogFileMetadataProcedure.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ package org.apache.spark.sql.hudi.command.procedures
import com.fasterxml.jackson.databind.ObjectMapper
import com.google.common.collect.{Lists, Maps}
import org.apache.hadoop.fs.Path
import org.apache.avro.generic.IndexedRecord
import org.apache.hudi.common.fs.FSUtils
import org.apache.hudi.common.model.HoodieLogFile
import org.apache.hudi.common.model.{HoodieAvroIndexedRecord, HoodieLogFile, HoodieRecord}
import org.apache.hudi.common.table.log.HoodieLogFormat
import org.apache.hudi.common.table.log.block.HoodieLogBlock.{HeaderMetadataType, HoodieLogBlockType}
import org.apache.hudi.common.table.log.block.{HoodieCorruptBlock, HoodieDataBlock}
Expand Down Expand Up @@ -93,7 +94,10 @@ class ShowHoodieLogFileMetadataProcedure extends BaseProcedure with ProcedureBui
}
block match {
case dataBlock: HoodieDataBlock =>
val recordItr = dataBlock.getRecordIterator
val mapper = new HoodieRecord.Mapper() {
override def apply(data: IndexedRecord) = new HoodieAvroIndexedRecord(data)
}
val recordItr = dataBlock.getRecordIterator(mapper)
recordItr.asScala.foreach(_ => recordCount.incrementAndGet())
recordItr.close()
}
Expand Down
11 changes: 7 additions & 4 deletions ...cala/org/apache/spark/sql/hudi/command/procedures/ShowHoodieLogFileRecordsProcedure.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import org.apache.avro.generic.IndexedRecord
import org.apache.hadoop.fs.Path
import org.apache.hudi.common.config.HoodieCommonConfig
import org.apache.hudi.common.fs.FSUtils
import org.apache.hudi.common.model.HoodieLogFile
import org.apache.hudi.common.model.{HoodieAvroIndexedRecord, HoodieLogFile, HoodieRecord, HoodieRecordPayload}
import org.apache.hudi.common.table.log.block.HoodieDataBlock
import org.apache.hudi.common.table.log.{HoodieLogFormat, HoodieMergedLogRecordScanner}
import org.apache.hudi.common.table.{HoodieTableMetaClient, TableSchemaResolver}
Expand Down Expand Up @@ -79,7 +79,7 @@ class ShowHoodieLogFileRecordsProcedure extends BaseProcedure with ProcedureBuil
.withBitCaskDiskMapCompressionEnabled(HoodieCommonConfig.DISK_MAP_BITCASK_COMPRESSION_ENABLED.defaultValue)
.build
scanner.asScala.foreach(hoodieRecord => {
val record = hoodieRecord.getData.getInsertValue(schema).get()
val record = hoodieRecord.getData.asInstanceOf[HoodieRecordPayload[_]].getInsertValue(schema).get()
if (allRecords.size() < limit) {
allRecords.add(record)
}
Expand All @@ -93,10 +93,13 @@ class ShowHoodieLogFileRecordsProcedure extends BaseProcedure with ProcedureBuil
val block = reader.next()
block match {
case dataBlock: HoodieDataBlock =>
val recordItr = dataBlock.getRecordIterator
val mapper = new HoodieRecord.Mapper() {
override def apply(data: IndexedRecord) = new HoodieAvroIndexedRecord(data)
}
val recordItr = dataBlock.getRecordIterator(mapper)
recordItr.asScala.foreach(record => {
if (allRecords.size() < limit) {
allRecords.add(record)
allRecords.add(record.getData.asInstanceOf[IndexedRecord])
}
})
recordItr.close()
Expand Down