Skip to content

Merged Apache bug fixes #124

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 5 commits into from
Nov 14, 2015
Merged

Merged Apache bug fixes #124

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b478ee3
[SPARK-11595][SQL][BRANCH-1.5] Fixes ADD JAR when the input path cont…
liancheng Nov 12, 2015
3676d4c
Fixed error in scaladoc of convertToCanonicalEdges
gauravkumar37 Nov 12, 2015
330961b
[SPARK-8029] robust shuffle writer (for 1.5 branch)
Nov 13, 2015
cac9641
Merge branch 'branch-1.5' of github.com:apache/spark into csd-1.5
markhamstra Nov 13, 2015
bf70090
bumped version in extras
markhamstra Nov 14, 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
Fixed error in scaladoc of convertToCanonicalEdges 
The code convertToCanonicalEdges is such that srcIds are smaller than dstIds but the scaladoc suggested otherwise. Have fixed the same.

Author: Gaurav Kumar <[email protected]>

Closes apache#9666 from gauravkumar37/patch-1.

(cherry picked from commit df0e318)
Signed-off-by: Reynold Xin <[email protected]>
  • Loading branch information
@gauravkumar37 @rxin
gauravkumar37 authored and rxin committed Nov 12, 2015
commit 3676d4c4de0e1f03915ed794925d841bc413cf0d
2 changes: 1 addition & 1 deletion graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ class GraphOps[VD: ClassTag, ED: ClassTag](graph: Graph[VD, ED]) extends Seriali
* Convert bi-directional edges into uni-directional ones.
* Some graph algorithms (e.g., TriangleCount) assume that an input graph
* has its edges in canonical direction.
* This function rewrites the vertex ids of edges so that srcIds are bigger
* This function rewrites the vertex ids of edges so that srcIds are smaller
* than dstIds, and merges the duplicated edges.
*
* @param mergeFunc the user defined reduce function which should
Expand Down