[GitHub] flink pull request #3904: [FLINK-6439] Fix close OutputStream && InputStream...
Github user asfgit closed the pull request at: https://github.com/apache/flink/pull/3904 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] flink pull request #3904: [FLINK-6439] Fix close OutputStream && InputStream...
Github user zentol commented on a diff in the pull request:
https://github.com/apache/flink/pull/3904#discussion_r116483406
--- Diff:
flink-streaming-java/src/test/java/org/apache/flink/streaming/util/OperatorSnapshotUtil.java
---
@@ -46,111 +46,113 @@ public static String getResourceFilename(String
filename) {
public static void writeStateHandle(OperatorStateHandles state, String
path) throws IOException {
FileOutputStream out = new FileOutputStream(path);
- DataOutputStream dos = new DataOutputStream(out);
-
- dos.writeInt(state.getOperatorChainIndex());
-
-
SavepointV1Serializer.serializeStreamStateHandle(state.getLegacyOperatorState(),
dos);
-
- Collection rawOperatorState =
state.getRawOperatorState();
- if (rawOperatorState != null) {
- dos.writeInt(rawOperatorState.size());
- for (OperatorStateHandle operatorStateHandle :
rawOperatorState) {
-
SavepointV1Serializer.serializeOperatorStateHandle(operatorStateHandle, dos);
+
+ try(DataOutputStream dos = new DataOutputStream(out)) {
--- End diff --
missing space after try
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] flink pull request #3904: [FLINK-6439] Fix close OutputStream && InputStream...
Github user zentol commented on a diff in the pull request:
https://github.com/apache/flink/pull/3904#discussion_r116483708
--- Diff:
flink-streaming-java/src/test/java/org/apache/flink/streaming/util/OperatorSnapshotUtil.java
---
@@ -46,111 +46,113 @@ public static String getResourceFilename(String
filename) {
public static void writeStateHandle(OperatorStateHandles state, String
path) throws IOException {
FileOutputStream out = new FileOutputStream(path);
- DataOutputStream dos = new DataOutputStream(out);
-
- dos.writeInt(state.getOperatorChainIndex());
-
-
SavepointV1Serializer.serializeStreamStateHandle(state.getLegacyOperatorState(),
dos);
-
- Collection rawOperatorState =
state.getRawOperatorState();
- if (rawOperatorState != null) {
- dos.writeInt(rawOperatorState.size());
- for (OperatorStateHandle operatorStateHandle :
rawOperatorState) {
-
SavepointV1Serializer.serializeOperatorStateHandle(operatorStateHandle, dos);
+
+ try(DataOutputStream dos = new DataOutputStream(out)) {
+
+ dos.writeInt(state.getOperatorChainIndex());
+
+
SavepointV1Serializer.serializeStreamStateHandle(state.getLegacyOperatorState(),
dos);
+
+ Collection rawOperatorState =
state.getRawOperatorState();
+ if (rawOperatorState != null) {
+ dos.writeInt(rawOperatorState.size());
+ for (OperatorStateHandle operatorStateHandle :
rawOperatorState) {
+
SavepointV1Serializer.serializeOperatorStateHandle(operatorStateHandle, dos);
+ }
+ } else {
+ // this means no states, not even an empty list
+ dos.writeInt(-1);
}
- } else {
- // this means no states, not even an empty list
- dos.writeInt(-1);
- }
- Collection managedOperatorState =
state.getManagedOperatorState();
- if (managedOperatorState != null) {
- dos.writeInt(managedOperatorState.size());
- for (OperatorStateHandle operatorStateHandle :
managedOperatorState) {
-
SavepointV1Serializer.serializeOperatorStateHandle(operatorStateHandle, dos);
+ Collection managedOperatorState =
state.getManagedOperatorState();
+ if (managedOperatorState != null) {
+ dos.writeInt(managedOperatorState.size());
+ for (OperatorStateHandle operatorStateHandle :
managedOperatorState) {
+
SavepointV1Serializer.serializeOperatorStateHandle(operatorStateHandle, dos);
+ }
+ } else {
+ // this means no states, not even an empty list
+ dos.writeInt(-1);
}
- } else {
- // this means no states, not even an empty list
- dos.writeInt(-1);
- }
- Collection rawKeyedState =
state.getRawKeyedState();
- if (rawKeyedState != null) {
- dos.writeInt(rawKeyedState.size());
- for (KeyedStateHandle keyedStateHandle : rawKeyedState)
{
-
SavepointV1Serializer.serializeKeyedStateHandle(keyedStateHandle, dos);
+ Collection rawKeyedState =
state.getRawKeyedState();
+ if (rawKeyedState != null) {
+ dos.writeInt(rawKeyedState.size());
+ for (KeyedStateHandle keyedStateHandle :
rawKeyedState) {
+
SavepointV1Serializer.serializeKeyedStateHandle(keyedStateHandle, dos);
+ }
+ } else {
+ // this means no operator states, not even an
empty list
+ dos.writeInt(-1);
}
- } else {
- // this means no operator states, not even an empty list
- dos.writeInt(-1);
- }
- Collection managedKeyedState =
state.getManagedKeyedState();
- if (managedKeyedState != null) {
- dos.writeInt(managedKeyedState.size());
- for (KeyedStateHandle keyedStateHandle :
managedKeyedState) {
-
[GitHub] flink pull request #3904: [FLINK-6439] Fix close OutputStream && InputStream...
GitHub user zjureel opened a pull request:
https://github.com/apache/flink/pull/3904
[FLINK-6439] Fix close OutputStream && InputStream in OperatorSnapshotUtil
â¦tUtil
Thanks for contributing to Apache Flink. Before you open your pull request,
please take the following check list into consideration.
If your changes take all of the items into account, feel free to open your
pull request. For more information and/or questions please refer to the [How To
Contribute guide](http://flink.apache.org/how-to-contribute.html).
In addition to going through the list, please provide a meaningful
description of your changes.
- [ ] General
- The pull request references the related JIRA issue ("[FLINK-XXX] Jira
title text")
- The pull request addresses only one issue
- Each commit in the PR has a meaningful commit message (including the
JIRA id)
- [ ] Documentation
- Documentation has been added for new functionality
- Old documentation affected by the pull request has been updated
- JavaDoc for public methods has been added
- [ ] Tests & Build
- Functionality added by the pull request is covered by tests
- `mvn clean verify` has been executed successfully locally or a Travis
build has passed
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/zjureel/flink FLINK-6439
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/flink/pull/3904.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #3904
commit 85fc9997d18bd6693b468a4cca9e495da6303d63
Author: zjureel
Date: 2017-05-15T10:14:11Z
[FLINK-6439] Fix close OutputStream && InputStream in OperatorSnapshotUtil
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
