Skip to content

[SPARK-28907][CORE] Review invalid usage of new Configuration() #25616

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

Closed
advancedxy wants to merge 2 commits into from
Closed

[SPARK-28907][CORE] Review invalid usage of new Configuration() #25616

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50d6d75
[SPARK-28907] Review invalid usage of new Configuration()
advancedxy Aug 29, 2019
149de72
call setConf for WholeTextFileReader to avoid NPE.
advancedxy Aug 30, 2019
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
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/input/PortableDataStream.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class PortableDataStream(

@transient private lazy val conf = {
val bais = new ByteArrayInputStream(confBytes)
val nconf = new Configuration()
val nconf = new Configuration(false)
nconf.readFields(new DataInputStream(bais))
nconf
}
Expand Down
13 changes: 11 additions & 2 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 @@ -69,7 +69,7 @@ private[spark] class WholeTextFileRecordReader(

override def nextKeyValue(): Boolean = {
if (!processed) {
val conf = new Configuration
val conf = getConf
val factory = new CompressionCodecFactory(conf)
val codec = factory.getCodec(path) // infers from file ext.
val fileIn = fs.open(path)
Expand Down Expand Up @@ -108,8 +108,17 @@ private[spark] class ConfigurableCombineFileRecordReader[K, V](
override def initNextRecordReader(): Boolean = {
val r = super.initNextRecordReader()
if (r) {
this.curReader.asInstanceOf[HConfigurable].setConf(getConf)
if (getConf != null) {
this.curReader.asInstanceOf[HConfigurable].setConf(getConf)

@advancedxy advancedxy Aug 29, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is needed because initNextRecordReader could be called in the constructor, which getConf would be null.

We have to override setConf too to set conf for the first reader.

}
}
r
}

override def setConf(c: Configuration): Unit = {
super.setConf(c)
if (this.curReader != null) {
this.curReader.asInstanceOf[HConfigurable].setConf(c)
}
}
}