You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2018/02/01 02:15:23 UTC
spark git commit: [SPARK-23157][SQL][FOLLOW-UP] DataFrame ->
SparkDataFrame in R comment
Repository: spark
Updated Branches:
refs/heads/master 9ff1d96f0 -> f470df2fc
[SPARK-23157][SQL][FOLLOW-UP] DataFrame -> SparkDataFrame in R comment
Author: Henry Robinson <he...@cloudera.com>
Closes #20443 from henryr/SPARK-23157.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f470df2f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f470df2f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f470df2f
Branch: refs/heads/master
Commit: f470df2fcf14e6234c577dc1bdfac27d49b441f5
Parents: 9ff1d96
Author: Henry Robinson <he...@cloudera.com>
Authored: Thu Feb 1 11:15:17 2018 +0900
Committer: hyukjinkwon <gu...@gmail.com>
Committed: Thu Feb 1 11:15:17 2018 +0900
----------------------------------------------------------------------
R/pkg/R/DataFrame.R | 4 ++--
python/pyspark/sql/dataframe.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f470df2f/R/pkg/R/DataFrame.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
index 547b5ea..41c3c3a 100644
--- a/R/pkg/R/DataFrame.R
+++ b/R/pkg/R/DataFrame.R
@@ -2090,8 +2090,8 @@ setMethod("selectExpr",
#'
#' @param x a SparkDataFrame.
#' @param colName a column name.
-#' @param col a Column expression (which must refer only to this DataFrame), or an atomic vector in
-#' the length of 1 as literal value.
+#' @param col a Column expression (which must refer only to this SparkDataFrame), or an atomic
+#' vector in the length of 1 as literal value.
#' @return A SparkDataFrame with the new column added or the existing column replaced.
#' @family SparkDataFrame functions
#' @aliases withColumn,SparkDataFrame,character-method
http://git-wip-us.apache.org/repos/asf/spark/blob/f470df2f/python/pyspark/sql/dataframe.py
----------------------------------------------------------------------
diff --git a/python/pyspark/sql/dataframe.py b/python/pyspark/sql/dataframe.py
index 055b2c4..1496cba 100644
--- a/python/pyspark/sql/dataframe.py
+++ b/python/pyspark/sql/dataframe.py
@@ -1829,7 +1829,7 @@ class DataFrame(object):
Returns a new :class:`DataFrame` by adding a column or replacing the
existing column that has the same name.
- The column expression must be an expression over this dataframe; attempting to add
+ The column expression must be an expression over this DataFrame; attempting to add
a column from some other dataframe will raise an error.
:param colName: string, name of the new column.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org