phoenix-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From JamesRTaylor <...@git.apache.org>
Subject [GitHub] phoenix pull request #221: PHOENIX-3427 fix saveToRdd for tenant-specific co...
Date Thu, 10 Nov 2016 22:01:17 GMT
Github user JamesRTaylor commented on a diff in the pull request:

    https://github.com/apache/phoenix/pull/221#discussion_r87495394
  
    --- Diff: phoenix-spark/src/main/scala/org/apache/phoenix/spark/ProductRDDFunctions.scala
---
    @@ -16,19 +16,20 @@ package org.apache.phoenix.spark
     import org.apache.hadoop.conf.Configuration
     import org.apache.hadoop.io.NullWritable
     import org.apache.phoenix.mapreduce.PhoenixOutputFormat
    -import org.apache.phoenix.mapreduce.util.{ColumnInfoToStringEncoderDecoder, PhoenixConfigurationUtil}
    +import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil
     import org.apache.spark.Logging
     import org.apache.spark.rdd.RDD
    +
     import scala.collection.JavaConversions._
     
     class ProductRDDFunctions[A <: Product](data: RDD[A]) extends Logging with Serializable
{
     
       def saveToPhoenix(tableName: String, cols: Seq[String],
    -                    conf: Configuration = new Configuration, zkUrl: Option[String] =
None)
    +                    conf: Configuration = new Configuration, zkUrl: Option[String] =
None, tenantId: Option[String] = None)
    --- End diff --
    
    Just do a git pull --rebase origin master on your local branch to pick up what Josh committed.
Then push your next commit to your repro (either in the pull request or a new one).
    
    Another way would be to just stash the changes for your last commit, get the latest by
doing a git pull origin master, then apply your stashed change, and push out to this pull
request.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message