You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2015/09/29 21:02:08 UTC
[1/2] flink git commit: [FLINK-2777] [docs] Fix Scala API description
in programming_guide.html
Repository: flink
Updated Branches:
refs/heads/master af477563e -> 2598709fa
[FLINK-2777] [docs] Fix Scala API description in programming_guide.html
def createLocalEnvironment(parallelism: Int = Runtime.getRuntime.availableProcessors()))
//issue1: In the end, there is a extra ")"
def createRemoteEnvironment(host: String, port: String, jarFiles: String*)
def createRemoteEnvironment(host: String, port: String, parallelism: Int, jarFiles: String*)
//issue2: the parameter of port should be "Int", not "String"
This closes #1193
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/bb899f70
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/bb899f70
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/bb899f70
Branch: refs/heads/master
Commit: bb899f708b536d1056d106bf131e67d9f1e545c7
Parents: af47756
Author: Liang Chen <ch...@huawei.com>
Authored: Tue Sep 29 23:53:02 2015 +0800
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Sep 29 18:14:20 2015 +0200
----------------------------------------------------------------------
docs/apis/programming_guide.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/bb899f70/docs/apis/programming_guide.md
----------------------------------------------------------------------
diff --git a/docs/apis/programming_guide.md b/docs/apis/programming_guide.md
index ff831a9..3959dc9 100644
--- a/docs/apis/programming_guide.md
+++ b/docs/apis/programming_guide.md
@@ -331,13 +331,13 @@ obtain one using these static methods on class `ExecutionEnvironment`:
{% highlight scala %}
def getExecutionEnvironment
-def createLocalEnvironment(parallelism: Int = Runtime.getRuntime.availableProcessors()))
+def createLocalEnvironment(parallelism: Int = Runtime.getRuntime.availableProcessors())
def createLocalEnvironment(customConfiguration: Configuration)
def createCollectionsEnvironment
-def createRemoteEnvironment(host: String, port: String, jarFiles: String*)
-def createRemoteEnvironment(host: String, port: String, parallelism: Int, jarFiles: String*)
+def createRemoteEnvironment(host: String, port: Int, jarFiles: String*)
+def createRemoteEnvironment(host: String, port: Int, parallelism: Int, jarFiles: String*)
{% endhighlight %}
Typically, you only need to use `getExecutionEnvironment()`, since this
[2/2] flink git commit: [FLINK-2754] Add a new module for micro
benchmark.
Posted by se...@apache.org.
[FLINK-2754] Add a new module for micro benchmark.
This closes #1177
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2598709f
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2598709f
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2598709f
Branch: refs/heads/master
Commit: 2598709fa3e011620f980f93dccffa0e687cac8d
Parents: bb899f7
Author: chengxiang li <ch...@intel.com>
Authored: Wed Sep 23 17:42:03 2015 +0800
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Sep 29 18:33:37 2015 +0200
----------------------------------------------------------------------
flink-benchmark/pom.xml | 100 +++++++++++++++++++++++++++++++++++++++++++
pom.xml | 1 +
2 files changed, 101 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/2598709f/flink-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/flink-benchmark/pom.xml b/flink-benchmark/pom.xml
new file mode 100644
index 0000000..b139be5
--- /dev/null
+++ b/flink-benchmark/pom.xml
@@ -0,0 +1,100 @@
+<?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-benchmark</artifactId>
+ <name>flink-benchmark</name>
+ <packaging>jar</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <jmh.version>1.4.1</jmh.version>
+ <uberjar.name>benchmarks</uberjar.name>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-clients</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openjdk.jmh</groupId>
+ <artifactId>jmh-core</artifactId>
+ <version>${jmh.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openjdk.jmh</groupId>
+ <artifactId>jmh-generator-annprocess</artifactId>
+ <version>${jmh.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <finalName>${uberjar.name}</finalName>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>org.openjdk.jmh.Main</mainClass>
+ </transformer>
+ </transformers>
+ <filters>
+ <filter>
+ <!--
+ Shading signed JARs will fail without this.
+ http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
+ -->
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/2598709f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6f1a137..573e49c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,7 @@ under the License.
<module>flink-quickstart</module>
<module>flink-contrib</module>
<module>flink-dist</module>
+ <module>flink-benchmark</module>
</modules>
<properties>