Commit graph

4173 commits

Author SHA1 Message Date
Dan Crankshaw 0d3ea36fd8 Added a groupEdges and a groupEdgeTriplets method. For some reason the groupEdgeTriplets method isn't properly iterating through the set of edges and thus is returning the wrong result. groupEdges seems to be working. 2013-10-06 18:34:23 -07:00
Dan Crankshaw 6cb21ce889 groupEdges() now compiles. Still need some unit tests 2013-10-06 15:33:35 -07:00
Dan Crankshaw 730a3156d3 Added initial groupEdges code. Still a prototype, I haven't figured out quite how it should all work yet. 2013-10-05 19:44:28 -07:00
Dan Crankshaw bfedbee13a Edge partitioner now partitions by canonical edge so all edges between two vertices (in either direction) will be sent to same machine. 2013-10-05 16:04:57 -07:00
Dan Crankshaw e096cbe90e Added 2D canonical edge partitioner 2013-10-05 15:20:15 -07:00
Dan Crankshaw da3e123afb Removed some comments 2013-10-03 18:11:35 -07:00
Dan Crankshaw 1ee60d3b34 Fixed bug in sampleLogNormal 2013-10-03 17:46:37 -07:00
Dan Crankshaw 27b442dc06 Fixed annotation import 2013-10-03 10:29:00 -07:00
Dan Crankshaw 8edd499eff Added rmat graph generator 2013-10-03 10:21:34 -07:00
Dan Crankshaw 3c3cc1508b Added initial implementation of lognormal graph generator. Haven't tested it yet. 2013-09-28 16:00:44 -07:00
Joey a00317bb9b Merge pull request #1 from ankurdave/aggregateNeighbors-returns-graph
Return Graph from Graph.aggregateNeighbors
2013-09-20 11:29:31 -07:00
Ankur Dave bf05dc7e78 Add a unit test for aggregateNeighbors 2013-09-19 23:45:15 -07:00
Ankur Dave 7cadeffdf4 Merge branch 'master' into aggregateNeighbors-returns-graph 2013-09-19 23:14:26 -07:00
Ankur Dave f08e520f4c Initialize sc in GraphSuite to avoid NullPointerException 2013-09-19 23:12:24 -07:00
Ankur Dave f02d5c8c53 Fix typo in aggregateNeighbors docs 2013-09-19 23:06:37 -07:00
Ankur Dave 6a5e665cdc Merge pull request #3 from ankurdave/clear-port-properties-after-tests
After unit tests, clear port properties unconditionally

