You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sh...@apache.org on 2015/04/16 22:06:39 UTC
spark git commit: [SPARK-6855] [SPARKR] Set R includes to get the
right collate order.
Repository: spark
Updated Branches:
refs/heads/master ef3fb801a -> 55f553a97
[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 <sh...@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
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/55f553a9
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/55f553a9
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/55f553a9
Branch: refs/heads/master
Commit: 55f553a979db925aa0c3559f7e80b99d2bf3feb4
Parents: ef3fb80
Author: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Authored: Thu Apr 16 13:06:34 2015 -0700
Committer: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Committed: Thu Apr 16 13:06:34 2015 -0700
----------------------------------------------------------------------
R/pkg/DESCRIPTION | 6 +++---
R/pkg/R/DataFrame.R | 2 +-
R/pkg/R/column.R | 2 +-
R/pkg/R/group.R | 3 +++
R/pkg/R/jobj.R | 3 +++
R/pkg/R/pairRDD.R | 2 ++
6 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/55f553a9/R/pkg/DESCRIPTION
----------------------------------------------------------------------
diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION
index 1842b97..052f68c 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'
http://git-wip-us.apache.org/repos/asf/spark/blob/55f553a9/R/pkg/R/DataFrame.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
index feafd56..044fdb4 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")
http://git-wip-us.apache.org/repos/asf/spark/blob/55f553a9/R/pkg/R/column.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/column.R b/R/pkg/R/column.R
index e196305..b282001 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")
http://git-wip-us.apache.org/repos/asf/spark/blob/55f553a9/R/pkg/R/group.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/group.R b/R/pkg/R/group.R
index 09fc0a7..855fbdf 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
http://git-wip-us.apache.org/repos/asf/spark/blob/55f553a9/R/pkg/R/jobj.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/jobj.R b/R/pkg/R/jobj.R
index 4180f14..a8a2523 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())
http://git-wip-us.apache.org/repos/asf/spark/blob/55f553a9/R/pkg/R/pairRDD.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/pairRDD.R b/R/pkg/R/pairRDD.R
index 739d399..5d64822 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 ############
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org