From f40a0898a7f627f0d66f8393f724b518c50fba09 Mon Sep 17 00:00:00 2001 From: Ankur Dave <ankurdave@gmail.com> Date: Mon, 9 May 2011 15:23:21 -0700 Subject: [PATCH] Rename bagel to spark.bagel and Pregel to Bagel --- .../{bagel/Pregel.scala => spark/bagel/Bagel.scala} | 10 +++++----- .../{ => spark}/bagel/examples/ShortestPath.scala | 8 ++++---- .../{ => spark}/bagel/examples/WikipediaPageRank.scala | 10 +++++----- bagel/src/test/scala/bagel/BagelSuite.scala | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) rename bagel/src/main/scala/{bagel/Pregel.scala => spark/bagel/Bagel.scala} (96%) rename bagel/src/main/scala/{ => spark}/bagel/examples/ShortestPath.scala (93%) rename bagel/src/main/scala/{ => spark}/bagel/examples/WikipediaPageRank.scala (93%) diff --git a/bagel/src/main/scala/bagel/Pregel.scala b/bagel/src/main/scala/spark/bagel/Bagel.scala similarity index 96% rename from bagel/src/main/scala/bagel/Pregel.scala rename to bagel/src/main/scala/spark/bagel/Bagel.scala index 2ec94ebb0d..08ff1d8a01 100644 --- a/bagel/src/main/scala/bagel/Pregel.scala +++ b/bagel/src/main/scala/spark/bagel/Bagel.scala @@ -1,11 +1,11 @@ -package bagel +package spark.bagel import spark._ import spark.SparkContext._ import scala.collection.mutable.ArrayBuffer -object Pregel extends Logging { +object Bagel extends Logging { def run[V <: Vertex : Manifest, M <: Message : Manifest, C : Manifest, A : Manifest]( sc: SparkContext, verts: RDD[(String, V)], @@ -88,7 +88,7 @@ object Pregel extends Logging { /** * Converts a compute function that doesn't take an aggregator to - * one that does, so it can be passed to Pregel.run. + * one that does, so it can be passed to Bagel.run. */ implicit def addAggregatorArg[ V <: Vertex : Manifest, M <: Message : Manifest, C @@ -128,7 +128,7 @@ class NullAggregator[V] extends Aggregator[V, Option[Nothing]] { } /** - * Represents a Pregel vertex. + * Represents a Bagel vertex. * * Subclasses may store state along with each vertex and must be * annotated with @serializable. @@ -139,7 +139,7 @@ trait Vertex { } /** - * Represents a Pregel message to a target vertex. + * Represents a Bagel message to a target vertex. * * Subclasses may contain a payload to deliver to the target vertex * and must be annotated with @serializable. diff --git a/bagel/src/main/scala/bagel/examples/ShortestPath.scala b/bagel/src/main/scala/spark/bagel/examples/ShortestPath.scala similarity index 93% rename from bagel/src/main/scala/bagel/examples/ShortestPath.scala rename to bagel/src/main/scala/spark/bagel/examples/ShortestPath.scala index 2e6100c070..a7fd386310 100644 --- a/bagel/src/main/scala/bagel/examples/ShortestPath.scala +++ b/bagel/src/main/scala/spark/bagel/examples/ShortestPath.scala @@ -1,12 +1,12 @@ -package bagel.examples +package spark.bagel.examples import spark._ import spark.SparkContext._ import scala.math.min -import bagel._ -import bagel.Pregel._ +import spark.bagel._ +import spark.bagel.Bagel._ object ShortestPath { def main(args: Array[String]) { @@ -68,7 +68,7 @@ object ShortestPath { (new SPVertex(self.id, newValue, self.outEdges, false), outbox) } - val result = Pregel.run(sc, vertices, messages)(combiner = MinCombiner, numSplits = numSplits)(compute) + val result = Bagel.run(sc, vertices, messages)(combiner = MinCombiner, numSplits = numSplits)(compute) // Print the result System.err.println("Shortest path from "+startVertex+" to all vertices:") diff --git a/bagel/src/main/scala/bagel/examples/WikipediaPageRank.scala b/bagel/src/main/scala/spark/bagel/examples/WikipediaPageRank.scala similarity index 93% rename from bagel/src/main/scala/bagel/examples/WikipediaPageRank.scala rename to bagel/src/main/scala/spark/bagel/examples/WikipediaPageRank.scala index a5e0a9ffb6..1bce5bebad 100644 --- a/bagel/src/main/scala/bagel/examples/WikipediaPageRank.scala +++ b/bagel/src/main/scala/spark/bagel/examples/WikipediaPageRank.scala @@ -1,10 +1,10 @@ -package bagel.examples +package spark.bagel.examples import spark._ import spark.SparkContext._ -import bagel._ -import bagel.Pregel._ +import spark.bagel._ +import spark.bagel.Bagel._ import scala.collection.mutable.ArrayBuffer import scala.xml.{XML,NodeSeq} @@ -63,9 +63,9 @@ object WikipediaPageRank { val messages = sc.parallelize(List[(String, PRMessage)]()) val result = if (noCombiner) { - Pregel.run(sc, vertices, messages)(numSplits = numSplits)(PRNoCombiner.compute(numVertices, epsilon)) + Bagel.run(sc, vertices, messages)(numSplits = numSplits)(PRNoCombiner.compute(numVertices, epsilon)) } else { - Pregel.run(sc, vertices, messages)(combiner = PRCombiner, numSplits = numSplits)(PRCombiner.compute(numVertices, epsilon)) + Bagel.run(sc, vertices, messages)(combiner = PRCombiner, numSplits = numSplits)(PRCombiner.compute(numVertices, epsilon)) } // Print the result diff --git a/bagel/src/test/scala/bagel/BagelSuite.scala b/bagel/src/test/scala/bagel/BagelSuite.scala index 53a93a6b80..1b47fc9ed5 100644 --- a/bagel/src/test/scala/bagel/BagelSuite.scala +++ b/bagel/src/test/scala/bagel/BagelSuite.scala @@ -1,4 +1,4 @@ -package bagel +package spark.bagel import org.scalatest.{FunSuite, Assertions} import org.scalatest.prop.Checkers @@ -10,7 +10,7 @@ import scala.collection.mutable.ArrayBuffer import spark._ -import bagel.Pregel._ +import spark.bagel.Bagel._ @serializable class TestVertex(val id: String, val active: Boolean, val age: Int) extends Vertex @serializable class TestMessage(val targetId: String) extends Message @@ -22,7 +22,7 @@ class BagelSuite extends FunSuite with Assertions { val msgs = sc.parallelize(Array[(String, TestMessage)]()) val numSupersteps = 5 val result = - Pregel.run(sc, verts, msgs)()(addAggregatorArg { + Bagel.run(sc, verts, msgs)()(addAggregatorArg { (self: TestVertex, msgs: Option[ArrayBuffer[TestMessage]], superstep: Int) => (new TestVertex(self.id, superstep < numSupersteps - 1, self.age + 1), Array[TestMessage]()) }) @@ -36,7 +36,7 @@ class BagelSuite extends FunSuite with Assertions { val msgs = sc.parallelize(Array("a" -> new TestMessage("a"))) val numSupersteps = 5 val result = - Pregel.run(sc, verts, msgs)()(addAggregatorArg { + Bagel.run(sc, verts, msgs)()(addAggregatorArg { (self: TestVertex, msgs: Option[ArrayBuffer[TestMessage]], superstep: Int) => val msgsOut = msgs match { -- GitLab