Github user StephanEwen commented on a diff in the pull request:
https://github.com/apache/flink/pull/2781#discussion_r91087211
--- Diff:
flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackend.java
---
@@ -346,4 +359,130 @@ public String toString() {
return "HeapKeyedStateBackend";
}
+ /**
+ * REMOVE
+ */
+ @Internal
+ @Deprecated
+ public Map<String, StateTable<K, ?, ?>> getStateTables() {
+ return stateTables;
+ }
+
+ @Deprecated
+ private void restoreOldSavepointKeyedState(
+ Collection<KeyGroupsStateHandle> stateHandles) throws
IOException, ClassNotFoundException {
+
+ if (stateHandles.isEmpty()) {
+ return;
+ }
+
+ HashMap<String, KvStateSnapshot<K, ?, ?, ?>> namedStates =
+
InstantiationUtil.deserializeObject(stateHandles.iterator().next().openInputStream(),
userCodeClassLoader);
+
+ for (Map.Entry<String, KvStateSnapshot<K, ?, ?, ?>> nameToState
: namedStates.entrySet()) {
+
+ KvStateSnapshot<K, ?, ?, ?> genericSnapshot =
nameToState.getValue();
+
+ final RestoredState restoredState;
+
+ if (genericSnapshot instanceof
AbstractMemStateSnapshot) {
+
+ AbstractMemStateSnapshot<K, ?, ?, ?, ?>
stateSnapshot =
+ (AbstractMemStateSnapshot<K, ?,
?, ?, ?>) nameToState.getValue();
+
+ restoredState = restoreHeapState(stateSnapshot);
+
+ } else if (genericSnapshot instanceof
AbstractFsStateSnapshot) {
+
+ AbstractFsStateSnapshot<K, ?, ?, ?, ?>
stateSnapshot =
+ (AbstractFsStateSnapshot<K, ?,
?, ?, ?>) nameToState.getValue();
+ restoredState = restoreFsState(stateSnapshot);
+ } else {
+ throw new IllegalStateException("Unknown state:
" + genericSnapshot);
+ }
+
+ Map rawResultMap = restoredState.getRawResultMap();
+ TypeSerializer<?> namespaceSerializer =
restoredState.getNamespaceSerializer();
+ TypeSerializer<?> stateSerializer =
restoredState.getStateSerializer();
+
+ if (namespaceSerializer instanceof VoidSerializer) {
+ namespaceSerializer =
VoidNamespaceSerializer.INSTANCE;
+ }
+
+ Map nullNameSpaceFix = (Map) rawResultMap.remove(null);
+
+ if (null != nullNameSpaceFix) {
+ rawResultMap.put(VoidNamespace.INSTANCE,
nullNameSpaceFix);
+ }
+
+ StateTable<K, ?, ?> stateTable = new
StateTable<>(stateSerializer, namespaceSerializer, keyGroupRange);
+ stateTable.getState().set(0, rawResultMap);
+
+ // add named state to the backend
+ getStateTables().put(nameToState.getKey(), stateTable);
+ }
+ }
+
+ private RestoredState restoreHeapState(AbstractMemStateSnapshot<K, ?,
?, ?, ?> stateSnapshot) throws IOException {
+ return new RestoredState(
+ stateSnapshot.deserialize(),
+ stateSnapshot.getNamespaceSerializer(),
+ stateSnapshot.getStateSerializer());
+ }
+
+ private RestoredState restoreFsState(AbstractFsStateSnapshot<K, ?, ?,
?, ?> stateSnapshot) throws IOException {
+ FileSystem fs = stateSnapshot.getFilePath().getFileSystem();
+ //TODO register closeable to support fast cancelation?
+ try (FSDataInputStream inStream =
fs.open(stateSnapshot.getFilePath())) {
+
+ DataInputViewStreamWrapper inView = new
DataInputViewStreamWrapper(inStream);
+
+ final int numKeys = inView.readInt();
--- End diff --
Minor comment: It seems this variable actually means `numNamespaces`.
---
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.
---
