diff options
author | Yuhao Yang <hhbyyh@gmail.com> | 2015-01-19 10:10:15 -0800 |
---|---|---|
committer | Xiangrui Meng <meng@databricks.com> | 2015-01-19 10:10:22 -0800 |
commit | 5d5ee40cfac5dea4b9f268aa8e2ac3da67c102d8 (patch) | |
tree | d36127da893b4b1d6e5f06ba067e57b7b5adc67b | |
parent | 94bafd8b0d520ce0bfacaff1e0fee42cb60a89a3 (diff) | |
download | spark-5d5ee40cfac5dea4b9f268aa8e2ac3da67c102d8.tar.gz spark-5d5ee40cfac5dea4b9f268aa8e2ac3da67c102d8.tar.bz2 spark-5d5ee40cfac5dea4b9f268aa8e2ac3da67c102d8.zip |
[SPARK-5282][mllib]: RowMatrix easily gets int overflow in the memory size warning
JIRA: https://issues.apache.org/jira/browse/SPARK-5282
fix the possible int overflow in the memory computation warning
Author: Yuhao Yang <hhbyyh@gmail.com>
Closes #4069 from hhbyyh/addscStop and squashes the following commits:
e54e5c8 [Yuhao Yang] change to MB based number
7afac23 [Yuhao Yang] 5282: fix int overflow in the warning
(cherry picked from commit 4432568aac1d4a44fa1a7c3469f095eb7a6ce945)
Signed-off-by: Xiangrui Meng <meng@databricks.com>
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/linalg/distributed/RowMatrix.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/linalg/distributed/RowMatrix.scala b/mllib/src/main/scala/org/apache/spark/mllib/linalg/distributed/RowMatrix.scala index 10a515af88..0e6665b194 100644 --- a/mllib/src/main/scala/org/apache/spark/mllib/linalg/distributed/RowMatrix.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/linalg/distributed/RowMatrix.scala @@ -131,8 +131,8 @@ class RowMatrix( throw new IllegalArgumentException(s"Argument with more than 65535 cols: $cols") } if (cols > 10000) { - val mem = cols * cols * 8 - logWarning(s"$cols columns will require at least $mem bytes of memory!") + val memMB = (cols.toLong * cols) / 125000 + logWarning(s"$cols columns will require at least $memMB megabytes of memory!") } } |