MB to MiB per SPARK-25696

seancxmao · seancxmao · commit 4ee2c8d7de40 · 2018-12-25T15:34:27.000+08:00
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/metric/SQLMetricsTestUtils.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/metric/SQLMetricsTestUtils.scala
@@ -208,7 +208,8 @@ trait SQLMetricsTestUtils extends SQLTestUtils {
   }
 
   private def stringToBytes(str: String): (Float, String) = {
-    val matcher = Pattern.compile("([0-9]+(\\.[0-9]+)?) (EB|PB|TB|GB|MB|KB|B)").matcher(str)
+    val matcher =
+      Pattern.compile("([0-9]+(\\.[0-9]+)?) (EiB|PiB|TiB|GiB|MiB|KiB|B)").matcher(str)
     if (matcher.matches()) {
       (matcher.group(1).toFloat, matcher.group(3))
     } else {

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,8 @@ trait SQLMetricsTestUtils extends SQLTestUtils {`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`private def stringToBytes(str: String): (Float, String) = {`
`211`		`- val matcher = Pattern.compile("([0-9]+(\\.[0-9]+)?) (EB\|PB\|TB\|GB\|MB\|KB\|B)").matcher(str)`
	`211`	`+ val matcher =`
	`212`	`+ Pattern.compile("([0-9]+(\\.[0-9]+)?) (EiB\|PiB\|TiB\|GiB\|MiB\|KiB\|B)").matcher(str)`
`212`	`213`	`if (matcher.matches()) {`
`213`	`214`	`(matcher.group(1).toFloat, matcher.group(3))`
`214`	`215`	`} else {`