git commit: SPARK-4222 [CORE] use readFully in FixedLengthBinaryRecordReader

2014-11-05 Thread matei
Repository: spark
Updated Branches:
  refs/heads/branch-1.2 f4beb77f0 - 6844e7a82


SPARK-4222 [CORE] use readFully in FixedLengthBinaryRecordReader

replaces the existing read() call with readFully().

Author: industrial-sloth industrial-sl...@users.noreply.github.com

Closes #3093 from industrial-sloth/branch-1.2-fixedLenRecRdr and squashes the 
following commits:

a245c8a [industrial-sloth] use readFully in FixedLengthBinaryRecordReader


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6844e7a8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6844e7a8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6844e7a8

Branch: refs/heads/branch-1.2
Commit: 6844e7a8219ac78790a422ffd5054924e7d2bea1
Parents: f4beb77
Author: industrial-sloth industrial-sl...@users.noreply.github.com
Authored: Wed Nov 5 15:38:48 2014 -0800
Committer: Matei Zaharia ma...@databricks.com
Committed: Wed Nov 5 15:38:48 2014 -0800

--
 .../org/apache/spark/input/FixedLengthBinaryRecordReader.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/6844e7a8/core/src/main/scala/org/apache/spark/input/FixedLengthBinaryRecordReader.scala
--
diff --git 
a/core/src/main/scala/org/apache/spark/input/FixedLengthBinaryRecordReader.scala
 
b/core/src/main/scala/org/apache/spark/input/FixedLengthBinaryRecordReader.scala
index 5164a74..36a1e5d 100644
--- 
a/core/src/main/scala/org/apache/spark/input/FixedLengthBinaryRecordReader.scala
+++ 
b/core/src/main/scala/org/apache/spark/input/FixedLengthBinaryRecordReader.scala
@@ -115,7 +115,7 @@ private[spark] class FixedLengthBinaryRecordReader
 if (currentPosition  splitEnd) {
   // setup a buffer to store the record
   val buffer = recordValue.getBytes
-  fileInputStream.read(buffer, 0, recordLength)
+  fileInputStream.readFully(buffer)
   // update our current position
   currentPosition = currentPosition + recordLength
   // return true


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org



git commit: SPARK-4222 [CORE] use readFully in FixedLengthBinaryRecordReader

2014-11-05 Thread matei
Repository: spark
Updated Branches:
  refs/heads/master a46497eec - f37817b18


SPARK-4222 [CORE] use readFully in FixedLengthBinaryRecordReader

replaces the existing read() call with readFully().

Author: industrial-sloth industrial-sl...@users.noreply.github.com

Closes #3093 from industrial-sloth/branch-1.2-fixedLenRecRdr and squashes the 
following commits:

a245c8a [industrial-sloth] use readFully in FixedLengthBinaryRecordReader

(cherry picked from commit 6844e7a8219ac78790a422ffd5054924e7d2bea1)
Signed-off-by: Matei Zaharia ma...@databricks.com


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f37817b1
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f37817b1
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f37817b1

Branch: refs/heads/master
Commit: f37817b18a479839b2e6118cc1cbd1059a94db52
Parents: a46497e
Author: industrial-sloth industrial-sl...@users.noreply.github.com
Authored: Wed Nov 5 15:38:48 2014 -0800
Committer: Matei Zaharia ma...@databricks.com
Committed: Wed Nov 5 15:39:16 2014 -0800

--
 .../org/apache/spark/input/FixedLengthBinaryRecordReader.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/f37817b1/core/src/main/scala/org/apache/spark/input/FixedLengthBinaryRecordReader.scala
--
diff --git 
a/core/src/main/scala/org/apache/spark/input/FixedLengthBinaryRecordReader.scala
 
b/core/src/main/scala/org/apache/spark/input/FixedLengthBinaryRecordReader.scala
index 5164a74..36a1e5d 100644
--- 
a/core/src/main/scala/org/apache/spark/input/FixedLengthBinaryRecordReader.scala
+++ 
b/core/src/main/scala/org/apache/spark/input/FixedLengthBinaryRecordReader.scala
@@ -115,7 +115,7 @@ private[spark] class FixedLengthBinaryRecordReader
 if (currentPosition  splitEnd) {
   // setup a buffer to store the record
   val buffer = recordValue.getBytes
-  fileInputStream.read(buffer, 0, recordLength)
+  fileInputStream.readFully(buffer)
   // update our current position
   currentPosition = currentPosition + recordLength
   // return true


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org