This is an automated email from the ASF dual-hosted git repository. tdsilva pushed a commit to branch 4.x-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push: new c93384f PHOENIX-5141 Use HBaseFactoryProvider.getConfigurationFactory (addendum) c93384f is described below commit c93384f8681316d4471e27d51ed0fbd1c26389e0 Author: Thomas D'Silva <tdsi...@apache.org> AuthorDate: Fri Mar 1 14:24:10 2019 -0800 PHOENIX-5141 Use HBaseFactoryProvider.getConfigurationFactory (addendum) --- .../main/scala/org/apache/phoenix/spark/DataFrameFunctions.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ac3993a..3b0289d 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 @@ -28,7 +28,7 @@ class DataFrameFunctions(data: DataFrame) extends Serializable { saveToPhoenix(parameters("table"), zkUrl = parameters.get("zkUrl"), tenantId = parameters.get("TenantId"), skipNormalizingIdentifier=parameters.contains("skipNormalizingIdentifier")) } - def saveToPhoenix(tableName: String, conf: Option[Configuration] = None, + def saveToPhoenix(tableName: String, conf: Configuration = new Configuration, zkUrl: Option[String] = None, tenantId: Option[String] = None, skipNormalizingIdentifier: Boolean = false): Unit = { // Retrieve the schema field names and normalize to Phoenix, need to do this outside of mapPartitions @@ -36,7 +36,7 @@ class DataFrameFunctions(data: DataFrame) extends Serializable { // Create a configuration object to use for saving - @transient val outConfig = ConfigurationUtil.getOutputConfiguration(tableName, fieldArray, zkUrl, tenantId, conf) + @transient val outConfig = ConfigurationUtil.getOutputConfiguration(tableName, fieldArray, zkUrl, tenantId, Some(conf)) // Retrieve the zookeeper URL val zkUrlFinal = ConfigurationUtil.getZookeeperURL(outConfig) @@ -47,7 +47,7 @@ class DataFrameFunctions(data: DataFrame) extends Serializable { // Create a within-partition config to retrieve the ColumnInfo list @transient val partitionConfig = ConfigurationUtil.getOutputConfiguration(tableName, fieldArray, zkUrlFinal, tenantId) @transient val columns = PhoenixConfigurationUtil.getUpsertColumnMetadataList(partitionConfig).toList - + rows.map { row => val rec = new PhoenixRecordWritable(columns) row.toSeq.foreach { e => rec.add(e) }