Repository: spark
Updated Branches:
  refs/heads/branch-1.2 e958132a8 -> b676d9ad3


[SPARK-4481][Streaming][Doc] Fix the wrong description of updateFunc (backport 
for branch-1.2)

backport for branch-1.2 as per #3356

Author: zsxwing <zsxw...@gmail.com>

Closes #3376 from zsxwing/SPARK-4481-branch-1.2 and squashes the following 
commits:

53b94e8 [zsxwing] Fix the wrong description of updateFunc


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b676d9ad
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b676d9ad
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b676d9ad

Branch: refs/heads/branch-1.2
Commit: b676d9ad347e296929361809b0001c0f5c700514
Parents: e958132
Author: zsxwing <zsxw...@gmail.com>
Authored: Thu Nov 20 01:13:36 2014 -0800
Committer: Tathagata Das <tathagata.das1...@gmail.com>
Committed: Thu Nov 20 01:13:36 2014 -0800

----------------------------------------------------------------------
 .../apache/spark/streaming/dstream/PairDStreamFunctions.scala | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/b676d9ad/streaming/src/main/scala/org/apache/spark/streaming/dstream/PairDStreamFunctions.scala
----------------------------------------------------------------------
diff --git 
a/streaming/src/main/scala/org/apache/spark/streaming/dstream/PairDStreamFunctions.scala
 
b/streaming/src/main/scala/org/apache/spark/streaming/dstream/PairDStreamFunctions.scala
index 9467595..f405dda 100644
--- 
a/streaming/src/main/scala/org/apache/spark/streaming/dstream/PairDStreamFunctions.scala
+++ 
b/streaming/src/main/scala/org/apache/spark/streaming/dstream/PairDStreamFunctions.scala
@@ -398,10 +398,9 @@ class PairDStreamFunctions[K, V](self: DStream[(K,V)])
    * Return a new "state" DStream where the state for each key is updated by 
applying
    * the given function on the previous state of the key and the new values of 
each key.
    * org.apache.spark.Partitioner is used to control the partitioning of each 
RDD.
-   * @param updateFunc State update function. If `this` function returns None, 
then
-   *                   corresponding state key-value pair will be eliminated. 
Note, that
-   *                   this function may generate a different a tuple with a 
different key
-   *                   than the input key. It is up to the developer to decide 
whether to
+   * @param updateFunc State update function. Note, that this function may 
generate a different
+   *                   tuple with a different key than the input key. 
Therefore keys may be removed
+   *                   or added in this way. It is up to the developer to 
decide whether to
    *                   remember the partitioner despite the key being changed.
    * @param partitioner Partitioner for controlling the partitioning of each 
RDD in the new
    *                    DStream


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to