You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/09/13 09:36:52 UTC
spark git commit: [SPARK-10222] [GRAPHX] [DOCS] More thoroughly
deprecate Bagel in favor of GraphX
Repository: spark
Updated Branches:
refs/heads/master b3a7480ab -> 1dc614b87
[SPARK-10222] [GRAPHX] [DOCS] More thoroughly deprecate Bagel in favor of GraphX
Finish deprecating Bagel; remove reference to nonexistent example
Author: Sean Owen <so...@cloudera.com>
Closes #8731 from srowen/SPARK-10222.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1dc614b8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1dc614b8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1dc614b8
Branch: refs/heads/master
Commit: 1dc614b874badde0eee60def46fb47f608bc4759
Parents: b3a7480
Author: Sean Owen <so...@cloudera.com>
Authored: Sun Sep 13 08:36:46 2015 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Sun Sep 13 08:36:46 2015 +0100
----------------------------------------------------------------------
bagel/src/main/scala/org/apache/spark/bagel/Bagel.scala | 6 ++++++
docs/bagel-programming-guide.md | 10 +---------
docs/index.md | 1 -
pom.xml | 2 +-
4 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/1dc614b8/bagel/src/main/scala/org/apache/spark/bagel/Bagel.scala
----------------------------------------------------------------------
diff --git a/bagel/src/main/scala/org/apache/spark/bagel/Bagel.scala b/bagel/src/main/scala/org/apache/spark/bagel/Bagel.scala
index 4e6b768..8399033 100644
--- a/bagel/src/main/scala/org/apache/spark/bagel/Bagel.scala
+++ b/bagel/src/main/scala/org/apache/spark/bagel/Bagel.scala
@@ -22,6 +22,7 @@ import org.apache.spark.SparkContext._
import org.apache.spark.rdd.RDD
import org.apache.spark.storage.StorageLevel
+@deprecated("Uses of Bagel should migrate to GraphX", "1.6.0")
object Bagel extends Logging {
val DEFAULT_STORAGE_LEVEL = StorageLevel.MEMORY_AND_DISK
@@ -270,18 +271,21 @@ object Bagel extends Logging {
}
}
+@deprecated("Uses of Bagel should migrate to GraphX", "1.6.0")
trait Combiner[M, C] {
def createCombiner(msg: M): C
def mergeMsg(combiner: C, msg: M): C
def mergeCombiners(a: C, b: C): C
}
+@deprecated("Uses of Bagel should migrate to GraphX", "1.6.0")
trait Aggregator[V, A] {
def createAggregator(vert: V): A
def mergeAggregators(a: A, b: A): A
}
/** Default combiner that simply appends messages together (i.e. performs no aggregation) */
+@deprecated("Uses of Bagel should migrate to GraphX", "1.6.0")
class DefaultCombiner[M: Manifest] extends Combiner[M, Array[M]] with Serializable {
def createCombiner(msg: M): Array[M] =
Array(msg)
@@ -297,6 +301,7 @@ class DefaultCombiner[M: Manifest] extends Combiner[M, Array[M]] with Serializab
* Subclasses may store state along with each vertex and must
* inherit from java.io.Serializable or scala.Serializable.
*/
+@deprecated("Uses of Bagel should migrate to GraphX", "1.6.0")
trait Vertex {
def active: Boolean
}
@@ -307,6 +312,7 @@ trait Vertex {
* Subclasses may contain a payload to deliver to the target vertex
* and must inherit from java.io.Serializable or scala.Serializable.
*/
+@deprecated("Uses of Bagel should migrate to GraphX", "1.6.0")
trait Message[K] {
def targetId: K
}
http://git-wip-us.apache.org/repos/asf/spark/blob/1dc614b8/docs/bagel-programming-guide.md
----------------------------------------------------------------------
diff --git a/docs/bagel-programming-guide.md b/docs/bagel-programming-guide.md
index c2fe6b0..347ca4a 100644
--- a/docs/bagel-programming-guide.md
+++ b/docs/bagel-programming-guide.md
@@ -4,7 +4,7 @@ displayTitle: Bagel Programming Guide
title: Bagel
---
-**Bagel will soon be superseded by [GraphX](graphx-programming-guide.html); we recommend that new users try GraphX instead.**
+**Bagel is deprecated, and superseded by [GraphX](graphx-programming-guide.html).**
Bagel is a Spark implementation of Google's [Pregel](http://portal.acm.org/citation.cfm?id=1807184) graph processing framework. Bagel currently supports basic graph computation, combiners, and aggregators.
@@ -157,11 +157,3 @@ trait Message[K] {
def targetId: K
}
{% endhighlight %}
-
-# Where to Go from Here
-
-Two example jobs, PageRank and shortest path, are included in `examples/src/main/scala/org/apache/spark/examples/bagel`. You can run them by passing the class name to the `bin/run-example` script included in Spark; e.g.:
-
- ./bin/run-example org.apache.spark.examples.bagel.WikipediaPageRank
-
-Each example program prints usage help when run without any arguments.
http://git-wip-us.apache.org/repos/asf/spark/blob/1dc614b8/docs/index.md
----------------------------------------------------------------------
diff --git a/docs/index.md b/docs/index.md
index d85cf12..c0dc2b8 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -90,7 +90,6 @@ options for deployment:
* [Spark SQL and DataFrames](sql-programming-guide.html): support for structured data and relational queries
* [MLlib](mllib-guide.html): built-in machine learning library
* [GraphX](graphx-programming-guide.html): Spark's new API for graph processing
- * [Bagel (Pregel on Spark)](bagel-programming-guide.html): older, simple graph processing model
**API Docs:**
http://git-wip-us.apache.org/repos/asf/spark/blob/1dc614b8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 88ebcec..421357e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
<modules>
<module>core</module>
- <module>bagel</module>
+ <module>bagel</module> <!-- Deprecated -->
<module>graphx</module>
<module>mllib</module>
<module>tools</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org