ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-6855] [SPARKR] Set R includes to get the right collate order.

Browse source 
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
This commit is contained in:
Shivaram Venkataraman 2015-04-16 13:06:34 -07:00
parent ef3fb801ae
commit 55f553a979
6 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
R/pkg/DESCRIPTION
View file

@ -17,19 +17,19 @@ License: Apache License (== 2.0)
Collate: Collate:
'generics.R' 'generics.R'
'jobj.R' 'jobj.R'
'SQLTypes.R'
'RDD.R' 'RDD.R'
'pairRDD.R' 'pairRDD.R'
'SQLTypes.R'
'column.R' 'column.R'
'group.R' 'group.R'
'DataFrame.R' 'DataFrame.R'
'SQLContext.R' 'SQLContext.R'
'backend.R'
'broadcast.R' 'broadcast.R'
'client.R'
'context.R' 'context.R'
'deserialize.R' 'deserialize.R'
'serialize.R' 'serialize.R'
'sparkR.R' 'sparkR.R'
'backend.R'
'client.R'
'utils.R' 'utils.R'
'zzz.R' 'zzz.R'

2
R/pkg/R/DataFrame.R
View file

@ -17,7 +17,7 @@
# DataFrame.R - DataFrame class and methods implemented in S4 OO classes # 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 NULL
setOldClass("jobj") setOldClass("jobj")

2
R/pkg/R/column.R
View file

@ -17,7 +17,7 @@
# Column Class # Column Class
#' @include generics.R jobj.R #' @include generics.R jobj.R SQLTypes.R
NULL NULL
setOldClass("jobj") setOldClass("jobj")

3
R/pkg/R/group.R
View file

@ -17,6 +17,9 @@
# group.R - GroupedData class and methods implemented in S4 OO classes # group.R - GroupedData class and methods implemented in S4 OO classes
#' @include generics.R jobj.R SQLTypes.R column.R
NULL
setOldClass("jobj") setOldClass("jobj")
#' @title S4 class that represents a GroupedData #' @title S4 class that represents a GroupedData

3
R/pkg/R/jobj.R
View file

@ -18,6 +18,9 @@
# References to objects that exist on the JVM backend # References to objects that exist on the JVM backend
# are maintained using the jobj. # are maintained using the jobj.
#' @include generics.R
NULL
# Maintain a reference count of Java object references # Maintain a reference count of Java object references
# This allows us to GC the java object when it is safe # This allows us to GC the java object when it is safe
.validJobjs <- new.env(parent = emptyenv()) .validJobjs <- new.env(parent = emptyenv())

2
R/pkg/R/pairRDD.R
View file

@ -16,6 +16,8 @@
# #
# Operations supported on RDDs contains pairs (i.e key, value) # Operations supported on RDDs contains pairs (i.e key, value)
#' @include generics.R jobj.R RDD.R
NULL
############ Actions and Transformations ############ ############ Actions and Transformations ############