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/11 00:41:24 UTC
spark git commit: [SPARK-12692][BUILD][GRAPHX] Scala style: Fix the
style violation (Space before ", " or ":")
Repository: spark
Updated Branches:
refs/heads/master e5904bb5e -> 3119206b7
[SPARK-12692][BUILD][GRAPHX] Scala style: Fix the style violation (Space before "," or ":")
Fix the style violation (space before `,` and `:`).
This PR is a followup for #10643.
Author: Kousuke Saruta <sa...@oss.nttdata.co.jp>
Closes #10683 from sarutak/SPARK-12692-followup-graphx.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3119206b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3119206b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3119206b
Branch: refs/heads/master
Commit: 3119206b7188c23055621dfeaf6874f21c711a82
Parents: e5904bb
Author: Kousuke Saruta <sa...@oss.nttdata.co.jp>
Authored: Sun Jan 10 15:41:22 2016 -0800
Committer: Reynold Xin <rx...@databricks.com>
Committed: Sun Jan 10 15:41:22 2016 -0800
----------------------------------------------------------------------
graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala | 5 ++---
.../org/apache/spark/graphx/impl/ReplicatedVertexView.scala | 4 ++--
.../org/apache/spark/graphx/impl/ShippableVertexPartition.scala | 4 ++--
.../org/apache/spark/graphx/impl/VertexPartitionBaseOps.scala | 2 +-
.../src/main/scala/org/apache/spark/graphx/lib/PageRank.scala | 2 +-
5 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/3119206b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
----------------------------------------------------------------------
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
index fc36e12..d048fb5 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
@@ -21,7 +21,6 @@ import scala.reflect.ClassTag
import scala.util.Random
import org.apache.spark.SparkException
-import org.apache.spark.SparkContext._
import org.apache.spark.graphx.lib._
import org.apache.spark.rdd.RDD
@@ -379,7 +378,7 @@ class GraphOps[VD: ClassTag, ED: ClassTag](graph: Graph[VD, ED]) extends Seriali
* @see [[org.apache.spark.graphx.lib.PageRank$#runUntilConvergenceWithOptions]]
*/
def personalizedPageRank(src: VertexId, tol: Double,
- resetProb: Double = 0.15) : Graph[Double, Double] = {
+ resetProb: Double = 0.15): Graph[Double, Double] = {
PageRank.runUntilConvergenceWithOptions(graph, tol, resetProb, Some(src))
}
@@ -392,7 +391,7 @@ class GraphOps[VD: ClassTag, ED: ClassTag](graph: Graph[VD, ED]) extends Seriali
* @see [[org.apache.spark.graphx.lib.PageRank$#runWithOptions]]
*/
def staticPersonalizedPageRank(src: VertexId, numIter: Int,
- resetProb: Double = 0.15) : Graph[Double, Double] = {
+ resetProb: Double = 0.15): Graph[Double, Double] = {
PageRank.runWithOptions(graph, numIter, resetProb, Some(src))
}
http://git-wip-us.apache.org/repos/asf/spark/blob/3119206b/graphx/src/main/scala/org/apache/spark/graphx/impl/ReplicatedVertexView.scala
----------------------------------------------------------------------
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/impl/ReplicatedVertexView.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/ReplicatedVertexView.scala
index f79f9c7..b4bec7c 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/impl/ReplicatedVertexView.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/ReplicatedVertexView.scala
@@ -41,8 +41,8 @@ class ReplicatedVertexView[VD: ClassTag, ED: ClassTag](
* shipping level.
*/
def withEdges[VD2: ClassTag, ED2: ClassTag](
- edges_ : EdgeRDDImpl[ED2, VD2]): ReplicatedVertexView[VD2, ED2] = {
- new ReplicatedVertexView(edges_, hasSrcId, hasDstId)
+ _edges: EdgeRDDImpl[ED2, VD2]): ReplicatedVertexView[VD2, ED2] = {
+ new ReplicatedVertexView(_edges, hasSrcId, hasDstId)
}
/**
http://git-wip-us.apache.org/repos/asf/spark/blob/3119206b/graphx/src/main/scala/org/apache/spark/graphx/impl/ShippableVertexPartition.scala
----------------------------------------------------------------------
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/impl/ShippableVertexPartition.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/ShippableVertexPartition.scala
index 3f203c4..96d807f 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/impl/ShippableVertexPartition.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/ShippableVertexPartition.scala
@@ -102,8 +102,8 @@ class ShippableVertexPartition[VD: ClassTag](
extends VertexPartitionBase[VD] {
/** Return a new ShippableVertexPartition with the specified routing table. */
- def withRoutingTable(routingTable_ : RoutingTablePartition): ShippableVertexPartition[VD] = {
- new ShippableVertexPartition(index, values, mask, routingTable_)
+ def withRoutingTable(_routingTable: RoutingTablePartition): ShippableVertexPartition[VD] = {
+ new ShippableVertexPartition(index, values, mask, _routingTable)
}
/**
http://git-wip-us.apache.org/repos/asf/spark/blob/3119206b/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBaseOps.scala
----------------------------------------------------------------------
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBaseOps.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBaseOps.scala
index f508b48..7c680dc 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBaseOps.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartitionBaseOps.scala
@@ -32,7 +32,7 @@ import org.apache.spark.util.collection.BitSet
* example, [[VertexPartition.VertexPartitionOpsConstructor]]).
*/
private[graphx] abstract class VertexPartitionBaseOps
- [VD: ClassTag, Self[X] <: VertexPartitionBase[X] : VertexPartitionBaseOpsConstructor]
+ [VD: ClassTag, Self[X] <: VertexPartitionBase[X]: VertexPartitionBaseOpsConstructor]
(self: Self[VD])
extends Serializable with Logging {
http://git-wip-us.apache.org/repos/asf/spark/blob/3119206b/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala
----------------------------------------------------------------------
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala b/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala
index 35b26c9..46faad2 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala
@@ -138,7 +138,7 @@ object PageRank extends Logging {
// edge partitions.
prevRankGraph = rankGraph
val rPrb = if (personalized) {
- (src: VertexId , id: VertexId) => resetProb * delta(src, id)
+ (src: VertexId, id: VertexId) => resetProb * delta(src, id)
} else {
(src: VertexId, id: VertexId) => resetProb
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org