Skip to content

Commit

Permalink
[FLINK-2833] [gelly] create a flink-libraries module and move gelly t…
Browse files Browse the repository at this point in the history
…here

This closes apache#1241
  • Loading branch information
vasia committed Oct 9, 2015
1 parent 71d5a39 commit 91ffbc1
Show file tree
Hide file tree
Showing 128 changed files with 46 additions and 7 deletions.
6 changes: 3 additions & 3 deletions docs/libs/gelly_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Gelly is a Graph API for Flink. It contains a set of methods and utilities which
Using Gelly
-----------

Gelly is currently part of the *staging* Maven project. All relevant classes are located in the *org.apache.flink.graph* package.
Gelly is currently part of the *libraries* Maven project. All relevant classes are located in the *org.apache.flink.graph* package.

Add the following dependency to your `pom.xml` to use Gelly.

Expand All @@ -57,7 +57,7 @@ Add the following dependency to your `pom.xml` to use Gelly.

Note that Gelly is currently not part of the binary distribution. See linking with it for cluster execution [here](../apis/cluster_execution.html#linking-with-modules-not-contained-in-the-binary-distribution).

The remaining sections provide a description of available methods and present several examples of how to use Gelly and how to mix it with the Flink DataSet API. After reading this guide, you might also want to check the {% gh_link /flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/example/ "Gelly examples" %}.
The remaining sections provide a description of available methods and present several examples of how to use Gelly and how to mix it with the Flink DataSet API. After reading this guide, you might also want to check the {% gh_link /flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/ "Gelly examples" %}.

Graph Representation
-----------
Expand Down Expand Up @@ -1194,7 +1194,7 @@ final class UpdateDistance extends ApplyFunction[Long, Double, Double] {

Note that `gather` takes a `Neighbor` type as an argument. This is a convenience type which simply wraps a vertex with its neighboring edge.

For more examples of how to implement algorithms with the Gather-Sum-Apply model, check the {% gh_link /flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/library/GSAPageRank.java "GSAPageRank" %} and {% gh_link /flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/library/GSAConnectedComponents.java "GSAConnectedComponents" %} library methods of Gelly.
For more examples of how to implement algorithms with the Gather-Sum-Apply model, check the {% gh_link /flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/GSAPageRank.java "GSAPageRank" %} and {% gh_link /flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/GSAConnectedComponents.java "GSAConnectedComponents" %} library methods of Gelly.

[Back to top](#top)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-staging</artifactId>
<artifactId>flink-libraries</artifactId>
<version>0.10-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ under the License.

<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-staging</artifactId>
<artifactId>flink-libraries</artifactId>
<version>0.10-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Expand Down
40 changes: 40 additions & 0 deletions flink-libraries/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.10-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>flink-libraries</artifactId>
<name>flink-libraries</name>
<packaging>pom</packaging>

<modules>
<module>flink-gelly</module>
<module>flink-gelly-scala</module>
</modules>
</project>
2 changes: 0 additions & 2 deletions flink-staging/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,10 @@ under the License.
<module>flink-hadoop-compatibility</module>
<module>flink-streaming</module>
<module>flink-hbase</module>
<module>flink-gelly</module>
<module>flink-hcatalog</module>
<module>flink-table</module>
<module>flink-ml</module>
<module>flink-language-binding</module>
<module>flink-gelly-scala</module>
<module>flink-scala-shell</module>
</modules>

Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ under the License.
<module>flink-tests</module>
<module>flink-test-utils</module>
<module>flink-staging</module>
<module>flink-libraries</module>
<module>flink-quickstart</module>
<module>flink-contrib</module>
<module>flink-dist</module>
Expand Down

0 comments on commit 91ffbc1

Please sign in to comment.