ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update expected size of strings to match our dummy string class

Browse source
This commit is contained in:
Shivaram Venkataraman 2013-01-07 17:00:32 -08:00
parent fb3d4d5e85
commit b1336e2fe4
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/src/test/scala/spark/SizeEstimatorSuite.scala
View file

@ -3,7 +3,6 @@ package spark
import org.scalatest.FunSuite
import org.scalatest.BeforeAndAfterAll
import org.scalatest.PrivateMethodTester
import org.scalatest.matchers.ShouldMatchers
class DummyClass1 {}
@ -30,7 +29,7 @@ class DummyString(val arr: Array[Char]) {
}
class SizeEstimatorSuite
extends FunSuite with BeforeAndAfterAll with PrivateMethodTester with ShouldMatchers {
extends FunSuite with BeforeAndAfterAll with PrivateMethodTester {
var oldArch: String = _
var oldOops: String = _
@ -54,15 +53,13 @@ class SizeEstimatorSuite
expect(48)(SizeEstimator.estimate(new DummyClass4(new DummyClass3)))
}
// NOTE: The String class definition changed in JDK 7 to exclude the int fields count and length.
// This means that the size of strings will be lesser by 8 bytes in JDK 7 compared to JDK 6.
// http://mail.openjdk.java.net/pipermail/core-libs-dev/2012-May/010257.html
// Work around to check for either.
// NOTE: The String class definition varies across JDK versions (1.6 vs. 1.7) and vendors
// (Sun vs IBM). Use a DummyString class to make tests deterministic.
test("strings") {
SizeEstimator.estimate(DummyString("")) should (equal (48) or equal (40))
SizeEstimator.estimate(DummyString("a")) should (equal (56) or equal (48))
SizeEstimator.estimate(DummyString("ab")) should (equal (56) or equal (48))
SizeEstimator.estimate(DummyString("abcdefgh")) should (equal(64) or equal(56))
expect(40)(SizeEstimator.estimate(DummyString("")))
expect(48)(SizeEstimator.estimate(DummyString("a")))
expect(48)(SizeEstimator.estimate(DummyString("ab")))
expect(56)(SizeEstimator.estimate(DummyString("abcdefgh")))
}
test("primitive arrays") {
@ -122,10 +119,8 @@ class SizeEstimatorSuite
resetOrClear("os.arch", arch)
}
// NOTE: The String class definition changed in JDK 7 to exclude the int fields count and length.
// This means that the size of strings will be lesser by 8 bytes in JDK 7 compared to JDK 6.
// http://mail.openjdk.java.net/pipermail/core-libs-dev/2012-May/010257.html
// Work around to check for either.
// NOTE: The String class definition varies across JDK versions (1.6 vs. 1.7) and vendors
// (Sun vs IBM). Use a DummyString class to make tests deterministic.
test("64-bit arch with no compressed oops") {
val arch = System.setProperty("os.arch", "amd64")
val oops = System.setProperty("spark.test.useCompressedOops", "false")
@ -133,10 +128,10 @@ class SizeEstimatorSuite
val initialize = PrivateMethod[Unit]('initialize)
SizeEstimator invokePrivate initialize()
SizeEstimator.estimate(DummyString("")) should (equal (64) or equal (56))
SizeEstimator.estimate(DummyString("a")) should (equal (72) or equal (64))
SizeEstimator.estimate(DummyString("ab")) should (equal (72) or equal (64))
SizeEstimator.estimate(DummyString("abcdefgh")) should (equal (80) or equal (72))
expect(56)(SizeEstimator.estimate(DummyString("")))
expect(64)(SizeEstimator.estimate(DummyString("a")))
expect(64)(SizeEstimator.estimate(DummyString("ab")))
expect(72)(SizeEstimator.estimate(DummyString("abcdefgh")))
resetOrClear("os.arch", arch)
resetOrClear("spark.test.useCompressedOops", oops)