Skip to content

[SPARK-48583][SQL][TESTS] Replace deprecated classes and methods of commons-io called in Spark #46935

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
wayneguow wants to merge 3 commits into from
Closed

[SPARK-48583][SQL][TESTS] Replace deprecated classes and methods of commons-io called in Spark #46935

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2127949
replace deprecated method
wayneguow Jun 11, 2024
ca916f7
replace CountingInputStream
wayneguow Jun 12, 2024
541e5b4
change to unbounded
wayneguow Jun 12, 2024
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 ...lyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/xml/UDFXPathUtilSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.spark.sql.catalyst.expressions.xml

import java.nio.charset.StandardCharsets
import javax.xml.xpath.XPathConstants.STRING

import org.w3c.dom.Node
Expand Down Expand Up @@ -85,7 +86,7 @@ class UDFXPathUtilSuite extends SparkFunSuite {
tempFile.deleteOnExit()
val fname = tempFile.getAbsolutePath

FileUtils.writeStringToFile(tempFile, secretValue)
FileUtils.writeStringToFile(tempFile, secretValue, StandardCharsets.UTF_8)

val xml =
s"""<?xml version="1.0" encoding="utf-8"?>
Expand Down
11 changes: 7 additions & 4 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/xml/XmlInputFormat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import java.io.{InputStream, InputStreamReader, IOException, Reader}
import java.nio.ByteBuffer
import java.nio.charset.Charset

import org.apache.commons.io.input.CountingInputStream
import org.apache.commons.io.input.BoundedInputStream
import org.apache.hadoop.fs.Seekable
import org.apache.hadoop.io.{LongWritable, Text}
import org.apache.hadoop.io.compress._
Expand Down Expand Up @@ -67,7 +67,7 @@ private[xml] class XmlRecordReader extends RecordReader[LongWritable, Text] {
private var end: Long = _
private var reader: Reader = _
private var filePosition: Seekable = _
private var countingIn: CountingInputStream = _
private var countingIn: BoundedInputStream = _
private var readerLeftoverCharFn: () => Boolean = _
private var readerByteBuffer: ByteBuffer = _
private var decompressor: Decompressor = _
Expand Down Expand Up @@ -117,7 +117,10 @@ private[xml] class XmlRecordReader extends RecordReader[LongWritable, Text] {
}
} else {
fsin.seek(start)
countingIn = new CountingInputStream(fsin)
countingIn = BoundedInputStream.builder()
.setInputStream(fsin)
.setMaxCount(fileSplit.getLength)
Copy link
Contributor

@LuciferYang LuciferYang Jun 12, 2024

Choose a reason for hiding this comment

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

Is this really necessary in the current scenario? Perhaps the unbound one is enough?

Copy link
Contributor Author

@wayneguow wayneguow Jun 12, 2024

Choose a reason for hiding this comment

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

Sounds good, changed to unbound .

.get()
in = countingIn
// don't use filePosition in this case. We have to count bytes read manually
}
Expand Down Expand Up @@ -156,7 +159,7 @@ private[xml] class XmlRecordReader extends RecordReader[LongWritable, Text] {
if (filePosition != null) {
filePosition.getPos
} else {
start + countingIn.getByteCount -
start + countingIn.getCount -
readerByteBuffer.remaining() -
(if (readerLeftoverCharFn()) 1 else 0)
}
Expand Down