You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by fe...@apache.org on 2018/12/01 07:14:10 UTC
spark git commit: [SPARK-26189][R] Fix unionAll doc in SparkR
Repository: spark
Updated Branches:
refs/heads/master 28d337440 -> 2f6e88fec
[SPARK-26189][R] Fix unionAll doc in SparkR
## What changes were proposed in this pull request?
Fix unionAll doc in SparkR
## How was this patch tested?
Manually ran test
Author: Huaxin Gao <hu...@us.ibm.com>
Closes #23161 from huaxingao/spark-26189.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2f6e88fe
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2f6e88fe
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2f6e88fe
Branch: refs/heads/master
Commit: 2f6e88fecb455a02c4c08c41290e2f338e979543
Parents: 28d3374
Author: Huaxin Gao <hu...@us.ibm.com>
Authored: Fri Nov 30 23:14:05 2018 -0800
Committer: Felix Cheung <fe...@apache.org>
Committed: Fri Nov 30 23:14:05 2018 -0800
----------------------------------------------------------------------
R/pkg/R/DataFrame.R | 20 ++++++++++++++++----
R/pkg/R/generics.R | 2 +-
2 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/2f6e88fe/R/pkg/R/DataFrame.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
index 745bb3e..24ed449 100644
--- a/R/pkg/R/DataFrame.R
+++ b/R/pkg/R/DataFrame.R
@@ -2730,13 +2730,25 @@ setMethod("union",
dataFrame(unioned)
})
-#' Return a new SparkDataFrame containing the union of rows
+#' Return a new SparkDataFrame containing the union of rows.
#'
-#' This is an alias for `union`.
+#' This is an alias for \code{union}.
#'
-#' @rdname union
-#' @name unionAll
+#' @param x a SparkDataFrame.
+#' @param y a SparkDataFrame.
+#' @return A SparkDataFrame containing the result of the unionAll operation.
+#' @family SparkDataFrame functions
#' @aliases unionAll,SparkDataFrame,SparkDataFrame-method
+#' @rdname unionAll
+#' @name unionAll
+#' @seealso \link{union}
+#' @examples
+#'\dontrun{
+#' sparkR.session()
+#' df1 <- read.json(path)
+#' df2 <- read.json(path2)
+#' unionAllDF <- unionAll(df1, df2)
+#' }
#' @note unionAll since 1.4.0
setMethod("unionAll",
signature(x = "SparkDataFrame", y = "SparkDataFrame"),
http://git-wip-us.apache.org/repos/asf/spark/blob/2f6e88fe/R/pkg/R/generics.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/generics.R b/R/pkg/R/generics.R
index 9d8c24c..eed7646 100644
--- a/R/pkg/R/generics.R
+++ b/R/pkg/R/generics.R
@@ -631,7 +631,7 @@ setGeneric("toRDD", function(x) { standardGeneric("toRDD") })
#' @rdname union
setGeneric("union", function(x, y) { standardGeneric("union") })
-#' @rdname union
+#' @rdname unionAll
setGeneric("unionAll", function(x, y) { standardGeneric("unionAll") })
#' @rdname unionByName
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org