From a2f0726e1696464a0e85740d8ff97997f0dde812 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Mon, 12 Dec 2016 14:02:25 +0100 Subject: [PATCH] [FLINK-5327] Remove IOEXception from StateObject::getStateSize --- .../flink/migration/state/MigrationStreamStateHandle.java | 2 +- .../org/apache/flink/runtime/state/ChainedStateHandle.java | 3 +-- .../org/apache/flink/runtime/state/KeyGroupsStateHandle.java | 2 +- .../apache/flink/runtime/state/MultiStreamStateHandle.java | 2 +- .../org/apache/flink/runtime/state/OperatorStateHandle.java | 2 +- .../flink/runtime/state/RetrievableStreamStateHandle.java | 2 +- .../java/org/apache/flink/runtime/state/StateObject.java | 5 +---- .../flink/runtime/state/filesystem/FileStateHandle.java | 3 +-- .../checkpoint/ZooKeeperCompletedCheckpointStoreITCase.java | 3 +-- .../runtime/tasks/InterruptSensitiveRestoreTest.java | 2 +- 10 files changed, 10 insertions(+), 16 deletions(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationStreamStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationStreamStateHandle.java index e7aa7881abd49..e2da757273676 100644 --- a/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationStreamStateHandle.java +++ b/flink-runtime/src/main/java/org/apache/flink/migration/state/MigrationStreamStateHandle.java @@ -50,7 +50,7 @@ public void discardState() throws Exception { } @Override - public long getStateSize() throws IOException { + public long getStateSize() { return delegate.getStateSize(); } } diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ChainedStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ChainedStateHandle.java index a807428f3199d..27ef576dedd70 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ChainedStateHandle.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ChainedStateHandle.java @@ -21,7 +21,6 @@ import org.apache.flink.util.Preconditions; -import java.io.IOException; import java.util.Collections; import java.util.List; @@ -85,7 +84,7 @@ public void discardState() throws Exception { } @Override - public long getStateSize() throws IOException { + public long getStateSize() { long sumStateSize = 0; if (operatorStateHandles != null) { diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyGroupsStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyGroupsStateHandle.java index 1d277b3420e41..b454e42c757f8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyGroupsStateHandle.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyGroupsStateHandle.java @@ -111,7 +111,7 @@ public void discardState() throws Exception { } @Override - public long getStateSize() throws IOException { + public long getStateSize() { return stateHandle.getStateSize(); } diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/MultiStreamStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/MultiStreamStateHandle.java index 7492262b3cecc..b95daceece56a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/MultiStreamStateHandle.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/MultiStreamStateHandle.java @@ -58,7 +58,7 @@ public void discardState() throws Exception { } @Override - public long getStateSize() throws IOException { + public long getStateSize() { return stateSize; } diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorStateHandle.java index 1ad41ea6735a4..3cd37c9eaf250 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorStateHandle.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorStateHandle.java @@ -55,7 +55,7 @@ public void discardState() throws Exception { } @Override - public long getStateSize() throws IOException { + public long getStateSize() { return delegateStateHandle.getStateSize(); } diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/RetrievableStreamStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/RetrievableStreamStateHandle.java index 29d21acd88bb2..653e22732cdcf 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/RetrievableStreamStateHandle.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/RetrievableStreamStateHandle.java @@ -70,7 +70,7 @@ public void discardState() throws Exception { } @Override - public long getStateSize() throws IOException { + public long getStateSize() { return wrappedStreamStateHandle.getStateSize(); } diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateObject.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateObject.java index a502b9d9c7dfe..9ff2fa87df58f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateObject.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateObject.java @@ -18,8 +18,6 @@ package org.apache.flink.runtime.state; -import java.io.IOException; - /** * Base of all types that represent checkpointed state. Specializations are for * example {@link StateHandle StateHandles} (directly resolve to state). @@ -45,7 +43,6 @@ public interface StateObject extends java.io.Serializable { *

If the the size is not known, return {@code 0}. * * @return Size of the state in bytes. - * @throws IOException If the operation fails during size retrieval. */ - long getStateSize() throws IOException; + long getStateSize(); } diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/filesystem/FileStateHandle.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/filesystem/FileStateHandle.java index b61c52d6c4146..91b3f793a4fbf 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/filesystem/FileStateHandle.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/filesystem/FileStateHandle.java @@ -93,10 +93,9 @@ public void discardState() throws Exception { * Returns the file size in bytes. * * @return The file size in bytes. - * @throws IOException Thrown if the file system cannot be accessed. */ @Override - public long getStateSize() throws IOException { + public long getStateSize() { return stateSize; } diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreITCase.java index f46f7d28e79f0..046adba10d32a 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/ZooKeeperCompletedCheckpointStoreITCase.java @@ -30,7 +30,6 @@ import scala.concurrent.duration.Deadline; import scala.concurrent.duration.FiniteDuration; -import java.io.IOException; import java.io.Serializable; import java.util.concurrent.TimeUnit; @@ -184,7 +183,7 @@ public void discardState() throws Exception { } @Override - public long getStateSize() throws IOException { + public long getStateSize() { return 0; } } diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/InterruptSensitiveRestoreTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/InterruptSensitiveRestoreTest.java index 1f79384b82713..c78548321a511 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/InterruptSensitiveRestoreTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/InterruptSensitiveRestoreTest.java @@ -249,7 +249,7 @@ private void block() { public void discardState() throws Exception {} @Override - public long getStateSize() throws IOException { + public long getStateSize() { return 0; } }