Skip to content
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

[#1439] Generify tuplesFromGraph #1440

Merged
merged 3 commits into from
Nov 15, 2019
Merged

[#1439] Generify tuplesFromGraph #1440

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e294b3e
[#1439] Generify tuplesFromGraph
timo95 Nov 5, 2019
ad2bf09
Merge branch 'develop' into 1439-metadata
p-f Nov 5, 2019
7d984db
Merge branch 'develop' into 1439-metadata
timo95 Nov 11, 2019
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
10 changes: 5 additions & 5 deletions gradoop-flink/src/main/java/org/gradoop/flink/io/api/metadata/MetaDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import org.gradoop.common.model.impl.metadata.PropertyMetaData;
import org.gradoop.flink.io.api.metadata.functions.ElementToPropertyMetaData;
import org.gradoop.flink.io.api.metadata.functions.ReducePropertyMetaData;
import org.gradoop.flink.model.api.epgm.BaseGraph;
import org.gradoop.flink.model.api.epgm.BaseGraphCollection;
import org.gradoop.flink.model.impl.epgm.LogicalGraph;
import org.gradoop.flink.util.GradoopFlinkConfig;

import java.io.IOException;
Expand Down Expand Up @@ -59,7 +59,7 @@ public interface MetaDataSource<M extends MetaData> {
* @param graph logical graph
* @return meta data information
*/
default DataSet<Tuple3<String, String, String>> tuplesFromGraph(LogicalGraph graph) {
default DataSet<Tuple3<String, String, String>> tuplesFromGraph(BaseGraph<?, ?, ?, ?, ?> graph) {
return tuplesFromElements(graph.getVertices())
.union(tuplesFromElements(graph.getEdges()));
}
Expand All @@ -78,10 +78,10 @@ default DataSet<Tuple3<String, String, String>> tuplesFromCollection(
}

/**
* Creates the meta data for the specified data set of EPGM elements.
* Creates the meta data for the specified data set of elements.
*
* @param elements EPGM elements
* @param <E> EPGM element type
* @param elements elements
* @param <E> element type
* @return meta data information
*/
static <E extends Element> DataSet<Tuple3<String, String, String>> tuplesFromElements(
Expand Down