Repository: spark
Updated Branches:
  refs/heads/branch-1.6 84cbed17e -> f7ae62c45


[SPARK-12116][SPARKR][DOCS] document how to workaround function name conflicts 
with dplyr

shivaram

Author: felixcheung <felixcheun...@hotmail.com>

Closes #10119 from felixcheung/rdocdplyrmasked.

(cherry picked from commit 43c575cb1766b32c74db17216194a8a74119b759)
Signed-off-by: Shivaram Venkataraman <shiva...@cs.berkeley.edu>


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

Branch: refs/heads/branch-1.6
Commit: f7ae62c45ebbe1370e7ead3d8a31c42e3a2d1468
Parents: 84cbed1
Author: felixcheung <felixcheun...@hotmail.com>
Authored: Thu Dec 3 09:22:21 2015 -0800
Committer: Shivaram Venkataraman <shiva...@cs.berkeley.edu>
Committed: Thu Dec 3 09:22:42 2015 -0800

----------------------------------------------------------------------
 docs/sparkr.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/f7ae62c4/docs/sparkr.md
----------------------------------------------------------------------
diff --git a/docs/sparkr.md b/docs/sparkr.md
index cfb9b41..0114878 100644
--- a/docs/sparkr.md
+++ b/docs/sparkr.md
@@ -384,5 +384,6 @@ The following functions are masked by the SparkR package:
   </tr>
 </table>
 
+Since part of SparkR is modeled on the `dplyr` package, certain functions in 
SparkR share the same names with those in `dplyr`. Depending on the load order 
of the two packages, some functions from the package loaded first are masked by 
those in the package loaded after. In such case, prefix such calls with the 
package name, for instance, `SparkR::cume_dist(x)` or `dplyr::cume_dist(x)`.
+  
 You can inspect the search path in R with 
[`search()`](https://stat.ethz.ch/R-manual/R-devel/library/base/html/search.html)
-


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

Reply via email to