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/07/30 19:00:31 UTC
spark git commit: [SPARK-9248] [SPARKR] Closing curly-braces should
always be on their own line
Repository: spark
Updated Branches:
refs/heads/master 81464f2a8 -> 7492a33fd
[SPARK-9248] [SPARKR] Closing curly-braces should always be on their own line
### JIRA
[[SPARK-9248] Closing curly-braces should always be on their own line - ASF JIRA](https://issues.apache.org/jira/browse/SPARK-9248)
## The result of `dev/lint-r`
[The result of `dev/lint-r` for SPARK-9248 at the revistion:6175d6cfe795fbd88e3ee713fac375038a3993a8](https://gist.github.com/yu-iskw/96cadcea4ce664c41f81)
Author: Yuu ISHIKAWA <yu...@gmail.com>
Closes #7795 from yu-iskw/SPARK-9248 and squashes the following commits:
c8eccd3 [Yuu ISHIKAWA] [SPARK-9248][SparkR] Closing curly-braces should always be on their own line
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7492a33f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7492a33f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7492a33f
Branch: refs/heads/master
Commit: 7492a33fdd074446c30c657d771a69932a00246d
Parents: 81464f2
Author: Yuu ISHIKAWA <yu...@gmail.com>
Authored: Thu Jul 30 10:00:27 2015 -0700
Committer: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Committed: Thu Jul 30 10:00:27 2015 -0700
----------------------------------------------------------------------
R/pkg/R/generics.R | 14 +++++++-------
R/pkg/R/pairRDD.R | 4 ++--
R/pkg/R/sparkR.R | 9 ++++++---
R/pkg/inst/tests/test_sparkSQL.R | 6 ++++--
4 files changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/7492a33f/R/pkg/R/generics.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/generics.R b/R/pkg/R/generics.R
index 836e017..a3a1210 100644
--- a/R/pkg/R/generics.R
+++ b/R/pkg/R/generics.R
@@ -254,8 +254,10 @@ setGeneric("flatMapValues", function(X, FUN) { standardGeneric("flatMapValues")
# @rdname intersection
# @export
-setGeneric("intersection", function(x, other, numPartitions = 1) {
- standardGeneric("intersection") })
+setGeneric("intersection",
+ function(x, other, numPartitions = 1) {
+ standardGeneric("intersection")
+ })
# @rdname keys
# @export
@@ -489,9 +491,7 @@ setGeneric("sample",
#' @rdname sample
#' @export
setGeneric("sample_frac",
- function(x, withReplacement, fraction, seed) {
- standardGeneric("sample_frac")
- })
+ function(x, withReplacement, fraction, seed) { standardGeneric("sample_frac") })
#' @rdname saveAsParquetFile
#' @export
@@ -553,8 +553,8 @@ setGeneric("withColumn", function(x, colName, col) { standardGeneric("withColumn
#' @rdname withColumnRenamed
#' @export
-setGeneric("withColumnRenamed", function(x, existingCol, newCol) {
- standardGeneric("withColumnRenamed") })
+setGeneric("withColumnRenamed",
+ function(x, existingCol, newCol) { standardGeneric("withColumnRenamed") })
###################### Column Methods ##########################
http://git-wip-us.apache.org/repos/asf/spark/blob/7492a33f/R/pkg/R/pairRDD.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/pairRDD.R b/R/pkg/R/pairRDD.R
index ebc6ff6..83801d3 100644
--- a/R/pkg/R/pairRDD.R
+++ b/R/pkg/R/pairRDD.R
@@ -202,8 +202,8 @@ setMethod("partitionBy",
packageNamesArr <- serialize(.sparkREnv$.packages,
connection = NULL)
- broadcastArr <- lapply(ls(.broadcastNames), function(name) {
- get(name, .broadcastNames) })
+ broadcastArr <- lapply(ls(.broadcastNames),
+ function(name) { get(name, .broadcastNames) })
jrdd <- getJRDD(x)
# We create a PairwiseRRDD that extends RDD[(Int, Array[Byte])],
http://git-wip-us.apache.org/repos/asf/spark/blob/7492a33f/R/pkg/R/sparkR.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/sparkR.R b/R/pkg/R/sparkR.R
index 76c1587..e83104f 100644
--- a/R/pkg/R/sparkR.R
+++ b/R/pkg/R/sparkR.R
@@ -22,7 +22,8 @@
connExists <- function(env) {
tryCatch({
exists(".sparkRCon", envir = env) && isOpen(env[[".sparkRCon"]])
- }, error = function(err) {
+ },
+ error = function(err) {
return(FALSE)
})
}
@@ -153,7 +154,8 @@ sparkR.init <- function(
.sparkREnv$backendPort <- backendPort
tryCatch({
connectBackend("localhost", backendPort)
- }, error = function(err) {
+ },
+ error = function(err) {
stop("Failed to connect JVM\n")
})
@@ -264,7 +266,8 @@ sparkRHive.init <- function(jsc = NULL) {
ssc <- callJMethod(sc, "sc")
hiveCtx <- tryCatch({
newJObject("org.apache.spark.sql.hive.HiveContext", ssc)
- }, error = function(err) {
+ },
+ error = function(err) {
stop("Spark SQL is not built with Hive support")
})
http://git-wip-us.apache.org/repos/asf/spark/blob/7492a33f/R/pkg/inst/tests/test_sparkSQL.R
----------------------------------------------------------------------
diff --git a/R/pkg/inst/tests/test_sparkSQL.R b/R/pkg/inst/tests/test_sparkSQL.R
index 62fe48a..d5db972 100644
--- a/R/pkg/inst/tests/test_sparkSQL.R
+++ b/R/pkg/inst/tests/test_sparkSQL.R
@@ -112,7 +112,8 @@ test_that("create DataFrame from RDD", {
df <- jsonFile(sqlContext, jsonPathNa)
hiveCtx <- tryCatch({
newJObject("org.apache.spark.sql.hive.test.TestHiveContext", ssc)
- }, error = function(err) {
+ },
+ error = function(err) {
skip("Hive is not build with SparkSQL, skipped")
})
sql(hiveCtx, "CREATE TABLE people (name string, age double, height float)")
@@ -602,7 +603,8 @@ test_that("write.df() as parquet file", {
test_that("test HiveContext", {
hiveCtx <- tryCatch({
newJObject("org.apache.spark.sql.hive.test.TestHiveContext", ssc)
- }, error = function(err) {
+ },
+ error = function(err) {
skip("Hive is not build with SparkSQL, skipped")
})
df <- createExternalTable(hiveCtx, "json", jsonPath, "json")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org