You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2015/11/19 11:10:27 UTC
[5/5] flink git commit: [doc] Fix JavaDoc of ElasticsearchSink
[doc] Fix JavaDoc of ElasticsearchSink
This closes #1367.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/821bcf5b
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/821bcf5b
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/821bcf5b
Branch: refs/heads/release-0.10
Commit: 821bcf5b606b3f0c949dd61c5ec6c43314baaace
Parents: f9a4d57
Author: Martin Liesenberg <ma...@gmail.com>
Authored: Tue Nov 17 13:47:20 2015 +0100
Committer: Till Rohrmann <tr...@apache.org>
Committed: Thu Nov 19 11:03:15 2015 +0100
----------------------------------------------------------------------
.../org/apache/flink/graph/scala/Graph.scala | 23 --------------------
.../elasticsearch/ElasticsearchSink.java | 2 +-
2 files changed, 1 insertion(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/821bcf5b/flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/Graph.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/Graph.scala b/flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/Graph.scala
index 737f758..d838fb5 100644
--- a/flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/Graph.scala
+++ b/flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/Graph.scala
@@ -961,29 +961,6 @@ TypeInformation : ClassTag](jgraph: jg.Graph[K, VV, EV]) {
}
/**
- * Performs intersect on the edge sets of the input graphs. Edges are considered equal, if they
- * have the same source identifier, target identifier and edge value.
- * <p>
- * The method computes pairs of equal edges from the input graphs. If the same edge occurs
- * multiple times in the input graphs, there will be multiple edge pairs to be considered. Each
- * edge instance can only be part of one pair. If the given parameter `distinctEdges` is set
- * to `true`, there will be exactly one edge in the output graph representing all pairs of
- * equal edges. If the parameter is set to `false`, both edges of each pair will be in the
- * output.
- * <p>
- * Vertices in the output graph will have no vertex values.
- *
- * @param graph the graph to perform intersect with
- * @param distinctEdges if set to { @code true}, there will be exactly one edge in the output
- * graph representing all pairs of equal edges, otherwise, for each pair,
- * both edges will be in the output graph
- * @return a new graph which contains only common vertices and edges from the input graphs
- */
- def intersect(graph: Graph[K, VV, EV], distinctEdges: Boolean): Graph[K, NullValue, EV] = {
- wrapGraph(jgraph.intersect(graph.getWrappedGraph, distinctEdges))
- }
-
- /**
* Compute a reduce transformation over the neighbors' vertex values of each vertex.
* For each vertex, the transformation consecutively calls a
* [[ReduceNeighborsFunction]] until only a single value for each vertex remains.
http://git-wip-us.apache.org/repos/asf/flink/blob/821bcf5b/flink-streaming-connectors/flink-connector-elasticsearch/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/ElasticsearchSink.java
----------------------------------------------------------------------
diff --git a/flink-streaming-connectors/flink-connector-elasticsearch/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/ElasticsearchSink.java b/flink-streaming-connectors/flink-connector-elasticsearch/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/ElasticsearchSink.java
index 546ec8d..ac14ade 100644
--- a/flink-streaming-connectors/flink-connector-elasticsearch/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/ElasticsearchSink.java
+++ b/flink-streaming-connectors/flink-connector-elasticsearch/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/ElasticsearchSink.java
@@ -54,7 +54,7 @@ import static org.elasticsearch.node.NodeBuilder.nodeBuilder;
* When using the first constructor {@link #ElasticsearchSink(java.util.Map, IndexRequestBuilder)}
* the sink will create a local {@link Node} for communicating with the
* Elasticsearch cluster. When using the second constructor
- * {@link #ElasticsearchSink(java.util.Map, IndexRequestBuilder)} a {@link TransportClient} will
+ * {@link #ElasticsearchSink(java.util.Map, java.util.List, IndexRequestBuilder)} a {@link TransportClient} will
* be used instead.
*
* <p>