You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ji...@apache.org on 2019/05/13 09:48:24 UTC
[flink] branch master updated: [FLINK-12495][python][client] Move
PythonGatewayServer into flink-clients.
This is an automated email from the ASF dual-hosted git repository.
jincheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new d1542e9 [FLINK-12495][python][client] Move PythonGatewayServer into flink-clients.
d1542e9 is described below
commit d1542e9561c6235feb902c9c6d781ba416b8f784
Author: sunjincheng121 <su...@gmail.com>
AuthorDate: Mon May 13 14:50:37 2019 +0800
[FLINK-12495][python][client] Move PythonGatewayServer into flink-clients.
This closes #8423
---
flink-clients/pom.xml | 7 +++++++
.../java/org/apache/flink/client}/python/PythonGatewayServer.java | 2 +-
flink-core/pom.xml | 7 -------
flink-python/pyflink/java_gateway.py | 2 +-
pom.xml | 1 +
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/flink-clients/pom.xml b/flink-clients/pom.xml
index 6476798..514b6cd 100644
--- a/flink-clients/pom.xml
+++ b/flink-clients/pom.xml
@@ -68,6 +68,13 @@ under the License.
<artifactId>commons-cli</artifactId>
</dependency>
+ <!-- Python API dependencies -->
+ <dependency>
+ <groupId>net.sf.py4j</groupId>
+ <artifactId>py4j</artifactId>
+ <version>${py4j.version}</version>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
diff --git a/flink-core/src/main/java/org/apache/flink/api/python/PythonGatewayServer.java b/flink-clients/src/main/java/org/apache/flink/client/python/PythonGatewayServer.java
similarity index 98%
rename from flink-core/src/main/java/org/apache/flink/api/python/PythonGatewayServer.java
rename to flink-clients/src/main/java/org/apache/flink/client/python/PythonGatewayServer.java
index 3e17401..6432a67 100644
--- a/flink-core/src/main/java/org/apache/flink/api/python/PythonGatewayServer.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/python/PythonGatewayServer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.api.python;
+package org.apache.flink.client.python;
import py4j.GatewayServer;
diff --git a/flink-core/pom.xml b/flink-core/pom.xml
index c6ff872..0768e81 100644
--- a/flink-core/pom.xml
+++ b/flink-core/pom.xml
@@ -86,13 +86,6 @@ under the License.
<artifactId>flink-shaded-guava</artifactId>
</dependency>
- <!-- Python API dependencies -->
- <dependency>
- <groupId>net.sf.py4j</groupId>
- <artifactId>py4j</artifactId>
- <version>0.10.8.1</version>
- </dependency>
-
<!-- ================== test dependencies ================== -->
<dependency>
diff --git a/flink-python/pyflink/java_gateway.py b/flink-python/pyflink/java_gateway.py
index 5c931de..ed1dc89 100644
--- a/flink-python/pyflink/java_gateway.py
+++ b/flink-python/pyflink/java_gateway.py
@@ -62,7 +62,7 @@ def launch_gateway():
raise Exception("Windows system is not supported currently.")
script = "./bin/pyflink-gateway-server.sh"
command = [os.path.join(FLINK_HOME, script)]
- command += ['-c', 'org.apache.flink.api.python.PythonGatewayServer']
+ command += ['-c', 'org.apache.flink.client.python.PythonGatewayServer']
# Create a temporary directory where the gateway server should write the connection information.
conn_info_dir = tempfile.mkdtemp()
diff --git a/pom.xml b/pom.xml
index 539e9d0..ed9ae64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,7 @@ under the License.
<mockito.version>2.21.0</mockito.version>
<powermock.version>2.0.0-RC.4</powermock.version>
<hamcrest.version>1.3</hamcrest.version>
+ <py4j.version>0.10.8.1</py4j.version>
<japicmp.skip>false</japicmp.skip>
<flink.convergence.phase>validate</flink.convergence.phase>
<!--