diff options
| author | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-04-16 13:06:34 -0700 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-04-16 13:06:34 -0700 |
| commit | 55f553a979db925aa0c3559f7e80b99d2bf3feb4 (patch) | |
| tree | 1014a4731dac7ef43934c14938b7a47b2b186fba /R/pkg | |
| parent | ef3fb801ae971656ed9cd1b0ab95bc5a1548adbd (diff) | |
| download | spark-55f553a979db925aa0c3559f7e80b99d2bf3feb4.tar.gz spark-55f553a979db925aa0c3559f7e80b99d2bf3feb4.tar.bz2 spark-55f553a979db925aa0c3559f7e80b99d2bf3feb4.zip | |
[SPARK-6855] [SPARKR] Set R includes to get the right collate order.
This prevents tools like devtools::document creating invalid collate orders
Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
Closes #5462 from shivaram/collate-order and squashes the following commits:
f3db562 [Shivaram Venkataraman] Set R includes to get the right collate order. This prevents tools like devtools::document creating invalid collate orders
Diffstat (limited to 'R/pkg')
| -rw-r--r-- | R/pkg/DESCRIPTION | 6 | ||||
| -rw-r--r-- | R/pkg/R/DataFrame.R | 2 | ||||
| -rw-r--r-- | R/pkg/R/column.R | 2 | ||||
| -rw-r--r-- | R/pkg/R/group.R | 3 | ||||
| -rw-r--r-- | R/pkg/R/jobj.R | 3 | ||||
| -rw-r--r-- | R/pkg/R/pairRDD.R | 2 |
6 files changed, 13 insertions, 5 deletions
diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION index 1842b97d43..052f68c6c2 100644 --- a/R/pkg/DESCRIPTION +++ b/R/pkg/DESCRIPTION @@ -17,19 +17,19 @@ License: Apache License (== 2.0) Collate: 'generics.R' 'jobj.R' - 'SQLTypes.R' 'RDD.R' 'pairRDD.R' + 'SQLTypes.R' 'column.R' 'group.R' 'DataFrame.R' 'SQLContext.R' + 'backend.R' 'broadcast.R' + 'client.R' 'context.R' 'deserialize.R' 'serialize.R' 'sparkR.R' - 'backend.R' - 'client.R' 'utils.R' 'zzz.R' diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R index feafd56909..044fdb4d01 100644 --- a/R/pkg/R/DataFrame.R +++ b/R/pkg/R/DataFrame.R @@ -17,7 +17,7 @@ # DataFrame.R - DataFrame class and methods implemented in S4 OO classes -#' @include jobj.R SQLTypes.R RDD.R pairRDD.R column.R group.R +#' @include generics.R jobj.R SQLTypes.R RDD.R pairRDD.R column.R group.R NULL setOldClass("jobj") diff --git a/R/pkg/R/column.R b/R/pkg/R/column.R index e196305186..b282001d8b 100644 --- a/R/pkg/R/column.R +++ b/R/pkg/R/column.R @@ -17,7 +17,7 @@ # Column Class -#' @include generics.R jobj.R +#' @include generics.R jobj.R SQLTypes.R NULL setOldClass("jobj") diff --git a/R/pkg/R/group.R b/R/pkg/R/group.R index 09fc0a7abe..855fbdfc7c 100644 --- a/R/pkg/R/group.R +++ b/R/pkg/R/group.R @@ -17,6 +17,9 @@ # group.R - GroupedData class and methods implemented in S4 OO classes +#' @include generics.R jobj.R SQLTypes.R column.R +NULL + setOldClass("jobj") #' @title S4 class that represents a GroupedData diff --git a/R/pkg/R/jobj.R b/R/pkg/R/jobj.R index 4180f146b7..a8a25230b6 100644 --- a/R/pkg/R/jobj.R +++ b/R/pkg/R/jobj.R @@ -18,6 +18,9 @@ # References to objects that exist on the JVM backend # are maintained using the jobj. +#' @include generics.R +NULL + # Maintain a reference count of Java object references # This allows us to GC the java object when it is safe .validJobjs <- new.env(parent = emptyenv()) diff --git a/R/pkg/R/pairRDD.R b/R/pkg/R/pairRDD.R index 739d399f08..5d64822859 100644 --- a/R/pkg/R/pairRDD.R +++ b/R/pkg/R/pairRDD.R @@ -16,6 +16,8 @@ # # Operations supported on RDDs contains pairs (i.e key, value) +#' @include generics.R jobj.R RDD.R +NULL ############ Actions and Transformations ############ |