You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2016/01/13 04:24:52 UTC
spark git commit: [SPARK-12692][BUILD][CORE] Scala style: Fix the
style violation (Space before ", ")
Repository: spark
Updated Branches:
refs/heads/master b3b9ad23c -> f14922cff
[SPARK-12692][BUILD][CORE] Scala style: Fix the style violation (Space before ",")
Fix the style violation (space before , and :).
This PR is a followup for #10643
Author: Kousuke Saruta <sa...@oss.nttdata.co.jp>
Closes #10719 from sarutak/SPARK-12692-followup-core.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f14922cf
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f14922cf
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f14922cf
Branch: refs/heads/master
Commit: f14922cff84b1e0984ba4597d764615184126bdc
Parents: b3b9ad2
Author: Kousuke Saruta <sa...@oss.nttdata.co.jp>
Authored: Tue Jan 12 19:24:50 2016 -0800
Committer: Reynold Xin <rx...@databricks.com>
Committed: Tue Jan 12 19:24:50 2016 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/rdd/CartesianRDD.scala | 2 +-
core/src/main/scala/org/apache/spark/rdd/RDD.scala | 2 +-
core/src/main/scala/org/apache/spark/status/api/v1/api.scala | 2 +-
core/src/test/scala/org/apache/spark/rdd/DoubleRDDSuite.scala | 2 +-
.../spark/scheduler/cluster/mesos/MesosSchedulerBackendSuite.scala | 2 +-
scalastyle-config.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f14922cf/core/src/main/scala/org/apache/spark/rdd/CartesianRDD.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/rdd/CartesianRDD.scala b/core/src/main/scala/org/apache/spark/rdd/CartesianRDD.scala
index 18e8cdd..57108dc 100644
--- a/core/src/main/scala/org/apache/spark/rdd/CartesianRDD.scala
+++ b/core/src/main/scala/org/apache/spark/rdd/CartesianRDD.scala
@@ -50,7 +50,7 @@ class CartesianRDD[T: ClassTag, U: ClassTag](
sc: SparkContext,
var rdd1 : RDD[T],
var rdd2 : RDD[U])
- extends RDD[Pair[T, U]](sc, Nil)
+ extends RDD[(T, U)](sc, Nil)
with Serializable {
val numPartitionsInRdd2 = rdd2.partitions.length
http://git-wip-us.apache.org/repos/asf/spark/blob/f14922cf/core/src/main/scala/org/apache/spark/rdd/RDD.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/rdd/RDD.scala b/core/src/main/scala/org/apache/spark/rdd/RDD.scala
index 53e01a0..9dad794 100644
--- a/core/src/main/scala/org/apache/spark/rdd/RDD.scala
+++ b/core/src/main/scala/org/apache/spark/rdd/RDD.scala
@@ -95,7 +95,7 @@ abstract class RDD[T: ClassTag](
/** Construct an RDD with just a one-to-one dependency on one parent */
def this(@transient oneParent: RDD[_]) =
- this(oneParent.context , List(new OneToOneDependency(oneParent)))
+ this(oneParent.context, List(new OneToOneDependency(oneParent)))
private[spark] def conf = sc.conf
// =======================================================================
http://git-wip-us.apache.org/repos/asf/spark/blob/f14922cf/core/src/main/scala/org/apache/spark/status/api/v1/api.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/api.scala b/core/src/main/scala/org/apache/spark/status/api/v1/api.scala
index 5feb1dc..9cd52d6 100644
--- a/core/src/main/scala/org/apache/spark/status/api/v1/api.scala
+++ b/core/src/main/scala/org/apache/spark/status/api/v1/api.scala
@@ -115,7 +115,7 @@ class StageData private[spark](
val status: StageStatus,
val stageId: Int,
val attemptId: Int,
- val numActiveTasks: Int ,
+ val numActiveTasks: Int,
val numCompleteTasks: Int,
val numFailedTasks: Int,
http://git-wip-us.apache.org/repos/asf/spark/blob/f14922cf/core/src/test/scala/org/apache/spark/rdd/DoubleRDDSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/rdd/DoubleRDDSuite.scala b/core/src/test/scala/org/apache/spark/rdd/DoubleRDDSuite.scala
index 4e72b89..7645178 100644
--- a/core/src/test/scala/org/apache/spark/rdd/DoubleRDDSuite.scala
+++ b/core/src/test/scala/org/apache/spark/rdd/DoubleRDDSuite.scala
@@ -178,7 +178,7 @@ class DoubleRDDSuite extends SparkFunSuite with SharedSparkContext {
test("WorksWithOutOfRangeWithInfiniteBuckets") {
// Verify that out of range works with two buckets
val rdd = sc.parallelize(Seq(10.01, -0.01, Double.NaN))
- val buckets = Array(-1.0/0.0 , 0.0, 1.0/0.0)
+ val buckets = Array(-1.0/0.0, 0.0, 1.0/0.0)
val histogramResults = rdd.histogram(buckets)
val expectedHistogramResults = Array(1, 1)
assert(histogramResults === expectedHistogramResults)
http://git-wip-us.apache.org/repos/asf/spark/blob/f14922cf/core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackendSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackendSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackendSuite.scala
index 504e578..e111e2e 100644
--- a/core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackendSuite.scala
+++ b/core/src/test/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackendSuite.scala
@@ -76,7 +76,7 @@ class MesosSchedulerBackendSuite extends SparkFunSuite with LocalSparkContext wi
test("check spark-class location correctly") {
val conf = new SparkConf
- conf.set("spark.mesos.executor.home" , "/mesos-home")
+ conf.set("spark.mesos.executor.home", "/mesos-home")
val listenerBus = mock[LiveListenerBus]
listenerBus.post(
http://git-wip-us.apache.org/repos/asf/spark/blob/f14922cf/scalastyle-config.xml
----------------------------------------------------------------------
diff --git a/scalastyle-config.xml b/scalastyle-config.xml
index 2439a1f..bc209ee 100644
--- a/scalastyle-config.xml
+++ b/scalastyle-config.xml
@@ -220,7 +220,7 @@ This file is divided into 3 sections:
<!-- Should turn this on, but we have a few places that need to be fixed first -->
<check level="warning" class="org.scalastyle.scalariform.DisallowSpaceBeforeTokenChecker" enabled="true">
<parameters>
- <parameter name="tokens">COLON, COMMA</parameter>
+ <parameter name="tokens">COMMA</parameter>
</parameters>
</check>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org