This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-table-store.git
The following commit(s) were added to refs/heads/master by this push:
new 706a92ff [FLINK-31027] Introduce annotations for table store
706a92ff is described below
commit 706a92ffeea7cdf8467d7839aee86132eae50eb5
Author: Shammon FY <[email protected]>
AuthorDate: Tue Feb 14 11:02:56 2023 +0800
[FLINK-31027] Introduce annotations for table store
This closes #526
---
.../utils/BenchmarkGlobalConfiguration.java | 2 --
.../table/store/annotation/Documentation.java | 4 ---
.../table/store/annotation/VisibleForTesting.java | 31 +++++++++-------------
.../flink/table/store/data/BinaryArrayWriter.java | 2 --
.../flink/table/store/data/BinaryRowWriter.java | 2 --
.../store/data/columnar/ByteColumnVector.java | 3 ---
.../store/data/columnar/BytesColumnVector.java | 3 ---
.../table/store/data/columnar/ColumnVector.java | 3 ---
.../store/data/columnar/DoubleColumnVector.java | 3 ---
.../store/data/columnar/FloatColumnVector.java | 3 ---
.../table/store/data/columnar/IntColumnVector.java | 3 ---
.../store/data/columnar/LongColumnVector.java | 3 ---
.../table/store/data/columnar/RowColumnVector.java | 3 ---
.../store/data/columnar/ShortColumnVector.java | 3 ---
.../data/columnar/heap/AbstractHeapVector.java | 2 --
.../data/columnar/heap/HeapBooleanVector.java | 2 --
.../store/data/columnar/heap/HeapByteVector.java | 2 --
.../store/data/columnar/heap/HeapBytesVector.java | 2 --
.../store/data/columnar/heap/HeapDoubleVector.java | 2 --
.../store/data/columnar/heap/HeapFloatVector.java | 2 --
.../store/data/columnar/heap/HeapIntVector.java | 2 --
.../store/data/columnar/heap/HeapLongVector.java | 2 --
.../store/data/columnar/heap/HeapRowVector.java | 2 --
.../store/data/columnar/heap/HeapShortVector.java | 2 --
.../columnar/writable/AbstractWritableVector.java | 2 --
.../columnar/writable/WritableBooleanVector.java | 2 --
.../data/columnar/writable/WritableByteVector.java | 2 --
.../columnar/writable/WritableBytesVector.java | 2 --
.../columnar/writable/WritableColumnVector.java | 2 --
.../columnar/writable/WritableDoubleVector.java | 2 --
.../columnar/writable/WritableFloatVector.java | 2 --
.../data/columnar/writable/WritableIntVector.java | 2 --
.../data/columnar/writable/WritableLongVector.java | 2 --
.../columnar/writable/WritableShortVector.java | 2 --
.../table/store/file/utils/RecyclableIterator.java | 3 ---
.../flink/table/store/fs/hadoop/HadoopFileIO.java | 2 +-
.../apache/flink/table/store/io/DataInputView.java | 2 --
.../flink/table/store/io/DataInputViewStream.java | 3 ---
.../table/store/io/DataInputViewStreamWrapper.java | 3 ---
.../flink/table/store/io/DataOutputViewStream.java | 3 ---
.../store/io/DataOutputViewStreamWrapper.java | 3 ---
.../table/store/memory/MemorySegmentUtils.java | 2 +-
.../store/options/description/Description.java | 3 ---
.../table/store/plugin/ComponentClassLoader.java | 2 +-
.../apache/flink/table/store/types/DateType.java | 3 ---
.../flink/table/store/utils/OperatingSystem.java | 3 ---
.../flink/table/store/utils/Preconditions.java | 3 ---
.../flink/table/store/utils/ThrowingConsumer.java | 3 ---
.../flink/table/store/datagen/DataGenerator.java | 3 ---
.../store/datagen/DataGeneratorContainer.java | 2 --
.../table/store/datagen/DataGeneratorMapper.java | 2 --
.../flink/table/store/datagen/RandomGenerator.java | 3 ---
.../store/datagen/RandomGeneratorVisitor.java | 2 --
.../flink/table/store/types/DataTypeAssert.java | 2 --
.../store/connector/AbstractTableStoreFactory.java | 2 +-
.../flink/table/store/connector/FlinkCatalog.java | 2 +-
.../table/store/kafka/KafkaLogSinkProvider.java | 2 +-
.../table/store/kafka/KafkaLogSourceProvider.java | 2 +-
.../flink/table/store/file/AbstractFileStore.java | 2 +-
.../apache/flink/table/store/file/KeyValue.java | 2 +-
.../file/append/AppendOnlyCompactManager.java | 2 +-
.../table/store/file/catalog/CatalogLock.java | 3 ---
.../table/store/file/io/DataFilePathFactory.java | 2 +-
.../store/file/io/KeyValueFileWriterFactory.java | 2 +-
.../table/store/file/io/RollingFileWriter.java | 2 +-
.../table/store/file/manifest/ManifestFile.java | 2 +-
.../store/file/mergetree/MergeTreeWriter.java | 2 +-
.../file/mergetree/SortBufferWriteBuffer.java | 2 +-
.../table/store/file/mergetree/SortedRun.java | 2 +-
.../mergetree/compact/MergeTreeCompactManager.java | 2 +-
.../mergetree/compact/UniversalCompaction.java | 2 +-
.../file/operation/AbstractFileStoreWrite.java | 2 +-
.../store/file/operation/FileStoreExpireImpl.java | 2 +-
.../store/file/operation/PartitionExpire.java | 2 +-
.../table/store/file/predicate/BucketSelector.java | 2 +-
.../table/store/file/schema/SchemaManager.java | 2 +-
.../table/store/file/utils/JsonSerdeUtil.java | 2 --
.../store/file/utils/MutableObjectIterator.java | 3 ---
.../store/file/utils/SerializableSupplier.java | 3 ---
.../flink/table/store/table/sink/TableWrite.java | 2 --
.../store/table/source/AbstractDataTableScan.java | 2 +-
.../table/store/table/source/DataTableScan.java | 2 +-
.../store/format/avro/AbstractAvroBulkFormat.java | 2 --
.../store/format/avro/AvroToRowDataConverters.java | 2 --
.../table/store/format/orc/OrcWriterFactory.java | 4 +--
.../orc/ThreadLocalClassLoaderConfiguration.java | 3 ---
.../orc/filter/OrcPredicateFunctionVisitor.java | 2 --
.../store/format/orc/writer/OrcBulkWriter.java | 2 --
.../format/orc/writer/PhysicalWriterImpl.java | 2 --
.../table/store/format/orc/writer/Vectorizer.java | 3 ---
.../parquet/reader/ParquetDecimalVector.java | 2 --
.../format/parquet/writer/ParquetBulkWriter.java | 2 --
.../writer/PositionOutputStreamAdapter.java | 3 ---
.../format/parquet/writer/StreamOutputFile.java | 3 ---
flink-table-store-shade/pom.xml | 7 -----
95 files changed, 40 insertions(+), 216 deletions(-)
diff --git
a/flink-table-store-benchmark/flink-table-store-cluster-benchmark/src/main/java/org/apache/flink/table/store/benchmark/utils/BenchmarkGlobalConfiguration.java
b/flink-table-store-benchmark/flink-table-store-cluster-benchmark/src/main/java/org/apache/flink/table/store/benchmark/utils/BenchmarkGlobalConfiguration.java
index fc36f9d3..3a38afcb 100644
---
a/flink-table-store-benchmark/flink-table-store-cluster-benchmark/src/main/java/org/apache/flink/table/store/benchmark/utils/BenchmarkGlobalConfiguration.java
+++
b/flink-table-store-benchmark/flink-table-store-cluster-benchmark/src/main/java/org/apache/flink/table/store/benchmark/utils/BenchmarkGlobalConfiguration.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.benchmark.utils;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.IllegalConfigurationException;
@@ -37,7 +36,6 @@ import java.util.Map;
* Global configuration object for benchmark. Similar to Java properties
configuration objects it
* includes key-value pairs which represent the framework's configuration.
*/
-@Internal
public final class BenchmarkGlobalConfiguration {
private static final Logger LOG =
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/annotation/Documentation.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/annotation/Documentation.java
index b02cbf63..99a8eeec 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/annotation/Documentation.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/annotation/Documentation.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.annotation;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.options.ConfigOption;
import java.lang.annotation.ElementType;
@@ -32,7 +31,6 @@ public final class Documentation {
/** Annotation used on config option fields to override the documented
default. */
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
- @Internal
public @interface OverrideDefault {
String value();
}
@@ -64,7 +62,6 @@ public final class Documentation {
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
- @Internal
public @interface Section {
/** The sections in the config docs where this option should be
included. */
@@ -81,7 +78,6 @@ public final class Documentation {
*/
@Target({ElementType.FIELD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
- @Internal
public @interface SuffixOption {
String value();
}
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogLock.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/annotation/VisibleForTesting.java
similarity index 54%
copy from
flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogLock.java
copy to
flink-table-store-common/src/main/java/org/apache/flink/table/store/annotation/VisibleForTesting.java
index 57543607..ff5a0d98 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogLock.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/annotation/VisibleForTesting.java
@@ -16,25 +16,20 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.file.catalog;
+package org.apache.flink.table.store.annotation;
-import org.apache.flink.annotation.Internal;
-
-import java.io.Closeable;
-import java.io.Serializable;
-import java.util.concurrent.Callable;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
/**
- * An interface that allows source and sink to use global lock to some
transaction-related things.
+ * This annotations declares that a function, field, constructor, or entire
type, is only visible
+ * for testing purposes.
+ *
+ * <p>This annotation is typically attached when for example a method should
be {@code private}
+ * (because it is not intended to be called externally), but cannot be
declared private, because
+ * some tests need to have access to it.
*/
-@Internal
-public interface CatalogLock extends Closeable {
-
- /** Run with catalog lock. The caller should tell catalog the database and
table name. */
- <T> T runWithLock(String database, String table, Callable<T> callable)
throws Exception;
-
- /** Factory to create {@link CatalogLock}. */
- interface Factory extends Serializable {
- CatalogLock create();
- }
-}
+@Documented
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD,
ElementType.CONSTRUCTOR})
+public @interface VisibleForTesting {}
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/BinaryArrayWriter.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/BinaryArrayWriter.java
index 4ecfe261..e7e92cf1 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/BinaryArrayWriter.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/BinaryArrayWriter.java
@@ -17,7 +17,6 @@
package org.apache.flink.table.store.data;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
import org.apache.flink.table.store.types.DataType;
@@ -25,7 +24,6 @@ import org.apache.flink.table.store.types.DataType;
import java.io.Serializable;
/** Writer for binary array. See {@link BinaryArray}. */
-@Internal
public final class BinaryArrayWriter extends AbstractBinaryWriter {
private final int nullBitsSizeInBytes;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/BinaryRowWriter.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/BinaryRowWriter.java
index 114b0047..d0d01f79 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/BinaryRowWriter.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/BinaryRowWriter.java
@@ -17,13 +17,11 @@
package org.apache.flink.table.store.data;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
import org.apache.flink.table.store.types.RowKind;
/** Writer for {@link BinaryRow}. */
-@Internal
public final class BinaryRowWriter extends AbstractBinaryWriter {
private final int nullBitsSizeInBytes;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/ByteColumnVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/ByteColumnVector.java
index 8c26bfc8..ddf53d12 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/ByteColumnVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/ByteColumnVector.java
@@ -18,10 +18,7 @@
package org.apache.flink.table.store.data.columnar;
-import org.apache.flink.annotation.Internal;
-
/** Byte column vector. */
-@Internal
public interface ByteColumnVector extends ColumnVector {
byte getByte(int i);
}
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/BytesColumnVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/BytesColumnVector.java
index 6c50bb7b..283550fb 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/BytesColumnVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/BytesColumnVector.java
@@ -18,13 +18,10 @@
package org.apache.flink.table.store.data.columnar;
-import org.apache.flink.annotation.Internal;
-
/**
* Bytes column vector to get {@link Bytes}, it include original data and
offset and length. The
* data in {@link Bytes} maybe reuse.
*/
-@Internal
public interface BytesColumnVector extends ColumnVector {
Bytes getBytes(int i);
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnVector.java
index e2967ad8..25a90d53 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnVector.java
@@ -18,10 +18,7 @@
package org.apache.flink.table.store.data.columnar;
-import org.apache.flink.annotation.Internal;
-
/** Nullable column vector. Access data through specific subclasses. */
-@Internal
public interface ColumnVector {
boolean isNullAt(int i);
}
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/DoubleColumnVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/DoubleColumnVector.java
index 94755a89..5e962afa 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/DoubleColumnVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/DoubleColumnVector.java
@@ -18,10 +18,7 @@
package org.apache.flink.table.store.data.columnar;
-import org.apache.flink.annotation.Internal;
-
/** Double column vector. */
-@Internal
public interface DoubleColumnVector extends ColumnVector {
double getDouble(int i);
}
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/FloatColumnVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/FloatColumnVector.java
index 662fd884..a1ed6656 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/FloatColumnVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/FloatColumnVector.java
@@ -18,10 +18,7 @@
package org.apache.flink.table.store.data.columnar;
-import org.apache.flink.annotation.Internal;
-
/** Float column vector. */
-@Internal
public interface FloatColumnVector extends ColumnVector {
float getFloat(int i);
}
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/IntColumnVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/IntColumnVector.java
index 3d61b15d..5d7b3a96 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/IntColumnVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/IntColumnVector.java
@@ -18,10 +18,7 @@
package org.apache.flink.table.store.data.columnar;
-import org.apache.flink.annotation.Internal;
-
/** Int column vector. */
-@Internal
public interface IntColumnVector extends ColumnVector {
int getInt(int i);
}
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/LongColumnVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/LongColumnVector.java
index 907e5b13..7c89809a 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/LongColumnVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/LongColumnVector.java
@@ -18,10 +18,7 @@
package org.apache.flink.table.store.data.columnar;
-import org.apache.flink.annotation.Internal;
-
/** Long column vector. */
-@Internal
public interface LongColumnVector extends ColumnVector {
long getLong(int i);
}
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/RowColumnVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/RowColumnVector.java
index 185f1e29..3c638933 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/RowColumnVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/RowColumnVector.java
@@ -18,10 +18,7 @@
package org.apache.flink.table.store.data.columnar;
-import org.apache.flink.annotation.Internal;
-
/** Row column vector. */
-@Internal
public interface RowColumnVector extends ColumnVector {
ColumnarRow getRow(int i);
}
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/ShortColumnVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/ShortColumnVector.java
index 47e9b664..58793d04 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/ShortColumnVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/ShortColumnVector.java
@@ -18,10 +18,7 @@
package org.apache.flink.table.store.data.columnar;
-import org.apache.flink.annotation.Internal;
-
/** Short column vector. */
-@Internal
public interface ShortColumnVector extends ColumnVector {
short getShort(int i);
}
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/AbstractHeapVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/AbstractHeapVector.java
index f2d9c6c2..7ab66daf 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/AbstractHeapVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/AbstractHeapVector.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.data.columnar.heap;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.core.memory.MemoryUtils;
import
org.apache.flink.table.store.data.columnar.writable.AbstractWritableVector;
@@ -26,7 +25,6 @@ import java.nio.ByteOrder;
import java.util.Arrays;
/** Heap vector that nullable shared structure. */
-@Internal
public abstract class AbstractHeapVector extends AbstractWritableVector {
public static final boolean LITTLE_ENDIAN = ByteOrder.nativeOrder() ==
ByteOrder.LITTLE_ENDIAN;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBooleanVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBooleanVector.java
index 0c6623bf..026086f4 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBooleanVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBooleanVector.java
@@ -18,13 +18,11 @@
package org.apache.flink.table.store.data.columnar.heap;
-import org.apache.flink.annotation.Internal;
import
org.apache.flink.table.store.data.columnar.writable.WritableBooleanVector;
import java.util.Arrays;
/** This class represents a nullable heap boolean column vector. */
-@Internal
public class HeapBooleanVector extends AbstractHeapVector implements
WritableBooleanVector {
private static final long serialVersionUID = 4131239076731313596L;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapByteVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapByteVector.java
index 2dca86dd..eba7d86c 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapByteVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapByteVector.java
@@ -18,13 +18,11 @@
package org.apache.flink.table.store.data.columnar.heap;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.writable.WritableByteVector;
import java.util.Arrays;
/** This class represents a nullable byte column vector. */
-@Internal
public class HeapByteVector extends AbstractHeapVector implements
WritableByteVector {
private static final long serialVersionUID = 7216045902943789034L;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBytesVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBytesVector.java
index f5a9b035..8d7a236e 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBytesVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBytesVector.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.data.columnar.heap;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.writable.WritableBytesVector;
import java.util.Arrays;
@@ -36,7 +35,6 @@ import java.util.Arrays;
* first. You can mix "by value" and "by reference" in the same column vector,
though that use is
* probably not typical.
*/
-@Internal
public class HeapBytesVector extends AbstractHeapVector implements
WritableBytesVector {
private static final long serialVersionUID = -8529155738773478597L;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapDoubleVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapDoubleVector.java
index 85aa8f10..a5b08a7f 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapDoubleVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapDoubleVector.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.data.columnar.heap;
-import org.apache.flink.annotation.Internal;
import
org.apache.flink.table.store.data.columnar.writable.WritableDoubleVector;
import java.nio.ByteBuffer;
@@ -30,7 +29,6 @@ import java.util.Arrays;
* be used for operations on all floating point double types and as such will
use a 64-bit double
* value to hold the biggest possible value.
*/
-@Internal
public class HeapDoubleVector extends AbstractHeapVector implements
WritableDoubleVector {
private static final long serialVersionUID = 6193940154117411328L;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapFloatVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapFloatVector.java
index 05568d3a..71f808f4 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapFloatVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapFloatVector.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.data.columnar.heap;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.writable.WritableFloatVector;
import java.nio.ByteBuffer;
@@ -29,7 +28,6 @@ import java.util.Arrays;
* This class represents a nullable double precision floating point column
vector. This class will
* be used for operations on all floating point float types.
*/
-@Internal
public class HeapFloatVector extends AbstractHeapVector implements
WritableFloatVector {
private static final long serialVersionUID = 8928878923550041110L;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapIntVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapIntVector.java
index 08ca70c4..ff52f4e0 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapIntVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapIntVector.java
@@ -18,13 +18,11 @@
package org.apache.flink.table.store.data.columnar.heap;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.writable.WritableIntVector;
import java.util.Arrays;
/** This class represents a nullable int column vector. */
-@Internal
public class HeapIntVector extends AbstractHeapVector implements
WritableIntVector {
private static final long serialVersionUID = -2749499358889718254L;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapLongVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapLongVector.java
index 4121bb3d..bda26bc2 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapLongVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapLongVector.java
@@ -18,13 +18,11 @@
package org.apache.flink.table.store.data.columnar.heap;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.writable.WritableLongVector;
import java.util.Arrays;
/** This class represents a nullable long column vector. */
-@Internal
public class HeapLongVector extends AbstractHeapVector implements
WritableLongVector {
private static final long serialVersionUID = 8534925169458006397L;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapRowVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapRowVector.java
index 27f22475..73ff4ed8 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapRowVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapRowVector.java
@@ -18,14 +18,12 @@
package org.apache.flink.table.store.data.columnar.heap;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.ColumnarRow;
import org.apache.flink.table.store.data.columnar.RowColumnVector;
import org.apache.flink.table.store.data.columnar.VectorizedColumnBatch;
import
org.apache.flink.table.store.data.columnar.writable.WritableColumnVector;
/** This class represents a nullable heap row column vector. */
-@Internal
public class HeapRowVector extends AbstractHeapVector
implements WritableColumnVector, RowColumnVector {
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapShortVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapShortVector.java
index 10354b4f..c31bc422 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapShortVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapShortVector.java
@@ -18,13 +18,11 @@
package org.apache.flink.table.store.data.columnar.heap;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.writable.WritableShortVector;
import java.util.Arrays;
/** This class represents a nullable short column vector. */
-@Internal
public class HeapShortVector extends AbstractHeapVector implements
WritableShortVector {
private static final long serialVersionUID = -8278486456144676292L;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/AbstractWritableVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/AbstractWritableVector.java
index 3aec5377..d19bee07 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/AbstractWritableVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/AbstractWritableVector.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.data.columnar.writable;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.ColumnVector;
import org.apache.flink.table.store.data.columnar.Dictionary;
@@ -28,7 +27,6 @@ import java.io.Serializable;
* Contains the shared structure for {@link ColumnVector}s, including NULL
information and
* dictionary. NOTE: if there are some nulls, must set {@link #noNulls} to
false.
*/
-@Internal
public abstract class AbstractWritableVector implements WritableColumnVector,
Serializable {
private static final long serialVersionUID = 1L;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBooleanVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBooleanVector.java
index 641df87f..f4273436 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBooleanVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBooleanVector.java
@@ -18,11 +18,9 @@
package org.apache.flink.table.store.data.columnar.writable;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.BooleanColumnVector;
/** Writable {@link BooleanColumnVector}. */
-@Internal
public interface WritableBooleanVector extends WritableColumnVector,
BooleanColumnVector {
/** Set boolean at rowId with the provided value. */
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableByteVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableByteVector.java
index 89d6f2b0..beeab10a 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableByteVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableByteVector.java
@@ -18,11 +18,9 @@
package org.apache.flink.table.store.data.columnar.writable;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.ByteColumnVector;
/** Writable {@link ByteColumnVector}. */
-@Internal
public interface WritableByteVector extends WritableColumnVector,
ByteColumnVector {
/** Set byte at rowId with the provided value. */
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBytesVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBytesVector.java
index 4d2e1a5f..062f870a 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBytesVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBytesVector.java
@@ -18,11 +18,9 @@
package org.apache.flink.table.store.data.columnar.writable;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.BytesColumnVector;
/** Writable {@link BytesColumnVector}. */
-@Internal
public interface WritableBytesVector extends WritableColumnVector,
BytesColumnVector {
/**
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableColumnVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableColumnVector.java
index 4d2bca87..3de8f6b4 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableColumnVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableColumnVector.java
@@ -18,12 +18,10 @@
package org.apache.flink.table.store.data.columnar.writable;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.ColumnVector;
import org.apache.flink.table.store.data.columnar.Dictionary;
/** Writable {@link ColumnVector}. */
-@Internal
public interface WritableColumnVector extends ColumnVector {
/** Resets the column to default state. */
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableDoubleVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableDoubleVector.java
index 6f2f0a3e..a1974e8e 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableDoubleVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableDoubleVector.java
@@ -18,11 +18,9 @@
package org.apache.flink.table.store.data.columnar.writable;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.DoubleColumnVector;
/** Writable {@link DoubleColumnVector}. */
-@Internal
public interface WritableDoubleVector extends WritableColumnVector,
DoubleColumnVector {
/** Set double at rowId with the provided value. */
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableFloatVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableFloatVector.java
index 8f711062..b0ec5b26 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableFloatVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableFloatVector.java
@@ -18,11 +18,9 @@
package org.apache.flink.table.store.data.columnar.writable;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.FloatColumnVector;
/** Writable {@link FloatColumnVector}. */
-@Internal
public interface WritableFloatVector extends WritableColumnVector,
FloatColumnVector {
/** Set float at rowId with the provided value. */
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableIntVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableIntVector.java
index 05798a2e..82280f7d 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableIntVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableIntVector.java
@@ -18,11 +18,9 @@
package org.apache.flink.table.store.data.columnar.writable;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.IntColumnVector;
/** Writable {@link IntColumnVector}. */
-@Internal
public interface WritableIntVector extends WritableColumnVector,
IntColumnVector {
/** Set int at rowId with the provided value. */
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableLongVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableLongVector.java
index a12e0025..41a4f852 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableLongVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableLongVector.java
@@ -18,11 +18,9 @@
package org.apache.flink.table.store.data.columnar.writable;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.LongColumnVector;
/** Writable {@link LongColumnVector}. */
-@Internal
public interface WritableLongVector extends WritableColumnVector,
LongColumnVector {
/** Set long at rowId with the provided value. */
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableShortVector.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableShortVector.java
index a9559254..d4656e4e 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableShortVector.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableShortVector.java
@@ -18,11 +18,9 @@
package org.apache.flink.table.store.data.columnar.writable;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.columnar.ShortColumnVector;
/** Writable {@link ShortColumnVector}. */
-@Internal
public interface WritableShortVector extends WritableColumnVector,
ShortColumnVector {
/** Set short at rowId with the provided value. */
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/file/utils/RecyclableIterator.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/file/utils/RecyclableIterator.java
index 34768390..6f5d722f 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/file/utils/RecyclableIterator.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/file/utils/RecyclableIterator.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.utils;
-import org.apache.flink.annotation.Internal;
-
import javax.annotation.Nullable;
/**
@@ -27,7 +25,6 @@ import javax.annotation.Nullable;
*
* @param <E> The type of the records returned by the iterator.
*/
-@Internal
public abstract class RecyclableIterator<E> implements
RecordReader.RecordIterator<E> {
@Nullable private final Runnable recycler;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/fs/hadoop/HadoopFileIO.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/fs/hadoop/HadoopFileIO.java
index f2720bb8..d7679bed 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/fs/hadoop/HadoopFileIO.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/fs/hadoop/HadoopFileIO.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.fs.hadoop;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.FileStatus;
import org.apache.flink.table.store.fs.Path;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataInputView.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataInputView.java
index 314f2adc..cfcf548f 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataInputView.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataInputView.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.io;
-import org.apache.flink.annotation.Public;
import org.apache.flink.table.store.memory.MemorySegment;
import java.io.DataInput;
@@ -28,7 +27,6 @@ import java.io.IOException;
* This interface defines a view over some memory that can be used to
sequentially read the contents
* of the memory. The view is typically backed by one or more {@link
MemorySegment}.
*/
-@Public
public interface DataInputView extends DataInput {
/**
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataInputViewStream.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataInputViewStream.java
index 512d8c24..1a9b82fb 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataInputViewStream.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataInputViewStream.java
@@ -18,14 +18,11 @@
package org.apache.flink.table.store.io;
-import org.apache.flink.annotation.Internal;
-
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
/** An input stream that draws its data from a {@link DataInputView}. */
-@Internal
public class DataInputViewStream extends InputStream {
protected DataInputView inputView;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataInputViewStreamWrapper.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataInputViewStreamWrapper.java
index 4971a0f8..3db557e5 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataInputViewStreamWrapper.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataInputViewStreamWrapper.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.io;
-import org.apache.flink.annotation.PublicEvolving;
-
import java.io.DataInputStream;
import java.io.EOFException;
import java.io.IOException;
@@ -29,7 +27,6 @@ import java.io.InputStream;
* Utility class that turns an {@link InputStream} into a {@link
* org.apache.flink.core.memory.DataInputView}.
*/
-@PublicEvolving
public class DataInputViewStreamWrapper extends DataInputStream implements
DataInputView {
public DataInputViewStreamWrapper(InputStream in) {
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataOutputViewStream.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataOutputViewStream.java
index 25fd3b63..f012cf22 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataOutputViewStream.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataOutputViewStream.java
@@ -18,13 +18,10 @@
package org.apache.flink.table.store.io;
-import org.apache.flink.annotation.Internal;
-
import java.io.IOException;
import java.io.OutputStream;
/** An output stream that draws its data from a {@link DataOutputView}. */
-@Internal
public class DataOutputViewStream extends OutputStream {
protected DataOutputView outputView;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataOutputViewStreamWrapper.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataOutputViewStreamWrapper.java
index c3dce7ce..d1e5eadb 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataOutputViewStreamWrapper.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/io/DataOutputViewStreamWrapper.java
@@ -18,14 +18,11 @@
package org.apache.flink.table.store.io;
-import org.apache.flink.annotation.PublicEvolving;
-
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
/** Utility class that turns an {@link OutputStream} into a {@link
DataOutputView}. */
-@PublicEvolving
public class DataOutputViewStreamWrapper extends DataOutputStream implements
DataOutputView {
private byte[] tempBuffer;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/memory/MemorySegmentUtils.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/memory/MemorySegmentUtils.java
index 5206cefd..3f6e0c15 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/memory/MemorySegmentUtils.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/memory/MemorySegmentUtils.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.memory;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.data.BinaryArray;
import org.apache.flink.table.store.data.BinaryMap;
import org.apache.flink.table.store.data.BinaryString;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/options/description/Description.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/options/description/Description.java
index f1fd62ae..96b560b2 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/options/description/Description.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/options/description/Description.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.options.description;
-import org.apache.flink.annotation.PublicEvolving;
-
import java.util.ArrayList;
import java.util.List;
@@ -52,7 +50,6 @@ public class Description {
* .build();
* }</pre>
*/
- @PublicEvolving
public static class DescriptionBuilder {
private final List<BlockElement> blocks = new ArrayList<>();
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/plugin/ComponentClassLoader.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/plugin/ComponentClassLoader.java
index 3f43ca5c..14c4c657 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/plugin/ComponentClassLoader.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/plugin/ComponentClassLoader.java
@@ -17,7 +17,7 @@
package org.apache.flink.table.store.plugin;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.util.function.FunctionWithException;
import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/types/DateType.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/types/DateType.java
index 311e5e1b..4071328d 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/types/DateType.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/types/DateType.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.annotation.PublicEvolving;
-
/**
* Data type of a date consisting of {@code year-month-day} with values
ranging from {@code
* 0000-01-01} to {@code 9999-12-31}. Compared to the SQL standard, the range
starts at year {@code
@@ -27,7 +25,6 @@ import org.apache.flink.annotation.PublicEvolving;
*
* <p>A conversion from and to {@code int} describes the number of days since
epoch.
*/
-@PublicEvolving
public final class DateType extends DataType {
private static final long serialVersionUID = 1L;
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/utils/OperatingSystem.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/utils/OperatingSystem.java
index 5702d482..9026fefa 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/utils/OperatingSystem.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/utils/OperatingSystem.java
@@ -18,10 +18,7 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.annotation.Internal;
-
/** An enumeration indicating the operating system that the JVM runs on. */
-@Internal
public enum OperatingSystem {
LINUX,
WINDOWS,
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/utils/Preconditions.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/utils/Preconditions.java
index c5ca329d..2468749c 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/utils/Preconditions.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/utils/Preconditions.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.annotation.Internal;
-
import javax.annotation.Nullable;
import java.util.concurrent.CompletableFuture;
@@ -31,7 +29,6 @@ import java.util.concurrent.ExecutionException;
* <p>This class is modelled after Google Guava's Preconditions class, and
partly takes code from
* that class. We add this code to the Flink code base in order to reduce
external dependencies.
*/
-@Internal
public final class Preconditions {
// ------------------------------------------------------------------------
diff --git
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/utils/ThrowingConsumer.java
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/utils/ThrowingConsumer.java
index 83be4ea1..deb6f828 100644
---
a/flink-table-store-common/src/main/java/org/apache/flink/table/store/utils/ThrowingConsumer.java
+++
b/flink-table-store-common/src/main/java/org/apache/flink/table/store/utils/ThrowingConsumer.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.annotation.Public;
-
/**
* This interface is basically Java's {@link java.util.function.Consumer}
interface enhanced with
* the ability to throw an exception.
@@ -27,7 +25,6 @@ import org.apache.flink.annotation.Public;
* @param <T> type of the consumed elements.
* @param <E> type of the exception thrown.
*/
-@Public
@FunctionalInterface
public interface ThrowingConsumer<T, E extends Throwable> {
diff --git
a/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/DataGenerator.java
b/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/DataGenerator.java
index 4c0de95f..77ecdb24 100644
---
a/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/DataGenerator.java
+++
b/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/DataGenerator.java
@@ -18,13 +18,10 @@
package org.apache.flink.table.store.datagen;
-import org.apache.flink.annotation.Experimental;
-
import java.io.Serializable;
import java.util.Iterator;
/** Stateful and re-scalable data generator. */
-@Experimental
public interface DataGenerator<T> extends Serializable, Iterator<T> {
void open();
diff --git
a/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/DataGeneratorContainer.java
b/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/DataGeneratorContainer.java
index 491a9c52..1210a492 100644
---
a/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/DataGeneratorContainer.java
+++
b/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/DataGeneratorContainer.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.datagen;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.options.ConfigOption;
import java.util.Arrays;
@@ -26,7 +25,6 @@ import java.util.HashSet;
import java.util.Set;
/** Container class for wrapping a {@link DataGenerator with its configuration
options}. */
-@Internal
public class DataGeneratorContainer {
private final DataGenerator generator;
diff --git
a/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/DataGeneratorMapper.java
b/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/DataGeneratorMapper.java
index 38771d3f..02951323 100644
---
a/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/DataGeneratorMapper.java
+++
b/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/DataGeneratorMapper.java
@@ -18,11 +18,9 @@
package org.apache.flink.table.store.datagen;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.util.function.SerializableFunction;
/** Utility for mapping the output of a {@link DataGenerator}. */
-@Internal
public class DataGeneratorMapper<A, B> implements DataGenerator<B> {
private final DataGenerator<A> generator;
diff --git
a/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/RandomGenerator.java
b/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/RandomGenerator.java
index 01b4bd60..7da89d9a 100644
---
a/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/RandomGenerator.java
+++
b/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/RandomGenerator.java
@@ -18,15 +18,12 @@
package org.apache.flink.table.store.datagen;
-import org.apache.flink.annotation.Experimental;
-
import org.apache.commons.math3.random.RandomDataGenerator;
import java.util.HashMap;
import java.util.Map;
/** Random generator. */
-@Experimental
public abstract class RandomGenerator<T> implements DataGenerator<T> {
protected transient RandomDataGenerator random;
diff --git
a/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/RandomGeneratorVisitor.java
b/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/RandomGeneratorVisitor.java
index eca47d72..746a3b6d 100644
---
a/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/RandomGeneratorVisitor.java
+++
b/flink-table-store-common/src/test/java/org/apache/flink/table/store/datagen/RandomGeneratorVisitor.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.datagen;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.BinaryString;
import org.apache.flink.table.store.data.Decimal;
import org.apache.flink.table.store.data.GenericArray;
@@ -62,7 +61,6 @@ import java.util.stream.Collectors;
import static org.apache.flink.table.store.options.ConfigOptions.key;
/** Creates a random {@link DataGeneratorContainer} for a particular logical
type. */
-@Internal
@SuppressWarnings("unchecked")
public class RandomGeneratorVisitor extends DataGenVisitorBase {
diff --git
a/flink-table-store-common/src/test/java/org/apache/flink/table/store/types/DataTypeAssert.java
b/flink-table-store-common/src/test/java/org/apache/flink/table/store/types/DataTypeAssert.java
index 64bd30cf..5b3c3306 100644
---
a/flink-table-store-common/src/test/java/org/apache/flink/table/store/types/DataTypeAssert.java
+++
b/flink-table-store-common/src/test/java/org/apache/flink/table/store/types/DataTypeAssert.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.annotation.Experimental;
import org.apache.flink.table.store.utils.InstantiationUtil;
import org.assertj.core.api.AbstractAssert;
@@ -31,7 +30,6 @@ import static org.assertj.core.api.Assertions.fail;
import static org.assertj.core.api.Assertions.not;
/** Assertions for {@link DataType}. */
-@Experimental
public class DataTypeAssert extends AbstractAssert<DataTypeAssert, DataType> {
public DataTypeAssert(DataType dataType) {
diff --git
a/flink-table-store-connector/src/main/java/org/apache/flink/table/store/connector/AbstractTableStoreFactory.java
b/flink-table-store-connector/src/main/java/org/apache/flink/table/store/connector/AbstractTableStoreFactory.java
index 0b02cc9d..291d1ac4 100644
---
a/flink-table-store-connector/src/main/java/org/apache/flink/table/store/connector/AbstractTableStoreFactory.java
+++
b/flink-table-store-connector/src/main/java/org/apache/flink/table/store/connector/AbstractTableStoreFactory.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.connector;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.RuntimeExecutionMode;
import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ExecutionOptions;
@@ -31,6 +30,7 @@ import
org.apache.flink.table.factories.DynamicTableSinkFactory;
import org.apache.flink.table.factories.DynamicTableSourceFactory;
import org.apache.flink.table.store.CoreOptions.LogChangelogMode;
import org.apache.flink.table.store.CoreOptions.LogConsistency;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.connector.sink.TableStoreSink;
import org.apache.flink.table.store.connector.source.SystemTableSource;
import org.apache.flink.table.store.connector.source.TableStoreSource;
diff --git
a/flink-table-store-connector/src/main/java/org/apache/flink/table/store/connector/FlinkCatalog.java
b/flink-table-store-connector/src/main/java/org/apache/flink/table/store/connector/FlinkCatalog.java
index cb3a376e..af7ec5db 100644
---
a/flink-table-store-connector/src/main/java/org/apache/flink/table/store/connector/FlinkCatalog.java
+++
b/flink-table-store-connector/src/main/java/org/apache/flink/table/store/connector/FlinkCatalog.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.connector;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.table.api.TableSchema;
import org.apache.flink.table.catalog.AbstractCatalog;
import org.apache.flink.table.catalog.CatalogBaseTable;
@@ -44,6 +43,7 @@ import
org.apache.flink.table.descriptors.DescriptorProperties;
import org.apache.flink.table.descriptors.Schema;
import org.apache.flink.table.expressions.Expression;
import org.apache.flink.table.factories.Factory;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.catalog.Catalog;
import org.apache.flink.table.store.file.catalog.Identifier;
import org.apache.flink.table.store.file.schema.SchemaChange;
diff --git
a/flink-table-store-connector/src/main/java/org/apache/flink/table/store/kafka/KafkaLogSinkProvider.java
b/flink-table-store-connector/src/main/java/org/apache/flink/table/store/kafka/KafkaLogSinkProvider.java
index bc71952b..cf88919c 100644
---
a/flink-table-store-connector/src/main/java/org/apache/flink/table/store/kafka/KafkaLogSinkProvider.java
+++
b/flink-table-store-connector/src/main/java/org/apache/flink/table/store/kafka/KafkaLogSinkProvider.java
@@ -18,12 +18,12 @@
package org.apache.flink.table.store.kafka;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.serialization.SerializationSchema;
import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer.Semantic;
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.store.CoreOptions.LogChangelogMode;
import org.apache.flink.table.store.CoreOptions.LogConsistency;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.log.LogSinkProvider;
import org.apache.flink.table.store.table.sink.LogSinkFunction;
diff --git
a/flink-table-store-connector/src/main/java/org/apache/flink/table/store/kafka/KafkaLogSourceProvider.java
b/flink-table-store-connector/src/main/java/org/apache/flink/table/store/kafka/KafkaLogSourceProvider.java
index a5658d92..7571e191 100644
---
a/flink-table-store-connector/src/main/java/org/apache/flink/table/store/kafka/KafkaLogSourceProvider.java
+++
b/flink-table-store-connector/src/main/java/org/apache/flink/table/store/kafka/KafkaLogSourceProvider.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.kafka;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.serialization.DeserializationSchema;
import org.apache.flink.connector.kafka.source.KafkaSource;
import
org.apache.flink.connector.kafka.source.enumerator.initializer.OffsetsInitializer;
@@ -26,6 +25,7 @@ import
org.apache.flink.connector.kafka.source.reader.deserializer.KafkaRecordDe
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.store.CoreOptions.LogConsistency;
import org.apache.flink.table.store.CoreOptions.StartupMode;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.log.LogSourceProvider;
import org.apache.flink.table.types.DataType;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/AbstractFileStore.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/AbstractFileStore.java
index 829d1d08..ca07237f 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/AbstractFileStore.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/AbstractFileStore.java
@@ -18,8 +18,8 @@
package org.apache.flink.table.store.file;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.table.store.CoreOptions;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.manifest.ManifestFile;
import org.apache.flink.table.store.file.manifest.ManifestList;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValue.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValue.java
index e7ef83c7..2e4aafe5 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValue.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValue.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.types.BigIntType;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/append/AppendOnlyCompactManager.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/append/AppendOnlyCompactManager.java
index 063a3184..3777e27e 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/append/AppendOnlyCompactManager.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/append/AppendOnlyCompactManager.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.append;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.compact.CompactFutureManager;
import org.apache.flink.table.store.file.compact.CompactResult;
import org.apache.flink.table.store.file.compact.CompactTask;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogLock.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogLock.java
index 57543607..bbdab71a 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogLock.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogLock.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.catalog;
-import org.apache.flink.annotation.Internal;
-
import java.io.Closeable;
import java.io.Serializable;
import java.util.concurrent.Callable;
@@ -27,7 +25,6 @@ import java.util.concurrent.Callable;
/**
* An interface that allows source and sink to use global lock to some
transaction-related things.
*/
-@Internal
public interface CatalogLock extends Closeable {
/** Run with catalog lock. The caller should tell catalog the database and
table name. */
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFilePathFactory.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFilePathFactory.java
index 5194b3b2..e11950ab 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFilePathFactory.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFilePathFactory.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.fs.Path;
import javax.annotation.concurrent.ThreadSafe;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueFileWriterFactory.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueFileWriterFactory.java
index 4ac82bb1..0a4693ea 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueFileWriterFactory.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueFileWriterFactory.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.KeyValueSerializer;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RollingFileWriter.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RollingFileWriter.java
index 467c692e..cb52e1ac 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RollingFileWriter.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RollingFileWriter.java
@@ -19,7 +19,7 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.utils.Preconditions;
import org.slf4j.Logger;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestFile.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestFile.java
index 4154dd3d..b9d02071 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestFile.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestFile.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.manifest;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.io.RollingFileWriter;
import org.apache.flink.table.store.file.io.SingleFileWriter;
import org.apache.flink.table.store.file.schema.SchemaManager;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/MergeTreeWriter.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/MergeTreeWriter.java
index 2a15e061..df4e4019 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/MergeTreeWriter.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/MergeTreeWriter.java
@@ -18,8 +18,8 @@
package org.apache.flink.table.store.file.mergetree;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.table.store.CoreOptions.ChangelogProducer;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.compact.CompactManager;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortBufferWriteBuffer.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortBufferWriteBuffer.java
index 2d7192d5..d0d93b51 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortBufferWriteBuffer.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortBufferWriteBuffer.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.mergetree;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.codegen.CodeGenUtils;
import org.apache.flink.table.store.codegen.NormalizedKeyComputer;
import org.apache.flink.table.store.codegen.RecordComparator;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortedRun.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortedRun.java
index 1d58f6a1..482e80b7 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortedRun.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortedRun.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.mergetree;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.utils.Preconditions;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactManager.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactManager.java
index adc3a1b8..d90ea05b 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactManager.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactManager.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.compact.CompactFutureManager;
import org.apache.flink.table.store.file.compact.CompactResult;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/UniversalCompaction.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/UniversalCompaction.java
index d243a5cd..06c4a0f8 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/UniversalCompaction.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/UniversalCompaction.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.compact.CompactUnit;
import org.apache.flink.table.store.file.mergetree.LevelSortedRun;
import org.apache.flink.table.store.file.mergetree.SortedRun;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AbstractFileStoreWrite.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AbstractFileStoreWrite.java
index d6f5e58d..56ec69de 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AbstractFileStoreWrite.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AbstractFileStoreWrite.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.disk.IOManager;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreExpireImpl.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreExpireImpl.java
index 800f14b7..3fda2887 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreExpireImpl.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreExpireImpl.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.manifest.ManifestEntry;
import org.apache.flink.table.store.file.manifest.ManifestFile;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/PartitionExpire.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/PartitionExpire.java
index 7482fa66..1785de1e 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/PartitionExpire.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/PartitionExpire.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.manifest.ManifestCommittable;
import org.apache.flink.table.store.file.manifest.ManifestEntry;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/predicate/BucketSelector.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/predicate/BucketSelector.java
index 3285f233..89344036 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/predicate/BucketSelector.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/predicate/BucketSelector.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.predicate;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.data.GenericRow;
import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaManager.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaManager.java
index 057d98de..98674a16 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaManager.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaManager.java
@@ -18,8 +18,8 @@
package org.apache.flink.table.store.file.schema;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.table.store.CoreOptions;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.casting.CastExecutors;
import org.apache.flink.table.store.file.operation.Lock;
import org.apache.flink.table.store.file.schema.SchemaChange.AddColumn;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/JsonSerdeUtil.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/JsonSerdeUtil.java
index 1b9026a4..c8ee6500 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/JsonSerdeUtil.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/JsonSerdeUtil.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.utils;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.file.schema.SchemaSerializer;
import org.apache.flink.table.store.file.schema.TableSchema;
import org.apache.flink.table.store.types.DataField;
@@ -40,7 +39,6 @@ import java.io.IOException;
import java.io.UncheckedIOException;
/** A utility class that provide abilities for JSON serialization and
deserialization. */
-@Internal
public class JsonSerdeUtil {
/**
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/MutableObjectIterator.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/MutableObjectIterator.java
index 51f94401..b90bc10c 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/MutableObjectIterator.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/MutableObjectIterator.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.utils;
-import org.apache.flink.annotation.Internal;
-
import java.io.IOException;
/**
@@ -34,7 +32,6 @@ import java.io.IOException;
*
* @param <E> The element type of the collection iterated over.
*/
-@Internal
public interface MutableObjectIterator<E> {
/**
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/SerializableSupplier.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/SerializableSupplier.java
index 308a57ad..946d4715 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/SerializableSupplier.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/SerializableSupplier.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.utils;
-import org.apache.flink.annotation.PublicEvolving;
-
import java.io.Serializable;
import java.util.function.Supplier;
@@ -28,6 +26,5 @@ import java.util.function.Supplier;
*
* @param <T> the type of results supplied by this supplier
*/
-@PublicEvolving
@FunctionalInterface
public interface SerializableSupplier<T> extends Supplier<T>, Serializable {}
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableWrite.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableWrite.java
index 6fc7f9fe..0593e7a0 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableWrite.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableWrite.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.disk.IOManager;
@@ -49,7 +48,6 @@ public interface TableWrite extends AutoCloseable {
* <p>Most probably, these files are created by another job. Currently
this method is only used
* by the dedicated compact job to see files created by writer jobs.
*/
- @Internal
void notifyNewFiles(long snapshotId, BinaryRow partition, int bucket,
List<DataFileMeta> files);
List<FileCommittable> prepareCommit(boolean blocking, long
commitIdentifier) throws Exception;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/AbstractDataTableScan.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/AbstractDataTableScan.java
index 4c020518..98c8d15e 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/AbstractDataTableScan.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/AbstractDataTableScan.java
@@ -18,8 +18,8 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.table.store.CoreOptions;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.io.DataFileMeta;
diff --git
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/DataTableScan.java
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/DataTableScan.java
index cfcc0f9f..f3ce422b 100644
---
a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/DataTableScan.java
+++
b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/DataTableScan.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.operation.ScanKind;
import org.apache.flink.table.store.file.predicate.Predicate;
diff --git
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/avro/AbstractAvroBulkFormat.java
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/avro/AbstractAvroBulkFormat.java
index cee7e8c4..41bd6848 100644
---
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/avro/AbstractAvroBulkFormat.java
+++
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/avro/AbstractAvroBulkFormat.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.format.avro;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.utils.IteratorResultIterator;
import org.apache.flink.table.store.file.utils.RecordReader;
@@ -45,7 +44,6 @@ import java.util.function.Function;
*
* <p>NOTE: Copied from Flink.
*/
-@Internal
public abstract class AbstractAvroBulkFormat<A> implements FormatReaderFactory
{
private static final long serialVersionUID = 1L;
diff --git
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/avro/AvroToRowDataConverters.java
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/avro/AvroToRowDataConverters.java
index 69c98acd..bb6bc50e 100644
---
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/avro/AvroToRowDataConverters.java
+++
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/avro/AvroToRowDataConverters.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.format.avro;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.BinaryString;
import org.apache.flink.table.store.data.Decimal;
import org.apache.flink.table.store.data.GenericArray;
@@ -51,7 +50,6 @@ import java.util.Map;
import static
org.apache.flink.table.store.format.avro.AvroSchemaConverter.extractValueTypeToAvroMap;
/** Tool class used to convert from Avro {@link GenericRecord} to {@link
InternalRow}. * */
-@Internal
public class AvroToRowDataConverters {
/**
diff --git
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/OrcWriterFactory.java
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/OrcWriterFactory.java
index eb7654dc..de14e7db 100644
---
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/OrcWriterFactory.java
+++
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/OrcWriterFactory.java
@@ -18,9 +18,8 @@
package org.apache.flink.table.store.format.orc;
-import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.serialization.BulkWriter;
+import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.format.FormatWriter;
import org.apache.flink.table.store.format.FormatWriterFactory;
@@ -47,7 +46,6 @@ import static
org.apache.flink.table.store.utils.Preconditions.checkNotNull;
* Vectorizer} implementation to convert the element into an {@link
* org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch}.
*/
-@PublicEvolving
public class OrcWriterFactory implements FormatWriterFactory {
private final Vectorizer<InternalRow> vectorizer;
diff --git
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/ThreadLocalClassLoaderConfiguration.java
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/ThreadLocalClassLoaderConfiguration.java
index 033f4edd..63126b2a 100644
---
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/ThreadLocalClassLoaderConfiguration.java
+++
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/ThreadLocalClassLoaderConfiguration.java
@@ -17,8 +17,6 @@
package org.apache.flink.table.store.format.orc;
-import org.apache.flink.annotation.Internal;
-
import org.apache.hadoop.conf.Configuration;
import java.net.URL;
@@ -29,7 +27,6 @@ import java.net.URL;
* <p>Since the conf is effectively cached across Flink jobs, at least force
the thread local
* classloader to avoid classloader leaks.
*/
-@Internal
public final class ThreadLocalClassLoaderConfiguration extends Configuration {
public ThreadLocalClassLoaderConfiguration() {}
diff --git
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/filter/OrcPredicateFunctionVisitor.java
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/filter/OrcPredicateFunctionVisitor.java
index 539969aa..ccbb3fee 100644
---
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/filter/OrcPredicateFunctionVisitor.java
+++
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/filter/OrcPredicateFunctionVisitor.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.format.orc.filter;
-import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.table.store.data.Decimal;
import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.file.predicate.FieldRef;
@@ -220,7 +219,6 @@ public class OrcPredicateFunctionVisitor
* @param <U> type of the third argument
* @param <R> type of the return value
*/
- @PublicEvolving
@FunctionalInterface
private interface TriFunction<S, T, U, R> {
diff --git
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/writer/OrcBulkWriter.java
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/writer/OrcBulkWriter.java
index 9c068988..63b7f79c 100644
---
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/writer/OrcBulkWriter.java
+++
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/writer/OrcBulkWriter.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.format.orc.writer;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.api.common.serialization.BulkWriter;
import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.format.FormatWriter;
@@ -31,7 +30,6 @@ import java.io.IOException;
import static org.apache.flink.table.store.utils.Preconditions.checkNotNull;
/** A {@link BulkWriter} implementation that writes data in ORC format. */
-@Internal
public class OrcBulkWriter implements FormatWriter {
private final Writer writer;
diff --git
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/writer/PhysicalWriterImpl.java
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/writer/PhysicalWriterImpl.java
index fbfddfd8..6f273b3f 100644
---
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/writer/PhysicalWriterImpl.java
+++
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/writer/PhysicalWriterImpl.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.format.orc.writer;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.fs.PositionOutputStream;
import com.google.protobuf.CodedOutputStream;
@@ -53,7 +52,6 @@ import static
org.apache.orc.impl.WriterImpl.getEstimatedBufferSize;
* <p>NOTE: If the ORC dependency version is updated, this file may have to be
updated as well to be
* in sync with the new version's PhysicalFsWriter.
*/
-@Internal
public class PhysicalWriterImpl implements PhysicalWriter {
private static final Logger LOG =
LoggerFactory.getLogger(PhysicalWriterImpl.class);
diff --git
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/writer/Vectorizer.java
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/writer/Vectorizer.java
index 4523b720..7957d1d1 100644
---
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/writer/Vectorizer.java
+++
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/orc/writer/Vectorizer.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.format.orc.writer;
-import org.apache.flink.annotation.PublicEvolving;
-
import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
import org.apache.orc.TypeDescription;
import org.apache.orc.Writer;
@@ -39,7 +37,6 @@ import static
org.apache.flink.table.store.utils.Preconditions.checkNotNull;
*
* @param <T> The type of the element
*/
-@PublicEvolving
public abstract class Vectorizer<T> implements Serializable {
private final TypeDescription schema;
diff --git
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/reader/ParquetDecimalVector.java
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/reader/ParquetDecimalVector.java
index 5e78aa50..2428ffe2 100644
---
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/reader/ParquetDecimalVector.java
+++
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/reader/ParquetDecimalVector.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.format.parquet.reader;
-import org.apache.flink.annotation.Internal;
import org.apache.flink.table.store.data.Decimal;
import org.apache.flink.table.store.data.columnar.BytesColumnVector;
import org.apache.flink.table.store.data.columnar.ColumnVector;
@@ -33,7 +32,6 @@ import org.apache.parquet.Preconditions;
* Parquet write decimal as int32 and int64 and binary, this class wrap the
real vector to provide
* {@link DecimalColumnVector} interface.
*/
-@Internal
public class ParquetDecimalVector implements DecimalColumnVector {
private final ColumnVector vector;
diff --git
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/writer/ParquetBulkWriter.java
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/writer/ParquetBulkWriter.java
index 882d277a..9dbf2114 100644
---
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/writer/ParquetBulkWriter.java
+++
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/writer/ParquetBulkWriter.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.format.parquet.writer;
-import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.api.common.serialization.BulkWriter;
import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.format.FormatWriter;
@@ -30,7 +29,6 @@ import java.io.IOException;
import static org.apache.flink.table.store.utils.Preconditions.checkNotNull;
/** A simple {@link BulkWriter} implementation that wraps a {@link
ParquetWriter}. */
-@PublicEvolving
public class ParquetBulkWriter implements FormatWriter {
/** The ParquetWriter to write to. */
diff --git
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/writer/PositionOutputStreamAdapter.java
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/writer/PositionOutputStreamAdapter.java
index dd106b0a..9624831d 100644
---
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/writer/PositionOutputStreamAdapter.java
+++
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/writer/PositionOutputStreamAdapter.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.format.parquet.writer;
-import org.apache.flink.annotation.Internal;
-
import org.apache.parquet.io.PositionOutputStream;
import java.io.IOException;
@@ -27,7 +25,6 @@ import java.io.IOException;
import static org.apache.parquet.Preconditions.checkNotNull;
/** An adapter to turn Flink's {@link PositionOutputStream} into a {@link
PositionOutputStream}. */
-@Internal
class PositionOutputStreamAdapter extends PositionOutputStream {
/** The Flink stream written to. */
diff --git
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/writer/StreamOutputFile.java
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/writer/StreamOutputFile.java
index a878a5bc..1b4e22b1 100644
---
a/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/writer/StreamOutputFile.java
+++
b/flink-table-store-format/src/main/java/org/apache/flink/table/store/format/parquet/writer/StreamOutputFile.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.format.parquet.writer;
-import org.apache.flink.annotation.Internal;
-
import org.apache.parquet.io.OutputFile;
import org.apache.parquet.io.PositionOutputStream;
@@ -34,7 +32,6 @@ import static
org.apache.flink.table.store.utils.Preconditions.checkNotNull;
* <p>Because the implementation goes against an open stream, rather than open
its own streams
* against a file, instances can create one stream only.
*/
-@Internal
public class StreamOutputFile implements OutputFile {
private static final long DEFAULT_BLOCK_SIZE = 64L * 1024L * 1024L;
diff --git a/flink-table-store-shade/pom.xml b/flink-table-store-shade/pom.xml
index 4e31e41b..740a7f1c 100644
--- a/flink-table-store-shade/pom.xml
+++ b/flink-table-store-shade/pom.xml
@@ -75,12 +75,6 @@ under the License.
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-annotations</artifactId>
- <version>${flink.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId>
@@ -240,7 +234,6 @@ under the License.
<include>org.apache.flink:flink-hadoop-fs</include>
<include>org.apache.flink:flink-shaded-jackson</include>
<include>org.apache.flink:flink-shaded-guava</include>
-
<include>org.apache.flink:flink-annotations</include>
<include>org.apache.flink:flink-shaded-asm-9</include>
<!-- Flink Table -->
