Skip to content

SKIPME merge Apache branch-1.4 #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markhamstra merged 14 commits into from
Jul 30, 2015
Merged

SKIPME merge Apache branch-1.4 #74

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a0b047b
[SPARK-9236] [CORE] Make defaultPartitioner not reuse a parent RDD's …
huitseeker Jul 24, 2015
ff5e5f2
[SPARK-9238] [SQL] Remove two extra useless entries for bytesOfCodePo…
zhichao-li Jul 24, 2015
712e13b
[SPARK-9254] [BUILD] [HOTFIX] sbt-launch-lib.bash should support HTTP…
liancheng Jul 22, 2015
a37796b
[SPARK-8881] [SPARK-9260] Fix algorithm for scheduling executors on w…
nishkamravi2 Jul 26, 2015
a4b80e6
[SPARK-9352] [SPARK-9353] Add tests for standalone scheduling code
Jul 26, 2015
d0ef42c
[SPARK-9326] Close lock file used for file downloads.
kayousterhout Jul 26, 2015
5aed926
[HOTFIX] Fix compile in MasterSuite
Jul 27, 2015
2b1973d
[SPARK-9352] [SPARK-9353] [HOTFIX] Reverts PR #7668 on branch-1.4
liancheng Jul 27, 2015
a671dad
[SPARK-8405] [DOC] Add how to view logs on Web UI when yarn log aggre…
carsonwang Jul 27, 2015
cfca1c5
Pregel example type fix
avulanov Jul 27, 2015
43035b4
[SPARK-9371][SQL] fix SPARK-9371 for branch 1.4
cloud-fan Jul 27, 2015
c103c99
[SPARK-9352] [SPARK-9353] Add tests for standalone scheduling code
Jul 26, 2015
8dfdca4
Use vector-friendly comparison for packages argument.
trestletech Jul 28, 2015
8b86fde
Merge branch 'branch-1.4' of github.com:apache/spark into csd-1.4
markhamstra Jul 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Pregel example type fix 
Pregel example to express single source shortest path from https://spark.apache.org/docs/latest/graphx-programming-guide.html#pregel-api does not work due to incorrect type. The reason is that `GraphGenerators.logNormalGraph` returns the graph with `Long` vertices. Fixing `val graph: Graph[Int, Double]` to `val graph: Graph[Long, Double]`.

Author: Alexander Ulanov <[email protected]>

Closes apache#7695 from avulanov/SPARK-9380-pregel-doc and squashes the following commits:

c269429 [Alexander Ulanov] Pregel example type fix

(cherry picked from commit 90006f3)
Signed-off-by: Kousuke Saruta <[email protected]>
  • Loading branch information
@avulanov @sarutak
avulanov authored and sarutak committed Jul 27, 2015
commit cfca1c5af4af96aa0483ea76d15fe2b135e5c03e
2 changes: 1 addition & 1 deletion docs/graphx-programming-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ import org.apache.spark.graphx._
// Import random graph generation library
import org.apache.spark.graphx.util.GraphGenerators
// A graph with edge attributes containing distances
val graph: Graph[Int, Double] =
val graph: Graph[Long, Double] =
GraphGenerators.logNormalGraph(sc, numVertices = 100).mapEdges(e => e.attr.toDouble)
val sourceId: VertexId = 42 // The ultimate source
// Initialize the graph such that all vertices except the root have distance infinity.
Expand Down