From 1d3648a0adeed2f6ce787c41b087d8238a1fa348 Mon Sep 17 00:00:00 2001 From: Yi Tian Date: Mon, 13 Jul 2015 20:52:40 +0800 Subject: [PATCH 1/2] Update PhoenixRelation.scala Add `UTF8String` support. --- .../main/scala/org/apache/phoenix/spark/PhoenixRelation.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala index 8804f3b9bdd..613dbd5b34e 100644 --- a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala +++ b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala @@ -92,6 +92,7 @@ case class PhoenixRelation(tableName: String, zkUrl: String)(@transient val sqlC // Helper function to escape string values in SQL queries private def compileValue(value: Any): Any = value match { case stringValue: String => s"'${escapeSql(stringValue)}'" + case stringValue: UTF8String => s"'${escapeSql(stringValue.toString)}'" case _ => value } } From cb9d79dd79484932790784d24256d3e022dd7f95 Mon Sep 17 00:00:00 2001 From: Yi Tian Date: Tue, 14 Jul 2015 16:03:06 +0800 Subject: [PATCH 2/2] Update PhoenixRelation.scala add missing import statement. --- .../main/scala/org/apache/phoenix/spark/PhoenixRelation.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala index 613dbd5b34e..33191585a14 100644 --- a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala +++ b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala @@ -20,6 +20,7 @@ package org.apache.phoenix.spark import org.apache.hadoop.conf.Configuration import org.apache.spark.rdd.RDD import org.apache.spark.sql.types.StructType +import org.apache.spark.sql.types.UTF8String import org.apache.spark.sql.{Row, SQLContext} import org.apache.spark.sql.sources._ import org.apache.commons.lang.StringEscapeUtils.escapeSql