This is an automated email from the ASF dual-hosted git repository. leiyanfei pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 6f132a8de491f6a93015bdd8432603a368330baf Author: fredia <fredia...@gmail.com> AuthorDate: Mon Sep 30 12:43:15 2024 +0800 [FLINK-35928][state/forst] Bump forstjni version to 0.1.2-beta --- .../flink-statebackend-forst/pom.xml | 2 +- .../flink/state/forst/ForStAggregatingState.java | 2 +- .../state/forst/ForStConfigurableOptions.java | 22 ++++++++-------- .../flink/state/forst/ForStDBBunchPutRequest.java | 6 ++--- .../flink/state/forst/ForStDBGetRequest.java | 6 ++--- .../flink/state/forst/ForStDBIterRequest.java | 4 +-- .../flink/state/forst/ForStDBMapCheckRequest.java | 6 ++--- .../state/forst/ForStDBMapEntryIterRequest.java | 2 +- .../state/forst/ForStDBMapKeyIterRequest.java | 2 +- .../state/forst/ForStDBMapValueIterRequest.java | 2 +- .../flink/state/forst/ForStDBPutRequest.java | 6 ++--- .../forst/ForStDBTtlCompactFiltersManager.java | 16 ++++++------ .../state/forst/ForStDBWriteBatchWrapper.java | 10 ++++---- .../state/forst/ForStGeneralMultiGetOperation.java | 6 ++--- .../apache/flink/state/forst/ForStInnerTable.java | 2 +- .../flink/state/forst/ForStIterateOperation.java | 2 +- .../flink/state/forst/ForStKeyedStateBackend.java | 6 ++--- .../state/forst/ForStKeyedStateBackendBuilder.java | 6 ++--- .../apache/flink/state/forst/ForStListState.java | 4 +-- .../apache/flink/state/forst/ForStMapIterator.java | 2 +- .../apache/flink/state/forst/ForStMapState.java | 4 +-- .../state/forst/ForStMemoryControllerUtils.java | 6 ++--- .../state/forst/ForStNativeMetricMonitor.java | 8 +++--- .../state/forst/ForStNativeMetricOptions.java | 2 +- .../flink/state/forst/ForStOperationUtils.java | 16 ++++++------ .../flink/state/forst/ForStOptionsFactory.java | 16 ++++++------ .../apache/flink/state/forst/ForStProperty.java | 4 +-- .../flink/state/forst/ForStReducingState.java | 2 +- .../flink/state/forst/ForStResourceContainer.java | 26 +++++++++---------- .../flink/state/forst/ForStSharedResources.java | 4 +-- .../flink/state/forst/ForStStateBackend.java | 8 +++--- .../flink/state/forst/ForStStateExecutor.java | 4 +-- .../apache/flink/state/forst/ForStValueState.java | 2 +- .../state/forst/ForStWriteBatchOperation.java | 4 +-- .../flink/state/forst/restore/ForStHandle.java | 10 ++++---- .../forst/restore/ForStNoneRestoreOperation.java | 4 +-- .../state/forst/restore/ForStRestoreResult.java | 4 +-- .../snapshot/ForStIncrementalSnapshotStrategy.java | 2 +- .../forst/snapshot/ForStSnapshotStrategyBase.java | 4 +-- .../sync/AbstractForStSyncAppendingState.java | 4 +-- .../state/forst/sync/AbstractForStSyncState.java | 8 +++--- .../forst/sync/ForStDBCachingPriorityQueueSet.java | 8 +++--- .../forst/sync/ForStDBPriorityQueueSetFactory.java | 8 +++--- .../state/forst/sync/ForStIteratorWrapper.java | 6 ++--- .../forst/sync/ForStSyncAggregatingState.java | 4 +-- .../forst/sync/ForStSyncKeyedStateBackend.java | 12 ++++----- .../sync/ForStSyncKeyedStateBackendBuilder.java | 6 ++--- .../flink/state/forst/sync/ForStSyncListState.java | 6 ++--- .../flink/state/forst/sync/ForStSyncMapState.java | 6 ++--- .../state/forst/sync/ForStSyncReducingState.java | 4 +-- .../state/forst/sync/ForStSyncValueState.java | 4 +-- .../state/forst/ForStDBIterateOperationTest.java | 4 +-- .../state/forst/ForStDBOperationTestBase.java | 8 +++--- .../apache/flink/state/forst/ForStExtension.java | 16 ++++++------ .../forst/ForStMemoryControllerUtilsTest.java | 6 ++--- .../state/forst/ForStMultiClassLoaderTest.java | 2 +- .../state/forst/ForStNativeMetricMonitorTest.java | 4 +-- .../state/forst/ForStOperationsUtilsTest.java | 8 +++--- .../flink/state/forst/ForStPropertyTest.java | 4 +-- .../state/forst/ForStResourceContainerTest.java | 29 +++++++++++----------- .../state/forst/ForStStateBackendConfigTest.java | 18 +++++++------- .../flink/state/forst/ForStStateExecutorTest.java | 2 +- .../state/forst/ForStWriteBatchOperationTest.java | 2 +- .../ForStIncrementalSnapshotStrategyTest.java | 6 ++--- 64 files changed, 214 insertions(+), 215 deletions(-) diff --git a/flink-state-backends/flink-statebackend-forst/pom.xml b/flink-state-backends/flink-statebackend-forst/pom.xml index fc4f112b05b..e06aaee3b2c 100644 --- a/flink-state-backends/flink-statebackend-forst/pom.xml +++ b/flink-state-backends/flink-statebackend-forst/pom.xml @@ -63,7 +63,7 @@ under the License. <dependency> <groupId>com.ververica</groupId> <artifactId>forstjni</artifactId> - <version>0.1.0-beta</version> + <version>0.1.2-beta</version> </dependency> <!-- test dependencies --> diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStAggregatingState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStAggregatingState.java index 3f6b179278a..0843317cc83 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStAggregatingState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStAggregatingState.java @@ -34,7 +34,7 @@ import org.apache.flink.runtime.state.v2.AbstractAggregatingState; import org.apache.flink.runtime.state.v2.AggregatingStateDescriptor; import org.apache.flink.util.Preconditions; -import org.rocksdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyHandle; import java.io.IOException; import java.util.function.Supplier; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStConfigurableOptions.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStConfigurableOptions.java index 0d1e2f29a87..1c0c9b9d19e 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStConfigurableOptions.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStConfigurableOptions.java @@ -24,9 +24,9 @@ import org.apache.flink.configuration.MemorySize; import org.apache.flink.configuration.description.Description; import org.apache.flink.util.Preconditions; -import org.rocksdb.CompactionStyle; -import org.rocksdb.CompressionType; -import org.rocksdb.InfoLogLevel; +import org.forstdb.CompactionStyle; +import org.forstdb.CompressionType; +import org.forstdb.InfoLogLevel; import java.io.File; import java.io.Serializable; @@ -43,14 +43,14 @@ import static org.apache.flink.state.forst.ForStOptions.EXECUTOR_COORDINATOR_INL import static org.apache.flink.state.forst.ForStOptions.EXECUTOR_READ_IO_PARALLELISM; import static org.apache.flink.state.forst.ForStOptions.EXECUTOR_WRITE_IO_INLINE; import static org.apache.flink.state.forst.ForStOptions.EXECUTOR_WRITE_IO_PARALLELISM; -import static org.rocksdb.CompactionStyle.FIFO; -import static org.rocksdb.CompactionStyle.LEVEL; -import static org.rocksdb.CompactionStyle.NONE; -import static org.rocksdb.CompactionStyle.UNIVERSAL; -import static org.rocksdb.CompressionType.LZ4_COMPRESSION; -import static org.rocksdb.CompressionType.NO_COMPRESSION; -import static org.rocksdb.CompressionType.SNAPPY_COMPRESSION; -import static org.rocksdb.InfoLogLevel.INFO_LEVEL; +import static org.forstdb.CompactionStyle.FIFO; +import static org.forstdb.CompactionStyle.LEVEL; +import static org.forstdb.CompactionStyle.NONE; +import static org.forstdb.CompactionStyle.UNIVERSAL; +import static org.forstdb.CompressionType.LZ4_COMPRESSION; +import static org.forstdb.CompressionType.NO_COMPRESSION; +import static org.forstdb.CompressionType.SNAPPY_COMPRESSION; +import static org.forstdb.InfoLogLevel.INFO_LEVEL; /** * This class contains the configuration options for the ForStStateBackend. diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBBunchPutRequest.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBBunchPutRequest.java index 04694456aaf..4a89fde78d3 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBBunchPutRequest.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBBunchPutRequest.java @@ -24,9 +24,9 @@ import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.core.state.InternalStateFuture; -import org.rocksdb.RocksDB; -import org.rocksdb.RocksDBException; -import org.rocksdb.RocksIterator; +import org.forstdb.RocksDB; +import org.forstdb.RocksDBException; +import org.forstdb.RocksIterator; import java.io.IOException; import java.util.Map; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBGetRequest.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBGetRequest.java index 448c95f816f..21f95e574f4 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBGetRequest.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBGetRequest.java @@ -20,9 +20,9 @@ package org.apache.flink.state.forst; import org.apache.flink.core.state.InternalStateFuture; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDB; -import org.rocksdb.RocksDBException; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDB; +import org.forstdb.RocksDBException; import java.io.IOException; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBIterRequest.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBIterRequest.java index 2714690ef59..de85ec26fe4 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBIterRequest.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBIterRequest.java @@ -21,8 +21,8 @@ package org.apache.flink.state.forst; import org.apache.flink.runtime.asyncprocessing.StateRequestHandler; import org.apache.flink.util.Preconditions; -import org.rocksdb.RocksDB; -import org.rocksdb.RocksIterator; +import org.forstdb.RocksDB; +import org.forstdb.RocksIterator; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapCheckRequest.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapCheckRequest.java index 1c799253c2f..4ff44f13096 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapCheckRequest.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapCheckRequest.java @@ -20,9 +20,9 @@ package org.apache.flink.state.forst; import org.apache.flink.core.state.InternalStateFuture; -import org.rocksdb.RocksDB; -import org.rocksdb.RocksDBException; -import org.rocksdb.RocksIterator; +import org.forstdb.RocksDB; +import org.forstdb.RocksDBException; +import org.forstdb.RocksIterator; import java.io.IOException; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapEntryIterRequest.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapEntryIterRequest.java index 355d678c432..44d19719f77 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapEntryIterRequest.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapEntryIterRequest.java @@ -23,7 +23,7 @@ import org.apache.flink.core.state.InternalStateFuture; import org.apache.flink.runtime.asyncprocessing.StateRequestHandler; import org.apache.flink.runtime.asyncprocessing.StateRequestType; -import org.rocksdb.RocksIterator; +import org.forstdb.RocksIterator; import javax.annotation.Nullable; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapKeyIterRequest.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapKeyIterRequest.java index 874a2f5a600..6f1a0586604 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapKeyIterRequest.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapKeyIterRequest.java @@ -23,7 +23,7 @@ import org.apache.flink.core.state.InternalStateFuture; import org.apache.flink.runtime.asyncprocessing.StateRequestHandler; import org.apache.flink.runtime.asyncprocessing.StateRequestType; -import org.rocksdb.RocksIterator; +import org.forstdb.RocksIterator; import javax.annotation.Nullable; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapValueIterRequest.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapValueIterRequest.java index e2602312b5b..fcc64af4cea 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapValueIterRequest.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBMapValueIterRequest.java @@ -23,7 +23,7 @@ import org.apache.flink.core.state.InternalStateFuture; import org.apache.flink.runtime.asyncprocessing.StateRequestHandler; import org.apache.flink.runtime.asyncprocessing.StateRequestType; -import org.rocksdb.RocksIterator; +import org.forstdb.RocksIterator; import javax.annotation.Nullable; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBPutRequest.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBPutRequest.java index f48e870bf2c..fc2372dfcb5 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBPutRequest.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBPutRequest.java @@ -21,9 +21,9 @@ package org.apache.flink.state.forst; import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.core.state.InternalStateFuture; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDB; -import org.rocksdb.RocksDBException; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDB; +import org.forstdb.RocksDBException; import javax.annotation.Nullable; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBTtlCompactFiltersManager.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBTtlCompactFiltersManager.java index f81119edef1..4e39492ae61 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBTtlCompactFiltersManager.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBTtlCompactFiltersManager.java @@ -35,11 +35,11 @@ import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.IOUtils; import org.apache.flink.util.Preconditions; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.DBOptions; -import org.rocksdb.FlinkCompactionFilter; -import org.rocksdb.FlinkCompactionFilter.FlinkCompactionFilterFactory; -import org.rocksdb.InfoLogLevel; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.DBOptions; +import org.forstdb.FlinkCompactionFilter; +import org.forstdb.FlinkCompactionFilter.FlinkCompactionFilterFactory; +import org.forstdb.InfoLogLevel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -111,12 +111,12 @@ public class ForStDBTtlCompactFiltersManager { columnFamilyOptionsMap.put(stateName, options); } - private static org.rocksdb.Logger createRocksDbNativeLogger() { + private static org.forstdb.Logger createRocksDbNativeLogger() { if (LOG.isDebugEnabled()) { - // options are always needed for org.rocksdb.Logger construction (no other constructor) + // options are always needed for org.forstdb.Logger construction (no other constructor) // the logger level gets configured from the options in native code try (DBOptions opts = new DBOptions().setInfoLogLevel(InfoLogLevel.DEBUG_LEVEL)) { - return new org.rocksdb.Logger(opts) { + return new org.forstdb.Logger(opts) { @Override protected void log(InfoLogLevel infoLogLevel, String logMsg) { LOG.debug("RocksDB filter native code log: " + logMsg); diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBWriteBatchWrapper.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBWriteBatchWrapper.java index 14eff409ab3..5ef51ae3ea9 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBWriteBatchWrapper.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBWriteBatchWrapper.java @@ -22,11 +22,11 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.util.IOUtils; import org.apache.flink.util.Preconditions; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDB; -import org.rocksdb.RocksDBException; -import org.rocksdb.WriteBatch; -import org.rocksdb.WriteOptions; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDB; +import org.forstdb.RocksDBException; +import org.forstdb.WriteBatch; +import org.forstdb.WriteOptions; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStGeneralMultiGetOperation.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStGeneralMultiGetOperation.java index 6dc5904c1b5..a235de7e208 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStGeneralMultiGetOperation.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStGeneralMultiGetOperation.java @@ -18,9 +18,9 @@ package org.apache.flink.state.forst; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.ReadOptions; -import org.rocksdb.RocksDB; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.ReadOptions; +import org.forstdb.RocksDB; import java.io.IOException; import java.util.ArrayList; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStInnerTable.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStInnerTable.java index 2984a815a20..a5478dd9b7a 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStInnerTable.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStInnerTable.java @@ -20,7 +20,7 @@ package org.apache.flink.state.forst; import org.apache.flink.runtime.asyncprocessing.StateRequest; -import org.rocksdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyHandle; import java.io.IOException; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStIterateOperation.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStIterateOperation.java index 4add2e30cd2..a9982a4067e 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStIterateOperation.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStIterateOperation.java @@ -18,7 +18,7 @@ package org.apache.flink.state.forst; -import org.rocksdb.RocksDB; +import org.forstdb.RocksDB; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackend.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackend.java index 7cd0323ab0b..30100335832 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackend.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackend.java @@ -49,9 +49,9 @@ import org.apache.flink.util.IOUtils; import org.apache.flink.util.Preconditions; import org.apache.flink.util.StateMigrationException; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.RocksDB; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.RocksDB; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackendBuilder.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackendBuilder.java index 44850424f84..ec4601683e7 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackendBuilder.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackendBuilder.java @@ -45,9 +45,9 @@ import org.apache.flink.util.IOUtils; import org.apache.flink.util.Preconditions; import org.apache.flink.util.ResourceGuard; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.RocksDB; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.RocksDB; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStListState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStListState.java index d1ddfa9db54..8bca44b4a67 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStListState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStListState.java @@ -35,7 +35,7 @@ import org.apache.flink.runtime.state.v2.AbstractListState; import org.apache.flink.runtime.state.v2.ListStateDescriptor; import org.apache.flink.util.Preconditions; -import org.rocksdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyHandle; import java.io.IOException; import java.util.Collections; @@ -45,7 +45,7 @@ import java.util.function.Supplier; /** * The {@link AbstractListState} implement for ForStDB. * - * <p>{@link ForStStateBackend} must ensure that we set the {@link org.rocksdb.StringAppendOperator} + * <p>{@link ForStStateBackend} must ensure that we set the {@link org.forstdb.StringAppendOperator} * on the column family that we use for our state since we use the {@code merge()} call. * * @param <K> The type of the key. diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMapIterator.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMapIterator.java index 2538bbf6bf7..5860ae02dae 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMapIterator.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMapIterator.java @@ -23,7 +23,7 @@ import org.apache.flink.runtime.asyncprocessing.AbstractStateIterator; import org.apache.flink.runtime.asyncprocessing.StateRequestHandler; import org.apache.flink.runtime.asyncprocessing.StateRequestType; -import org.rocksdb.RocksIterator; +import org.forstdb.RocksIterator; import java.util.Collection; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMapState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMapState.java index 05b448bc743..1dcc65e325f 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMapState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMapState.java @@ -35,8 +35,8 @@ import org.apache.flink.runtime.state.v2.MapStateDescriptor; import org.apache.flink.runtime.state.v2.StateDescriptor; import org.apache.flink.util.Preconditions; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksIterator; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksIterator; import java.io.IOException; import java.util.Map; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMemoryControllerUtils.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMemoryControllerUtils.java index 670c991cd60..f46e69592f9 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMemoryControllerUtils.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMemoryControllerUtils.java @@ -20,9 +20,9 @@ package org.apache.flink.state.forst; import org.apache.flink.annotation.VisibleForTesting; -import org.rocksdb.Cache; -import org.rocksdb.LRUCache; -import org.rocksdb.WriteBufferManager; +import org.forstdb.Cache; +import org.forstdb.LRUCache; +import org.forstdb.WriteBufferManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStNativeMetricMonitor.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStNativeMetricMonitor.java index 71b511853d5..d2e4622a2a2 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStNativeMetricMonitor.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStNativeMetricMonitor.java @@ -23,10 +23,10 @@ import org.apache.flink.metrics.Gauge; import org.apache.flink.metrics.MetricGroup; import org.apache.flink.metrics.View; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDB; -import org.rocksdb.Statistics; -import org.rocksdb.TickerType; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDB; +import org.forstdb.Statistics; +import org.forstdb.TickerType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStNativeMetricOptions.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStNativeMetricOptions.java index 40a973b61ef..14c73fb0574 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStNativeMetricOptions.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStNativeMetricOptions.java @@ -24,7 +24,7 @@ import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; import org.apache.flink.configuration.ReadableConfig; -import org.rocksdb.TickerType; +import org.forstdb.TickerType; import java.io.Serializable; import java.util.Collection; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStOperationUtils.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStOperationUtils.java index 8e030ab9db7..f852a0bb8de 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStOperationUtils.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStOperationUtils.java @@ -30,14 +30,14 @@ import org.apache.flink.util.IOUtils; import org.apache.flink.util.OperatingSystem; import org.apache.flink.util.Preconditions; -import org.rocksdb.ColumnFamilyDescriptor; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.DBOptions; -import org.rocksdb.ExportImportFilesMetaData; -import org.rocksdb.ReadOptions; -import org.rocksdb.RocksDB; -import org.rocksdb.RocksDBException; +import org.forstdb.ColumnFamilyDescriptor; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.DBOptions; +import org.forstdb.ExportImportFilesMetaData; +import org.forstdb.ReadOptions; +import org.forstdb.RocksDB; +import org.forstdb.RocksDBException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStOptionsFactory.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStOptionsFactory.java index 80ac8511fa6..3afd8210723 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStOptionsFactory.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStOptionsFactory.java @@ -20,10 +20,10 @@ package org.apache.flink.state.forst; import org.apache.flink.annotation.Experimental; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.DBOptions; -import org.rocksdb.ReadOptions; -import org.rocksdb.WriteOptions; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.DBOptions; +import org.forstdb.ReadOptions; +import org.forstdb.WriteOptions; import java.util.Collection; @@ -45,7 +45,7 @@ public interface ForStOptionsFactory extends java.io.Serializable { * * @param currentOptions The options object with the pre-defined options. * @param handlesToClose The collection to register newly created {@link - * org.rocksdb.RocksObject}s. + * org.forstdb.RocksObject}s. * @return The options object on which the additional options are set. */ DBOptions createDBOptions(DBOptions currentOptions, Collection<AutoCloseable> handlesToClose); @@ -60,7 +60,7 @@ public interface ForStOptionsFactory extends java.io.Serializable { * * @param currentOptions The options object with the pre-defined options. * @param handlesToClose The collection to register newly created {@link - * org.rocksdb.RocksObject}s. + * org.forstdb.RocksObject}s. * @return The options object on which the additional options are set. */ ColumnFamilyOptions createColumnOptions( @@ -90,7 +90,7 @@ public interface ForStOptionsFactory extends java.io.Serializable { * * @param currentOptions The options object with the pre-defined options. * @param handlesToClose The collection to register newly created {@link - * org.rocksdb.RocksObject}s. + * org.forstdb.RocksObject}s. * @return The options object on which the additional options are set. */ default WriteOptions createWriteOptions( @@ -108,7 +108,7 @@ public interface ForStOptionsFactory extends java.io.Serializable { * * @param currentOptions The options object with the pre-defined options. * @param handlesToClose The collection to register newly created {@link - * org.rocksdb.RocksObject}s. + * org.forstdb.RocksObject}s. * @return The options object on which the additional options are set. */ default ReadOptions createReadOptions( diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStProperty.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStProperty.java index 042fb5916b8..2f1d46189e2 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStProperty.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStProperty.java @@ -20,8 +20,8 @@ package org.apache.flink.state.forst; import org.apache.flink.annotation.Internal; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDB; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDB; /** * {@link RocksDB} properties that can be queried by Flink's metrics reporter. diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStReducingState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStReducingState.java index f640da7f9c1..5043b483588 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStReducingState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStReducingState.java @@ -33,7 +33,7 @@ import org.apache.flink.runtime.state.v2.AbstractReducingState; import org.apache.flink.runtime.state.v2.ReducingStateDescriptor; import org.apache.flink.util.Preconditions; -import org.rocksdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyHandle; import java.io.IOException; import java.util.function.Supplier; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStResourceContainer.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStResourceContainer.java index 6a00c1f0abe..5c4034954b9 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStResourceContainer.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStResourceContainer.java @@ -30,19 +30,19 @@ import org.apache.flink.util.FileUtils; import org.apache.flink.util.IOUtils; import org.apache.flink.util.Preconditions; -import org.rocksdb.BlockBasedTableConfig; -import org.rocksdb.BloomFilter; -import org.rocksdb.Cache; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.DBOptions; -import org.rocksdb.Filter; -import org.rocksdb.FlinkEnv; -import org.rocksdb.IndexType; -import org.rocksdb.PlainTableConfig; -import org.rocksdb.ReadOptions; -import org.rocksdb.Statistics; -import org.rocksdb.TableFormatConfig; -import org.rocksdb.WriteOptions; +import org.forstdb.BlockBasedTableConfig; +import org.forstdb.BloomFilter; +import org.forstdb.Cache; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.DBOptions; +import org.forstdb.Filter; +import org.forstdb.FlinkEnv; +import org.forstdb.IndexType; +import org.forstdb.PlainTableConfig; +import org.forstdb.ReadOptions; +import org.forstdb.Statistics; +import org.forstdb.TableFormatConfig; +import org.forstdb.WriteOptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStSharedResources.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStSharedResources.java index e6451fefda6..bf7d1c46436 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStSharedResources.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStSharedResources.java @@ -18,8 +18,8 @@ package org.apache.flink.state.forst; -import org.rocksdb.Cache; -import org.rocksdb.WriteBufferManager; +import org.forstdb.Cache; +import org.forstdb.WriteBufferManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStStateBackend.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStStateBackend.java index 6cf5acc0114..f8ddc75d54c 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStStateBackend.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStStateBackend.java @@ -48,8 +48,8 @@ import org.apache.flink.util.FileUtils; import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.concurrent.FutureUtils; -import org.rocksdb.NativeLibraryLoader; -import org.rocksdb.RocksDB; +import org.forstdb.NativeLibraryLoader; +import org.forstdb.RocksDB; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -620,7 +620,7 @@ public class ForStStateBackend extends AbstractManagedMemoryStateBackend // ------------------------------------------------------------------------ /** - * Sets {@link org.rocksdb.Options} for the ForSt instances. Because the options are not + * Sets {@link org.forstdb.Options} for the ForSt instances. Because the options are not * serializable and hold native code references, they must be specified through a factory. * * <p>The options created by the factory here are applied on top of user-configured options from @@ -633,7 +633,7 @@ public class ForStStateBackend extends AbstractManagedMemoryStateBackend this.forStOptionsFactory = optionsFactory; } - /** Gets {@link org.rocksdb.Options} for the ForSt instances. */ + /** Gets {@link org.forstdb.Options} for the ForSt instances. */ @Nullable public ForStOptionsFactory getForStOptions() { return forStOptionsFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStStateExecutor.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStStateExecutor.java index ebbf211e5ea..4099b4bbf5b 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStStateExecutor.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStStateExecutor.java @@ -25,8 +25,8 @@ import org.apache.flink.util.Preconditions; import org.apache.flink.util.concurrent.ExecutorThreadFactory; import org.apache.flink.util.concurrent.FutureUtils; -import org.rocksdb.RocksDB; -import org.rocksdb.WriteOptions; +import org.forstdb.RocksDB; +import org.forstdb.WriteOptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStValueState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStValueState.java index 15dcd72cec6..a3d2c41d0b1 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStValueState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStValueState.java @@ -34,7 +34,7 @@ import org.apache.flink.runtime.state.v2.AbstractValueState; import org.apache.flink.runtime.state.v2.ValueStateDescriptor; import org.apache.flink.util.Preconditions; -import org.rocksdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyHandle; import java.io.IOException; import java.util.function.Supplier; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStWriteBatchOperation.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStWriteBatchOperation.java index 96943ed1efa..2f24a285014 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStWriteBatchOperation.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStWriteBatchOperation.java @@ -18,8 +18,8 @@ package org.apache.flink.state.forst; -import org.rocksdb.RocksDB; -import org.rocksdb.WriteOptions; +import org.forstdb.RocksDB; +import org.forstdb.WriteOptions; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStHandle.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStHandle.java index c0791df1760..045324e2888 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStHandle.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStHandle.java @@ -27,11 +27,11 @@ import org.apache.flink.state.forst.ForStNativeMetricOptions; import org.apache.flink.state.forst.ForStOperationUtils; import org.apache.flink.util.IOUtils; -import org.rocksdb.ColumnFamilyDescriptor; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.DBOptions; -import org.rocksdb.RocksDB; +import org.forstdb.ColumnFamilyDescriptor; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.DBOptions; +import org.forstdb.RocksDB; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStNoneRestoreOperation.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStNoneRestoreOperation.java index 975ff88dbde..49de3b7c99e 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStNoneRestoreOperation.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStNoneRestoreOperation.java @@ -22,8 +22,8 @@ import org.apache.flink.metrics.MetricGroup; import org.apache.flink.state.forst.ForStKeyedStateBackend.ForStKvStateInfo; import org.apache.flink.state.forst.ForStNativeMetricOptions; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.DBOptions; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.DBOptions; import java.io.File; import java.util.Map; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStRestoreResult.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStRestoreResult.java index 07d1c2f7907..67628e62e42 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStRestoreResult.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStRestoreResult.java @@ -21,8 +21,8 @@ package org.apache.flink.state.forst.restore; import org.apache.flink.runtime.state.IncrementalKeyedStateHandle.HandleAndLocalPath; import org.apache.flink.state.forst.ForStNativeMetricMonitor; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDB; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDB; import javax.annotation.Nullable; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStIncrementalSnapshotStrategy.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStIncrementalSnapshotStrategy.java index 23894999833..64468055594 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStIncrementalSnapshotStrategy.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStIncrementalSnapshotStrategy.java @@ -40,7 +40,7 @@ import org.apache.flink.state.forst.ForStStateDataTransfer; import org.apache.flink.util.Preconditions; import org.apache.flink.util.ResourceGuard; -import org.rocksdb.RocksDB; +import org.forstdb.RocksDB; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStSnapshotStrategyBase.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStSnapshotStrategyBase.java index 740360e5042..12d87fbf9e8 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStSnapshotStrategyBase.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStSnapshotStrategyBase.java @@ -45,8 +45,8 @@ import org.apache.flink.util.IOUtils; import org.apache.flink.util.Preconditions; import org.apache.flink.util.ResourceGuard; -import org.rocksdb.RocksDB; -import org.rocksdb.RocksDBException; +import org.forstdb.RocksDB; +import org.forstdb.RocksDBException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncAppendingState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncAppendingState.java index c9d845f7190..5c805433066 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncAppendingState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncAppendingState.java @@ -21,8 +21,8 @@ package org.apache.flink.state.forst.sync; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalAppendingState; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDBException; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDBException; import java.io.IOException; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncState.java index e9cea2834fb..f526d8facba 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncState.java @@ -30,16 +30,16 @@ import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.Preconditions; import org.apache.flink.util.StateMigrationException; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDBException; -import org.rocksdb.WriteOptions; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDBException; +import org.forstdb.WriteOptions; import java.io.IOException; /** * Base class for {@link State} implementations that store state in a RocksDB database. * - * <p>State is not stored in this class but in the {@link org.rocksdb.RocksDB} instance that the + * <p>State is not stored in this class but in the {@link org.forstdb.RocksDB} instance that the * {@link org.apache.flink.state.forst.ForStStateBackend} manages and checkpoints. * * @param <K> The type of the key. diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBCachingPriorityQueueSet.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBCachingPriorityQueueSet.java index 6ae049f39df..0585104a2f3 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBCachingPriorityQueueSet.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBCachingPriorityQueueSet.java @@ -31,10 +31,10 @@ import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.shaded.guava32.com.google.common.primitives.UnsignedBytes; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.ReadOptions; -import org.rocksdb.RocksDB; -import org.rocksdb.RocksDBException; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.ReadOptions; +import org.forstdb.RocksDB; +import org.forstdb.RocksDBException; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBPriorityQueueSetFactory.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBPriorityQueueSetFactory.java index de45b6415b0..7b4ad8a6466 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBPriorityQueueSetFactory.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBPriorityQueueSetFactory.java @@ -40,10 +40,10 @@ import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.Preconditions; import org.apache.flink.util.StateMigrationException; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.ReadOptions; -import org.rocksdb.RocksDB; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.ReadOptions; +import org.forstdb.RocksDB; import javax.annotation.Nonnull; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStIteratorWrapper.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStIteratorWrapper.java index de2c11e8d8f..643841ef29d 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStIteratorWrapper.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStIteratorWrapper.java @@ -20,9 +20,9 @@ package org.apache.flink.state.forst.sync; import org.apache.flink.util.FlinkRuntimeException; -import org.rocksdb.RocksDBException; -import org.rocksdb.RocksIterator; -import org.rocksdb.RocksIteratorInterface; +import org.forstdb.RocksDBException; +import org.forstdb.RocksIterator; +import org.forstdb.RocksIteratorInterface; import javax.annotation.Nonnull; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncAggregatingState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncAggregatingState.java index 64967bf4491..79f069b0a19 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncAggregatingState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncAggregatingState.java @@ -28,8 +28,8 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; import org.apache.flink.runtime.state.internal.InternalAggregatingState; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDBException; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDBException; import java.io.IOException; import java.util.Collection; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackend.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackend.java index e6e586fbf65..eb9d6c03052 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackend.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackend.java @@ -70,12 +70,12 @@ import org.apache.flink.util.Preconditions; import org.apache.flink.util.ResourceGuard; import org.apache.flink.util.StateMigrationException; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.ReadOptions; -import org.rocksdb.RocksDB; -import org.rocksdb.Snapshot; -import org.rocksdb.WriteOptions; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.ReadOptions; +import org.forstdb.RocksDB; +import org.forstdb.Snapshot; +import org.forstdb.WriteOptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackendBuilder.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackendBuilder.java index 4b4349b5614..cb38b0f315b 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackendBuilder.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackendBuilder.java @@ -57,9 +57,9 @@ import org.apache.flink.util.IOUtils; import org.apache.flink.util.Preconditions; import org.apache.flink.util.ResourceGuard; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.RocksDB; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.RocksDB; import javax.annotation.Nonnull; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncListState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncListState.java index 2a03a11fb3d..2fbd1e22256 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncListState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncListState.java @@ -34,8 +34,8 @@ import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.Preconditions; import org.apache.flink.util.StateMigrationException; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDBException; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDBException; import javax.annotation.Nullable; @@ -51,7 +51,7 @@ import static org.apache.flink.runtime.state.StateSnapshotTransformer.Collection * {@link ListState} implementation that stores state in RocksDB. * * <p>{@link org.apache.flink.state.forst.ForStStateBackend} must ensure that we set the {@link - * org.rocksdb.StringAppendOperator} on the column family that we use for our state since we use the + * org.forstdb.StringAppendOperator} on the column family that we use for our state since we use the * {@code merge()} call. * * @param <K> The type of the key. diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncMapState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncMapState.java index 8f3042f0e20..8eaf1df09a2 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncMapState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncMapState.java @@ -38,9 +38,9 @@ import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.Preconditions; import org.apache.flink.util.StateMigrationException; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDB; -import org.rocksdb.RocksDBException; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDB; +import org.forstdb.RocksDBException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncReducingState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncReducingState.java index bdc23ddc663..fe8bea670c5 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncReducingState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncReducingState.java @@ -28,8 +28,8 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; import org.apache.flink.runtime.state.internal.InternalReducingState; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDBException; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDBException; import java.io.IOException; import java.util.Collection; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncValueState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncValueState.java index b1933e33689..5e00f5a9d94 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncValueState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncValueState.java @@ -26,8 +26,8 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; import org.apache.flink.runtime.state.internal.InternalValueState; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDBException; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDBException; import java.io.IOException; diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStDBIterateOperationTest.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStDBIterateOperationTest.java index 1948ed5f129..3c017ab82b6 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStDBIterateOperationTest.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStDBIterateOperationTest.java @@ -27,9 +27,9 @@ import org.apache.flink.runtime.asyncprocessing.StateRequestType; import org.apache.flink.runtime.state.VoidNamespace; import org.apache.flink.runtime.state.v2.internal.InternalPartitionedState; +import org.forstdb.RocksDB; +import org.forstdb.RocksIterator; import org.junit.jupiter.api.Test; -import org.rocksdb.RocksDB; -import org.rocksdb.RocksIterator; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStDBOperationTestBase.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStDBOperationTestBase.java index 2519e339663..13b83cf391c 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStDBOperationTestBase.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStDBOperationTestBase.java @@ -46,13 +46,13 @@ import org.apache.flink.util.function.BiFunctionWithException; import org.apache.flink.util.function.FunctionWithException; import org.apache.flink.util.function.ThrowingConsumer; +import org.forstdb.ColumnFamilyDescriptor; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.RocksDB; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.io.TempDir; -import org.rocksdb.ColumnFamilyDescriptor; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.RocksDB; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStExtension.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStExtension.java index f921c9377f8..db384692be3 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStExtension.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStExtension.java @@ -24,18 +24,18 @@ import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.IOUtils; import org.apache.flink.util.ResourceGuard; +import org.forstdb.ColumnFamilyDescriptor; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.DBOptions; +import org.forstdb.InfoLogLevel; +import org.forstdb.ReadOptions; +import org.forstdb.RocksDB; +import org.forstdb.WriteOptions; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.rules.TemporaryFolder; -import org.rocksdb.ColumnFamilyDescriptor; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.DBOptions; -import org.rocksdb.InfoLogLevel; -import org.rocksdb.ReadOptions; -import org.rocksdb.RocksDB; -import org.rocksdb.WriteOptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStMemoryControllerUtilsTest.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStMemoryControllerUtilsTest.java index ae9a1ae6391..e29ce68747d 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStMemoryControllerUtilsTest.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStMemoryControllerUtilsTest.java @@ -18,13 +18,13 @@ package org.apache.flink.state.forst; +import org.forstdb.Cache; +import org.forstdb.NativeLibraryLoader; +import org.forstdb.WriteBufferManager; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.rocksdb.Cache; -import org.rocksdb.NativeLibraryLoader; -import org.rocksdb.WriteBufferManager; import java.io.IOException; diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStMultiClassLoaderTest.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStMultiClassLoaderTest.java index 86aa8ecae15..2753ea63320 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStMultiClassLoaderTest.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStMultiClassLoaderTest.java @@ -21,10 +21,10 @@ package org.apache.flink.state.forst; import org.apache.flink.util.FlinkUserCodeClassLoaders; import org.apache.flink.util.concurrent.Executors; +import org.forstdb.RocksDB; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.rocksdb.RocksDB; import java.lang.reflect.Method; import java.net.URL; diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStNativeMetricMonitorTest.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStNativeMetricMonitorTest.java index b1a2716e8a3..b6fafc87615 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStNativeMetricMonitorTest.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStNativeMetricMonitorTest.java @@ -28,10 +28,10 @@ import org.apache.flink.runtime.metrics.groups.UnregisteredMetricGroups; import org.apache.flink.runtime.metrics.scope.ScopeFormats; import org.apache.flink.traces.SpanBuilder; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDBException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDBException; import java.math.BigInteger; import java.util.ArrayList; diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStOperationsUtilsTest.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStOperationsUtilsTest.java index e20382aff9d..abbb63c1c74 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStOperationsUtilsTest.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStOperationsUtilsTest.java @@ -20,14 +20,14 @@ package org.apache.flink.state.forst; import org.apache.flink.util.OperatingSystem; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.DBOptions; +import org.forstdb.NativeLibraryLoader; +import org.forstdb.RocksDB; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.DBOptions; -import org.rocksdb.NativeLibraryLoader; -import org.rocksdb.RocksDB; import java.io.File; import java.io.IOException; diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStPropertyTest.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStPropertyTest.java index 56e577b803f..4158b92fec2 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStPropertyTest.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStPropertyTest.java @@ -18,10 +18,10 @@ package org.apache.flink.state.forst; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDB; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDB; /** Validate ForSt properties. */ class ForStPropertyTest { diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStResourceContainerTest.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStResourceContainerTest.java index a3d4e7fa979..4a0d4d999a5 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStResourceContainerTest.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStResourceContainerTest.java @@ -23,23 +23,23 @@ import org.apache.flink.core.fs.Path; import org.apache.flink.runtime.memory.OpaqueMemoryResource; import org.apache.flink.util.function.ThrowingRunnable; +import org.forstdb.BlockBasedTableConfig; +import org.forstdb.BloomFilter; +import org.forstdb.Cache; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.DBOptions; +import org.forstdb.FlinkEnv; +import org.forstdb.IndexType; +import org.forstdb.LRUCache; +import org.forstdb.NativeLibraryLoader; +import org.forstdb.ReadOptions; +import org.forstdb.TableFormatConfig; +import org.forstdb.WriteBufferManager; +import org.forstdb.WriteOptions; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.rocksdb.BlockBasedTableConfig; -import org.rocksdb.BloomFilter; -import org.rocksdb.Cache; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.DBOptions; -import org.rocksdb.FlinkEnv; -import org.rocksdb.IndexType; -import org.rocksdb.LRUCache; -import org.rocksdb.NativeLibraryLoader; -import org.rocksdb.ReadOptions; -import org.rocksdb.TableFormatConfig; -import org.rocksdb.WriteBufferManager; -import org.rocksdb.WriteOptions; import java.io.File; import java.io.IOException; @@ -49,7 +49,6 @@ import java.util.Collection; import java.util.HashSet; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -295,7 +294,7 @@ public class ForStResourceContainerTest { assertThat(actual.indexType(), is(IndexType.kTwoLevelIndexSearch)); assertThat(actual.partitionFilters(), is(true)); assertThat(actual.pinTopLevelIndexAndFilter(), is(true)); - assertThat(actual.filterPolicy(), not(blockBasedFilter)); + assertFalse(actual.filterPolicy() == blockBasedFilter); } assertFalse("Block based filter is left unclosed.", blockBasedFilter.isOwningHandle()); } diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStStateBackendConfigTest.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStStateBackendConfigTest.java index 9fa6db466a1..e80f0b9f850 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStStateBackendConfigTest.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStStateBackendConfigTest.java @@ -43,21 +43,21 @@ import org.apache.flink.testutils.junit.FailsInGHAContainerWithRootUser; import org.apache.flink.util.FileUtils; import org.apache.commons.lang3.RandomUtils; +import org.forstdb.BlockBasedTableConfig; +import org.forstdb.BloomFilter; +import org.forstdb.ColumnFamilyOptions; +import org.forstdb.CompactionStyle; +import org.forstdb.CompressionType; +import org.forstdb.DBOptions; +import org.forstdb.FlushOptions; +import org.forstdb.InfoLogLevel; +import org.forstdb.util.SizeUnit; import org.junit.Assume; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.jupiter.api.Timeout; import org.junit.rules.TemporaryFolder; -import org.rocksdb.BlockBasedTableConfig; -import org.rocksdb.BloomFilter; -import org.rocksdb.ColumnFamilyOptions; -import org.rocksdb.CompactionStyle; -import org.rocksdb.CompressionType; -import org.rocksdb.DBOptions; -import org.rocksdb.FlushOptions; -import org.rocksdb.InfoLogLevel; -import org.rocksdb.util.SizeUnit; import java.io.File; import java.nio.file.Files; diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStStateExecutorTest.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStStateExecutorTest.java index d715cae5a7f..e6a1d1afc56 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStStateExecutorTest.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStStateExecutorTest.java @@ -29,8 +29,8 @@ import org.apache.flink.runtime.state.KeyGroupRangeAssignment; import org.apache.flink.runtime.state.VoidNamespace; import org.apache.flink.runtime.state.v2.AbstractKeyedState; +import org.forstdb.WriteOptions; import org.junit.jupiter.api.Test; -import org.rocksdb.WriteOptions; import java.util.ArrayList; import java.util.HashMap; diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStWriteBatchOperationTest.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStWriteBatchOperationTest.java index bad7da19b26..41abf364c38 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStWriteBatchOperationTest.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStWriteBatchOperationTest.java @@ -21,8 +21,8 @@ package org.apache.flink.state.forst; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.VoidNamespace; +import org.forstdb.WriteOptions; import org.junit.jupiter.api.Test; -import org.rocksdb.WriteOptions; import java.util.ArrayList; import java.util.HashMap; diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/snapshot/ForStIncrementalSnapshotStrategyTest.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/snapshot/ForStIncrementalSnapshotStrategyTest.java index 57817cfb1e8..756b21f9cc5 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/snapshot/ForStIncrementalSnapshotStrategyTest.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/snapshot/ForStIncrementalSnapshotStrategyTest.java @@ -33,12 +33,12 @@ import org.apache.flink.state.forst.ForStKeyedStateBackend; import org.apache.flink.state.forst.ForStStateDataTransfer; import org.apache.flink.testutils.junit.utils.TempDirUtils; +import org.forstdb.ColumnFamilyHandle; +import org.forstdb.RocksDB; +import org.forstdb.RocksDBException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.io.TempDir; -import org.rocksdb.ColumnFamilyHandle; -import org.rocksdb.RocksDB; -import org.rocksdb.RocksDBException; import java.io.File; import java.io.IOException;