Skip to content

More genericization in ConfigurableCombineFileRecordReader #2

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
merged 1 commit into from
Dec 16, 2014
Merged

More genericization in ConfigurableCombineFileRecordReader #2

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: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/input/WholeTextFileInputFormat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ private[spark] class WholeTextFileInputFormat
split: InputSplit,
context: TaskAttemptContext): RecordReader[String, String] = {

val reader = new ConfigurableCombineFileRecordReader(split, context)
val reader =
new ConfigurableCombineFileRecordReader(split, context, classOf[WholeTextFileRecordReader])
reader.setConf(getConf)
reader
}
Expand Down
14 changes: 8 additions & 6 deletions core/src/main/scala/org/apache/spark/input/WholeTextFileRecordReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,23 @@ private[spark] class WholeTextFileRecordReader(

/**
* A [[org.apache.hadoop.mapreduce.lib.input.CombineFileRecordReader CombineFileRecordReader]]
* that could pass Hadoop configuration to WholeTextFileRecordReader.
* that can pass Hadoop Configuration to [[org.apache.hadoop.conf.Configurable Configurable]]
* RecordReaders.
*/
private[spark] class ConfigurableCombineFileRecordReader(
private[spark] class ConfigurableCombineFileRecordReader[K, V](
split: InputSplit,
context: TaskAttemptContext)
extends CombineFileRecordReader[String, String](
context: TaskAttemptContext,
recordReaderClass: Class[_ <: RecordReader[K, V] with HConfigurable])
extends CombineFileRecordReader[K, V](
split.asInstanceOf[CombineFileSplit],
context,
classOf[WholeTextFileRecordReader]
recordReaderClass
) with Configurable {

override def initNextRecordReader(): Boolean = {
val r = super.initNextRecordReader()
if (r) {
this.curReader.asInstanceOf[WholeTextFileRecordReader].setConf(getConf)
this.curReader.asInstanceOf[HConfigurable].setConf(getConf)
}
r
}
Expand Down