commit b320e68377e3997dd139f2de9dd73829bc8768e2
author Balazs Meszaros <balazs.meszaros@cloudera.com> Mon Feb 04 15:14:52 2019 +0100
committer Peter Somogyi <petersomogyi@users.noreply.github.com> Tue Feb 12 14:17:07 2019 +0100
tree 2bc7e77c83e313ef24fc90f6eadfcde50d7481d6
parent b68a4b68a1407290a0971d707d58165e57fea364

HBASE-21841 Allow inserting null values throw DataSource API

spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/DefaultSource.scala

diff --git a/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/DefaultSource.scala b/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/DefaultSource.scala
index 4e05695..d9d5a66 100644
--- a/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/DefaultSource.scala
+++ b/spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/DefaultSource.scala
@@ -222,8 +222,11 @@
       val put = timestamp.fold(new Put(rBytes))(new Put(rBytes, _))
 
       colsIdxedFields.foreach { case (x, y) =>
-        val b = Utils.toBytes(row(x), y)
-        put.addColumn(Bytes.toBytes(y.cf), Bytes.toBytes(y.col), b)
+        val r = row(x)
+        if (r != null) {
+          val b = Utils.toBytes(r, y)
+          put.addColumn(Bytes.toBytes(y.cf), Bytes.toBytes(y.col), b)
+        }
       }
       count += 1
       (new ImmutableBytesWritable, put)