Skip to content

Commit

Permalink
Minor fixes of name and rdname
Browse files Browse the repository at this point in the history
  • Loading branch information
junyangq committed Aug 8, 2016
1 parent c2445f3 commit f811a7d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion R/pkg/R/DataFrame.R
Original file line number Diff line number Diff line change
Expand Up @@ -2121,7 +2121,7 @@ setMethod("arrange",
})

#' @rdname arrange
#' @name arrange
#' @name orderBy
#' @aliases orderBy,SparkDataFrame,characterOrColumn-method
#' @export
#' @note orderBy(SparkDataFrame, characterOrColumn) since 1.4.0
Expand Down
2 changes: 1 addition & 1 deletion R/pkg/R/WindowSpec.R
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ setMethod("partitionBy",
#' @param x a WindowSpec
#' @param col a character or Column object indicating an ordering column
#' @param ... additional sorting fields
#' @return A WindowSpec
#' @return A WindowSpec.
#' @name orderBy
#' @rdname orderBy
#' @aliases orderBy,WindowSpec,character-method
Expand Down
6 changes: 5 additions & 1 deletion R/pkg/R/generics.R
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ setGeneric("merge")
#' @export
setGeneric("mutate", function(.data, ...) {standardGeneric("mutate") })

#' @rdname orderBy
#' @rdname arrange
#' @export
setGeneric("orderBy", function(x, col, ...) { standardGeneric("orderBy") })

Expand Down Expand Up @@ -771,6 +771,10 @@ setGeneric("over", function(x, window) { standardGeneric("over") })

###################### WindowSpec Methods ##########################

#' @rdname orderBy
#' @export
setGeneric("orderBy", function(x, col, ...) { standardGeneric("orderBy") })

#' @rdname rowsBetween
#' @export
setGeneric("rowsBetween", function(x, start, end) { standardGeneric("rowsBetween") })
Expand Down

0 comments on commit f811a7d

Please sign in to comment.