Skip to content

Commit 2682719

Browse files
committed
Revert "Fix docs for window functions"
This reverts commit e5771a1.
1 parent 71170e9 commit 2682719

File tree

4 files changed

+21
-22
lines changed

4 files changed

+21
-22
lines changed

R/pkg/R/DataFrame.R

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2483,8 +2483,7 @@ setMethod("unionAll",
24832483
#'
24842484
#' @param x a SparkDataFrame.
24852485
#' @param ... additional SparkDataFrame(s).
2486-
#' @param deparse.level currently not used (put here to match the signature of
2487-
#' the base implementation).
2486+
#' @param deparse.level dummy variable, currently not used.
24882487
#' @return A SparkDataFrame containing the result of the union.
24892488
#' @family SparkDataFrame functions
24902489
#' @aliases rbind,SparkDataFrame-method
@@ -3213,7 +3212,7 @@ setMethod("histogram",
32133212
#' @param x A SparkDataFrame
32143213
#' @param url JDBC database url of the form `jdbc:subprotocol:subname`
32153214
#' @param tableName The name of the table in the external database
3216-
#' @param ... additional JDBC database connection properties.
3215+
#' @param ... additional JDBC database connection propertie(s).
32173216
#' @param mode One of 'append', 'overwrite', 'error', 'ignore' save mode (it is 'error' by default)
32183217
#' @family SparkDataFrame functions
32193218
#' @rdname write.jdbc

R/pkg/R/SQLContext.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ getDefaultSqlSource <- function() {
181181
#' @method createDataFrame default
182182
#' @note createDataFrame since 1.4.0
183183
# TODO(davies): support sampling and infer type from NA
184-
createDataFrame.default <- function(data, schema = NULL, samplingRatio = 1.0) {
184+
createDataFrame.default <- function(data, schema = NULL) {
185185
sparkSession <- getSparkSession()
186186
if (is.data.frame(data)) {
187187
# get the names of columns, they will be put into RDD

R/pkg/R/functions.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,7 @@ setMethod("minute",
11411141
#' @export
11421142
#' @examples \dontrun{select(df, monotonically_increasing_id())}
11431143
setMethod("monotonically_increasing_id",
1144-
signature("missing"),
1144+
signature(),
11451145
function() {
11461146
jc <- callJStatic("org.apache.spark.sql.functions", "monotonically_increasing_id")
11471147
column(jc)
@@ -1498,7 +1498,7 @@ setMethod("soundex",
14981498
#' \dontrun{select(df, spark_partition_id())}
14991499
#' @note spark_partition_id since 2.0.0
15001500
setMethod("spark_partition_id",
1501-
signature("missing"),
1501+
signature(),
15021502
function() {
15031503
jc <- callJStatic("org.apache.spark.sql.functions", "spark_partition_id")
15041504
column(jc)
@@ -3128,7 +3128,7 @@ setMethod("ifelse",
31283128
#' }
31293129
#' @note cume_dist since 1.6.0
31303130
setMethod("cume_dist",
3131-
signature("missing"),
3131+
signature(),
31323132
function() {
31333133
jc <- callJStatic("org.apache.spark.sql.functions", "cume_dist")
31343134
column(jc)
@@ -3152,7 +3152,7 @@ setMethod("cume_dist",
31523152
#' @examples \dontrun{dense_rank()}
31533153
#' @note dense_rank since 1.6.0
31543154
setMethod("dense_rank",
3155-
signature("missing"),
3155+
signature(),
31563156
function() {
31573157
jc <- callJStatic("org.apache.spark.sql.functions", "dense_rank")
31583158
column(jc)
@@ -3267,7 +3267,7 @@ setMethod("ntile",
32673267
#' @examples \dontrun{percent_rank()}
32683268
#' @note percent_rank since 1.6.0
32693269
setMethod("percent_rank",
3270-
signature("missing"),
3270+
signature(),
32713271
function() {
32723272
jc <- callJStatic("org.apache.spark.sql.functions", "percent_rank")
32733273
column(jc)
@@ -3325,7 +3325,7 @@ setMethod("rank",
33253325
#' @examples \dontrun{row_number()}
33263326
#' @note row_number since 1.6.0
33273327
setMethod("row_number",
3328-
signature("missing"),
3328+
signature(),
33293329
function() {
33303330
jc <- callJStatic("org.apache.spark.sql.functions", "row_number")
33313331
column(jc)

R/pkg/R/generics.R

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -920,10 +920,10 @@ setGeneric("crc32", function(x) { standardGeneric("crc32") })
920920
#' @export
921921
setGeneric("hash", function(x, ...) { standardGeneric("hash") })
922922

923-
#' @param x empty. Should be used with no argument.
923+
#' @param ... empty. Use with no argument.
924924
#' @rdname cume_dist
925925
#' @export
926-
setGeneric("cume_dist", function(x = "missing") { standardGeneric("cume_dist") })
926+
setGeneric("cume_dist", function(...) { standardGeneric("cume_dist") })
927927

928928
#' @rdname datediff
929929
#' @export
@@ -953,10 +953,10 @@ setGeneric("dayofyear", function(x) { standardGeneric("dayofyear") })
953953
#' @export
954954
setGeneric("decode", function(x, charset) { standardGeneric("decode") })
955955

956-
#' @param x empty. Should be used with no argument.
956+
#' @param ... empty. Use with no argument.
957957
#' @rdname dense_rank
958958
#' @export
959-
setGeneric("dense_rank", function(x = "missing") { standardGeneric("dense_rank") })
959+
setGeneric("dense_rank", function(...) { standardGeneric("dense_rank") })
960960

961961
#' @rdname encode
962962
#' @export
@@ -1070,11 +1070,11 @@ setGeneric("md5", function(x) { standardGeneric("md5") })
10701070
#' @export
10711071
setGeneric("minute", function(x) { standardGeneric("minute") })
10721072

1073-
#' @param x empty. Should be used with no argument.
1073+
#' @param ... empty. Use with no argument.
10741074
#' @rdname monotonically_increasing_id
10751075
#' @export
10761076
setGeneric("monotonically_increasing_id",
1077-
function(x = "missing") { standardGeneric("monotonically_increasing_id") })
1077+
function(...) { standardGeneric("monotonically_increasing_id") })
10781078

10791079
#' @rdname month
10801080
#' @export
@@ -1108,10 +1108,10 @@ setGeneric("ntile", function(x) { standardGeneric("ntile") })
11081108
#' @export
11091109
setGeneric("n_distinct", function(x, ...) { standardGeneric("n_distinct") })
11101110

1111-
#' @param x empty. Should be used with no argument.
1111+
#' @param ... empty. Use with no argument.
11121112
#' @rdname percent_rank
11131113
#' @export
1114-
setGeneric("percent_rank", function(x = "missing") { standardGeneric("percent_rank") })
1114+
setGeneric("percent_rank", function(...) { standardGeneric("percent_rank") })
11151115

11161116
#' @rdname pmod
11171117
#' @export
@@ -1154,10 +1154,10 @@ setGeneric("reverse", function(x) { standardGeneric("reverse") })
11541154
#' @export
11551155
setGeneric("rint", function(x) { standardGeneric("rint") })
11561156

1157-
#' @param x empty. Should be used with no argument.
1157+
#' @param ... empty. Use with no argument.
11581158
#' @rdname row_number
11591159
#' @export
1160-
setGeneric("row_number", function(x = "missing") { standardGeneric("row_number") })
1160+
setGeneric("row_number", function(...) { standardGeneric("row_number") })
11611161

11621162
#' @rdname rpad
11631163
#' @export
@@ -1215,10 +1215,10 @@ setGeneric("sort_array", function(x, asc = TRUE) { standardGeneric("sort_array")
12151215
#' @export
12161216
setGeneric("soundex", function(x) { standardGeneric("soundex") })
12171217

1218-
#' @param x empty. Should be used with no argument.
1218+
#' @param ... empty. Use with no argument.
12191219
#' @rdname spark_partition_id
12201220
#' @export
1221-
setGeneric("spark_partition_id", function(x = "missing") { standardGeneric("spark_partition_id") })
1221+
setGeneric("spark_partition_id", function(...) { standardGeneric("spark_partition_id") })
12221222

12231223
#' @rdname sd
12241224
#' @export

0 commit comments

Comments
 (0)