You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/07/11 10:04:27 UTC
[1/4] flink git commit: [FLINK-9754][release] Remove references to
scala profiles
Repository: flink
Updated Branches:
refs/heads/release-1.5 62839e88e -> 8c18a9217
[FLINK-9754][release] Remove references to scala profiles
This closes #6286.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8c18a921
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8c18a921
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8c18a921
Branch: refs/heads/release-1.5
Commit: 8c18a92171cd7293b4f8f592bda276a6d0107654
Parents: bbdb987
Author: zentol <ch...@apache.org>
Authored: Mon Jul 9 12:48:13 2018 +0200
Committer: zentol <ch...@apache.org>
Committed: Wed Jul 11 09:17:26 2018 +0200
----------------------------------------------------------------------
tools/releasing/create_binary_release.sh | 2 +-
tools/releasing/deploy_staging_jars.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/8c18a921/tools/releasing/create_binary_release.sh
----------------------------------------------------------------------
diff --git a/tools/releasing/create_binary_release.sh b/tools/releasing/create_binary_release.sh
index ac2619c..374c785 100755
--- a/tools/releasing/create_binary_release.sh
+++ b/tools/releasing/create_binary_release.sh
@@ -60,7 +60,7 @@ make_binary_release() {
fi
# enable release profile here (to check for the maven version)
- $MVN clean package $FLAGS -Prelease,scala-${SCALA_VERSION} -pl flink-shaded-hadoop/flink-shaded-hadoop2-uber,flink-dist -am -Dgpg.skip -Dcheckstyle.skip=true -DskipTests -Dmaven.test.skip=true
+ $MVN clean package $FLAGS -Prelease -pl flink-shaded-hadoop/flink-shaded-hadoop2-uber,flink-dist -am -Dgpg.skip -Dcheckstyle.skip=true -DskipTests -Dmaven.test.skip=true
cd flink-dist/target/flink-*-bin/
tar czf "${dir_name}.tgz" flink-*
http://git-wip-us.apache.org/repos/asf/flink/blob/8c18a921/tools/releasing/deploy_staging_jars.sh
----------------------------------------------------------------------
diff --git a/tools/releasing/deploy_staging_jars.sh b/tools/releasing/deploy_staging_jars.sh
index 9245bdd..1bc20d0 100755
--- a/tools/releasing/deploy_staging_jars.sh
+++ b/tools/releasing/deploy_staging_jars.sh
@@ -41,5 +41,5 @@ cd ..
echo "Deploying to repository.apache.org"
echo "Deploying Scala 2.11 version"
-$MVN clean deploy -Prelease,docs-and-source,scala-2.11 -DskipTests -DretryFailedDeploymentCount=10
+$MVN clean deploy -Prelease,docs-and-source -DskipTests -DretryFailedDeploymentCount=10
[2/4] flink git commit: [FLINK-9584][connector] Properly close output
streams in Bucketing-/RollingSink
Posted by ch...@apache.org.
[FLINK-9584][connector] Properly close output streams in Bucketing-/RollingSink
This closes #6164.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d3b644a0
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d3b644a0
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d3b644a0
Branch: refs/heads/release-1.5
Commit: d3b644a0e006352880cb7c613cdab6ea86c45719
Parents: 434bf57
Author: sihuazhou <su...@163.com>
Authored: Thu Jun 14 18:12:20 2018 +0800
Committer: zentol <ch...@apache.org>
Committed: Wed Jul 11 09:17:26 2018 +0200
----------------------------------------------------------------------
.../flink/streaming/connectors/fs/RollingSink.java | 11 ++++-------
.../streaming/connectors/fs/bucketing/BucketingSink.java | 11 ++++-------
2 files changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d3b644a0/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/RollingSink.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/RollingSink.java b/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/RollingSink.java
index 709a7c9..9ec97b7 100644
--- a/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/RollingSink.java
+++ b/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/RollingSink.java
@@ -533,12 +533,9 @@ public class RollingSink<T> extends RichSinkFunction<T>
}
// verify that truncate actually works
- FSDataOutputStream outputStream;
Path testPath = new Path(UUID.randomUUID().toString());
- try {
- outputStream = fs.create(testPath);
+ try (FSDataOutputStream outputStream = fs.create(testPath)) {
outputStream.writeUTF("hello");
- outputStream.close();
} catch (IOException e) {
LOG.error("Could not create file for checking if truncate works.", e);
throw new RuntimeException("Could not create file for checking if truncate works.", e);
@@ -702,9 +699,9 @@ public class RollingSink<T> extends RichSinkFunction<T>
Path validLengthFilePath = getValidLengthPathFor(partPath);
if (!fs.exists(validLengthFilePath) && fs.exists(partPath)) {
LOG.debug("Writing valid-length file for {} to specify valid length {}", partPath, bucketState.currentFileValidLength);
- FSDataOutputStream lengthFileOut = fs.create(validLengthFilePath);
- lengthFileOut.writeUTF(Long.toString(bucketState.currentFileValidLength));
- lengthFileOut.close();
+ try (FSDataOutputStream lengthFileOut = fs.create(validLengthFilePath)) {
+ lengthFileOut.writeUTF(Long.toString(bucketState.currentFileValidLength));
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d3b644a0/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSink.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSink.java b/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSink.java
index 89f4f6f..6b1d64e 100644
--- a/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSink.java
+++ b/flink-connectors/flink-connector-filesystem/src/main/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSink.java
@@ -605,12 +605,9 @@ public class BucketingSink<T>
}
// verify that truncate actually works
- FSDataOutputStream outputStream;
Path testPath = new Path(UUID.randomUUID().toString());
- try {
- outputStream = fs.create(testPath);
+ try (FSDataOutputStream outputStream = fs.create(testPath)) {
outputStream.writeUTF("hello");
- outputStream.close();
} catch (IOException e) {
LOG.error("Could not create file for checking if truncate works.", e);
throw new RuntimeException("Could not create file for checking if truncate works. " +
@@ -854,9 +851,9 @@ public class BucketingSink<T>
Path validLengthFilePath = getValidLengthPathFor(partPath);
if (!fs.exists(validLengthFilePath) && fs.exists(partPath)) {
LOG.debug("Writing valid-length file for {} to specify valid length {}", partPath, validLength);
- FSDataOutputStream lengthFileOut = fs.create(validLengthFilePath);
- lengthFileOut.writeUTF(Long.toString(validLength));
- lengthFileOut.close();
+ try (FSDataOutputStream lengthFileOut = fs.create(validLengthFilePath)) {
+ lengthFileOut.writeUTF(Long.toString(validLength));
+ }
}
}
[4/4] flink git commit: [FLINK-9743][client] Use correct zip path
separator for nested jars
Posted by ch...@apache.org.
[FLINK-9743][client] Use correct zip path separator for nested jars
This closes #6263.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/434bf57c
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/434bf57c
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/434bf57c
Branch: refs/heads/release-1.5
Commit: 434bf57c96c74e5f87b7bc2ec7635392f3a512cb
Parents: 62839e8
Author: snuyanzin <sn...@gmail.com>
Authored: Thu Jul 5 11:58:33 2018 +0300
Committer: zentol <ch...@apache.org>
Committed: Wed Jul 11 09:17:26 2018 +0200
----------------------------------------------------------------------
.../flink/client/program/PackagedProgram.java | 4 ++-
.../client/program/PackagedProgramTest.java | 28 ++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/434bf57c/flink-clients/src/main/java/org/apache/flink/client/program/PackagedProgram.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/PackagedProgram.java b/flink-clients/src/main/java/org/apache/flink/client/program/PackagedProgram.java
index d81cacb..377b277 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/program/PackagedProgram.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/program/PackagedProgram.java
@@ -695,7 +695,9 @@ public class PackagedProgram {
for (int i = 0; i < containedJarFileEntries.size(); i++) {
final JarEntry entry = containedJarFileEntries.get(i);
String name = entry.getName();
- name = name.replace(File.separatorChar, '_');
+ // '/' as in case of zip, jar
+ // java.util.zip.ZipEntry#isDirectory always looks only for '/' not for File.separator
+ name = name.replace('/', '_');
File tempFile;
try {
http://git-wip-us.apache.org/repos/asf/flink/blob/434bf57c/flink-clients/src/test/java/org/apache/flink/client/program/PackagedProgramTest.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/test/java/org/apache/flink/client/program/PackagedProgramTest.java b/flink-clients/src/test/java/org/apache/flink/client/program/PackagedProgramTest.java
index e137ada..355e663 100644
--- a/flink-clients/src/test/java/org/apache/flink/client/program/PackagedProgramTest.java
+++ b/flink-clients/src/test/java/org/apache/flink/client/program/PackagedProgramTest.java
@@ -19,18 +19,29 @@
package org.apache.flink.client.program;
import org.apache.flink.client.cli.CliFrontendTestUtils;
+import org.apache.flink.configuration.ConfigConstants;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.PrintStream;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
/**
* Tests for the {@link PackagedProgramTest}.
*/
public class PackagedProgramTest {
+ @Rule
+ public final TemporaryFolder temporaryFolder = new TemporaryFolder();
+
@Test
public void testGetPreviewPlan() {
try {
@@ -56,6 +67,23 @@ public class PackagedProgramTest {
}
}
+ @Test
+ public void testExtractContainedLibraries() throws Exception {
+ String s = "testExtractContainedLibraries";
+ byte[] nestedJarContent = s.getBytes(ConfigConstants.DEFAULT_CHARSET);
+ File fakeJar = temporaryFolder.newFile("test.jar");
+ try (ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(fakeJar))) {
+ ZipEntry entry = new ZipEntry("lib/internalTest.jar");
+ zos.putNextEntry(entry);
+ zos.write(nestedJarContent);
+ zos.closeEntry();
+ }
+
+ final List<File> files = PackagedProgram.extractContainedLibraries(fakeJar.toURI().toURL());
+ Assert.assertEquals(1, files.size());
+ Assert.assertArrayEquals(nestedJarContent, Files.readAllBytes(files.iterator().next().toPath()));
+ }
+
private static final class NullOutputStream extends java.io.OutputStream {
@Override
public void write(int b) {}
[3/4] flink git commit: [FLINK-9768][release] Speed up binary release
Posted by ch...@apache.org.
[FLINK-9768][release] Speed up binary release
This closes #6285.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/bbdb9877
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/bbdb9877
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/bbdb9877
Branch: refs/heads/release-1.5
Commit: bbdb98772eeb24c6fed10a6302c4139a03abdaff
Parents: d3b644a
Author: zentol <ch...@apache.org>
Authored: Mon Jul 9 12:02:35 2018 +0200
Committer: zentol <ch...@apache.org>
Committed: Wed Jul 11 09:17:26 2018 +0200
----------------------------------------------------------------------
tools/releasing/create_binary_release.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/bbdb9877/tools/releasing/create_binary_release.sh
----------------------------------------------------------------------
diff --git a/tools/releasing/create_binary_release.sh b/tools/releasing/create_binary_release.sh
index 6e783cf..ac2619c 100755
--- a/tools/releasing/create_binary_release.sh
+++ b/tools/releasing/create_binary_release.sh
@@ -60,7 +60,7 @@ make_binary_release() {
fi
# enable release profile here (to check for the maven version)
- $MVN clean package $FLAGS -DskipTests -Prelease,scala-${SCALA_VERSION} -Dgpg.skip
+ $MVN clean package $FLAGS -Prelease,scala-${SCALA_VERSION} -pl flink-shaded-hadoop/flink-shaded-hadoop2-uber,flink-dist -am -Dgpg.skip -Dcheckstyle.skip=true -DskipTests -Dmaven.test.skip=true
cd flink-dist/target/flink-*-bin/
tar czf "${dir_name}.tgz" flink-*