-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-35153][State] Internal async list state and corresponding stat…
…e descriptor This closes #24781
- Loading branch information
Showing
8 changed files
with
288 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/InternalListState.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.flink.runtime.state.v2; | ||
|
|
||
| import org.apache.flink.api.common.state.v2.ListState; | ||
| import org.apache.flink.api.common.state.v2.StateFuture; | ||
| import org.apache.flink.api.common.state.v2.StateIterator; | ||
| import org.apache.flink.runtime.asyncprocessing.StateRequestHandler; | ||
| import org.apache.flink.runtime.asyncprocessing.StateRequestType; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * A default implementation of {@link ListState} which delegates all async requests to {@link | ||
| * StateRequestHandler}. | ||
| * | ||
| * @param <K> The type of key the state is associated to. | ||
| * @param <V> The type of values kept internally in state. | ||
| */ | ||
| public class InternalListState<K, V> extends InternalKeyedState<K, V> implements ListState<V> { | ||
|
|
||
| public InternalListState( | ||
| StateRequestHandler stateRequestHandler, ListStateDescriptor<V> stateDescriptor) { | ||
| super(stateRequestHandler, stateDescriptor); | ||
| } | ||
|
|
||
| @Override | ||
| public StateFuture<StateIterator<V>> asyncGet() { | ||
| return handleRequest(StateRequestType.MERGING_GET, null); | ||
| } | ||
|
|
||
| @Override | ||
| public StateFuture<Void> asyncAdd(V value) { | ||
| return handleRequest(StateRequestType.MERGING_ADD, value); | ||
| } | ||
|
|
||
| @Override | ||
| public StateFuture<Void> asyncUpdate(List<V> values) { | ||
| return handleRequest(StateRequestType.LIST_UPDATE, values); | ||
| } | ||
|
|
||
| @Override | ||
| public StateFuture<Void> asyncAddAll(List<V> values) { | ||
| return handleRequest(StateRequestType.LIST_ADD_ALL, values); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/ListStateDescriptor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.flink.runtime.state.v2; | ||
|
|
||
| import org.apache.flink.api.common.serialization.SerializerConfig; | ||
| import org.apache.flink.api.common.state.v2.ListState; | ||
| import org.apache.flink.api.common.typeinfo.TypeInformation; | ||
|
|
||
| /** | ||
| * {@link StateDescriptor} for {@link ListState}. This can be used to create partitioned list state | ||
| * internally. | ||
| * | ||
| * @param <T> The type of each value that the list state can hold. | ||
| */ | ||
| public class ListStateDescriptor<T> extends StateDescriptor<T> { | ||
|
|
||
| /** | ||
| * Creates a new {@code ListStateDescriptor} with the given stateId and type. | ||
| * | ||
| * @param stateId The (unique) stateId for the state. | ||
| * @param typeInfo The type of the values in the state. | ||
| */ | ||
| public ListStateDescriptor(String stateId, TypeInformation<T> typeInfo) { | ||
| super(stateId, typeInfo); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a new {@code ListStateDescriptor} with the given stateId and type. | ||
| * | ||
| * @param stateId The (unique) stateId for the state. | ||
| * @param typeInfo The type of the values in the state. | ||
| * @param serializerConfig The serializer related config used to generate {@code | ||
| * TypeSerializer}. | ||
| */ | ||
| public ListStateDescriptor( | ||
| String stateId, TypeInformation<T> typeInfo, SerializerConfig serializerConfig) { | ||
| super(stateId, typeInfo, serializerConfig); | ||
| } | ||
|
|
||
| @Override | ||
| public Type getType() { | ||
| return Type.LIST; | ||
| } | ||
| } |
57 changes: 57 additions & 0 deletions
57
flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/InternalListStateTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.flink.runtime.state.v2; | ||
|
|
||
| import org.apache.flink.api.common.typeinfo.BasicTypeInfo; | ||
| import org.apache.flink.runtime.asyncprocessing.StateRequestType; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| /** Tests for {@link InternalListState}. */ | ||
| public class InternalListStateTest extends InternalKeyedStateTestBase { | ||
|
|
||
| @Test | ||
| @SuppressWarnings({"unchecked", "rawtypes"}) | ||
| public void testEachOperation() { | ||
| ListStateDescriptor<Integer> descriptor = | ||
| new ListStateDescriptor<>("testState", BasicTypeInfo.INT_TYPE_INFO); | ||
| InternalListState<String, Integer> listState = new InternalListState<>(aec, descriptor); | ||
| aec.setCurrentContext(aec.buildContext("test", "test")); | ||
|
|
||
| listState.asyncClear(); | ||
| validateRequestRun(listState, StateRequestType.CLEAR, null); | ||
|
|
||
| listState.asyncGet(); | ||
| validateRequestRun(listState, StateRequestType.MERGING_GET, null); | ||
|
|
||
| listState.asyncAdd(1); | ||
| validateRequestRun(listState, StateRequestType.MERGING_ADD, 1); | ||
|
|
||
| List<Integer> list = new ArrayList<>(); | ||
| listState.asyncUpdate(list); | ||
| validateRequestRun(listState, StateRequestType.LIST_UPDATE, list); | ||
|
|
||
| list = new ArrayList<>(); | ||
| listState.asyncAddAll(list); | ||
| validateRequestRun(listState, StateRequestType.LIST_ADD_ALL, list); | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/ListStateDescriptorTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.flink.runtime.state.v2; | ||
|
|
||
| import org.apache.flink.api.common.typeinfo.BasicTypeInfo; | ||
| import org.apache.flink.core.testutils.CommonTestUtils; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| /** Tests for {@link ListStateDescriptor}. */ | ||
| public class ListStateDescriptorTest { | ||
|
|
||
| @Test | ||
| void testHashCodeAndEquals() throws Exception { | ||
| final String name = "testName"; | ||
|
|
||
| ListStateDescriptor<Integer> original = | ||
| new ListStateDescriptor<>(name, BasicTypeInfo.INT_TYPE_INFO); | ||
| ListStateDescriptor<Integer> same = | ||
| new ListStateDescriptor<>(name, BasicTypeInfo.INT_TYPE_INFO); | ||
| ListStateDescriptor<Integer> sameBySerializer = | ||
| new ListStateDescriptor<>(name, BasicTypeInfo.INT_TYPE_INFO); | ||
|
|
||
| // test that hashCode() works on state descriptors with initialized and uninitialized | ||
| // serializers | ||
| assertThat(same).hasSameHashCodeAs(original); | ||
| assertThat(sameBySerializer).hasSameHashCodeAs(original); | ||
|
|
||
| assertThat(same).isEqualTo(original); | ||
| assertThat(sameBySerializer).isEqualTo(original); | ||
|
|
||
| // equality with a clone | ||
| ListStateDescriptor<Integer> clone = CommonTestUtils.createCopySerializable(original); | ||
| assertThat(clone).isEqualTo(original); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters