Repository: phoenix Updated Branches: refs/heads/4.x-cdh5.11.2 ce7fae412 -> 00940b343
PHOENIX-4056 Spark 2.2 empty path fix (Stepan Migunov) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/00940b34 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/00940b34 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/00940b34 Branch: refs/heads/4.x-cdh5.11.2 Commit: 00940b3430777c18e9a0984e0fa0c2768f6b6c55 Parents: ce7fae4 Author: Josh Mahonin <jmaho...@gmail.com> Authored: Fri Feb 9 15:03:25 2018 -0500 Committer: Josh Mahonin <jmaho...@gmail.com> Committed: Fri Feb 9 15:16:14 2018 -0500 ---------------------------------------------------------------------- .../scala/org/apache/phoenix/spark/DataFrameFunctions.scala | 6 +++++- .../scala/org/apache/phoenix/spark/ProductRDDFunctions.scala | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/00940b34/phoenix-spark/src/main/scala/org/apache/phoenix/spark/DataFrameFunctions.scala ---------------------------------------------------------------------- diff --git a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/DataFrameFunctions.scala b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/DataFrameFunctions.scala index 92f4c58..be4a32b 100644 --- a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/DataFrameFunctions.scala +++ b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/DataFrameFunctions.scala @@ -57,7 +57,11 @@ class DataFrameFunctions(data: DataFrame) extends Serializable { // Save it phxRDD.saveAsNewAPIHadoopFile( - "", + Option( + conf.get("mapreduce.output.fileoutputformat.outputdir") + ).getOrElse( + Option(conf.get("mapred.output.dir")).getOrElse("") + ), classOf[NullWritable], classOf[PhoenixRecordWritable], classOf[PhoenixOutputFormat[PhoenixRecordWritable]], http://git-wip-us.apache.org/repos/asf/phoenix/blob/00940b34/phoenix-spark/src/main/scala/org/apache/phoenix/spark/ProductRDDFunctions.scala ---------------------------------------------------------------------- diff --git a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/ProductRDDFunctions.scala b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/ProductRDDFunctions.scala index 9b368b6..1b33e6e 100644 --- a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/ProductRDDFunctions.scala +++ b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/ProductRDDFunctions.scala @@ -49,7 +49,11 @@ class ProductRDDFunctions[A <: Product](data: RDD[A]) extends Serializable { // Save it phxRDD.saveAsNewAPIHadoopFile( - "", + Option( + conf.get("mapreduce.output.fileoutputformat.outputdir") + ).getOrElse( + Option(conf.get("mapred.output.dir")).getOrElse("") + ), classOf[NullWritable], classOf[PhoenixRecordWritable], classOf[PhoenixOutputFormat[PhoenixRecordWritable]],
