You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2015/07/23 19:32:14 UTC
spark git commit: [SPARK-9243] [Documentation] null -> zero in
crosstab doc
Repository: spark
Updated Branches:
refs/heads/master d2666a3c7 -> ecfb31276
[SPARK-9243] [Documentation] null -> zero in crosstab doc
We forgot to update doc. brkyvz
Author: Xiangrui Meng <me...@databricks.com>
Closes #7608 from mengxr/SPARK-9243 and squashes the following commits:
0ea3236 [Xiangrui Meng] null -> zero in crosstab doc
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ecfb3127
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ecfb3127
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ecfb3127
Branch: refs/heads/master
Commit: ecfb3127670c7f15e3a15e7f51fa578532480cda
Parents: d2666a3
Author: Xiangrui Meng <me...@databricks.com>
Authored: Thu Jul 23 10:32:11 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Thu Jul 23 10:32:11 2015 -0700
----------------------------------------------------------------------
R/pkg/R/DataFrame.R | 2 +-
python/pyspark/sql/dataframe.py | 2 +-
.../main/scala/org/apache/spark/sql/DataFrameStatFunctions.scala | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ecfb3127/R/pkg/R/DataFrame.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
index 06dd6b7..f4c93d3 100644
--- a/R/pkg/R/DataFrame.R
+++ b/R/pkg/R/DataFrame.R
@@ -1566,7 +1566,7 @@ setMethod("fillna",
#' @return a local R data.frame representing the contingency table. The first column of each row
#' will be the distinct values of `col1` and the column names will be the distinct values
#' of `col2`. The name of the first column will be `$col1_$col2`. Pairs that have no
-#' occurrences will have `null` as their counts.
+#' occurrences will have zero as their counts.
#'
#' @rdname statfunctions
#' @export
http://git-wip-us.apache.org/repos/asf/spark/blob/ecfb3127/python/pyspark/sql/dataframe.py
----------------------------------------------------------------------
diff --git a/python/pyspark/sql/dataframe.py b/python/pyspark/sql/dataframe.py
index 83e02b8..d76e051 100644
--- a/python/pyspark/sql/dataframe.py
+++ b/python/pyspark/sql/dataframe.py
@@ -1130,7 +1130,7 @@ class DataFrame(object):
non-zero pair frequencies will be returned.
The first column of each row will be the distinct values of `col1` and the column names
will be the distinct values of `col2`. The name of the first column will be `$col1_$col2`.
- Pairs that have no occurrences will have `null` as their counts.
+ Pairs that have no occurrences will have zero as their counts.
:func:`DataFrame.crosstab` and :func:`DataFrameStatFunctions.crosstab` are aliases.
:param col1: The name of the first column. Distinct items will make the first item of
http://git-wip-us.apache.org/repos/asf/spark/blob/ecfb3127/sql/core/src/main/scala/org/apache/spark/sql/DataFrameStatFunctions.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/DataFrameStatFunctions.scala b/sql/core/src/main/scala/org/apache/spark/sql/DataFrameStatFunctions.scala
index 587869e..4ec5808 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/DataFrameStatFunctions.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/DataFrameStatFunctions.scala
@@ -77,7 +77,7 @@ final class DataFrameStatFunctions private[sql](df: DataFrame) {
* pair frequencies will be returned.
* The first column of each row will be the distinct values of `col1` and the column names will
* be the distinct values of `col2`. The name of the first column will be `$col1_$col2`. Counts
- * will be returned as `Long`s. Pairs that have no occurrences will have `null` as their counts.
+ * will be returned as `Long`s. Pairs that have no occurrences will have zero as their counts.
* Null elements will be replaced by "null", and back ticks will be dropped from elements if they
* exist.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org