Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
b483e1db
F
flink
项目概览
doujutun3207
/
flink
与 Fork 源项目一致
从无法访问的项目Fork
通知
24
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
flink
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b483e1db
编写于
7月 17, 2019
作者:
D
Dian Fu
提交者:
Chesnay Schepler
7月 19, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FLINK-13308][python] Drop the classifier of the flink-python jar
上级
567f8547
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
11 addition
and
11 deletion
+11
-11
flink-container/docker/Dockerfile
flink-container/docker/Dockerfile
+1
-1
flink-dist/pom.xml
flink-dist/pom.xml
+0
-1
flink-dist/src/main/assemblies/opt.xml
flink-dist/src/main/assemblies/opt.xml
+2
-2
flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh
flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh
+1
-1
flink-dist/src/main/flink-bin/bin/pyflink-shell.sh
flink-dist/src/main/flink-bin/bin/pyflink-shell.sh
+1
-1
flink-python/pom.xml
flink-python/pom.xml
+5
-4
tools/travis_controller.sh
tools/travis_controller.sh
+1
-1
未找到文件。
flink-container/docker/Dockerfile
浏览文件 @
b483e1db
...
...
@@ -52,7 +52,7 @@ ADD $job_artifacts/* $FLINK_JOB_ARTIFACTS_DIR/
RUN
set
-x
&&
\
ln
-s
$FLINK_INSTALL_PATH
/flink-[0-9]
*
$FLINK_HOME
&&
\
for
jar
in
$FLINK_JOB_ARTIFACTS_DIR
/
*
.jar
;
do
[
-f
"
$jar
"
]
||
continue
;
ln
-s
$jar
$FLINK_LIB_DIR
;
done
&&
\
if
[
-n
"
$python_version
"
]
;
then
ln
-s
$FLINK_OPT_DIR
/flink-python
-
*
-java-binding
.jar
$FLINK_LIB_DIR
;
fi
&&
\
if
[
-n
"
$python_version
"
]
;
then
ln
-s
$FLINK_OPT_DIR
/flink-python
*
.jar
$FLINK_LIB_DIR
;
fi
&&
\
if
[
-f
${
FLINK_INSTALL_PATH
}
/flink-shaded-hadoop
*
]
;
then
ln
-s
${
FLINK_INSTALL_PATH
}
/flink-shaded-hadoop
*
$FLINK_LIB_DIR
;
fi
&&
\
addgroup
-S
flink
&&
adduser
-D
-S
-H
-G
flink
-h
$FLINK_HOME
flink
&&
\
chown
-R
flink:flink
${
FLINK_INSTALL_PATH
}
/flink-
*
&&
\
...
...
flink-dist/pom.xml
浏览文件 @
b483e1db
...
...
@@ -351,7 +351,6 @@ under the License.
<dependency>
<groupId>
org.apache.flink
</groupId>
<artifactId>
flink-python_${scala.binary.version}
</artifactId>
<classifier>
java-binding
</classifier>
<version>
${project.version}
</version>
<scope>
provided
</scope>
</dependency>
...
...
flink-dist/src/main/assemblies/opt.xml
浏览文件 @
b483e1db
...
...
@@ -163,9 +163,9 @@
<!-- Python -->
<file>
<source>
../flink-python/target/flink-python_${scala.binary.version}-${project.version}
-java-binding
.jar
</source>
<source>
../flink-python/target/flink-python_${scala.binary.version}-${project.version}.jar
</source>
<outputDirectory>
opt
</outputDirectory>
<destName>
flink-python
-${project.version}-java-binding
.jar
</destName>
<destName>
flink-python
_${scala.binary.version}-${project.version}
.jar
</destName>
<fileMode>
0644
</fileMode>
</file>
</files>
...
...
flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh
浏览文件 @
b483e1db
...
...
@@ -51,7 +51,7 @@ log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-python-$HOSTNAME.log
log_setting
=(
-Dlog
.file
=
"
$log
"
-Dlog4j
.configuration
=
file:
"
$FLINK_CONF_DIR
"
/log4j-cli.properties
-Dlogback
.configurationFile
=
file:
"
$FLINK_CONF_DIR
"
/logback.xml
)
TABLE_JAR_PATH
=
`
echo
"
$FLINK_HOME
"
/opt/flink-table
*
.jar
`
PYTHON_JAR_PATH
=
`
echo
"
$FLINK_HOME
"
/opt/flink-python
*
java-binding
.jar
`
PYTHON_JAR_PATH
=
`
echo
"
$FLINK_HOME
"
/opt/flink-python
*
.jar
`
FLINK_TEST_CLASSPATH
=
""
if
[[
-n
"
$FLINK_TESTING
"
]]
;
then
...
...
flink-dist/src/main/flink-bin/bin/pyflink-shell.sh
浏览文件 @
b483e1db
...
...
@@ -25,7 +25,7 @@ _FLINK_HOME_DETERMINED=1
.
"
$FLINK_HOME
"
/bin/config.sh
FLINK_CLASSPATH
=
`
constructFlinkClassPath
`
PYTHON_JAR_PATH
=
`
echo
"
$FLINK_OPT_DIR
"
/flink-python
*
java-binding
.jar
`
PYTHON_JAR_PATH
=
`
echo
"
$FLINK_OPT_DIR
"
/flink-python
*
.jar
`
PYFLINK_PYTHON
=
"
${
PYFLINK_PYTHON
:-
"python"
}
"
...
...
flink-python/pom.xml
浏览文件 @
b483e1db
...
...
@@ -135,17 +135,18 @@ under the License.
<executions>
<execution>
<id>
shade-flink
</id>
<phase>
package
</phase>
<goals>
<goal>
shade
</goal>
</goals>
<configuration>
<shadeTestJar>
false
</shadeTestJar>
<shadedArtifactAttached>
true
</shadedArtifactAttached>
<shadedClassifierName>
java-binding
</shadedClassifierName>
<artifactSet>
<includes
combine.children=
"append"
>
<include>
net.razorvine:*
</include>
<include>
net.sf.py4j:*
</include>
</includes>
</artifactSet>
<relocations>
<relocations
combine.children=
"append"
>
<relocation>
<pattern>
py4j
</pattern>
<shadedPattern>
org.apache.flink.api.python.shaded.py4j
</shadedPattern>
...
...
tools/travis_controller.sh
浏览文件 @
b483e1db
...
...
@@ -147,7 +147,7 @@ if [ $STAGE == "$STAGE_COMPILE" ]; then
!
-path
"
$CACHE_FLINK_DIR
/flink-streaming-java/target/flink-streaming-java*tests.jar"
\
!
-path
"
$CACHE_FLINK_DIR
/flink-dist/target/flink-*-bin/flink-*/lib/flink-dist*.jar"
\
!
-path
"
$CACHE_FLINK_DIR
/flink-dist/target/flink-*-bin/flink-*/opt/flink-table*.jar"
\
!
-path
"
$CACHE_FLINK_DIR
/flink-dist/target/flink-*-bin/flink-*/opt/flink-python*
java-binding
.jar"
\
!
-path
"
$CACHE_FLINK_DIR
/flink-dist/target/flink-*-bin/flink-*/opt/flink-python*.jar"
\
!
-path
"
$CACHE_FLINK_DIR
/flink-connectors/flink-connector-elasticsearch-base/target/flink-*.jar"
\
!
-path
"
$CACHE_FLINK_DIR
/flink-connectors/flink-connector-kafka-base/target/flink-*.jar"
\
!
-path
"
$CACHE_FLINK_DIR
/flink-table/flink-table-planner/target/flink-table-planner*tests.jar"
| xargs
rm
-rf
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录