sort generics

apache · Apr 14, 2015 · 168b7fe · 168b7fe
1 parent b1fe460
commit 168b7fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
@@ -1159,8 +1159,6 @@ setMethod("intersect",
 #' df2 <- jsonFile(sqlCtx, path2)
 #' exceptDF <- except(df, df2)
 #' }
-setGeneric("except", function(x, y) { standardGeneric("except") })
-
 #' @rdname except
 #' @export
 setMethod("except",

diff --git a/R/pkg/R/generics.R b/R/pkg/R/generics.R
@@ -229,6 +229,11 @@ setGeneric("zipWithUniqueId", function(x) { standardGeneric("zipWithUniqueId") }
 
 
 ############ Binary Functions #############
+
+#' @rdname cartesian
+#' @export
+setGeneric("cartesian", function(x, other) { standardGeneric("cartesian") })
+
 #' @rdname countByKey
 #' @export
 setGeneric("countByKey", function(x) { standardGeneric("countByKey") })
@@ -237,10 +242,6 @@ setGeneric("countByKey", function(x) { standardGeneric("countByKey") })
 #' @export
 setGeneric("flatMapValues", function(X, FUN) { standardGeneric("flatMapValues") })
 
-#' @rdname cartesian
-#' @export
-setGeneric("cartesian", function(x, other) { standardGeneric("cartesian") })
-
 #' @rdname intersection
 #' @export
 setGeneric("intersection", function(x, other, numPartitions = 1L) {
@@ -258,10 +259,6 @@ setGeneric("lookup", function(x, key) { standardGeneric("lookup") })
 #' @export
 setGeneric("mapValues", function(X, FUN) { standardGeneric("mapValues") })
 
-#' @rdname values
-#' @export
-setGeneric("values", function(x) { standardGeneric("values") })
-
 #' @rdname sampleByKey
 #' @export
 setGeneric("sampleByKey",
@@ -367,6 +364,7 @@ setGeneric("subtractByKey",
              standardGeneric("subtractByKey")
            })
 
+
 ################### Broadcast Variable Methods #################
 
 #' @rdname broadcast
@@ -389,6 +387,10 @@ setGeneric("dtypes", function(x) { standardGeneric("dtypes") })
 #' @export
 setGeneric("explain", function(x, ...) { standardGeneric("explain") })
 
+#' @rdname except
+#' @export
+setGeneric("except", function(x, y) { standardGeneric("except") })
+
 #' @rdname filter
 #' @export
 setGeneric("filter", function(x, condition) { standardGeneric("filter") })