You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sh...@apache.org on 2016/06/21 02:36:53 UTC
spark git commit: remove duplicated docs in dapply
Repository: spark
Updated Branches:
refs/heads/master a42bf5553 -> e2b7eba87
remove duplicated docs in dapply
## What changes were proposed in this pull request?
Removed unnecessary duplicated documentation in dapply and dapplyCollect.
In this pull request I created separate R docs for dapply and dapplyCollect - kept dapply's documentation separate from dapplyCollect's and referred from one to another via a link.
## How was this patch tested?
Existing test cases.
Author: Narine Kokhlikyan <na...@slice.com>
Closes #13790 from NarineK/dapply-docs-fix.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e2b7eba8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e2b7eba8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e2b7eba8
Branch: refs/heads/master
Commit: e2b7eba87cdf67fa737c32f5f6ca075445ff28cb
Parents: a42bf55
Author: Narine Kokhlikyan <na...@slice.com>
Authored: Mon Jun 20 19:36:51 2016 -0700
Committer: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Committed: Mon Jun 20 19:36:51 2016 -0700
----------------------------------------------------------------------
R/pkg/R/DataFrame.R | 4 +++-
R/pkg/R/generics.R | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/e2b7eba8/R/pkg/R/DataFrame.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
index ecdcd6e..b3f2dd8 100644
--- a/R/pkg/R/DataFrame.R
+++ b/R/pkg/R/DataFrame.R
@@ -1250,6 +1250,7 @@ dapplyInternal <- function(x, func, schema) {
#' @family SparkDataFrame functions
#' @rdname dapply
#' @name dapply
+#' @seealso \link{dapplyCollect}
#' @export
#' @examples
#' \dontrun{
@@ -1294,8 +1295,9 @@ setMethod("dapply",
#' to each partition will be passed.
#' The output of func should be a data.frame.
#' @family SparkDataFrame functions
-#' @rdname dapply
+#' @rdname dapplyCollect
#' @name dapplyCollect
+#' @seealso \link{dapply}
#' @export
#' @examples
#' \dontrun{
http://git-wip-us.apache.org/repos/asf/spark/blob/e2b7eba8/R/pkg/R/generics.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/generics.R b/R/pkg/R/generics.R
index f6b9276..3fb6370 100644
--- a/R/pkg/R/generics.R
+++ b/R/pkg/R/generics.R
@@ -457,7 +457,7 @@ setGeneric("createOrReplaceTempView",
#' @export
setGeneric("dapply", function(x, func, schema) { standardGeneric("dapply") })
-#' @rdname dapply
+#' @rdname dapplyCollect
#' @export
setGeneric("dapplyCollect", function(x, func) { standardGeneric("dapplyCollect") })
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org