Also submitted to Spark upstream (mesos/spark#940)
2013-09-19 22:41:44 -07:00
Ankur Dave 3ebbcaf21c After unit tests, clear port properties unconditionally 2013-09-19 22:14:38 -07:00
Ankur Dave 68ad33a127 Merge pull request #2 from ankurdave/package-fixes
Package fixes (spark.graph -> org.apache.spark.graph)
2013-09-19 21:30:27 -07:00
Ankur Dave d3cbde0085 Import appropriate Spark core classes 2013-09-19 19:29:58 -07:00
Ankur Dave c278907bf0 Move BytecodeUtils to the right package 2013-09-19 19:28:22 -07:00
Ankur Dave 9632ad3b21 Move IndexedRDDSuite to org.apache.spark 2013-09-19 19:25:52 -07:00
Ankur Dave 4c694bd705 Move IndexedRDD and GraphSuite to org.apache.spark 2013-09-19 19:13:07 -07:00
Ankur Dave 4e967af6af Return Graph from default aggregateNeighbors also 2013-09-18 16:18:33 -07:00
Ankur Dave b04f1a4019 Implement aggregateNeighbors returning Graph 2013-09-18 16:18:33 -07:00
Ankur Dave 9ff783599b Return Graph from aggregateNeighbors; update callers
This commit only affects the Graph API, not GraphImpl.
2013-09-18 16:18:33 -07:00
Joseph E. Gonzalez 9335aff946 Merge branch 'indexed_rdd' of /Users/jegonzal/Documents/amplab/spark 2013-09-18 11:58:33 -07:00
Joseph E. Gonzalez 55696e2584 GraphX now builds with all merged changes. 2013-09-17 22:42:12 -07:00
Joseph E. Gonzalez c0b392a160 Mering changes from master 2013-09-17 22:03:33 -07:00
Joseph E. Gonzalez 8b59fb72c4 Merging latest changes from spark main branch 2013-09-17 20:56:12 -07:00
Joseph E. Gonzalez a3fb29938c Merging changes between Reynold's branch and Joey's modifications. 2013-09-17 17:34:24 -07:00
Patrick Wendell 2aff7989ab Merge pull request #933 from jey/yarn-typo-fix
Fix typo in Maven build docs
2013-09-15 14:05:04 -07:00
Jey Kottalam ac0dd99394 Fix typo in Maven build docs 2013-09-15 13:29:22 -07:00
Patrick Wendell dbd2c4fd94 Merge pull request #932 from pwendell/mesos-version
Bumping Mesos version to 0.13.0
2013-09-15 13:20:41 -07:00
Patrick Wendell 9fb0b9d77f Merge pull request #931 from pwendell/yarn-docs
Explain yarn.version in Maven build docs
2013-09-15 13:02:53 -07:00
Patrick Wendell c856860c5b Bumping Mesos version to 0.13.0 2013-09-15 12:46:26 -07:00
Patrick Wendell 362ea0c051 Explain yarn.version in Maven build docs 2013-09-15 12:40:49 -07:00
Patrick Wendell c4c1db2dd5 Merge pull request #929 from pwendell/master
Use different Hadoop version for YARN artifacts.
2013-09-13 19:52:12 -07:00
Patrick Wendell e9eba8c3ce Use different Hadoop version for YARN artifacts.
This uses a seperate Hadoop version for YARN artifact. This means when people link against
spark-yarn, things will resolve correctly.
2013-09-13 15:34:57 -07:00
Patrick Wendell 45ec1cc90e Add git scm url for publishing 2013-09-12 13:47:31 -07:00
Patrick Wendell a310de69e0 Merge pull request #926 from kayousterhout/dynamic
Changed localProperties to use ThreadLocal (not DynamicVariable).
2013-09-11 19:36:11 -07:00
Matei Zaharia 58c7d8b138 Merge pull request #927 from benh/mesos-docs
Updated Spark on Mesos documentation.
2013-09-11 17:33:42 -07:00
Benjamin Hindman 8e2602dd70 More updates to Spark on Mesos documentation. 2013-09-11 16:08:54 -07:00
Benjamin Hindman a0f0c1bed2 Updated Spark on Mesos documentation. 2013-09-11 16:05:25 -07:00
Kay Ousterhout 93c4253275 Changed localProperties to use ThreadLocal (not DynamicVariable).
The fact that DynamicVariable uses an InheritableThreadLocal
can cause problems where the properties end up being shared
across threads in certain circumstances.
2013-09-11 13:01:39 -07:00
Patrick Wendell 91a59e6b10 Merge pull request #919 from mateiz/jets3t
Add explicit jets3t dependency, which is excluded in hadoop-client
2013-09-11 10:21:48 -07:00
Patrick Wendell b9128d34bf Merge pull request #922 from pwendell/port-change
Change default port number from 3030 to 4030.
2013-09-11 10:03:06 -07:00
Patrick Wendell bddf135670 Change port from 3030 to 4040 2013-09-11 10:01:38 -07:00
Reynold Xin e07eef83af Merge pull request #925 from davidmccauley/master
SPARK-894 - Not all WebUI fields delivered VIA JSON
2013-09-11 07:35:39 -07:00
David McCauley 5dd875c5b5 SPARK-894 - Not all WebUI fields delivered VIA JSON 2013-09-11 10:46:37 +01:00
Matei Zaharia 8432f27fbe Merge pull request #923 from haoyuan/master
fix run-example script
2013-09-10 23:19:53 -07:00