Skip to content

Commit 316daca

Browse files
authored
[FLINK-4602][State] Move RocksDB statebackend classes to o.a.f.state.rocksdb package. (#25543)
1 parent cddb14e commit 316daca

File tree

150 files changed

+2913
-2654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+2913
-2654
lines changed

docs/content.zh/docs/dev/python/table/table_environment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ table_env.get_config().set("execution.checkpointing.interval", "3min")
769769

770770
# 设置 statebackend 类型为 "rocksdb",其他可选项有 "hashmap"
771771
# 你也可以将这个属性设置为 StateBackendFactory 的完整类名
772-
# e.g. org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackendFactory
772+
# e.g. org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackendFactory
773773
table_env.get_config().set("state.backend.type", "rocksdb")
774774

775775
# 设置 RocksDB statebackend 所需要的 checkpoint 目录

docs/content.zh/docs/ops/state/state_backends.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ env = StreamExecutionEnvironment.get_execution_environment(config)
169169

170170
可选值包括 *jobmanager* (HashMapStateBackend), *rocksdb* (EmbeddedRocksDBStateBackend),
171171
或使用实现了 state backend 工厂 {{< gh_link file="flink-runtime/src/main/java/org/apache/flink/runtime/state/StateBackendFactory.java" name="StateBackendFactory" >}} 的类的全限定类名,
172-
例如: EmbeddedRocksDBStateBackend 对应为 `org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackendFactory`
172+
例如: EmbeddedRocksDBStateBackend 对应为 `org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackendFactory`
173173

174174
`execution.checkpointing.dir` 选项指定了所有 State Backend 写 CheckPoint 数据和写元数据文件的目录。
175175
你能在 [这里]({{< ref "docs/ops/state/checkpoints" >}}#directory-structure) 找到关于 CheckPoint 目录结构的详细信息。

docs/content/docs/dev/python/table/table_environment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ table_env.get_config().set("execution.checkpointing.interval", "3min")
773773

774774
# set the statebackend type to "rocksdb", other available options are "hashmap"
775775
# you can also set the full qualified Java class name of the StateBackendFactory to this option
776-
# e.g. org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackendFactory
776+
# e.g. org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackendFactory
777777
table_env.get_config().set("state.backend.type", "rocksdb")
778778

779779
# set the checkpoint directory, which is required by the RocksDB statebackend

docs/content/docs/ops/state/state_backends.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ A default state backend can be configured in the [Flink configuration file]({{<
161161

162162
Possible values for the config entry are *hashmap* (HashMapStateBackend), *rocksdb* (EmbeddedRocksDBStateBackend), or the fully qualified class
163163
name of the class that implements the state backend factory {{< gh_link file="flink-runtime/src/main/java/org/apache/flink/runtime/state/StateBackendFactory.java" name="StateBackendFactory" >}},
164-
such as `org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackendFactory` for EmbeddedRocksDBStateBackend.
164+
such as `org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackendFactory` for EmbeddedRocksDBStateBackend.
165165

166166
The `execution.checkpointing.dir` option defines the directory to which all backends write checkpoint data and meta data files.
167167
You can find more details about the checkpoint directory structure [here]({{< ref "docs/ops/state/checkpoints" >}}#directory-structure).

flink-core/src/main/java/org/apache/flink/api/common/state/StateTtlConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,14 +456,14 @@ public static class RocksdbCompactFilterCleanupStrategy
456456

457457
/**
458458
* @deprecated Use {@link
459-
* org.apache.flink.contrib.streaming.state.RocksDBConfigurableOptions#COMPACT_FILTER_PERIODIC_COMPACTION_TIME}
459+
* org.apache.flink.state.rocksdb.RocksDBConfigurableOptions#COMPACT_FILTER_PERIODIC_COMPACTION_TIME}
460460
* instead.
461461
*/
462462
@Deprecated static final Duration DEFAULT_PERIODIC_COMPACTION_TIME = Duration.ofDays(30);
463463

464464
/**
465465
* @deprecated Use {@link
466-
* org.apache.flink.contrib.streaming.state.RocksDBConfigurableOptions#COMPACT_FILTER_QUERY_TIME_AFTER_NUM_ENTRIES}
466+
* org.apache.flink.state.rocksdb.RocksDBConfigurableOptions#COMPACT_FILTER_QUERY_TIME_AFTER_NUM_ENTRIES}
467467
* instead.
468468
*/
469469
@Deprecated

flink-docs/src/main/java/org/apache/flink/docs/util/ConfigurationOptionLocator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public class ConfigurationOptionLocator {
6767
"flink-metrics/flink-metrics-otel", "org.apache.flink.metrics.otel"),
6868
new OptionsClassLocation(
6969
"flink-state-backends/flink-statebackend-rocksdb",
70-
"org.apache.flink.contrib.streaming.state"),
70+
"org.apache.flink.state.rocksdb"),
7171
new OptionsClassLocation(
7272
"flink-table/flink-table-api-java", "org.apache.flink.table.api.config"),
7373
new OptionsClassLocation("flink-python", "org.apache.flink.python"),
@@ -95,7 +95,7 @@ public class ConfigurationOptionLocator {
9595
"org.apache.flink.configuration.WritableConfig",
9696
"org.apache.flink.configuration.ConfigOptions",
9797
"org.apache.flink.streaming.api.environment.CheckpointConfig",
98-
"org.apache.flink.contrib.streaming.state.PredefinedOptions",
98+
"org.apache.flink.state.rocksdb.PredefinedOptions",
9999
"org.apache.flink.python.PythonConfig",
100100
"org.apache.flink.cep.configuration.SharedBufferCacheConfig",
101101
"org.apache.flink.table.api.config.LookupJoinHintOptions"));

flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/DataStreamStateTTLTestProgram.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
package org.apache.flink.streaming.tests;
2020

2121
import org.apache.flink.api.common.state.StateTtlConfig;
22-
import org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend;
2322
import org.apache.flink.runtime.state.StateBackend;
2423
import org.apache.flink.runtime.state.hashmap.HashMapStateBackend;
24+
import org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend;
2525
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
2626
import org.apache.flink.streaming.api.functions.sink.legacy.PrintSinkFunction;
2727
import org.apache.flink.streaming.api.graph.StreamGraph;

flink-examples/flink-examples-streaming/src/main/java/org/apache/flink/streaming/examples/statemachine/StateMachineExample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public static void main(String[] args) throws Exception {
9696
boolean incrementalCheckpoints = params.getBoolean("incremental-checkpoints", false);
9797
configuration.set(
9898
StateBackendOptions.STATE_BACKEND,
99-
"org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackendFactory");
99+
"org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackendFactory");
100100
configuration.set(CheckpointingOptions.INCREMENTAL_CHECKPOINTS, incrementalCheckpoints);
101101
configuration.set(CheckpointingOptions.CHECKPOINT_STORAGE, "filesystem");
102102
configuration.set(CheckpointingOptions.CHECKPOINTS_DIRECTORY, checkpointDir);

flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPOperatorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
import org.apache.flink.cep.pattern.conditions.SimpleCondition;
4040
import org.apache.flink.cep.time.TimerService;
4141
import org.apache.flink.cep.utils.CepOperatorTestUtilities;
42-
import org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend;
4342
import org.apache.flink.mock.Whitebox;
4443
import org.apache.flink.runtime.checkpoint.OperatorSubtaskState;
4544
import org.apache.flink.runtime.state.storage.JobManagerCheckpointStorage;
45+
import org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend;
4646
import org.apache.flink.streaming.api.watermark.Watermark;
4747
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
4848
import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness;

flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPRescalingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
import org.apache.flink.cep.pattern.Pattern;
2828
import org.apache.flink.cep.pattern.conditions.SimpleCondition;
2929
import org.apache.flink.cep.utils.CepOperatorTestUtilities;
30-
import org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend;
3130
import org.apache.flink.runtime.checkpoint.OperatorSubtaskState;
3231
import org.apache.flink.runtime.state.KeyGroupRangeAssignment;
3332
import org.apache.flink.runtime.state.storage.JobManagerCheckpointStorage;
33+
import org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend;
3434
import org.apache.flink.streaming.api.watermark.Watermark;
3535
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
3636
import org.apache.flink.streaming.util.AbstractStreamOperatorTestHarness;

flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/EmbeddedRocksDBStateBackendReaderKeyedStateITCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.apache.flink.api.java.tuple.Tuple2;
2222
import org.apache.flink.configuration.Configuration;
2323
import org.apache.flink.configuration.StateBackendOptions;
24-
import org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend;
24+
import org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend;
2525

2626
/** IT Case for reading keyed state from a memory state backend. */
2727
public class EmbeddedRocksDBStateBackendReaderKeyedStateITCase

flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/EmbeddedRocksDBStateBackendWindowITCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.apache.flink.api.java.tuple.Tuple2;
2222
import org.apache.flink.configuration.Configuration;
2323
import org.apache.flink.configuration.StateBackendOptions;
24-
import org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend;
24+
import org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend;
2525

2626
/** IT Case for reading window state with the embedded rocksdb state backend. */
2727
public class EmbeddedRocksDBStateBackendWindowITCase

flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/SavepointDeepCopyTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import org.apache.flink.api.common.typeinfo.Types;
2525
import org.apache.flink.api.java.tuple.Tuple2;
2626
import org.apache.flink.configuration.MemorySize;
27-
import org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend;
2827
import org.apache.flink.runtime.state.StateBackend;
2928
import org.apache.flink.runtime.state.hashmap.HashMapStateBackend;
3029
import org.apache.flink.state.api.functions.KeyedStateBootstrapFunction;
3130
import org.apache.flink.state.api.functions.KeyedStateReaderFunction;
3231
import org.apache.flink.state.api.utils.JobResultRetriever;
32+
import org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend;
3333
import org.apache.flink.streaming.api.datastream.DataStream;
3434
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
3535
import org.apache.flink.test.util.AbstractTestBaseJUnit4;

flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/SavepointWriterITCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.apache.flink.api.common.typeinfo.Types;
3131
import org.apache.flink.configuration.Configuration;
3232
import org.apache.flink.configuration.StateBackendOptions;
33-
import org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend;
3433
import org.apache.flink.runtime.jobgraph.SavepointRestoreSettings;
3534
import org.apache.flink.runtime.state.FunctionInitializationContext;
3635
import org.apache.flink.runtime.state.FunctionSnapshotContext;
@@ -39,6 +38,7 @@
3938
import org.apache.flink.state.api.functions.BroadcastStateBootstrapFunction;
4039
import org.apache.flink.state.api.functions.KeyedStateBootstrapFunction;
4140
import org.apache.flink.state.api.functions.StateBootstrapFunction;
41+
import org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend;
4242
import org.apache.flink.streaming.api.checkpoint.CheckpointedFunction;
4343
import org.apache.flink.streaming.api.datastream.DataStream;
4444
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;

flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/SavepointWriterWindowITCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
import org.apache.flink.api.java.tuple.Tuple3;
3030
import org.apache.flink.configuration.Configuration;
3131
import org.apache.flink.configuration.StateBackendOptions;
32-
import org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend;
3332
import org.apache.flink.runtime.jobgraph.SavepointRestoreSettings;
3433
import org.apache.flink.runtime.state.StateBackend;
3534
import org.apache.flink.runtime.state.hashmap.HashMapStateBackend;
3635
import org.apache.flink.state.api.utils.MaxWatermarkSource;
36+
import org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend;
3737
import org.apache.flink.streaming.api.datastream.DataStream;
3838
import org.apache.flink.streaming.api.datastream.SingleOutputStreamOperator;
3939
import org.apache.flink.streaming.api.datastream.WindowedStream;

flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/output/KeyedStateBootstrapOperatorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import org.apache.flink.api.common.state.ValueStateDescriptor;
2525
import org.apache.flink.api.common.typeinfo.Types;
2626
import org.apache.flink.api.java.tuple.Tuple3;
27-
import org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend;
2827
import org.apache.flink.core.fs.Path;
2928
import org.apache.flink.runtime.checkpoint.OperatorSubtaskState;
3029
import org.apache.flink.runtime.state.storage.FileSystemCheckpointStorage;
3130
import org.apache.flink.state.api.functions.KeyedStateBootstrapFunction;
3231
import org.apache.flink.state.api.output.operators.KeyedStateBootstrapOperator;
32+
import org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend;
3333
import org.apache.flink.streaming.api.TimeDomain;
3434
import org.apache.flink.streaming.api.functions.KeyedProcessFunction;
3535
import org.apache.flink.streaming.api.operators.KeyedProcessOperator;

flink-python/pyflink/datastream/state_backend.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def _from_j_state_backend(j_state_backend):
3939
gateway = get_gateway()
4040
JStateBackend = gateway.jvm.org.apache.flink.runtime.state.StateBackend
4141
JHashMapStateBackend = gateway.jvm.org.apache.flink.runtime.state.hashmap.HashMapStateBackend
42-
JEmbeddedRocksDBStateBackend = gateway.jvm.org.apache.flink.contrib.streaming.state.\
42+
JEmbeddedRocksDBStateBackend = gateway.jvm.org.apache.flink.state.rocksdb.\
4343
EmbeddedRocksDBStateBackend
4444
j_clz = j_state_backend.getClass()
4545

@@ -191,7 +191,7 @@ def __init__(self,
191191
if j_embedded_rocks_db_state_backend is None:
192192
gateway = get_gateway()
193193
JTernaryBoolean = gateway.jvm.org.apache.flink.util.TernaryBoolean
194-
JEmbeddedRocksDBStateBackend = gateway.jvm.org.apache.flink.contrib.streaming.state \
194+
JEmbeddedRocksDBStateBackend = gateway.jvm.org.apache.flink.state.rocksdb \
195195
.EmbeddedRocksDBStateBackend
196196

197197
if enable_incremental_checkpointing not in (None, True, False):
@@ -316,7 +316,7 @@ def set_options(self, options_factory_class_name: str):
316316
The options factory must have a default constructor.
317317
"""
318318
gateway = get_gateway()
319-
JOptionsFactory = gateway.jvm.org.apache.flink.contrib.streaming.state.RocksDBOptionsFactory
319+
JOptionsFactory = gateway.jvm.org.apache.flink.state.rocksdb.RocksDBOptionsFactory
320320
j_options_factory_clz = load_java_class(options_factory_class_name)
321321
if not get_java_class(JOptionsFactory).isAssignableFrom(j_options_factory_clz):
322322
raise ValueError("The input class does not implement RocksDBOptionsFactory.")
@@ -448,7 +448,7 @@ def _from_j_predefined_options(j_predefined_options) -> 'PredefinedOptions':
448448

449449
def _to_j_predefined_options(self):
450450
gateway = get_gateway()
451-
JPredefinedOptions = gateway.jvm.org.apache.flink.contrib.streaming.state.PredefinedOptions
451+
JPredefinedOptions = gateway.jvm.org.apache.flink.state.rocksdb.PredefinedOptions
452452
return getattr(JPredefinedOptions, self.name)
453453

454454

flink-python/pyflink/datastream/tests/test_state_backend.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ def test_get_set_options(self):
8585
self.assertIsNone(state_backend.get_options())
8686

8787
state_backend.set_options(
88-
"org.apache.flink.contrib.streaming.state."
88+
"org.apache.flink.state.rocksdb."
8989
"RocksDBStateBackendConfigTest$TestOptionsFactory")
9090

9191
self.assertEqual(state_backend.get_options(),
92-
"org.apache.flink.contrib.streaming.state."
92+
"org.apache.flink.state.rocksdb."
9393
"RocksDBStateBackendConfigTest$TestOptionsFactory")
9494

9595
def test_get_set_number_of_transfer_threads(self):

flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/HAQueryableStateRocksDBBackendITCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
/**
4747
* Several integration tests for queryable state using the {@link
48-
* org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend}.
48+
* org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend}.
4949
*/
5050
class HAQueryableStateRocksDBBackendITCase extends AbstractQueryableStateTestBase {
5151

flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/itcases/NonHAQueryableStateRocksDBBackendITCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
/**
4343
* Several integration tests for queryable state using the {@link
44-
* org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend}.
44+
* org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend}.
4545
*/
4646
public class NonHAQueryableStateRocksDBBackendITCase extends AbstractQueryableStateTestBase {
4747

flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KVStateRequestSerializerRocksDBTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
import org.apache.flink.api.common.state.MapStateDescriptor;
2323
import org.apache.flink.api.common.typeutils.base.LongSerializer;
2424
import org.apache.flink.api.common.typeutils.base.StringSerializer;
25-
import org.apache.flink.contrib.streaming.state.RocksDBKeyedStateBackend;
26-
import org.apache.flink.contrib.streaming.state.RocksDBTestUtils;
2725
import org.apache.flink.queryablestate.client.VoidNamespace;
2826
import org.apache.flink.queryablestate.client.VoidNamespaceSerializer;
2927
import org.apache.flink.runtime.state.internal.InternalListState;
3028
import org.apache.flink.runtime.state.internal.InternalMapState;
29+
import org.apache.flink.state.rocksdb.RocksDBKeyedStateBackend;
30+
import org.apache.flink.state.rocksdb.RocksDBTestUtils;
3131

3232
import org.junit.jupiter.api.Test;
3333
import org.junit.jupiter.api.io.TempDir;

flink-runtime/src/main/java/org/apache/flink/runtime/state/StateBackendLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class StateBackendLoader {
5858

5959
/** Used for loading RocksDBStateBackend. */
6060
private static final String ROCKSDB_STATE_BACKEND_FACTORY =
61-
"org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackendFactory";
61+
"org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackendFactory";
6262

6363
/** Used for loading ForStStateBackend. */
6464
private static final String FORST_STATE_BACKEND_FACTORY =

flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogDelegateEmbeddedRocksDBStateBackendTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
import org.apache.flink.api.common.typeutils.TypeSerializer;
2323
import org.apache.flink.configuration.Configuration;
2424
import org.apache.flink.configuration.StateLatencyTrackOptions;
25-
import org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend;
26-
import org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackendTest;
2725
import org.apache.flink.runtime.execution.Environment;
2826
import org.apache.flink.runtime.state.CheckpointStreamFactory;
2927
import org.apache.flink.runtime.state.CheckpointableKeyedStateBackend;
3028
import org.apache.flink.runtime.state.ConfigurableStateBackend;
3129
import org.apache.flink.runtime.state.KeyGroupRange;
3230
import org.apache.flink.runtime.state.StateBackend;
3331
import org.apache.flink.runtime.state.TestTaskStateManager;
32+
import org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend;
33+
import org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackendTest;
3434
import org.apache.flink.testutils.junit.utils.TempDirUtils;
3535

3636
import org.junit.jupiter.api.Disabled;

flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogDelegateStateTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
import org.apache.flink.api.common.state.State;
2525
import org.apache.flink.api.common.state.StateDescriptor;
2626
import org.apache.flink.api.common.state.ValueStateDescriptor;
27-
import org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend;
2827
import org.apache.flink.runtime.operators.testutils.MockEnvironment;
2928
import org.apache.flink.runtime.state.AbstractStateBackend;
3029
import org.apache.flink.runtime.state.KeyedStateBackend;
3130
import org.apache.flink.runtime.state.StateBackendTestBase;
3231
import org.apache.flink.runtime.state.VoidNamespace;
3332
import org.apache.flink.runtime.state.VoidNamespaceSerializer;
3433
import org.apache.flink.runtime.state.hashmap.HashMapStateBackend;
34+
import org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend;
3535
import org.apache.flink.util.IOUtils;
3636

3737
import org.junit.After;

flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogStateBackendLoadingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.apache.flink.configuration.ReadableConfig;
2626
import org.apache.flink.configuration.StateBackendOptions;
2727
import org.apache.flink.configuration.StateChangelogOptions;
28-
import org.apache.flink.contrib.streaming.state.EmbeddedRocksDBStateBackend;
2928
import org.apache.flink.runtime.jobgraph.tasks.JobCheckpointingSettings;
3029
import org.apache.flink.runtime.state.AbstractKeyedStateBackend;
3130
import org.apache.flink.runtime.state.AbstractStateBackend;
@@ -41,6 +40,7 @@
4140
import org.apache.flink.runtime.state.delegate.DelegatingStateBackend;
4241
import org.apache.flink.runtime.state.hashmap.HashMapStateBackend;
4342
import org.apache.flink.runtime.state.storage.JobManagerCheckpointStorage;
43+
import org.apache.flink.state.rocksdb.EmbeddedRocksDBStateBackend;
4444
import org.apache.flink.streaming.api.datastream.SingleOutputStreamOperator;
4545
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
4646
import org.apache.flink.streaming.api.functions.source.legacy.SourceFunction;

0 commit comments

Comments
 (0)