aboutsummaryrefslogtreecommitdiff
path: root/docs/graphx-programming-guide.md
diff options
context:
space:
mode:
authorAnkur Dave <ankurdave@gmail.com>2014-01-10 11:37:10 -0800
committerAnkur Dave <ankurdave@gmail.com>2014-01-10 11:37:10 -0800
commit6bd9a78e78d42dc5c216af4b6f59a71a002f82e5 (patch)
treedee127765fa8429478641eb5f25f64a4038b2ce8 /docs/graphx-programming-guide.md
parentcfc10c74a33cfd0997f53cb37053fd69193ee790 (diff)
downloadspark-6bd9a78e78d42dc5c216af4b6f59a71a002f82e5.tar.gz
spark-6bd9a78e78d42dc5c216af4b6f59a71a002f82e5.tar.bz2
spark-6bd9a78e78d42dc5c216af4b6f59a71a002f82e5.zip
Add back Bagel links to docs, but mark them superseded
Diffstat (limited to 'docs/graphx-programming-guide.md')
-rw-r--r--docs/graphx-programming-guide.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/graphx-programming-guide.md b/docs/graphx-programming-guide.md
index a551e4306d..8ae5f17e12 100644
--- a/docs/graphx-programming-guide.md
+++ b/docs/graphx-programming-guide.md
@@ -16,7 +16,7 @@ title: GraphX Programming Guide
# Overview
GraphX is the new (alpha) Spark API for graphs and graph-parallel
-computation. At a high-level GraphX, extends the Spark
+computation. At a high-level, GraphX extends the Spark
[RDD](api/core/index.html#org.apache.spark.rdd.RDD) by
introducing the [Resilient Distributed property Graph (RDG)](#property_graph):
a directed graph with properties attached to each vertex and edge.
@@ -77,12 +77,13 @@ graph-parallel systems while easily expressing the entire analytics pipelines.
## GraphX Replaces the Spark Bagel API
Prior to the release of GraphX, graph computation in Spark was expressed using
-Bagel, an implementation of the Pregel API. GraphX improves upon Bagel by exposing
-a richer property graph API, a more streamlined version of the Pregel abstraction,
-and system optimizations to improve performance and reduce memory
+Bagel, an implementation of the Pregel API. GraphX improves upon Bagel by
+exposing a richer property graph API, a more streamlined version of the Pregel
+abstraction, and system optimizations to improve performance and reduce memory
overhead. While we plan to eventually deprecate the Bagel, we will continue to
-support the API and [Bagel programming guide](bagel-programming-guide.html). However,
-we encourage Bagel to explore the new GraphX API and comment on issues that may
+support the [Bagel API](api/bagel/index.html#org.apache.spark.bagel.package) and
+[Bagel programming guide](bagel-programming-guide.html). However, we encourage
+Bagel users to explore the new GraphX API and comment on issues that may
complicate the transition from Bagel.
# The Property Graph
@@ -168,4 +169,3 @@ val userInfoWithPageRank = subgraph.outerJoinVertices(pagerankGraph.vertices){
println(userInfoWithPageRank.top(5))
{% endhighlight %}
-