Github user srowen commented on a diff in the pull request:
https://github.com/apache/spark/pull/13351#discussion_r65072973
--- Diff: core/src/main/scala/org/apache/spark/util/Utils.scala ---
@@ -2345,28 +2345,23 @@ private[spark] class RedirectThread(
*/
private[spark] class CircularBuffer(sizeInBytes: Int = 10240) extends
java.io.OutputStream {
var pos: Int = 0
- var buffer = new Array[Int](sizeInBytes)
+ var isBufferFull = false
+ var buffer = new Array[Byte](sizeInBytes)
- def write(i: Int): Unit = {
- buffer(pos) = i
+ def write(input: Int): Unit = {
+ buffer(pos) = input.toByte
pos = (pos + 1) % buffer.length
+ isBufferFull = isBufferFull || (pos == 0)
}
override def toString: String = {
- val (end, start) = buffer.splitAt(pos)
- val input = new java.io.InputStream {
- val iterator = (start ++ end).iterator
+ val end = new String(buffer, 0, pos, StandardCharsets.UTF_8)
--- End diff --
There could be a multibyte char encoding broken across end and start. I
think we have to unfortunately build the whole byte array to convert and then
read it as a string.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
