Mailing-List: contact issues-help@flink.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@flink.apache.org
From: vasia <git@git.apache.org>
To: issues@flink.incubator.apache.org
Reply-To: issues@flink.incubator.apache.org
References: <git-pr-847-flink@git.apache.org>
In-Reply-To: <git-pr-847-flink@git.apache.org>
Subject: [GitHub] flink pull request: [FLINK-1520]Read edges and vertices from
 CSV f...
Content-Type: text/plain
Message-Id: <20150617210539.5E7B7DFFC0@git1-us-west.apache.org>
Date: Wed, 17 Jun 2015 21:05:39 +0000 (UTC)

Github user vasia commented on a diff in the pull request:

    https://github.com/apache/flink/pull/847#discussion_r32674923
  
    --- Diff: flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/GraphCsvReader.java ---
    @@ -0,0 +1,388 @@
    +/*
    + * 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.
    + */
    +
    +package org.apache.flink.graph;
    +import com.google.common.base.Preconditions;
    +import org.apache.flink.api.common.functions.MapFunction;
    +import org.apache.flink.api.java.DataSet;
    +import org.apache.flink.api.java.io.CsvReader;
    +import org.apache.flink.api.java.tuple.Tuple2;
    +import org.apache.flink.api.java.tuple.Tuple3;
    +import org.apache.flink.core.fs.Path;
    +import org.apache.flink.api.java.ExecutionEnvironment;
    +import org.apache.flink.graph.Graph;
    +import org.apache.flink.types.NullValue;
    +import org.apache.flink.core.fs.Path;
    +
    +
    +/**
    + * A class to build a Graph using path(s) provided to CSV file(s) with edge (vertices) data
    + * The class also configures the CSV readers used to read edges(vertices) data such as the field types,
    + * the delimiters (row and field),  the fields that should be included or skipped, and other flags
    + * such as whether to skip the initial line as the header.
    + * The configuration is done using the functions provided in The {@link org.apache.flink.api.java.io.CsvReader} class.
    + */
    +
    +
    +
    +public class GraphCsvReader{
    +
    +	private final Path path1,path2;
    +	private final ExecutionEnvironment executionContext;
    +
    +	private Path edgePath;
    +	private Path vertexPath;
    +	protected CsvReader EdgeReader;
    +	protected CsvReader VertexReader;
    +	protected MapFunction mapper;
    +
    +//--------------------------------------------------------------------------------------------------------------------
    +
    +	public GraphCsvReader(Path path1,Path path2, ExecutionEnvironment context)
    +	{
    +		this.path1 = path1;
    +		this.path2 = path2;
    +		this.VertexReader = new CsvReader(path1,context);
    +		this.EdgeReader = new CsvReader(path2,context);
    +		this.mapper=null;
    +		this.executionContext=context;
    +	}
    +
    +	public GraphCsvReader(Path path2, ExecutionEnvironment context)
    +	{
    +		this.path1=null;
    +		this.path2 = path2;
    +		this.EdgeReader = new CsvReader(path2,context);
    +		this.VertexReader = null;
    +		this.mapper = null;
    +		this.executionContext=context;
    +	}
    +
    +	public GraphCsvReader(Path path2,final MapFunction mapper, ExecutionEnvironment context)
    +	{
    +		this.path1=null;
    +		this.path2 = path2;
    +		this.EdgeReader = new CsvReader(path2,context);
    +		this.VertexReader = null;
    +		this.mapper = mapper;
    +		this.executionContext=context;
    +	}
    +
    +	public GraphCsvReader (String path2,ExecutionEnvironment context)
    +	{
    +		this(new Path(Preconditions.checkNotNull(path2, "The file path may not be null.")), context);
    +
    +	}
    +
    +	public GraphCsvReader(String path1, String path2, ExecutionEnvironment context)
    +	{
    +		this(new Path(Preconditions.checkNotNull(path1, "The file path may not be null.")),new Path(Preconditions.checkNotNull(path2, "The file path may not be null.")), context);
    +	}
    +
    +
    +	public GraphCsvReader (String path2, final MapFunction mapper, ExecutionEnvironment context)
    +	{
    +
    +			this(new Path(Preconditions.checkNotNull(path2, "The file path may not be null.")),mapper, context);
    +
    +
    +	}
    +
    +	public CsvReader getEdgeReader()
    +	{
    +		return this.EdgeReader;
    +	}
    +
    +	public CsvReader getVertexReader()
    +	{
    +		return this.VertexReader;
    +	}
    +	//--------------------------------------------------------------------------------------------------------------------
    +
    +	/**
    +	 * Specifies the types for the Graph fields and returns a Graph with those field types
    +	 *
    +	 * This method is overloaded for the case in which Vertices don't have a value
    +	 *
    +	 * @param type0 The type of CSV field 0 and 1 for the CSV reader used for reading Edge data, the type of CSV field 0 for the CSV reader used for reading Vertex data  and the type of Vetex ID in the returned Graph.
    +	 * @param  type1 The type of CSV field 1 for the CSV reader used for reading Vertex data and the type of Vertex Value in the returned Graph.
    +	 * @param  type2 The type of CSV field 2 for the CSV reader used for reading Edge data and the type of Edge Value in the returned Graph.
    +	 * @return The {@link org.apache.flink.graph.Graph} with Edges and Vertices extracted from the parsed CSV data.
    +	 */
    +	public <K,VV,EV> Graph<K,VV,EV> types(Class<K> type0, Class<VV> type1, Class<EV> type2)
    +	{
    +		DataSet<Tuple3<K,K,EV>> edges = this.EdgeReader.types(type0,type0,type2);
    +		if(path1!=null)
    +		{
    +			DataSet<Tuple2<K,VV>> vertices = this.VertexReader.types(type0,type1);
    +			return Graph.fromTupleDataSet(vertices,edges,executionContext);
    +		}
    +		else
    +		{
    +			return Graph.fromTupleDataSet(edges,mapper,executionContext);
    +		}
    +
    +
    +	}
    +	/**
    +	 * Specifies the types for the Graph fields and returns a Graph with those field types
    +	 *
    +	 * This method is overloaded for the case in which Vertices don't have a value
    +	 *
    +	 * @param type0 The type of CSV field 0 and 1 for the CSV reader used for reading Edge data and the type of Vetex ID in the returned Graph.
    +	 * @param  type1 The type of CSV field 2 for the CSV reader used for reading Edge data and the type of Edge Value in the returned Graph.
    +	 * @return The {@link org.apache.flink.graph.Graph} with Edge extracted from the parsed CSV data and Vertices mapped from Edges with null Value.
    +	 */
    +	public <K, EV> Graph<K,NullValue,EV> types(Class<K> type0, Class<EV> type1)
    +	{
    +		DataSet<Tuple3<K,K,EV>> edges = this.EdgeReader.types(type0,type0,type1);
    +		return Graph.fromTupleDataSet(edges,executionContext);
    +	}
    +
    +	/**
    +	 *Configures the Delimiter that separates rows for the CSV readers used to read the edges and vertices
    +	 *	({@code '\n'}) is used by default.
    +	 *
    +	 *@param delimiter The delimiter that separates the rows.
    +	 * @return The GraphCsv reader instance itself, to allow for fluent function chaining.
    +	 */
    +	public GraphCsvReader lineDelimiter(String delimiter)
    +	{
    +		this.EdgeReader.lineDelimiter(delimiter);
    +		this.VertexReader.lineDelimiter(delimiter);
    +		return this;
    +	}
    +
    +	/**
    +	 *Configures the Delimiter that separates fields in a row for the CSV readers used to read the edges and vertices
    +	 * ({@code ','}) is used by default.
    +	 *
    +	 * @param delimiter The delimiter that separates the fields in a row.
    +	 * @return The GraphCsv reader instance itself, to allow for fluent function chaining.
    +	 */
    +	@Deprecated
    +	public GraphCsvReader fieldDelimiter(char delimiter)
    +	{
    +		this.EdgeReader.fieldDelimiter(delimiter);
    +		this.VertexReader.fieldDelimiter(delimiter);
    --- End diff --
    
    same


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---