Moved setGeneric and other comments applied

prabeesh · Jul 30, 2015 · c1b88bd · c1b88bd
1 parent d9307f8
commit c1b88bd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
@@ -580,7 +580,7 @@ setMethod("ncol",
             length(columns(x))
           })
 
-#' Returns the dimentions (number for rows and columns) of a DataFrame
+#' Returns the dimentions (number of rows and columns) of a DataFrame
 #' @param x a SparkSQL DataFrame
 #'
 #' @rdname dim
@@ -1296,23 +1296,18 @@ setMethod("unionAll",
             dataFrame(unioned)
           })
 
-setGeneric("rbind", signature = "...")
-
-rbind.SparkDataFrames <- function(x, ..., deparse.level = 1) {
-  allargs <- list(...)
-  if (nargs() == 3) {
-    unionAll(x, ...)
-  } else {
-    unionAll(x, Recall(..., deparse.level = 1))
-  }
-}
-
 #' @rdname rbind
 #' @aliases unionAll
-setMethod("rbind",
-          signature(... = "DataFrame"),
-          rbind.SparkDataFrames
-          )
+  setMethod("rbind",
+            signature(... = "DataFrame"),
+            function(x, ..., deparse.level = 1) {
+              allargs <- list(...)
+              if (nargs() == 3) {
+                unionAll(x, ...)
+              } else {
+                unionAll(x, Recall(..., deparse.level = 1))
+              }
+            })
 
 #' Intersect
 #'

diff --git a/R/pkg/R/generics.R b/R/pkg/R/generics.R
@@ -669,3 +669,7 @@ setGeneric("upper", function(x) { standardGeneric("upper") })
 #' @rdname glm
 #' @export
 setGeneric("glm")
+
+#' @rdname rbind
+#' @export
+setGeneric("rbind", signature = "...")