aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorKaren Feng <karenfeng.us@gmail.com>2013-07-10 13:15:42 -0700
committerKaren Feng <karenfeng.us@gmail.com>2013-07-10 13:15:42 -0700
commit04263e4d4609355d8e0779dea472fbb1aff5ef4f (patch)
tree578390fb103fcc7ec4349315263caec2d17c0409 /core
parentcfb6447ac4903a870dd268836dc0d8952491d591 (diff)
downloadspark-04263e4d4609355d8e0779dea472fbb1aff5ef4f.tar.gz
spark-04263e4d4609355d8e0779dea472fbb1aff5ef4f.tar.bz2
spark-04263e4d4609355d8e0779dea472fbb1aff5ef4f.zip
Made some minor style changes
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/spark/Utils.scala11
-rw-r--r--core/src/test/scala/spark/ui/UISuite.scala6
2 files changed, 8 insertions, 9 deletions
diff --git a/core/src/main/scala/spark/Utils.scala b/core/src/main/scala/spark/Utils.scala
index 512ac92d89..c5627c8419 100644
--- a/core/src/main/scala/spark/Utils.scala
+++ b/core/src/main/scala/spark/Utils.scala
@@ -622,16 +622,15 @@ private object Utils extends Logging {
}
/** Return a string containing part of a file from byte 'a' to 'b'. */
- def offsetBytes(path: String, a: Long, b: Long): String = {
+ def offsetBytes(path: String, start: Long, end: Long): String = {
val file = new File(path)
val length = file.length()
- val B = math.min(length, b)
- val A = math.max(0, a)
- val buff = new Array[Byte]((B-A).toInt)
- val skip = A
+ val effectiveStart = math.min(length, start)
+ val effectiveEnd = math.max(0, end)
+ val buff = new Array[Byte]((effectiveEnd-effectiveStart).toInt)
val stream = new FileInputStream(file)
- stream.skip(skip)
+ stream.skip(effectiveStart)
stream.read(buff)
stream.close()
Source.fromBytes(buff).mkString
diff --git a/core/src/test/scala/spark/ui/UISuite.scala b/core/src/test/scala/spark/ui/UISuite.scala
index b7a822c4bc..ab174732e3 100644
--- a/core/src/test/scala/spark/ui/UISuite.scala
+++ b/core/src/test/scala/spark/ui/UISuite.scala
@@ -91,13 +91,13 @@ class UISuite extends FunSuite {
// Read last few bytes
assert(Utils.offsetBytes(f1Path, 12, 18) === "7\n8\n9\n")
- //Read some nonexistent bytes in the beginning
+ // Read some nonexistent bytes in the beginning
assert(Utils.offsetBytes(f1Path, -5, 5) === "1\n2\n3")
- //Read some nonexistent bytes at the end
+ // Read some nonexistent bytes at the end
assert(Utils.offsetBytes(f1Path, 12, 22) === "7\n8\n9\n")
- //Read some nonexistent bytes on both ends
+ // Read some nonexistent bytes on both ends
assert(Utils.offsetBytes(f1Path, -3, 25) === "1\n2\n3\n4\n5\n6\n7\n8\n9\n")
FileUtils.deleteDirectory(tmpDir2)