You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tz...@apache.org on 2019/04/11 04:46:10 UTC
[flink] branch master updated: [FLINK-12066] [State Backends]
Remove StateSerializerProvider field in keyed state backend
This is an automated email from the ASF dual-hosted git repository.
tzulitai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 1132a52 [FLINK-12066] [State Backends] Remove StateSerializerProvider field in keyed state backend
1132a52 is described below
commit 1132a52a58c3710a9a183111fda84cd1432605fa
Author: Yu Li <li...@apache.org>
AuthorDate: Wed Apr 10 17:32:19 2019 +0800
[FLINK-12066] [State Backends] Remove StateSerializerProvider field in keyed state backend
This closes #8078.
---
.../flink/runtime/state/AbstractKeyedStateBackend.java | 14 +++++++-------
.../flink/runtime/state/heap/HeapKeyedStateBackend.java | 7 +++----
.../runtime/state/heap/HeapKeyedStateBackendBuilder.java | 2 +-
.../contrib/streaming/state/RocksDBKeyedStateBackend.java | 5 ++---
.../streaming/state/RocksDBKeyedStateBackendBuilder.java | 2 +-
5 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/AbstractKeyedStateBackend.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/AbstractKeyedStateBackend.java
index 606e827..a06030c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/AbstractKeyedStateBackend.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/AbstractKeyedStateBackend.java
@@ -53,8 +53,8 @@ public abstract class AbstractKeyedStateBackend<K> implements
Closeable,
CheckpointListener {
- /** {@link StateSerializerProvider} for our key serializer. */
- protected final StateSerializerProvider<K> keySerializerProvider;
+ /** The key serializer. */
+ protected final TypeSerializer<K> keySerializer;
/** Listeners to changes of ({@link #keyContext}). */
private final ArrayList<KeySelectionListener<K>> keySelectionListeners;
@@ -102,7 +102,7 @@ public abstract class AbstractKeyedStateBackend<K> implements
InternalKeyContext<K> keyContext) {
this(
kvStateRegistry,
- StateSerializerProvider.fromNewRegisteredSerializer(keySerializer),
+ keySerializer,
userCodeClassLoader,
executionConfig,
ttlTimeProvider,
@@ -114,7 +114,7 @@ public abstract class AbstractKeyedStateBackend<K> implements
public AbstractKeyedStateBackend(
TaskKvStateRegistry kvStateRegistry,
- StateSerializerProvider<K> keySerializerProvider,
+ TypeSerializer<K> keySerializer,
ClassLoader userCodeClassLoader,
ExecutionConfig executionConfig,
TtlTimeProvider ttlTimeProvider,
@@ -128,7 +128,7 @@ public abstract class AbstractKeyedStateBackend<K> implements
Preconditions.checkArgument(numberOfKeyGroups >= keyGroupRange.getNumberOfKeyGroups(), "The total number of key groups must be at least the number in the key group range assigned to this backend");
this.kvStateRegistry = kvStateRegistry;
- this.keySerializerProvider = keySerializerProvider;
+ this.keySerializer = keySerializer;
this.userCodeClassLoader = Preconditions.checkNotNull(userCodeClassLoader);
this.cancelStreamRegistry = cancelStreamRegistry;
this.keyValueStatesByName = new HashMap<>();
@@ -197,7 +197,7 @@ public abstract class AbstractKeyedStateBackend<K> implements
*/
@Override
public TypeSerializer<K> getKeySerializer() {
- return keySerializerProvider.currentSchemaSerializer();
+ return keySerializer;
}
/**
@@ -268,7 +268,7 @@ public abstract class AbstractKeyedStateBackend<K> implements
final TypeSerializer<N> namespaceSerializer,
StateDescriptor<S, V> stateDescriptor) throws Exception {
checkNotNull(namespaceSerializer, "Namespace serializer");
- checkNotNull(keySerializerProvider, "State key serializer has not been configured in the config. " +
+ checkNotNull(keySerializer, "State key serializer has not been configured in the config. " +
"This operation cannot use partitioned state.");
InternalKvState<K, ?, ?> kvState = keyValueStatesByName.get(stateDescriptor.getName());
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackend.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackend.java
index 25c3470..7e184ab 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackend.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackend.java
@@ -46,7 +46,6 @@ import org.apache.flink.runtime.state.PriorityComparable;
import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo;
import org.apache.flink.runtime.state.RegisteredPriorityQueueStateBackendMetaInfo;
import org.apache.flink.runtime.state.SnapshotResult;
-import org.apache.flink.runtime.state.StateSerializerProvider;
import org.apache.flink.runtime.state.StateSnapshotRestore;
import org.apache.flink.runtime.state.StateSnapshotTransformer.StateSnapshotTransformFactory;
import org.apache.flink.runtime.state.StateSnapshotTransformers;
@@ -114,7 +113,7 @@ public class HeapKeyedStateBackend<K> extends AbstractKeyedStateBackend<K> {
public HeapKeyedStateBackend(
TaskKvStateRegistry kvStateRegistry,
- StateSerializerProvider<K> keySerializerProvider,
+ TypeSerializer<K> keySerializer,
ClassLoader userCodeClassLoader,
ExecutionConfig executionConfig,
TtlTimeProvider ttlTimeProvider,
@@ -128,7 +127,7 @@ public class HeapKeyedStateBackend<K> extends AbstractKeyedStateBackend<K> {
InternalKeyContext<K> keyContext) {
super(
kvStateRegistry,
- keySerializerProvider,
+ keySerializer,
userCodeClassLoader,
executionConfig,
ttlTimeProvider,
@@ -240,7 +239,7 @@ public class HeapKeyedStateBackend<K> extends AbstractKeyedStateBackend<K> {
newStateSerializer,
snapshotTransformFactory);
- stateTable = snapshotStrategy.newStateTable(keyContext, newMetaInfo, keySerializerProvider.currentSchemaSerializer());
+ stateTable = snapshotStrategy.newStateTable(keyContext, newMetaInfo, keySerializer);
registeredKVStates.put(stateDesc.getName(), stateTable);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackendBuilder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackendBuilder.java
index 71d048c..7d9430a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackendBuilder.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackendBuilder.java
@@ -117,7 +117,7 @@ public class HeapKeyedStateBackendBuilder<K> extends AbstractKeyedStateBackendBu
}
return new HeapKeyedStateBackend<>(
kvStateRegistry,
- keySerializerProvider,
+ keySerializerProvider.currentSchemaSerializer(),
userCodeClassLoader,
executionConfig,
ttlTimeProvider,
diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java
index 11f773f..e0dd9c2 100644
--- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java
+++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackend.java
@@ -49,7 +49,6 @@ import org.apache.flink.runtime.state.PriorityQueueSetFactory;
import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo;
import org.apache.flink.runtime.state.RegisteredStateMetaInfoBase;
import org.apache.flink.runtime.state.SnapshotResult;
-import org.apache.flink.runtime.state.StateSerializerProvider;
import org.apache.flink.runtime.state.StateSnapshotTransformer.StateSnapshotTransformFactory;
import org.apache.flink.runtime.state.StreamCompressionDecorator;
import org.apache.flink.runtime.state.heap.HeapPriorityQueueElement;
@@ -200,7 +199,7 @@ public class RocksDBKeyedStateBackend<K> extends AbstractKeyedStateBackend<K> {
DBOptions dbOptions,
Function<String, ColumnFamilyOptions> columnFamilyOptionsFactory,
TaskKvStateRegistry kvStateRegistry,
- StateSerializerProvider<K> keySerializerProvider,
+ TypeSerializer<K> keySerializer,
ExecutionConfig executionConfig,
TtlTimeProvider ttlTimeProvider,
RocksDB db,
@@ -221,7 +220,7 @@ public class RocksDBKeyedStateBackend<K> extends AbstractKeyedStateBackend<K> {
super(
kvStateRegistry,
- keySerializerProvider,
+ keySerializer,
userCodeClassLoader,
executionConfig,
ttlTimeProvider,
diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackendBuilder.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackendBuilder.java
index b55a7a0..b515c94 100644
--- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackendBuilder.java
+++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBKeyedStateBackendBuilder.java
@@ -335,7 +335,7 @@ public class RocksDBKeyedStateBackendBuilder<K> extends AbstractKeyedStateBacken
this.dbOptions,
columnFamilyOptionsFactory,
this.kvStateRegistry,
- this.keySerializerProvider,
+ this.keySerializerProvider.currentSchemaSerializer(),
this.executionConfig,
this.ttlTimeProvider,
db,