aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorMichael Armbrust <michael@databricks.com>2014-07-29 22:42:54 -0700
committerMichael Armbrust <michael@databricks.com>2014-07-29 22:42:54 -0700
commit077f633b4720422c5efbf0382e869ead3dc49612 (patch)
tree61cb3f2f35b4cc01c825b8d5ae6e83a78d8bd165 /sql
parent2e6efcacea19bddbdae1d655ef54186f2e52747f (diff)
downloadspark-077f633b4720422c5efbf0382e869ead3dc49612.tar.gz
spark-077f633b4720422c5efbf0382e869ead3dc49612.tar.bz2
spark-077f633b4720422c5efbf0382e869ead3dc49612.zip
[SQL] Handle null values in debug()
Author: Michael Armbrust <michael@databricks.com> Closes #1646 from marmbrus/nullDebug and squashes the following commits: 49050a8 [Michael Armbrust] Handle null values in debug()
Diffstat (limited to 'sql')
-rw-r--r--sql/core/src/main/scala/org/apache/spark/sql/execution/debug/package.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/debug/package.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/debug/package.scala
index 5ef46c32d4..f31df05182 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/debug/package.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/debug/package.scala
@@ -105,7 +105,9 @@ package object debug {
var i = 0
while (i < numColumns) {
val value = currentRow(i)
- columnStats(i).elementTypes += HashSet(value.getClass.getName)
+ if (value != null) {
+ columnStats(i).elementTypes += HashSet(value.getClass.getName)
+ }
i += 1
}
currentRow