diff --git a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/18509c9e-3250-4c52-91b9-11ccefc85db1 b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/18509c9e-3250-4c52-91b9-11ccefc85db1 index 4139ca61b8baf..d7602b20e7b70 100644 --- a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/18509c9e-3250-4c52-91b9-11ccefc85db1 +++ b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/18509c9e-3250-4c52-91b9-11ccefc85db1 @@ -30,7 +30,7 @@ org.apache.flink.api.connector.sink2.CommitterInitContext.metricGroup(): Returne org.apache.flink.api.connector.sink2.SupportsCommitter.getCommittableSerializer(): Returned leaf type org.apache.flink.core.io.SimpleVersionedSerializer does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated org.apache.flink.api.connector.sink2.SupportsWriterState.getWriterStateSerializer(): Returned leaf type org.apache.flink.core.io.SimpleVersionedSerializer does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated org.apache.flink.api.connector.sink2.WriterInitContext.asSerializationSchemaInitializationContext(): Returned leaf type org.apache.flink.api.common.serialization.SerializationSchema$InitializationContext does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated -org.apache.flink.api.connector.sink2.WriterInitContext.createInputSerializer(): Returned leaf type org.apache.flink.api.common.typeutils.TypeSerializer does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated +org.apache.flink.api.connector.sink2.WriterInitContext.createInputSerializer(): Returned leaf type org.apache.flink.api.common.typeinfo.utils.TypeSerializer does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated org.apache.flink.api.connector.sink2.WriterInitContext.getMailboxExecutor(): Returned leaf type org.apache.flink.api.common.operators.MailboxExecutor does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated org.apache.flink.api.connector.sink2.WriterInitContext.getProcessingTimeService(): Returned leaf type org.apache.flink.api.common.operators.ProcessingTimeService does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated org.apache.flink.api.connector.sink2.WriterInitContext.getUserCodeClassLoader(): Returned leaf type org.apache.flink.util.UserCodeClassLoader does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated @@ -56,7 +56,7 @@ org.apache.flink.api.connector.source.lib.util.IteratorSourceReaderBase.pollNext org.apache.flink.api.java.typeutils.PojoTypeInfo.createPojoSerializer(org.apache.flink.api.common.serialization.SerializerConfig): Argument leaf type org.apache.flink.api.common.serialization.SerializerConfig does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated org.apache.flink.api.java.typeutils.PojoTypeInfo.createPojoSerializer(org.apache.flink.api.common.serialization.SerializerConfig): Returned leaf type org.apache.flink.api.java.typeutils.runtime.PojoSerializer does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated org.apache.flink.api.java.typeutils.ValueTypeInfo.createSerializer(org.apache.flink.api.common.serialization.SerializerConfig): Argument leaf type org.apache.flink.api.common.serialization.SerializerConfig does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated -org.apache.flink.api.java.typeutils.ValueTypeInfo.createSerializer(org.apache.flink.api.common.serialization.SerializerConfig): Returned leaf type org.apache.flink.api.common.typeutils.TypeSerializer does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated +org.apache.flink.api.java.typeutils.ValueTypeInfo.createSerializer(org.apache.flink.api.common.serialization.SerializerConfig): Returned leaf type org.apache.flink.api.common.typeinfo.utils.TypeSerializer does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated org.apache.flink.configuration.Configuration.get(org.apache.flink.configuration.ConfigOption): Argument leaf type org.apache.flink.configuration.ConfigOption does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated org.apache.flink.configuration.Configuration.getOptional(org.apache.flink.configuration.ConfigOption): Argument leaf type org.apache.flink.configuration.ConfigOption does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated org.apache.flink.configuration.Configuration.removeConfig(org.apache.flink.configuration.ConfigOption): Argument leaf type org.apache.flink.configuration.ConfigOption does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @Deprecated diff --git a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/5b9eed8a-5fb6-4373-98ac-3be2a71941b8 b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/5b9eed8a-5fb6-4373-98ac-3be2a71941b8 index 05081f810d9ea..451fc2b750efc 100644 --- a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/5b9eed8a-5fb6-4373-98ac-3be2a71941b8 +++ b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/5b9eed8a-5fb6-4373-98ac-3be2a71941b8 @@ -109,8 +109,8 @@ org.apache.flink.streaming.api.functions.windowing.ProcessAllWindowFunction.proc org.apache.flink.streaming.api.functions.windowing.ProcessWindowFunction.clear(org.apache.flink.streaming.api.functions.windowing.ProcessWindowFunction$Context): Argument leaf type org.apache.flink.streaming.api.functions.windowing.ProcessWindowFunction$Context does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated org.apache.flink.streaming.api.functions.windowing.ProcessWindowFunction.process(java.lang.Object, org.apache.flink.streaming.api.functions.windowing.ProcessWindowFunction$Context, java.lang.Iterable, org.apache.flink.util.Collector): Argument leaf type org.apache.flink.streaming.api.functions.windowing.ProcessWindowFunction$Context does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated org.apache.flink.streaming.api.operators.AbstractStreamOperator.getContainingTask(): Returned leaf type org.apache.flink.streaming.runtime.tasks.StreamTask does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated -org.apache.flink.streaming.api.operators.AbstractStreamOperator.getInternalTimerService(java.lang.String, org.apache.flink.api.common.typeutils.TypeSerializer, org.apache.flink.streaming.api.operators.Triggerable): Argument leaf type org.apache.flink.streaming.api.operators.Triggerable does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated -org.apache.flink.streaming.api.operators.AbstractStreamOperator.getInternalTimerService(java.lang.String, org.apache.flink.api.common.typeutils.TypeSerializer, org.apache.flink.streaming.api.operators.Triggerable): Returned leaf type org.apache.flink.streaming.api.operators.InternalTimerService does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated +org.apache.flink.streaming.api.operators.AbstractStreamOperator.getInternalTimerService(java.lang.String, org.apache.flink.api.common.typeinfo.utils.TypeSerializer, org.apache.flink.streaming.api.operators.Triggerable): Argument leaf type org.apache.flink.streaming.api.operators.Triggerable does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated +org.apache.flink.streaming.api.operators.AbstractStreamOperator.getInternalTimerService(java.lang.String, org.apache.flink.api.common.typeinfo.utils.TypeSerializer, org.apache.flink.streaming.api.operators.Triggerable): Returned leaf type org.apache.flink.streaming.api.operators.InternalTimerService does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated org.apache.flink.streaming.api.operators.AbstractStreamOperator.getKeyedStateBackend(): Returned leaf type org.apache.flink.runtime.state.KeyedStateBackend does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated org.apache.flink.streaming.api.operators.AbstractStreamOperator.getOperatorConfig(): Returned leaf type org.apache.flink.streaming.api.graph.StreamConfig does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated org.apache.flink.streaming.api.operators.AbstractStreamOperator.getOperatorID(): Returned leaf type org.apache.flink.runtime.jobgraph.OperatorID does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated diff --git a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/f7a4e6fa-e7de-48c9-a61e-c13e83f0c72e b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/f7a4e6fa-e7de-48c9-a61e-c13e83f0c72e index 4425343714287..094cffe13b065 100644 --- a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/f7a4e6fa-e7de-48c9-a61e-c13e83f0c72e +++ b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/f7a4e6fa-e7de-48c9-a61e-c13e83f0c72e @@ -470,12 +470,12 @@ Method has return type in (FileWriterBucketState.java:0) Method has generic return type >> with type argument depending on in (FileWriterBucketState.java:0) Method calls constructor ([B)> in (FileWriterBucketStateSerializer.java:87) -Method calls constructor (org.apache.flink.core.fs.RecoverableWriter$ResumeRecoverable)> in (FileWriterBucketStateSerializer.java:134) -Method calls constructor (org.apache.flink.core.fs.RecoverableWriter$CommitRecoverable)> in (FileWriterBucketStateSerializer.java:138) +Method calls constructor (org.apache.flink.core.fs.RecoverableWriter$ResumeRecoverable)> in (FileWriterBucketStateSerializer.java:134) +Method calls constructor (org.apache.flink.core.fs.RecoverableWriter$CommitRecoverable)> in (FileWriterBucketStateSerializer.java:138) Method calls method in (FileWriterBucketStateSerializer.java:236) Method calls method in (FileWriterBucketStateSerializer.java:226) -Method has generic parameter type > with type argument depending on in (FileWriterBucketStateSerializer.java:0) -Method has generic parameter type > with type argument depending on in (FileWriterBucketStateSerializer.java:0) +Method has generic parameter type > with type argument depending on in (FileWriterBucketStateSerializer.java:0) +Method has generic parameter type > with type argument depending on in (FileWriterBucketStateSerializer.java:0) Method calls constructor (int)> in (FileWriterBucketStateSerializer.java:79) Method calls method in (FileWriterBucketStateSerializer.java:82) Method calls method in (FileWriterBucketStateSerializer.java:80) @@ -639,8 +639,8 @@ Method calls method in (CompactBucketWriter.java:44) Method calls constructor (java.lang.Object)> in (CompactCoordinator.java:192) Method calls constructor (java.lang.Object)> in (CompactCoordinator.java:200) -Method calls constructor (org.apache.flink.api.common.typeutils.TypeSerializer)> in (CompactCoordinator.java:118) -Method calls constructor (org.apache.flink.api.common.typeutils.TypeSerializer, org.apache.flink.api.common.typeutils.TypeSerializer)> in (CompactCoordinator.java:118) +Method calls constructor (org.apache.flink.api.common.typeinfo.utils.TypeSerializer)> in (CompactCoordinator.java:118) +Method calls constructor (org.apache.flink.api.common.typeinfo.utils.TypeSerializer, org.apache.flink.api.common.typeinfo.utils.TypeSerializer)> in (CompactCoordinator.java:118) Method calls constructor (java.lang.Class, org.apache.flink.api.common.serialization.SerializerConfig)> in (CompactCoordinator.java:118) Method gets field in (CompactCoordinator.java:107) Method gets field in (CompactCoordinator.java:107) @@ -654,8 +654,8 @@ Method calls constructor (java.lang.Object)> in (CompactOperator.java:164) Method calls method in (CompactOperator.java:162) Method calls method in (CompactOperator.java:163) -Method calls constructor (org.apache.flink.api.common.typeutils.TypeSerializer)> in (CompactOperator.java:111) -Method calls constructor (org.apache.flink.api.common.typeutils.TypeSerializer, org.apache.flink.api.common.typeutils.TypeSerializer)> in (CompactOperator.java:111) +Method calls constructor (org.apache.flink.api.common.typeinfo.utils.TypeSerializer)> in (CompactOperator.java:111) +Method calls constructor (org.apache.flink.api.common.typeinfo.utils.TypeSerializer, org.apache.flink.api.common.typeinfo.utils.TypeSerializer)> in (CompactOperator.java:111) Method calls constructor (java.lang.Class, org.apache.flink.api.common.serialization.SerializerConfig)> in (CompactOperator.java:111) Method gets field in (CompactOperator.java:103) Method calls method in (CompactOperator.java:141) @@ -680,10 +680,10 @@ Static Initializer ()> calls method in (StandardDeCompressors.java:44) Static Initializer ()> calls method in (StandardDeCompressors.java:46) Static Initializer ()> gets field in (AbstractStreamingWriter.java:74) -Static Initializer ()> calls constructor (org.apache.flink.api.common.typeutils.TypeSerializer)> in (PartitionTimeCommitTrigger.java:52) -Static Initializer ()> calls constructor (org.apache.flink.api.common.typeutils.TypeSerializer, org.apache.flink.api.common.typeutils.TypeSerializer)> in (PartitionTimeCommitTrigger.java:56) +Static Initializer ()> calls constructor (org.apache.flink.api.common.typeinfo.utils.TypeSerializer)> in (PartitionTimeCommitTrigger.java:52) +Static Initializer ()> calls constructor (org.apache.flink.api.common.typeinfo.utils.TypeSerializer, org.apache.flink.api.common.typeinfo.utils.TypeSerializer)> in (PartitionTimeCommitTrigger.java:56) Static Initializer ()> gets field in (PartitionTimeCommitTrigger.java:56) Static Initializer ()> gets field in (PartitionTimeCommitTrigger.java:52) -Static Initializer ()> calls constructor (org.apache.flink.api.common.typeutils.TypeSerializer, org.apache.flink.api.common.typeutils.TypeSerializer)> in (ProcTimeCommitTrigger.java:47) +Static Initializer ()> calls constructor (org.apache.flink.api.common.typeinfo.utils.TypeSerializer, org.apache.flink.api.common.typeinfo.utils.TypeSerializer)> in (ProcTimeCommitTrigger.java:47) Static Initializer ()> gets field in (ProcTimeCommitTrigger.java:47) Static Initializer ()> gets field in (ProcTimeCommitTrigger.java:47) diff --git a/flink-connectors/flink-connector-base/src/test/java/org/apache/flink/connector/base/sink/writer/TestSinkInitContext.java b/flink-connectors/flink-connector-base/src/test/java/org/apache/flink/connector/base/sink/writer/TestSinkInitContext.java index bea671bb6f617..c991d356bc1c7 100644 --- a/flink-connectors/flink-connector-base/src/test/java/org/apache/flink/connector/base/sink/writer/TestSinkInitContext.java +++ b/flink-connectors/flink-connector-base/src/test/java/org/apache/flink/connector/base/sink/writer/TestSinkInitContext.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.operators.MailboxExecutor; import org.apache.flink.api.common.operators.ProcessingTimeService; import org.apache.flink.api.common.serialization.SerializationSchema; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.sink2.WriterInitContext; import org.apache.flink.connector.testutils.source.TestingJobInfo; import org.apache.flink.connector.testutils.source.TestingTaskInfo; diff --git a/flink-connectors/flink-connector-datagen-test/src/test/java/org/apache/flink/connector/datagen/functions/FromElementsGeneratorSourceITCase.java b/flink-connectors/flink-connector-datagen-test/src/test/java/org/apache/flink/connector/datagen/functions/FromElementsGeneratorSourceITCase.java index 19a390b175db3..8c8521fd597e5 100644 --- a/flink-connectors/flink-connector-datagen-test/src/test/java/org/apache/flink/connector/datagen/functions/FromElementsGeneratorSourceITCase.java +++ b/flink-connectors/flink-connector-datagen-test/src/test/java/org/apache/flink/connector/datagen/functions/FromElementsGeneratorSourceITCase.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.TypeExtractor; import org.apache.flink.connector.datagen.source.DataGeneratorSource; import org.apache.flink.connector.datagen.source.generated.User; diff --git a/flink-connectors/flink-connector-datagen/src/main/java/org/apache/flink/connector/datagen/functions/FromElementsGeneratorFunction.java b/flink-connectors/flink-connector-datagen/src/main/java/org/apache/flink/connector/datagen/functions/FromElementsGeneratorFunction.java index 1219e15490a36..335750ae0a1f0 100644 --- a/flink-connectors/flink-connector-datagen/src/main/java/org/apache/flink/connector/datagen/functions/FromElementsGeneratorFunction.java +++ b/flink-connectors/flink-connector-datagen/src/main/java/org/apache/flink/connector/datagen/functions/FromElementsGeneratorFunction.java @@ -22,10 +22,10 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.source.SourceReaderContext; import org.apache.flink.connector.datagen.source.GeneratorFunction; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.streaming.api.operators.OutputTypeConfigurable; diff --git a/flink-connectors/flink-connector-datagen/src/main/java/org/apache/flink/connector/datagen/functions/IndexLookupGeneratorFunction.java b/flink-connectors/flink-connector-datagen/src/main/java/org/apache/flink/connector/datagen/functions/IndexLookupGeneratorFunction.java index e67df68fd5e38..6088a13ae462a 100644 --- a/flink-connectors/flink-connector-datagen/src/main/java/org/apache/flink/connector/datagen/functions/IndexLookupGeneratorFunction.java +++ b/flink-connectors/flink-connector-datagen/src/main/java/org/apache/flink/connector/datagen/functions/IndexLookupGeneratorFunction.java @@ -22,10 +22,10 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.source.SourceReaderContext; import org.apache.flink.connector.datagen.source.GeneratorFunction; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.util.Preconditions; diff --git a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/FileSinkCommittableSerializer.java b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/FileSinkCommittableSerializer.java index febc9a53305c6..9165d7980c6a9 100644 --- a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/FileSinkCommittableSerializer.java +++ b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/FileSinkCommittableSerializer.java @@ -23,9 +23,9 @@ import org.apache.flink.core.io.SimpleVersionedSerialization; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.streaming.api.functions.sink.filesystem.InProgressFileWriter; import java.io.IOException; diff --git a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/compactor/operator/CompactorOperator.java b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/compactor/operator/CompactorOperator.java index fa4e2b3d54b41..d0bdfe13d9dbb 100644 --- a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/compactor/operator/CompactorOperator.java +++ b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/compactor/operator/CompactorOperator.java @@ -32,7 +32,7 @@ import org.apache.flink.core.io.SimpleVersionedSerialization; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.runtime.state.StateInitializationContext; import org.apache.flink.runtime.state.StateSnapshotContext; diff --git a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/compactor/operator/CompactorRequestSerializer.java b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/compactor/operator/CompactorRequestSerializer.java index e00e32f9b855a..ba4be21005ede 100644 --- a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/compactor/operator/CompactorRequestSerializer.java +++ b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/compactor/operator/CompactorRequestSerializer.java @@ -23,7 +23,7 @@ import org.apache.flink.core.io.SimpleVersionedSerialization; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; import java.io.IOException; diff --git a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/compactor/operator/CompactorRequestTypeInfo.java b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/compactor/operator/CompactorRequestTypeInfo.java index 07eceae5a3309..a82c08e49ae95 100644 --- a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/compactor/operator/CompactorRequestTypeInfo.java +++ b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/compactor/operator/CompactorRequestTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.connector.file.sink.FileSinkCommittable; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.io.SimpleVersionedSerializerTypeSerializerProxy; diff --git a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/writer/FileWriterBucketStateSerializer.java b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/writer/FileWriterBucketStateSerializer.java index 48e78300d5a6b..2c5c3b5cb225b 100644 --- a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/writer/FileWriterBucketStateSerializer.java +++ b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/sink/writer/FileWriterBucketStateSerializer.java @@ -24,9 +24,9 @@ import org.apache.flink.core.io.SimpleVersionedSerialization; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.streaming.api.functions.sink.filesystem.InProgressFileWriter; import org.apache.flink.streaming.api.functions.sink.filesystem.OutputStreamBasedPartFileWriter; import org.apache.flink.streaming.api.functions.sink.filesystem.bucketassigners.SimpleVersionedStringSerializer; diff --git a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/src/FileSourceSplitSerializer.java b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/src/FileSourceSplitSerializer.java index 6b7bcb5866965..8427ec56b619e 100644 --- a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/src/FileSourceSplitSerializer.java +++ b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/src/FileSourceSplitSerializer.java @@ -23,9 +23,9 @@ import org.apache.flink.core.fs.Path; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Optional; diff --git a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/ContinuousPartitionFetcher.java b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/ContinuousPartitionFetcher.java index e616ac5405ada..c65087ca14115 100644 --- a/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/ContinuousPartitionFetcher.java +++ b/flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/ContinuousPartitionFetcher.java @@ -19,7 +19,7 @@ package org.apache.flink.connector.file.table; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.table.catalog.ObjectPath; diff --git a/flink-connectors/flink-file-sink-common/src/main/java/org/apache/flink/streaming/api/functions/sink/filesystem/OutputStreamBasedPartFileWriter.java b/flink-connectors/flink-file-sink-common/src/main/java/org/apache/flink/streaming/api/functions/sink/filesystem/OutputStreamBasedPartFileWriter.java index 06d3bf9303a84..e8c8131902f3d 100644 --- a/flink-connectors/flink-file-sink-common/src/main/java/org/apache/flink/streaming/api/functions/sink/filesystem/OutputStreamBasedPartFileWriter.java +++ b/flink-connectors/flink-file-sink-common/src/main/java/org/apache/flink/streaming/api/functions/sink/filesystem/OutputStreamBasedPartFileWriter.java @@ -24,9 +24,9 @@ import org.apache.flink.core.io.SimpleVersionedSerialization; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.IOUtils; import javax.annotation.Nullable; diff --git a/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/api/java/typeutils/WritableTypeInfo.java b/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/api/java/typeutils/WritableTypeInfo.java index 9419b70f325f3..b0ee5eaf738f5 100644 --- a/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/api/java/typeutils/WritableTypeInfo.java +++ b/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/api/java/typeutils/WritableTypeInfo.java @@ -26,7 +26,7 @@ import org.apache.flink.api.common.typeinfo.AtomicType; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.WritableComparator; import org.apache.flink.api.java.typeutils.runtime.WritableSerializer; diff --git a/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableComparator.java b/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableComparator.java index df3226dbddda3..ff6fe9a23b0a3 100644 --- a/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableComparator.java +++ b/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.NormalizableKey; import org.apache.flink.util.InstantiationUtil; diff --git a/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializer.java b/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializer.java index 0a42357e434e8..7a220c27d49b1 100644 --- a/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializer.java +++ b/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.GenericTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; import com.esotericsoftware.kryo.Kryo; diff --git a/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopReducerWrappedFunction.java b/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopReducerWrappedFunction.java index 69032c3e4efe8..5e00d4e381bc9 100644 --- a/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopReducerWrappedFunction.java +++ b/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/HadoopReducerWrappedFunction.java @@ -22,7 +22,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.functions.OpenContext; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.hadoop.mapred.wrapper.HadoopDummyReporter; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.ResultTypeQueryable; diff --git a/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopTupleUnwrappingIterator.java b/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopTupleUnwrappingIterator.java index 5b5cc20dcbd52..c1a42453ce80a 100644 --- a/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopTupleUnwrappingIterator.java +++ b/flink-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/wrapper/HadoopTupleUnwrappingIterator.java @@ -19,7 +19,7 @@ package org.apache.flink.hadoopcompatibility.mapred.wrapper; import org.apache.flink.api.common.operators.util.TupleUnwrappingIterator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import java.util.Iterator; diff --git a/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableComparatorTest.java b/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableComparatorTest.java index 30655c22d8980..d1fd454395c3d 100644 --- a/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableComparatorTest.java +++ b/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** Tests for the {@link WritableComparator}. */ class WritableComparatorTest extends ComparatorTestBase { diff --git a/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableComparatorUUIDTest.java b/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableComparatorUUIDTest.java index 513958dc206fd..7aa6db70c8800 100644 --- a/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableComparatorUUIDTest.java +++ b/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableComparatorUUIDTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.UUID; diff --git a/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializerUUIDTest.java b/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializerUUIDTest.java index 2693619fd260f..912aef90ed7a6 100644 --- a/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializerUUIDTest.java +++ b/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializerUUIDTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.UUID; diff --git a/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializerUpgradeTest.java b/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializerUpgradeTest.java index 21527a5f3ae88..9e36b57a80860 100644 --- a/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializerUpgradeTest.java +++ b/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.java.typeutils.runtime.WritableSerializerUpgradeTest.WritableName; diff --git a/flink-core/src/main/java/org/apache/flink/core/memory/DataInputView.java b/flink-core-api/src/main/java/org/apache/flink/api/common/memory/DataInputView.java similarity index 98% rename from flink-core/src/main/java/org/apache/flink/core/memory/DataInputView.java rename to flink-core-api/src/main/java/org/apache/flink/api/common/memory/DataInputView.java index 58d5c634aed5b..31b298c5e2c2f 100644 --- a/flink-core/src/main/java/org/apache/flink/core/memory/DataInputView.java +++ b/flink-core-api/src/main/java/org/apache/flink/api/common/memory/DataInputView.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.core.memory; +package org.apache.flink.api.common.memory; import org.apache.flink.annotation.Public; diff --git a/flink-core/src/main/java/org/apache/flink/core/memory/DataOutputView.java b/flink-core-api/src/main/java/org/apache/flink/api/common/memory/DataOutputView.java similarity index 97% rename from flink-core/src/main/java/org/apache/flink/core/memory/DataOutputView.java rename to flink-core-api/src/main/java/org/apache/flink/api/common/memory/DataOutputView.java index 894c721a4e90b..1228ba8093f74 100644 --- a/flink-core/src/main/java/org/apache/flink/core/memory/DataOutputView.java +++ b/flink-core-api/src/main/java/org/apache/flink/api/common/memory/DataOutputView.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.core.memory; +package org.apache.flink.api.common.memory; import org.apache.flink.annotation.Public; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializer.java b/flink-core-api/src/main/java/org/apache/flink/api/common/typeinfo/utils/TypeSerializer.java similarity index 98% rename from flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializer.java rename to flink-core-api/src/main/java/org/apache/flink/api/common/typeinfo/utils/TypeSerializer.java index 5b520c09f9272..d52c18c703b92 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializer.java +++ b/flink-core-api/src/main/java/org/apache/flink/api/common/typeinfo/utils/TypeSerializer.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.common.typeutils; +package org.apache.flink.api.common.typeinfo.utils; import org.apache.flink.annotation.PublicEvolving; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.io.Serializable; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSchemaCompatibility.java b/flink-core-api/src/main/java/org/apache/flink/api/common/typeinfo/utils/TypeSerializerSchemaCompatibility.java similarity index 99% rename from flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSchemaCompatibility.java rename to flink-core-api/src/main/java/org/apache/flink/api/common/typeinfo/utils/TypeSerializerSchemaCompatibility.java index 4afad42acbcb7..609a09f14d00b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSchemaCompatibility.java +++ b/flink-core-api/src/main/java/org/apache/flink/api/common/typeinfo/utils/TypeSerializerSchemaCompatibility.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.common.typeutils; +package org.apache.flink.api.common.typeinfo.utils; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.util.Preconditions; @@ -41,7 +41,7 @@ public class TypeSerializerSchemaCompatibility { /** Enum for the type of the compatibility. */ - enum Type { + public enum Type { /** This indicates that the new serializer continued to be used as is. */ COMPATIBLE_AS_IS, diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshot.java b/flink-core-api/src/main/java/org/apache/flink/api/common/typeinfo/utils/TypeSerializerSnapshot.java similarity index 79% rename from flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshot.java rename to flink-core-api/src/main/java/org/apache/flink/api/common/typeinfo/utils/TypeSerializerSnapshot.java index 1fe4134ee51c9..be3683a61d4b4 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshot.java +++ b/flink-core-api/src/main/java/org/apache/flink/api/common/typeinfo/utils/TypeSerializerSnapshot.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.common.typeutils; +package org.apache.flink.api.common.typeinfo.utils; import org.apache.flink.annotation.PublicEvolving; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; @@ -85,7 +85,7 @@ public interface TypeSerializerSnapshot { * * @param out the {@link DataOutputView} to write the snapshot to. * @throws IOException Thrown if the snapshot data could not be written. - * @see #writeVersionedSnapshot(DataOutputView, TypeSerializerSnapshot) + * @see {@link org.apache.flink.api.common.typeutils.TypeSerializerUtils#writeVersionedSnapshot(DataOutputView, TypeSerializerSnapshot)} */ void writeSnapshot(DataOutputView out) throws IOException; @@ -98,7 +98,7 @@ public interface TypeSerializerSnapshot { * @param in the {@link DataInputView} to read the snapshot from. * @param userCodeClassLoader the user code classloader * @throws IOException Thrown if the snapshot data could be read or parsed. - * @see #readVersionedSnapshot(DataInputView, ClassLoader) + * @see org.apache.flink.api.common.typeutils.TypeSerializerUtils#readVersionedSnapshot(DataInputView, ClassLoader) */ void readSnapshot(int readVersion, DataInputView in, ClassLoader userCodeClassLoader) throws IOException; @@ -133,38 +133,4 @@ void readSnapshot(int readVersion, DataInputView in, ClassLoader userCodeClassLo */ TypeSerializerSchemaCompatibility resolveSchemaCompatibility( TypeSerializerSnapshot oldSerializerSnapshot); - - // ------------------------------------------------------------------------ - // read / write utilities - // ------------------------------------------------------------------------ - - /** - * Writes the given snapshot to the out stream. One should always use this method to write - * snapshots out, rather than directly calling {@link #writeSnapshot(DataOutputView)}. - * - *

The snapshot written with this method can be read via {@link - * #readVersionedSnapshot(DataInputView, ClassLoader)}. - */ - static void writeVersionedSnapshot(DataOutputView out, TypeSerializerSnapshot snapshot) - throws IOException { - out.writeUTF(snapshot.getClass().getName()); - out.writeInt(snapshot.getCurrentVersion()); - snapshot.writeSnapshot(out); - } - - /** - * Reads a snapshot from the stream, performing resolving - * - *

This method reads snapshots written by {@link #writeVersionedSnapshot(DataOutputView, - * TypeSerializerSnapshot)}. - */ - static TypeSerializerSnapshot readVersionedSnapshot(DataInputView in, ClassLoader cl) - throws IOException { - final TypeSerializerSnapshot snapshot = - TypeSerializerSnapshotSerializationUtil.readAndInstantiateSnapshotClass(in, cl); - - int version = in.readInt(); - snapshot.readSnapshot(version, in, cl); - return snapshot; - } } diff --git a/flink-core/src/main/java/org/apache/flink/util/Preconditions.java b/flink-core-api/src/main/java/org/apache/flink/util/Preconditions.java similarity index 100% rename from flink-core/src/main/java/org/apache/flink/util/Preconditions.java rename to flink-core-api/src/main/java/org/apache/flink/util/Preconditions.java diff --git a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/SerializedListAccumulator.java b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/SerializedListAccumulator.java index 2678fc5542808..ba9537bc066c1 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/accumulators/SerializedListAccumulator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/accumulators/SerializedListAccumulator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.accumulators; import org.apache.flink.annotation.PublicEvolving; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/RuntimeContext.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/RuntimeContext.java index b36c0adaa2ad7..90b27a0e88129 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/functions/RuntimeContext.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/functions/RuntimeContext.java @@ -40,7 +40,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.metrics.groups.OperatorMetricGroup; import java.io.Serializable; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/SerializerFactory.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/SerializerFactory.java index 401b9a8872270..a037974559b31 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/functions/SerializerFactory.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/functions/SerializerFactory.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** A factory for {@link TypeSerializer} implementations. */ @Internal diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/AbstractRuntimeUDFContext.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/AbstractRuntimeUDFContext.java index 75efc2a82d8d0..62e214dd5b241 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/AbstractRuntimeUDFContext.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/AbstractRuntimeUDFContext.java @@ -43,7 +43,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.Path; import org.apache.flink.metrics.groups.OperatorMetricGroup; import org.apache.flink.util.UserCodeClassLoader; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingIterator.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingIterator.java index ce3e56067a449..8c678f5c4e6ca 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingIterator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingIterator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.functions.util; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.TraversableOnceException; import java.util.Iterator; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingListCollector.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingListCollector.java index a9c41951c7bce..f24476e2bbb40 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingListCollector.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/functions/util/CopyingListCollector.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.functions.util; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.Collector; import java.util.List; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java index dfe658cee6408..d435cc83a74cb 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryInputFormat.java @@ -29,7 +29,7 @@ import org.apache.flink.core.fs.FileStatus; import org.apache.flink.core.fs.FileSystem; import org.apache.flink.core.fs.Path; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.util.Preconditions; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryOutputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryOutputFormat.java index c9ea4d11e6944..2fd880181181a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryOutputFormat.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/BinaryOutputFormat.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Public; import org.apache.flink.configuration.Configuration; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import java.io.FilterOutputStream; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/BlockInfo.java b/flink-core/src/main/java/org/apache/flink/api/common/io/BlockInfo.java index 96c75df5a1a09..928201f1ef293 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/BlockInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/BlockInfo.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Public; import org.apache.flink.core.io.IOReadableWritable; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/SerializedInputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/SerializedInputFormat.java index 9760e90120ec1..0515bff8f7607 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/SerializedInputFormat.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/SerializedInputFormat.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Public; import org.apache.flink.core.io.IOReadableWritable; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/io/SerializedOutputFormat.java b/flink-core/src/main/java/org/apache/flink/api/common/io/SerializedOutputFormat.java index ed569fdda2d74..0f8b626f19760 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/io/SerializedOutputFormat.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/io/SerializedOutputFormat.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Public; import org.apache.flink.core.io.IOReadableWritable; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSourceBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSourceBase.java index fec6abbf5520b..1fbc22de04b7d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSourceBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/GenericDataSourceBase.java @@ -27,7 +27,7 @@ import org.apache.flink.api.common.operators.util.UserCodeClassWrapper; import org.apache.flink.api.common.operators.util.UserCodeObjectWrapper; import org.apache.flink.api.common.operators.util.UserCodeWrapper; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.io.InputSplit; import org.apache.flink.util.Visitor; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java index 175ea9d496069..fcaa66dd6dd3c 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupOperatorBase.java @@ -40,7 +40,7 @@ import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.Collector; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupRawOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupRawOperatorBase.java index dc9b357f81bb8..c474b09c20166 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupRawOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CoGroupRawOperatorBase.java @@ -34,7 +34,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.CompositeType; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.Collector; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java index eef215d7bd33b..1f1659a1577cb 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java @@ -30,7 +30,7 @@ import org.apache.flink.api.common.operators.util.UserCodeClassWrapper; import org.apache.flink.api.common.operators.util.UserCodeObjectWrapper; import org.apache.flink.api.common.operators.util.UserCodeWrapper; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.ArrayList; import java.util.List; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.java index 5552a6cffa7ee..f450497706295 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/FlatMapOperatorBase.java @@ -30,7 +30,7 @@ import org.apache.flink.api.common.operators.util.UserCodeClassWrapper; import org.apache.flink.api.common.operators.util.UserCodeObjectWrapper; import org.apache.flink.api.common.operators.util.UserCodeWrapper; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.ArrayList; import java.util.List; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupCombineOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupCombineOperatorBase.java index 17abb37f606ae..88cea860cdc33 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupCombineOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupCombineOperatorBase.java @@ -35,7 +35,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.CompositeType; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.commons.lang3.ArrayUtils; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java index 5ed9512ed46a4..2485f33fc41cf 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/GroupReduceOperatorBase.java @@ -39,7 +39,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.CompositeType; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.commons.lang3.ArrayUtils; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/InnerJoinOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/InnerJoinOperatorBase.java index 6f60889b51a28..f91f79c5450b2 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/InnerJoinOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/InnerJoinOperatorBase.java @@ -35,7 +35,7 @@ import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.Collector; import java.util.ArrayList; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java index 0cc50f5296902..5aea200c8faf0 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapOperatorBase.java @@ -29,7 +29,7 @@ import org.apache.flink.api.common.operators.util.UserCodeClassWrapper; import org.apache.flink.api.common.operators.util.UserCodeObjectWrapper; import org.apache.flink.api.common.operators.util.UserCodeWrapper; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.ArrayList; import java.util.List; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapPartitionOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapPartitionOperatorBase.java index 8733ee4fbda3b..4cf4665a51e3b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapPartitionOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/MapPartitionOperatorBase.java @@ -31,7 +31,7 @@ import org.apache.flink.api.common.operators.util.UserCodeClassWrapper; import org.apache.flink.api.common.operators.util.UserCodeObjectWrapper; import org.apache.flink.api.common.operators.util.UserCodeWrapper; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.ArrayList; import java.util.List; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/OuterJoinOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/OuterJoinOperatorBase.java index 856836e1465d5..0fe34e333f1fa 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/OuterJoinOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/OuterJoinOperatorBase.java @@ -35,7 +35,7 @@ import org.apache.flink.api.common.typeutils.CompositeType; import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.Collector; import org.apache.commons.collections.ResettableIterator; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.java index 9096821e22311..1ea0c3ea439af 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/ReduceOperatorBase.java @@ -36,7 +36,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.CompositeType; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.ArrayList; import java.util.Collections; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/JoinHashMap.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/JoinHashMap.java index 8fb0872beda46..bb9481b840a84 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/JoinHashMap.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/JoinHashMap.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.commons.collections.map.AbstractHashedMap; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/ListKeyGroupedIterator.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/ListKeyGroupedIterator.java index 2f6def5d2dfe3..dbf39589d65e3 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/operators/util/ListKeyGroupedIterator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/util/ListKeyGroupedIterator.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.TraversableOnceException; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/serialization/TypeInformationSerializationSchema.java b/flink-core/src/main/java/org/apache/flink/api/common/serialization/TypeInformationSerializationSchema.java index 5e740b0debf33..9801221dd0b5a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/serialization/TypeInformationSerializationSchema.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/serialization/TypeInformationSerializationSchema.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Public; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/AggregatingStateDescriptor.java b/flink-core/src/main/java/org/apache/flink/api/common/state/AggregatingStateDescriptor.java index 06d3a17762764..bfcfd6a19d63b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/AggregatingStateDescriptor.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/AggregatingStateDescriptor.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.functions.AggregateFunction; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import static org.apache.flink.util.Preconditions.checkNotNull; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/ListStateDescriptor.java b/flink-core/src/main/java/org/apache/flink/api/common/state/ListStateDescriptor.java index 5cc166bf93485..25002f331e634 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/ListStateDescriptor.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/ListStateDescriptor.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.java.typeutils.ListTypeInfo; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/MapStateDescriptor.java b/flink-core/src/main/java/org/apache/flink/api/common/state/MapStateDescriptor.java index 2dd2d6cc4ac30..8aafe1e8073df 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/MapStateDescriptor.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/MapStateDescriptor.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.api.java.typeutils.MapTypeInfo; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingStateDescriptor.java b/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingStateDescriptor.java index d90c52cc640fc..25408fe2640c4 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingStateDescriptor.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/ReducingStateDescriptor.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.functions.RichFunction; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import static org.apache.flink.util.Preconditions.checkNotNull; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/StateDescriptor.java b/flink-core/src/main/java/org/apache/flink/api/common/state/StateDescriptor.java index 321eec76ebf53..2629e7a42c26c 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/StateDescriptor.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/StateDescriptor.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.SerializerFactory; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.TypeExtractor; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/state/ValueStateDescriptor.java b/flink-core/src/main/java/org/apache/flink/api/common/state/ValueStateDescriptor.java index 1545d99e5325c..828d99063f610 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/state/ValueStateDescriptor.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/state/ValueStateDescriptor.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** * {@link StateDescriptor} for {@link ValueState}. This can be used to create partitioned value diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/BasicArrayTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/BasicArrayTypeInfo.java index dc5e05d980192..8fda8c62cc2f9 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/BasicArrayTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/BasicArrayTypeInfo.java @@ -22,7 +22,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.functions.InvalidTypesException; import org.apache.flink.api.common.serialization.SerializerConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.GenericArraySerializer; import org.apache.flink.api.common.typeutils.base.array.StringArraySerializer; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/BasicTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/BasicTypeInfo.java index afe11eb110f61..82b90778d17b8 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/BasicTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/BasicTypeInfo.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.functions.InvalidTypesException; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.BigDecComparator; import org.apache.flink.api.common.typeutils.base.BigDecSerializer; import org.apache.flink.api.common.typeutils.base.BigIntComparator; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/FractionalTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/FractionalTypeInfo.java index ed0013088e4e8..288f5e4ea4e2e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/FractionalTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/FractionalTypeInfo.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Public; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Arrays; import java.util.HashSet; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/IntegerTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/IntegerTypeInfo.java index 8afea05675997..78750986a150d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/IntegerTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/IntegerTypeInfo.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Public; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Arrays; import java.util.HashSet; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/LocalTimeTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/LocalTimeTypeInfo.java index 243b2e83622cf..8d8c7229699f7 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/LocalTimeTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/LocalTimeTypeInfo.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LocalDateComparator; import org.apache.flink.api.common.typeutils.base.LocalDateSerializer; import org.apache.flink.api.common.typeutils.base.LocalDateTimeComparator; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/NothingTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/NothingTypeInfo.java index 906f1cc96e51f..0d4a605708c30 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/NothingTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/NothingTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Public; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.serialization.SerializerConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.Nothing; /** Placeholder type information for the {@link Nothing} type. */ diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/NumericTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/NumericTypeInfo.java index 26507be1dc067..bfca59598b2a2 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/NumericTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/NumericTypeInfo.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Public; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Arrays; import java.util.HashSet; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/PrimitiveArrayTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/PrimitiveArrayTypeInfo.java index bfe7ff59c968d..ced3271feebdf 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/PrimitiveArrayTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/PrimitiveArrayTypeInfo.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.InvalidTypesException; import org.apache.flink.api.common.serialization.SerializerConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.array.BooleanPrimitiveArrayComparator; import org.apache.flink.api.common.typeutils.base.array.BooleanPrimitiveArraySerializer; import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArrayComparator; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/SqlTimeTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/SqlTimeTypeInfo.java index c8a098149bef6..1a0629711a1fb 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/SqlTimeTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/SqlTimeTypeInfo.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DateComparator; import org.apache.flink.api.common.typeutils.base.SqlDateSerializer; import org.apache.flink.api.common.typeutils.base.SqlTimeSerializer; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/TypeInformation.java b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/TypeInformation.java index 4f76a3f2a926a..835d3d772efea 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/TypeInformation.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeinfo/TypeInformation.java @@ -22,7 +22,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.functions.InvalidTypesException; import org.apache.flink.api.common.serialization.SerializerConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.TypeExtractor; import org.apache.flink.util.FlinkRuntimeException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeSerializer.java index dbcfa7367634a..6b21263144aef 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeSerializer.java @@ -18,8 +18,9 @@ package org.apache.flink.api.common.typeutils; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.Preconditions; import javax.annotation.Nonnull; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerSnapshot.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerSnapshot.java index f96acd6af0c73..8130ca22c7001 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerSnapshot.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerSnapshot.java @@ -20,12 +20,15 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.PublicEvolving; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.GenericArraySerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.api.java.typeutils.runtime.EitherSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerUtil.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerUtil.java index 8382daa20aca7..04100437f902b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerUtil.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerUtil.java @@ -19,6 +19,9 @@ package org.apache.flink.api.common.typeutils; import org.apache.flink.annotation.Internal; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.util.Preconditions; import static org.apache.flink.util.Preconditions.checkArgument; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/GenericTypeSerializerSnapshot.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/GenericTypeSerializerSnapshot.java index 9cc6cfe60e499..805090abbc454 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/GenericTypeSerializerSnapshot.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/GenericTypeSerializerSnapshot.java @@ -19,8 +19,11 @@ package org.apache.flink.api.common.typeutils; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.util.InstantiationUtil; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/LegacySerializerSnapshotTransformer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/LegacySerializerSnapshotTransformer.java index 7846893857978..81e2a8239b6de 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/LegacySerializerSnapshotTransformer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/LegacySerializerSnapshotTransformer.java @@ -19,6 +19,8 @@ package org.apache.flink.api.common.typeutils; import org.apache.flink.annotation.Internal; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; /** * This interface provides a way for {@link TypeSerializer}s to transform a legacy {@link diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/NestedSerializersSnapshotDelegate.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/NestedSerializersSnapshotDelegate.java index afb89c36d0c15..0b5b566fc2d05 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/NestedSerializersSnapshotDelegate.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/NestedSerializersSnapshotDelegate.java @@ -19,8 +19,10 @@ package org.apache.flink.api.common.typeutils; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import java.io.IOException; import java.util.Arrays; @@ -108,7 +110,7 @@ public final void writeNestedSerializerSnapshots(DataOutputView out) throws IOEx out.writeInt(nestedSnapshots.length); for (TypeSerializerSnapshot snap : nestedSnapshots) { - TypeSerializerSnapshot.writeVersionedSnapshot(out, snap); + TypeSerializerUtils.writeVersionedSnapshot(out, snap); } } @@ -133,7 +135,7 @@ public static NestedSerializersSnapshotDelegate readNestedSerializerSnapshots( new TypeSerializerSnapshot[numSnapshots]; for (int i = 0; i < numSnapshots; i++) { - nestedSnapshots[i] = TypeSerializerSnapshot.readVersionedSnapshot(in, cl); + nestedSnapshots[i] = TypeSerializerUtils.readVersionedSnapshot(in, cl); } return new NestedSerializersSnapshotDelegate(nestedSnapshots); diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/SimpleTypeSerializerSnapshot.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/SimpleTypeSerializerSnapshot.java index 00475e708896d..c98e425e30ec8 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/SimpleTypeSerializerSnapshot.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/SimpleTypeSerializerSnapshot.java @@ -19,8 +19,11 @@ package org.apache.flink.api.common.typeutils; import org.apache.flink.annotation.PublicEvolving; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import javax.annotation.Nonnull; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/SingleThreadAccessCheckingTypeSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/SingleThreadAccessCheckingTypeSerializer.java index 6f03b595c31b2..18918a2ba7a7c 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/SingleThreadAccessCheckingTypeSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/SingleThreadAccessCheckingTypeSerializer.java @@ -19,8 +19,10 @@ package org.apache.flink.api.common.typeutils; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java index 77b893549cbfa..5914d85d7c48e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeComparator.java @@ -19,8 +19,8 @@ package org.apache.flink.api.common.typeutils; import org.apache.flink.annotation.PublicEvolving; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerFactory.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerFactory.java index 2c251438f9dd7..178842eccb274 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerFactory.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerFactory.java @@ -19,6 +19,7 @@ package org.apache.flink.api.common.typeutils; import org.apache.flink.annotation.Internal; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; @Internal diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotSerializationUtil.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotSerializationUtil.java index 10c8ff730019e..013b420f58c59 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotSerializationUtil.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotSerializationUtil.java @@ -19,9 +19,10 @@ package org.apache.flink.api.common.typeutils; import org.apache.flink.annotation.VisibleForTesting; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.core.io.VersionedIOReadableWritable; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; import org.apache.flink.util.Preconditions; @@ -108,7 +109,7 @@ public void write(DataOutputView out) throws IOException { // write the format version of this utils format super.write(out); - TypeSerializerSnapshot.writeVersionedSnapshot(out, serializerSnapshot); + TypeSerializerUtils.writeVersionedSnapshot(out, serializerSnapshot); } @SuppressWarnings("unchecked") @@ -159,7 +160,7 @@ TypeSerializerSnapshot getSerializerSnapshot() { @VisibleForTesting static TypeSerializerSnapshot deserializeV2(DataInputView in, ClassLoader cl) throws IOException { - return TypeSerializerSnapshot.readVersionedSnapshot(in, cl); + return TypeSerializerUtils.readVersionedSnapshot(in, cl); } } } diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerUtils.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerUtils.java index 705ce11ea93c1..e0175c95655d1 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerUtils.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/TypeSerializerUtils.java @@ -18,6 +18,12 @@ package org.apache.flink.api.common.typeutils; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; + +import java.io.IOException; import java.util.Arrays; /** Utilities for dealing with the {@link TypeSerializer} and the {@link TypeSerializerSnapshot}. */ @@ -38,4 +44,34 @@ public static TypeSerializerSnapshot[] snapshot( /** This class is not meanto to be instantiated. */ private TypeSerializerUtils() {} + + /** + * Writes the given snapshot to the out stream. One should always use this method to write + * snapshots out, rather than directly calling {@link TypeSerializerSnapshot#writeSnapshot(DataOutputView)}. + * + *

The snapshot written with this method can be read via {@link + * #readVersionedSnapshot(DataInputView, ClassLoader)}. + */ + public static void writeVersionedSnapshot(DataOutputView out, TypeSerializerSnapshot snapshot) + throws IOException { + out.writeUTF(snapshot.getClass().getName()); + out.writeInt(snapshot.getCurrentVersion()); + snapshot.writeSnapshot(out); + } + + /** + * Reads a snapshot from the stream, performing resolving + * + *

This method reads snapshots written by {@link #writeVersionedSnapshot(DataOutputView, + * TypeSerializerSnapshot)}. + */ + public static TypeSerializerSnapshot readVersionedSnapshot(DataInputView in, ClassLoader cl) + throws IOException { + final TypeSerializerSnapshot snapshot = + TypeSerializerSnapshotSerializationUtil.readAndInstantiateSnapshotClass(in, cl); + + int version = in.readInt(); + snapshot.readSnapshot(version, in, cl); + return snapshot; + } } diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/UnloadableDummyTypeSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/UnloadableDummyTypeSerializer.java index a43e70e75fd65..7dba57b76a3e1 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/UnloadableDummyTypeSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/UnloadableDummyTypeSerializer.java @@ -18,8 +18,10 @@ package org.apache.flink.api.common.typeutils; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.util.Preconditions; import javax.annotation.Nullable; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java index 9c8d6a9e95958..d4bbbc6aa71b4 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BasicTypeComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigDecComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigDecComparator.java index 9a61f96a6328d..9e0d79dec38b5 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigDecComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigDecComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigDecSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigDecSerializer.java index ad5fabe7cb505..3d19bcd96e0ad 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigDecSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigDecSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.math.BigDecimal; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigIntComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigIntComparator.java index a6514b0707528..275863e356187 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigIntComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigIntComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigIntSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigIntSerializer.java index 802f0d15c0603..b8c1b7b7db99a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigIntSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BigIntSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.math.BigInteger; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanComparator.java index cb3a70d5b1996..da537bb17e41e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java index dc1f5fbfc99ac..860d5c501732a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueComparator.java index 6d8761035c19b..5054da0eaa625 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.BooleanValue; import org.apache.flink.types.NormalizableKey; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializer.java index e124e315abe96..dbad7aeb7dbfc 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.BooleanValue; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteComparator.java index e9c510ff3a584..035472b827410 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java index 50c0e8331b863..00f4df615405c 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueComparator.java index 997337f2e834d..3865029353634 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.ByteValue; import org.apache.flink.types.NormalizableKey; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializer.java index 2116ff6706c88..c6327628e1cb9 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.ByteValue; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharComparator.java index 73b88f7ebdd13..2178fc34158e1 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java index 803f24da1d607..1fc6ac1799bca 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueComparator.java index ce051ca4d41c5..4d196506f2914 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.CharValue; import org.apache.flink.types.NormalizableKey; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueSerializer.java index 3d01fc63e563a..3d01f51939b1f 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/CharValueSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.CharValue; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateComparator.java index f1c48b137b8b9..ff6de977e51f3 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateSerializer.java index 1c6cad743d779..64f7520fb965c 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DateSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Date; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleComparator.java index e4e44fb1d1240..4663eb060de98 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java index d9b6585eab996..4256b483bc30b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueComparator.java index 19ccb1a334bd7..9490e23264295 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.DoubleValue; import org.apache.flink.types.NormalizableKey; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializer.java index e6cbbd58ec804..ef28c9bf92279 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.DoubleValue; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumComparator.java index fc126278e5e94..3e55ee294ce82 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumSerializer.java index ca7d1fc56326a..0da13c8a2e9dd 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/EnumSerializer.java @@ -20,11 +20,11 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java index 60a04dc6edc34..1747da8aa1ead 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java index 942ca884e0af8..c2b3c8286aa0e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueComparator.java index 44dd29949203a..2ccf1af692799 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.FloatValue; import org.apache.flink.types.NormalizableKey; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializer.java index 5c268fa0be0e4..a345f4e982e84 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.FloatValue; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/GenericArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/GenericArraySerializer.java index 7b2a56736bd87..86a8d6f7a72cb 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/GenericArraySerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/GenericArraySerializer.java @@ -19,9 +19,9 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.lang.reflect.Array; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/GenericArraySerializerSnapshot.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/GenericArraySerializerSnapshot.java index 6e24edeb13b65..48fb562bddd09 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/GenericArraySerializerSnapshot.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/GenericArraySerializerSnapshot.java @@ -19,11 +19,11 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/InstantComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/InstantComparator.java index 20e99f57e5654..e68a21ee09a7a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/InstantComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/InstantComparator.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/InstantSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/InstantSerializer.java index 85fcff7007d16..a3bd2527a99ed 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/InstantSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/InstantSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.time.Instant; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntComparator.java index e3e8e515e3ab2..7d5ca1bedfdc4 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java index d87adc1b60791..7fa7ba8d05bda 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueComparator.java index 04e73669586a3..27c3ab5d5871f 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.IntValue; import org.apache.flink.types.NormalizableKey; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueSerializer.java index 7e03785a1d064..4035b34de8297 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/IntValueSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.IntValue; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ListSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ListSerializer.java index 3ee54671583ca..7f7ba87d41bfb 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ListSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ListSerializer.java @@ -19,10 +19,10 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.ArrayList; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ListSerializerSnapshot.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ListSerializerSnapshot.java index 836b19fce73c5..38b0e86889dfb 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ListSerializerSnapshot.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ListSerializerSnapshot.java @@ -19,8 +19,8 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import java.util.List; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateComparator.java index 107cb3e5a1239..bb3d7fb9b1645 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateSerializer.java index 3b522afc0bd84..eb3f09ff1804c 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.time.LocalDate; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeComparator.java index 3a6870993d692..3c6a808976634 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeSerializer.java index c0b8c9f716a7c..93c63498bdb68 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.time.LocalDate; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalTimeComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalTimeComparator.java index 2ebf098f66b27..10d076cbf7db1 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalTimeComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalTimeComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalTimeSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalTimeSerializer.java index 18a328c0c3ac3..fe45583fc901e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalTimeSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LocalTimeSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.time.LocalTime; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongComparator.java index 98c91e0e7fdfa..386b41ca107f2 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java index 9411ec66c87f3..42ee3a48efc7d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueComparator.java index e67048f4d2cb8..4b2723e6efed6 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.LongValue; import org.apache.flink.types.NormalizableKey; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueSerializer.java index 98633862740bd..c8fd90a066da1 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/LongValueSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.LongValue; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/MapSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/MapSerializer.java index fb2713251de82..5d49343738424 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/MapSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/MapSerializer.java @@ -19,10 +19,10 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.CollectionUtil; import org.apache.flink.util.Preconditions; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/MapSerializerSnapshot.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/MapSerializerSnapshot.java index c565808b5c0c8..ccd26114ab414 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/MapSerializerSnapshot.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/MapSerializerSnapshot.java @@ -19,8 +19,8 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import java.util.Map; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/NullValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/NullValueComparator.java index d36ceab059d83..3ce24cb430648 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/NullValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/NullValueComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.NormalizableKey; import org.apache.flink.types.NullValue; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/NullValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/NullValueSerializer.java index 617d190de463a..68f25c05ac0c1 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/NullValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/NullValueSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.NullValue; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortComparator.java index 2a6808300cea9..f48e8403c7460 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java index 11ac32f79a1f4..25d0bc39c021d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueComparator.java index c76fdcaecb621..364cdc67eaf59 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.NormalizableKey; import org.apache.flink.types.ShortValue; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializer.java index a7d976b49817c..405d4e4fe546d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.ShortValue; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlDateSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlDateSerializer.java index 8a3893ccb6792..85cd2c38d60cf 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlDateSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlDateSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.sql.Date; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlTimeSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlTimeSerializer.java index 0531cee96e8d8..2515662aff761 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlTimeSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlTimeSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.sql.Time; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlTimestampComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlTimestampComparator.java index 465d4f226f6c5..c25d533f6db3e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlTimestampComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlTimestampComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlTimestampSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlTimestampSerializer.java index b9a6996f71722..72a79fa51ef3f 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlTimestampSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/SqlTimestampSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.sql.Timestamp; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringComparator.java index a88c7784374d1..51aa0f5a017c8 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringComparator.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.StringValue; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java index 72a03b460bab1..797732c958297 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.StringValue; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueComparator.java index 613277446e9a1..7c73debce3854 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.NormalizableKey; import org.apache.flink.types.StringValue; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueSerializer.java index fac7eb4ce43bb..088b2189d6237 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/StringValueSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.StringValue; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/TypeSerializerSingleton.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/TypeSerializerSingleton.java index 5d1c56a003ca1..b4d0e091d1b5b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/TypeSerializerSingleton.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/TypeSerializerSingleton.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; @Internal public abstract class TypeSerializerSingleton extends TypeSerializer { diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/VoidSerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/VoidSerializer.java index 6a9e09b7112d3..6daacb0941046 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/VoidSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/VoidSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializer.java index 6d4c0753ba712..005fd6defe405 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializer.java index d3ddc29d5093f..79df0ec063871 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializer.java index 27409fde48cf6..01fc4e68ef5c5 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializer.java index 6a342bc5323b7..17c536ea8fbfc 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializer.java index 179ccf1eaa6c3..05df0d2d40ec7 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializer.java index a2cafc057ab2a..b878c42359600 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializer.java index 2e689c480de6f..1648395e4f23a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/PrimitiveArrayComparator.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/PrimitiveArrayComparator.java index 1aa367ef875c1..babbb1aea7d8c 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/PrimitiveArrayComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/PrimitiveArrayComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.base.BasicTypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializer.java index 9a01c1f2dadc9..db397ae98fc81 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializer.java b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializer.java index b4ba7c182a8d5..3757ebb79449b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.StringValue; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/connector/sink2/WriterInitContext.java b/flink-core/src/main/java/org/apache/flink/api/connector/sink2/WriterInitContext.java index 2211ce47bd6f6..5b68db4655805 100644 --- a/flink-core/src/main/java/org/apache/flink/api/connector/sink2/WriterInitContext.java +++ b/flink-core/src/main/java/org/apache/flink/api/connector/sink2/WriterInitContext.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.operators.MailboxExecutor; import org.apache.flink.api.common.operators.ProcessingTimeService; import org.apache.flink.api.common.serialization.SerializationSchema; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.metrics.groups.SinkWriterMetricGroup; import org.apache.flink.util.UserCodeClassLoader; diff --git a/flink-core/src/main/java/org/apache/flink/api/connector/source/lib/NumberSequenceSource.java b/flink-core/src/main/java/org/apache/flink/api/connector/source/lib/NumberSequenceSource.java index 53e6a2832b7be..c9d96c333e4ce 100644 --- a/flink-core/src/main/java/org/apache/flink/api/connector/source/lib/NumberSequenceSource.java +++ b/flink-core/src/main/java/org/apache/flink/api/connector/source/lib/NumberSequenceSource.java @@ -33,9 +33,9 @@ import org.apache.flink.api.java.typeutils.ResultTypeQueryable; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.NumberSequenceIterator; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/AvroUtils.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/AvroUtils.java index 23b3a4c83d395..685543cbaab91 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/AvroUtils.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/AvroUtils.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.KryoRegistration; import org.apache.flink.api.java.typeutils.runtime.kryo.Serializers; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/EitherTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/EitherTypeInfo.java index 58064c5921fa7..08e38d5482aa6 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/EitherTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/EitherTypeInfo.java @@ -22,7 +22,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.EitherSerializer; import org.apache.flink.types.Either; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/EnumTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/EnumTypeInfo.java index 7e4dd71fb6c27..7a74fcbc220e2 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/EnumTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/EnumTypeInfo.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeinfo.AtomicType; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.EnumComparator; import org.apache.flink.api.common.typeutils.base.EnumSerializer; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/GenericTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/GenericTypeInfo.java index 69d0752c82b34..52225f4d3df1e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/GenericTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/GenericTypeInfo.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeinfo.AtomicType; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.GenericTypeComparator; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/ListTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/ListTypeInfo.java index e58544f337a94..60c3cc787ea27 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/ListTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/ListTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import java.util.List; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/MapTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/MapTypeInfo.java index 7e5eb5942417a..47b527caa83ca 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/MapTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/MapTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.util.Preconditions; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/MissingTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/MissingTypeInfo.java index 34d3a21f3522a..fa2d3bbd3995d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/MissingTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/MissingTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.InvalidTypesException; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** * A special type information signifying that the type extraction failed. It contains additional diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java index b7e5740506e61..feb0eaa9dde71 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/ObjectArrayTypeInfo.java @@ -22,7 +22,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.GenericArraySerializer; import java.lang.reflect.Array; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/PojoTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/PojoTypeInfo.java index 7c09ca1d9de70..73763e47c0f9a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/PojoTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/PojoTypeInfo.java @@ -26,7 +26,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.CompositeType; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.PojoComparator; import org.apache.flink.api.java.typeutils.runtime.PojoSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/RowTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/RowTypeInfo.java index 394a75d3b7a04..66389f8be9fef 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/RowTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/RowTypeInfo.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.CompositeType; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.RowComparator; import org.apache.flink.api.java.typeutils.runtime.RowSerializer; import org.apache.flink.types.Row; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TupleTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TupleTypeInfo.java index 9162d57e2e19c..a75d51aa32cbe 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TupleTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TupleTypeInfo.java @@ -26,7 +26,7 @@ import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple; import org.apache.flink.api.java.tuple.Tuple0; import org.apache.flink.api.java.typeutils.runtime.Tuple0Serializer; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java index 2a2c6a32e4053..651387230ae30 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/ValueTypeInfo.java @@ -26,7 +26,7 @@ import org.apache.flink.api.common.typeinfo.AtomicType; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.BooleanValueComparator; import org.apache.flink.api.common.typeutils.base.BooleanValueSerializer; import org.apache.flink.api.common.typeutils.base.ByteValueComparator; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java index b3c2372f8ad01..b927fe14fcdda 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.CopyableValue; import org.apache.flink.types.NormalizableKey; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java index 45e36f93095ba..99f9e3a4cb0fc 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.GenericTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.CopyableValue; import org.apache.flink.util.InstantiationUtil; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputViewStream.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputViewStream.java index 8137413ad72f1..1d1e413c3531b 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputViewStream.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataInputViewStream.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import java.io.EOFException; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputViewStream.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputViewStream.java index ab425344681c4..c68ca0d3e87b2 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputViewStream.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/DataOutputViewStream.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.io.OutputStream; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializer.java index 399be21766ccf..81d6b901c35fa 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializer.java @@ -19,9 +19,9 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.Either; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java index cfd7496c880f4..a0dfdbe1d37d6 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/GenericTypeComparator.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.NormalizableKey; import org.apache.flink.util.InstantiationUtil; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/JavaEitherSerializerSnapshot.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/JavaEitherSerializerSnapshot.java index e0fc4877b172b..545b3f13eccd4 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/JavaEitherSerializerSnapshot.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/JavaEitherSerializerSnapshot.java @@ -19,9 +19,9 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.types.Either; /** Snapshot class for the {@link EitherSerializer}. */ diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/KryoUtils.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/KryoUtils.java index 7e7a6d8565d53..d70479631f835 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/KryoUtils.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/KryoUtils.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.InstantiationUtil; import com.esotericsoftware.kryo.Kryo; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/MaskUtils.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/MaskUtils.java index faccc10d2a212..f6b6eef288295 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/MaskUtils.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/MaskUtils.java @@ -18,8 +18,8 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullAwareComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullAwareComparator.java index a2f5dfb31adf4..cd300f930540d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullAwareComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullAwareComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeComparator; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullableSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullableSerializer.java index 2517f101a4f90..c6cb704177244 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullableSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/NullableSerializer.java @@ -19,12 +19,12 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import javax.annotation.Nonnull; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java index d9d910592d077..71267712bcb9a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoComparator.java @@ -21,9 +21,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeComparator; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.NullKeyFieldException; import org.apache.flink.util.InstantiationUtil; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoFieldUtils.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoFieldUtils.java index e4950f6efe6d3..ea6f9f8b2907e 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoFieldUtils.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoFieldUtils.java @@ -19,8 +19,8 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; import javax.annotation.Nullable; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java index 95bf8895949c2..ef2bc6a1563a5 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.TypeExtractor; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.CollectionUtil; import javax.annotation.Nullable; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerSnapshot.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerSnapshot.java index cb8deb5b9e7cc..7ee96039dca51 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerSnapshot.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerSnapshot.java @@ -23,12 +23,12 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerUtil; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerUtil.IntermediateCompatibilityResult; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.CollectionUtil; import org.apache.flink.util.LinkedOptionalMap; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerSnapshotData.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerSnapshotData.java index 6b2bd112ad14f..92807cb375335 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerSnapshotData.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerSnapshotData.java @@ -19,10 +19,11 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; +import org.apache.flink.api.common.typeutils.TypeSerializerUtils; import org.apache.flink.util.CollectionUtil; import org.apache.flink.util.InstantiationUtil; import org.apache.flink.util.LinkedOptionalMap; @@ -191,17 +192,17 @@ void writeSnapshotData(DataOutputView out) throws IOException { out, fieldSerializerSnapshots, PojoFieldUtils::writeField, - TypeSerializerSnapshot::writeVersionedSnapshot); + TypeSerializerUtils::writeVersionedSnapshot); writeOptionalMap( out, registeredSubclassSerializerSnapshots, NoOpWriter.noopWriter(), - TypeSerializerSnapshot::writeVersionedSnapshot); + TypeSerializerUtils::writeVersionedSnapshot); writeOptionalMap( out, nonRegisteredSubclassSerializerSnapshots, NoOpWriter.noopWriter(), - TypeSerializerSnapshot::writeVersionedSnapshot); + TypeSerializerUtils::writeVersionedSnapshot); } private static PojoSerializerSnapshotData readSnapshotData( @@ -291,7 +292,7 @@ private static BiFunctionWithException { try { - return TypeSerializerSnapshot.readVersionedSnapshot(input, cl); + return TypeSerializerUtils.readVersionedSnapshot(input, cl); } catch (Throwable t) { LOG.warn("Exception while reading serializer snapshot.", t); return null; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowComparator.java index 65c57f788d378..948500abffb81 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowComparator.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeComparator; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple4; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.KeyFieldOutOfBoundsException; import org.apache.flink.types.Row; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowSerializer.java index cef69e27ed231..2950aadcd99ef 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RowSerializer.java @@ -20,11 +20,11 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.typeutils.RowTypeInfo; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.Row; import org.apache.flink.types.RowKind; import org.apache.flink.types.RowUtils; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeSerializerFactory.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeSerializerFactory.java index 9b8f541daa32d..763bf0ff10792 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeSerializerFactory.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/RuntimeSerializerFactory.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.configuration.Configuration; import org.apache.flink.util.InstantiationUtil; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/Tuple0Serializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/Tuple0Serializer.java index bbd43e782e802..14c1f94598bbe 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/Tuple0Serializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/Tuple0Serializer.java @@ -14,11 +14,11 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.tuple.Tuple0; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.Preconditions; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/Tuple0SerializerSnapshot.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/Tuple0SerializerSnapshot.java index b5687776a9674..a780fe113f5ed 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/Tuple0SerializerSnapshot.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/Tuple0SerializerSnapshot.java @@ -14,7 +14,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.tuple.Tuple0; /** A {@link TypeSerializerSnapshot} for {@link Tuple0Serializer}. */ diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java index ab7c7fb53bccb..239682567b800 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparator.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.KeyFieldOutOfBoundsException; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java index 6fa8fd6aa8e0c..2dd95be2f29e5 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorBase.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeComparator; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.KeyFieldOutOfBoundsException; import org.apache.flink.types.NullKeyFieldException; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java index fe7d7fd61ebc2..e7076dc3fd9f5 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializer.java @@ -19,11 +19,11 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.tuple.Tuple; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.NullFieldException; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerBase.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerBase.java index 15c833bce38ee..04b33aecfe8a5 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerBase.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerBase.java @@ -19,9 +19,9 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Arrays; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerSnapshot.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerSnapshot.java index 59406b1862416..63d8f08d5c61a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerSnapshot.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerSnapshot.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java index c5f6b5893f633..2887960304c30 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.NormalizableKey; import org.apache.flink.types.Value; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java index 666fbd66986fd..c49e3c81bd6c6 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.GenericTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.Value; import org.apache.flink.util.CollectionUtil; import org.apache.flink.util.InstantiationUtil; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializer.java index 0aa83b2f29804..23625e1d38648 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializer.java @@ -22,16 +22,16 @@ import org.apache.flink.api.common.SerializableSerializer; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.typeutils.AvroUtils; import org.apache.flink.api.java.typeutils.runtime.DataInputViewStream; import org.apache.flink.api.java.typeutils.runtime.DataOutputViewStream; import org.apache.flink.api.java.typeutils.runtime.KryoRegistration; import org.apache.flink.api.java.typeutils.runtime.KryoUtils; import org.apache.flink.api.java.typeutils.runtime.NoFetchingInput; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.CollectionUtil; import org.apache.flink.util.InstantiationUtil; import org.apache.flink.util.TernaryBoolean; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerSnapshot.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerSnapshot.java index 33b29d8629b45..10f8e674dac51 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerSnapshot.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerSnapshot.java @@ -19,12 +19,12 @@ package org.apache.flink.api.java.typeutils.runtime.kryo; import org.apache.flink.api.common.SerializableSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.typeutils.runtime.KryoRegistration; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.LinkedOptionalMap.MergeResult; import com.esotericsoftware.kryo.Serializer; diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerSnapshotData.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerSnapshotData.java index b527d8abd27ef..f430b15bb981a 100644 --- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerSnapshotData.java +++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerSnapshotData.java @@ -22,8 +22,8 @@ import org.apache.flink.api.java.typeutils.runtime.DataInputViewStream; import org.apache.flink.api.java.typeutils.runtime.DataOutputViewStream; import org.apache.flink.api.java.typeutils.runtime.KryoRegistration; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; import org.apache.flink.util.LinkedOptionalMap; import org.apache.flink.util.function.BiFunctionWithException; diff --git a/flink-core/src/main/java/org/apache/flink/configuration/Configuration.java b/flink-core/src/main/java/org/apache/flink/configuration/Configuration.java index d7294752788b7..61f94c0a7d256 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/Configuration.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/Configuration.java @@ -23,8 +23,8 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.core.io.IOReadableWritable; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.StringValue; import org.apache.flink.util.CollectionUtil; diff --git a/flink-core/src/main/java/org/apache/flink/configuration/DelegatingConfiguration.java b/flink-core/src/main/java/org/apache/flink/configuration/DelegatingConfiguration.java index dd9992b102263..f4b818bb6197b 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/DelegatingConfiguration.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/DelegatingConfiguration.java @@ -18,8 +18,8 @@ package org.apache.flink.configuration; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.Preconditions; import javax.annotation.Nonnull; diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/Path.java b/flink-core/src/main/java/org/apache/flink/core/fs/Path.java index 1e08f5a6d2723..a3b6a24874042 100644 --- a/flink-core/src/main/java/org/apache/flink/core/fs/Path.java +++ b/flink-core/src/main/java/org/apache/flink/core/fs/Path.java @@ -24,8 +24,8 @@ import org.apache.flink.annotation.Public; import org.apache.flink.core.io.IOReadableWritable; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.StringUtils; import javax.annotation.Nullable; diff --git a/flink-core/src/main/java/org/apache/flink/core/io/IOReadableWritable.java b/flink-core/src/main/java/org/apache/flink/core/io/IOReadableWritable.java index 1d5a226111efb..e14665caa55f8 100644 --- a/flink-core/src/main/java/org/apache/flink/core/io/IOReadableWritable.java +++ b/flink-core/src/main/java/org/apache/flink/core/io/IOReadableWritable.java @@ -19,8 +19,8 @@ package org.apache.flink.core.io; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/core/io/PostVersionedIOReadableWritable.java b/flink-core/src/main/java/org/apache/flink/core/io/PostVersionedIOReadableWritable.java index 21156ba9016b9..8ca314addd628 100644 --- a/flink-core/src/main/java/org/apache/flink/core/io/PostVersionedIOReadableWritable.java +++ b/flink-core/src/main/java/org/apache/flink/core/io/PostVersionedIOReadableWritable.java @@ -19,9 +19,9 @@ package org.apache.flink.core.io; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.IOUtils; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerialization.java b/flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerialization.java index 47ac388d2fdb6..a7ae0cc012538 100644 --- a/flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerialization.java +++ b/flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerialization.java @@ -19,8 +19,8 @@ package org.apache.flink.core.io; import org.apache.flink.annotation.PublicEvolving; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.ArrayList; diff --git a/flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerializerAdapter.java b/flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerializerAdapter.java index 03056be26a99d..3f77dff97cf3a 100644 --- a/flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerializerAdapter.java +++ b/flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerializerAdapter.java @@ -19,7 +19,7 @@ package org.apache.flink.core.io; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; diff --git a/flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerializerTypeSerializerProxy.java b/flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerializerTypeSerializerProxy.java index 461a2b16e03e6..75f24e733442a 100644 --- a/flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerializerTypeSerializerProxy.java +++ b/flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerializerTypeSerializerProxy.java @@ -19,10 +19,10 @@ package org.apache.flink.core.io; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; import org.apache.flink.util.function.SerializableSupplier; diff --git a/flink-core/src/main/java/org/apache/flink/core/io/VersionedIOReadableWritable.java b/flink-core/src/main/java/org/apache/flink/core/io/VersionedIOReadableWritable.java index 46e20bc325c1e..7129a10d33f1d 100644 --- a/flink-core/src/main/java/org/apache/flink/core/io/VersionedIOReadableWritable.java +++ b/flink-core/src/main/java/org/apache/flink/core/io/VersionedIOReadableWritable.java @@ -19,8 +19,8 @@ package org.apache.flink.core.io; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Arrays; diff --git a/flink-core/src/main/java/org/apache/flink/core/memory/DataInputDeserializer.java b/flink-core/src/main/java/org/apache/flink/core/memory/DataInputDeserializer.java index b7c83f554f91d..9ba72dd5d37dc 100644 --- a/flink-core/src/main/java/org/apache/flink/core/memory/DataInputDeserializer.java +++ b/flink-core/src/main/java/org/apache/flink/core/memory/DataInputDeserializer.java @@ -18,6 +18,8 @@ package org.apache.flink.core.memory; +import org.apache.flink.api.common.memory.DataInputView; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/flink-core/src/main/java/org/apache/flink/core/memory/DataInputViewStreamWrapper.java b/flink-core/src/main/java/org/apache/flink/core/memory/DataInputViewStreamWrapper.java index 6f15de797912e..933e801e91e26 100644 --- a/flink-core/src/main/java/org/apache/flink/core/memory/DataInputViewStreamWrapper.java +++ b/flink-core/src/main/java/org/apache/flink/core/memory/DataInputViewStreamWrapper.java @@ -19,6 +19,7 @@ package org.apache.flink.core.memory; import org.apache.flink.annotation.PublicEvolving; +import org.apache.flink.api.common.memory.DataInputView; import java.io.DataInputStream; import java.io.EOFException; diff --git a/flink-core/src/main/java/org/apache/flink/core/memory/DataOutputSerializer.java b/flink-core/src/main/java/org/apache/flink/core/memory/DataOutputSerializer.java index 7cf802a91a8cf..34c1624924c4c 100644 --- a/flink-core/src/main/java/org/apache/flink/core/memory/DataOutputSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/core/memory/DataOutputSerializer.java @@ -18,6 +18,8 @@ package org.apache.flink.core.memory; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.Preconditions; import java.io.EOFException; diff --git a/flink-core/src/main/java/org/apache/flink/core/memory/DataOutputViewStreamWrapper.java b/flink-core/src/main/java/org/apache/flink/core/memory/DataOutputViewStreamWrapper.java index 7f2af72124cbf..ec6dab485c957 100644 --- a/flink-core/src/main/java/org/apache/flink/core/memory/DataOutputViewStreamWrapper.java +++ b/flink-core/src/main/java/org/apache/flink/core/memory/DataOutputViewStreamWrapper.java @@ -19,6 +19,8 @@ package org.apache.flink.core.memory; import org.apache.flink.annotation.PublicEvolving; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.DataOutputStream; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/core/memory/SeekableDataInputView.java b/flink-core/src/main/java/org/apache/flink/core/memory/SeekableDataInputView.java index 018852c5e2e79..8119cc166c832 100644 --- a/flink-core/src/main/java/org/apache/flink/core/memory/SeekableDataInputView.java +++ b/flink-core/src/main/java/org/apache/flink/core/memory/SeekableDataInputView.java @@ -19,6 +19,7 @@ package org.apache.flink.core.memory; import org.apache.flink.annotation.PublicEvolving; +import org.apache.flink.api.common.memory.DataInputView; /** * Interface marking a {@link DataInputView} as seekable. Seekable views can set the position where diff --git a/flink-core/src/main/java/org/apache/flink/core/memory/SeekableDataOutputView.java b/flink-core/src/main/java/org/apache/flink/core/memory/SeekableDataOutputView.java index 9f5621ce2f28c..2b84458b5177d 100644 --- a/flink-core/src/main/java/org/apache/flink/core/memory/SeekableDataOutputView.java +++ b/flink-core/src/main/java/org/apache/flink/core/memory/SeekableDataOutputView.java @@ -19,6 +19,7 @@ package org.apache.flink.core.memory; import org.apache.flink.annotation.PublicEvolving; +import org.apache.flink.api.common.memory.DataOutputView; /** * Interface marking a {@link DataOutputView} as seekable. Seekable views can set the position where diff --git a/flink-core/src/main/java/org/apache/flink/types/BooleanValue.java b/flink-core/src/main/java/org/apache/flink/types/BooleanValue.java index c25a467af1f58..43793baff82d6 100644 --- a/flink-core/src/main/java/org/apache/flink/types/BooleanValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/BooleanValue.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/types/ByteValue.java b/flink-core/src/main/java/org/apache/flink/types/ByteValue.java index 73b436efc4a4f..76ab3593ff1ff 100644 --- a/flink-core/src/main/java/org/apache/flink/types/ByteValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/ByteValue.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/types/CharValue.java b/flink-core/src/main/java/org/apache/flink/types/CharValue.java index 1a6c60614cc8f..e2b6dd7af9eba 100644 --- a/flink-core/src/main/java/org/apache/flink/types/CharValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/CharValue.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/types/CopyableValue.java b/flink-core/src/main/java/org/apache/flink/types/CopyableValue.java index f06d52c907a17..bcaf67bfd93c0 100644 --- a/flink-core/src/main/java/org/apache/flink/types/CopyableValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/CopyableValue.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/types/DoubleValue.java b/flink-core/src/main/java/org/apache/flink/types/DoubleValue.java index 45f0346b1c3e7..01dd4f2ec16d0 100644 --- a/flink-core/src/main/java/org/apache/flink/types/DoubleValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/DoubleValue.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/types/Either.java b/flink-core/src/main/java/org/apache/flink/types/Either.java index 071c2cff0fef8..22899505d1a8a 100644 --- a/flink-core/src/main/java/org/apache/flink/types/Either.java +++ b/flink-core/src/main/java/org/apache/flink/types/Either.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.Public; import org.apache.flink.api.common.typeinfo.TypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.EitherTypeInfoFactory; import org.apache.flink.api.java.typeutils.runtime.EitherSerializer; diff --git a/flink-core/src/main/java/org/apache/flink/types/FloatValue.java b/flink-core/src/main/java/org/apache/flink/types/FloatValue.java index 3bc83cd3e0423..abc9964481cc1 100644 --- a/flink-core/src/main/java/org/apache/flink/types/FloatValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/FloatValue.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/types/IntValue.java b/flink-core/src/main/java/org/apache/flink/types/IntValue.java index 508f47a275a8c..1fb3f17d37177 100644 --- a/flink-core/src/main/java/org/apache/flink/types/IntValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/IntValue.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/types/ListValue.java b/flink-core/src/main/java/org/apache/flink/types/ListValue.java index 229d1308447f9..9218c68a30042 100644 --- a/flink-core/src/main/java/org/apache/flink/types/ListValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/ListValue.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.ReflectionUtil; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/types/LongValue.java b/flink-core/src/main/java/org/apache/flink/types/LongValue.java index c94576fadd4cd..5c755c0317547 100644 --- a/flink-core/src/main/java/org/apache/flink/types/LongValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/LongValue.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/types/MapValue.java b/flink-core/src/main/java/org/apache/flink/types/MapValue.java index b619c89a7b109..19c55ad56bcc6 100644 --- a/flink-core/src/main/java/org/apache/flink/types/MapValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/MapValue.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.ReflectionUtil; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/types/NullValue.java b/flink-core/src/main/java/org/apache/flink/types/NullValue.java index 4d1aa2f53ed45..d26c732ce513e 100644 --- a/flink-core/src/main/java/org/apache/flink/types/NullValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/NullValue.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/types/Record.java b/flink-core/src/main/java/org/apache/flink/types/Record.java index a7b6f989b7db3..78a4e58a4cb98 100644 --- a/flink-core/src/main/java/org/apache/flink/types/Record.java +++ b/flink-core/src/main/java/org/apache/flink/types/Record.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemoryUtils; import org.apache.flink.util.InstantiationUtil; @@ -1221,7 +1221,7 @@ private void initFields(final byte[] data, final int begin, final int len) { /** * Writes this record to the given output view. This method is similar to {@link - * org.apache.flink.core.io.IOReadableWritable#write(org.apache.flink.core.memory.DataOutputView)}, + * org.apache.flink.core.io.IOReadableWritable#write(DataOutputView)}, * but it returns the number of bytes written. * * @param target The view to write the record to. diff --git a/flink-core/src/main/java/org/apache/flink/types/ShortValue.java b/flink-core/src/main/java/org/apache/flink/types/ShortValue.java index d2163b57de205..29b179ede62ac 100644 --- a/flink-core/src/main/java/org/apache/flink/types/ShortValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/ShortValue.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/types/StringValue.java b/flink-core/src/main/java/org/apache/flink/types/StringValue.java index a9e2ad4e10145..530c47a6f1730 100644 --- a/flink-core/src/main/java/org/apache/flink/types/StringValue.java +++ b/flink-core/src/main/java/org/apache/flink/types/StringValue.java @@ -19,8 +19,8 @@ package org.apache.flink.types; import org.apache.flink.annotation.Public; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.DataInput; diff --git a/flink-core/src/main/java/org/apache/flink/util/InstantiationUtil.java b/flink-core/src/main/java/org/apache/flink/util/InstantiationUtil.java index 334a30cde88df..60f1ede249a82 100644 --- a/flink-core/src/main/java/org/apache/flink/util/InstantiationUtil.java +++ b/flink-core/src/main/java/org/apache/flink/util/InstantiationUtil.java @@ -19,10 +19,10 @@ package org.apache.flink.util; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.io.IOReadableWritable; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; diff --git a/flink-core/src/main/java/org/apache/flink/util/LinkedOptionalMapSerializer.java b/flink-core/src/main/java/org/apache/flink/util/LinkedOptionalMapSerializer.java index e9f4976f2efcf..0c413f70e0809 100644 --- a/flink-core/src/main/java/org/apache/flink/util/LinkedOptionalMapSerializer.java +++ b/flink-core/src/main/java/org/apache/flink/util/LinkedOptionalMapSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.function.BiConsumerWithException; import org.apache.flink.util.function.BiFunctionWithException; diff --git a/flink-core/src/main/java/org/apache/flink/util/StringUtils.java b/flink-core/src/main/java/org/apache/flink/util/StringUtils.java index 164bb609da295..8683c52324ae0 100644 --- a/flink-core/src/main/java/org/apache/flink/util/StringUtils.java +++ b/flink-core/src/main/java/org/apache/flink/util/StringUtils.java @@ -19,8 +19,8 @@ package org.apache.flink.util; import org.apache.flink.annotation.PublicEvolving; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.StringValue; import javax.annotation.Nonnull; diff --git a/flink-core/src/main/java/org/apache/flink/util/Utils.java b/flink-core/src/main/java/org/apache/flink/util/Utils.java index cda91d9401ca6..9716becdd80a2 100644 --- a/flink-core/src/main/java/org/apache/flink/util/Utils.java +++ b/flink-core/src/main/java/org/apache/flink/util/Utils.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.io.RichOutputFormat; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.CompositeType; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.GenericTypeInfo; import org.apache.flink.configuration.Configuration; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/ExecutionConfigTest.java b/flink-core/src/test/java/org/apache/flink/api/common/ExecutionConfigTest.java index 2fdc3ec08de37..bebf3934723b2 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/ExecutionConfigTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/ExecutionConfigTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.GenericTypeInfo; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; import org.apache.flink.configuration.Configuration; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java b/flink-core/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java index ce40b8019fb18..d6e249b8a87fc 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/io/BinaryInputFormatTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.io.statistics.BaseStatistics; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.fs.FileInputSplit; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.testutils.junit.utils.TempDirUtils; import org.apache.flink.types.Record; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/state/ListStateDescriptorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/state/ListStateDescriptorTest.java index e60c93dd49d31..5e139e1d93a8d 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/state/ListStateDescriptorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/state/ListStateDescriptorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/state/MapStateDescriptorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/state/MapStateDescriptorTest.java index f65edcfae263e..a0dc2aec75559 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/state/MapStateDescriptorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/state/MapStateDescriptorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/state/ReducingStateDescriptorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/state/ReducingStateDescriptorTest.java index 2a31220045b1f..4792a4789edf7 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/state/ReducingStateDescriptorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/state/ReducingStateDescriptorTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; import org.apache.flink.core.testutils.CommonTestUtils; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/state/StateDescriptorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/state/StateDescriptorTest.java index c9ca47004086a..db0c18032a7eb 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/state/StateDescriptorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/state/StateDescriptorTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.typeutils.PojoTypeInfo; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/state/ValueStateDescriptorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/state/ValueStateDescriptorTest.java index 22b852bd75988..6a5309958a073 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/state/ValueStateDescriptorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/state/ValueStateDescriptorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; import org.apache.flink.configuration.ConfigConstants; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/ComparatorTestBase.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/ComparatorTestBase.java index ace4a396d75bd..54c5aa12a76c4 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/ComparatorTestBase.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/ComparatorTestBase.java @@ -19,8 +19,9 @@ package org.apache.flink.api.common.typeutils; import org.apache.flink.api.common.operators.Order; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeSerializerTest.java index f40fca5148dc4..543bf8b189ede 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeSerializerTest.java @@ -20,13 +20,15 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.BooleanSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.TypeExtractor; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.junit.jupiter.api.Test; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerSnapshotTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerSnapshotTest.java index 64580d09457ba..edab7b7826c8d 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerSnapshotTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerSnapshotTest.java @@ -18,11 +18,14 @@ package org.apache.flink.api.common.typeutils; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.junit.jupiter.api.Test; @@ -189,11 +192,11 @@ void testNestedFieldSerializerArityMismatchPrecedence() throws IOException { testSerializer.snapshotConfiguration(); DataOutputSerializer out = new DataOutputSerializer(128); - TypeSerializerSnapshot.writeVersionedSnapshot(out, testSerializerSnapshot); + TypeSerializerUtils.writeVersionedSnapshot(out, testSerializerSnapshot); DataInputDeserializer in = new DataInputDeserializer(out.getCopyOfBuffer()); testSerializerSnapshot = - TypeSerializerSnapshot.readVersionedSnapshot( + TypeSerializerUtils.readVersionedSnapshot( in, Thread.currentThread().getContextClassLoader()); TestCompositeTypeSerializer newTestSerializer = @@ -225,11 +228,11 @@ void testRestoreCompositeTypeSerializer() throws IOException { testSerializer.snapshotConfiguration(); DataOutputSerializer out = new DataOutputSerializer(128); - TypeSerializerSnapshot.writeVersionedSnapshot(out, testSerializerSnapshot); + TypeSerializerUtils.writeVersionedSnapshot(out, testSerializerSnapshot); DataInputDeserializer in = new DataInputDeserializer(out.getCopyOfBuffer()); testSerializerSnapshot = - TypeSerializerSnapshot.readVersionedSnapshot( + TypeSerializerUtils.readVersionedSnapshot( in, Thread.currentThread().getContextClassLoader()); // now, restore the composite type serializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerUpgradeTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerUpgradeTest.java index eeaece4b2600e..dc6057ac1f88d 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerUpgradeTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerUpgradeTest.java @@ -19,6 +19,8 @@ package org.apache.flink.api.common.typeutils; import org.apache.flink.FlinkVersion; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.base.GenericArraySerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerUtilTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerUtilTest.java index b688f1ac0594e..4e1603dbe5055 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerUtilTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerUtilTest.java @@ -18,6 +18,8 @@ package org.apache.flink.api.common.typeutils; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerUtil.IntermediateCompatibilityResult; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.testutils.migration.SchemaCompatibilityTestingSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java index 167b59211f060..f26d0bbbd4fb0 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestBase.java @@ -18,13 +18,16 @@ package org.apache.flink.api.common.typeutils; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.typeutils.runtime.NullableSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.testutils.CustomEqualityMatcher; import org.apache.flink.testutils.DeeplyEqualsChecker; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java index fb4efe7261240..77dc4cb0250f8 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/SerializerTestInstance.java @@ -18,6 +18,7 @@ package org.apache.flink.api.common.typeutils; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.testutils.DeeplyEqualsChecker; import org.junit.jupiter.api.Test; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeInformationTestBase.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeInformationTestBase.java index 529b99251ec89..ece4697078642 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeInformationTestBase.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeInformationTestBase.java @@ -20,6 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.InstantiationUtil; import org.junit.jupiter.api.Test; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerConditions.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerConditions.java index c33f7526afea9..c52957ed28747 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerConditions.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerConditions.java @@ -18,6 +18,8 @@ package org.apache.flink.api.common.typeutils; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.assertj.core.api.Condition; import java.util.function.Predicate; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotTest.java index b176adc482b36..90f8bc93f9eb1 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotTest.java @@ -18,9 +18,12 @@ package org.apache.flink.api.common.typeutils; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerUpgradeTestBase.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerUpgradeTestBase.java index ee278f29f80f9..c366867bed704 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerUpgradeTestBase.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerUpgradeTestBase.java @@ -19,10 +19,13 @@ package org.apache.flink.api.common.typeutils; import org.apache.flink.FlinkVersion; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.test.util.MigrationTest; import org.assertj.core.api.Condition; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BasicTypeSerializerUpgradeTestSpecifications.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BasicTypeSerializerUpgradeTestSpecifications.java index dffa004791a18..cf7f8294a2c98 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BasicTypeSerializerUpgradeTestSpecifications.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BasicTypeSerializerUpgradeTestSpecifications.java @@ -19,9 +19,9 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.types.BooleanValue; import org.apache.flink.types.ByteValue; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigDecComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigDecComparatorTest.java index 69648aba9ec31..15db86cd41312 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigDecComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigDecComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.math.BigDecimal; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigDecSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigDecSerializerTest.java index b056b74a74bca..b4932822b542b 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigDecSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigDecSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.math.BigDecimal; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigIntComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigIntComparatorTest.java index 21164e6891e11..100fc0c0dd69d 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigIntComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigIntComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.math.BigInteger; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigIntSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigIntSerializerTest.java index f7cd390d27d52..08667f2e69a6e 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigIntSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BigIntSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.math.BigInteger; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanComparatorTest.java index 6d1af6b4746e5..ffcf9cc3a8a12 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; class BooleanComparatorTest extends ComparatorTestBase { diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java index 5cec273ce8070..ac58eeaaaeb47 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanValueComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanValueComparatorTest.java index 8a22ba2f8e3d5..b0c4d0ba51c27 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanValueComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanValueComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.BooleanValue; class BooleanValueComparatorTest extends ComparatorTestBase { diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializerTest.java index e08e4c203081b..64414004ef60f 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanValueSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.BooleanValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java index 1645b71eed320..456c24f236153 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java index f5c97840e4107..2336d6ff2bd46 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteValueComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteValueComparatorTest.java index 7d3742a3052f6..cf421deacbf0c 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteValueComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteValueComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.ByteValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializerTest.java index 3b003dfe43f50..edd08bbae54a1 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteValueSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.ByteValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharComparatorTest.java index ff272b4a512a1..a5e10de678481 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharSerializerTest.java index be5b87e47fe86..dc3bb2ebe57df 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharValueComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharValueComparatorTest.java index 1363595205606..f7d209fdc78c1 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharValueComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharValueComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.CharValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharValueSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharValueSerializerTest.java index 3a1e78e9815e8..a307ba724f908 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharValueSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/CharValueSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.CharValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DateComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DateComparatorTest.java index cf3d798da5dee..204f018046361 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DateComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DateComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Date; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DateSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DateSerializerTest.java index 3d6ac694e630f..7438101878c03 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DateSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DateSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Date; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java index 663e251930744..ae45167db96f1 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java index 1075836b2f513..0a21743fe6f08 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleValueComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleValueComparatorTest.java index 75d61842f850e..e5f3ea9c91353 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleValueComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleValueComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.DoubleValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializerTest.java index 66cc3d188fc90..f4b902cf07220 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleValueSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.DoubleValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/EnumSerializerCompatibilityTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/EnumSerializerCompatibilityTest.java index 11ce9abcdd367..698e0b1b944e3 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/EnumSerializerCompatibilityTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/EnumSerializerCompatibilityTest.java @@ -18,8 +18,8 @@ package org.apache.flink.api.common.typeutils.base; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshotSerializationUtil; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/EnumSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/EnumSerializerTest.java index 6c7a0314acf1a..25f72b02a79af 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/EnumSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/EnumSerializerTest.java @@ -19,8 +19,8 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestInstance; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshotSerializationUtil; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/EnumSerializerUpgradeTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/EnumSerializerUpgradeTest.java index 837de9b3f9462..c8671f1471f84 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/EnumSerializerUpgradeTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/EnumSerializerUpgradeTest.java @@ -20,9 +20,9 @@ import org.apache.flink.FlinkVersion; import org.apache.flink.api.common.typeutils.ClassRelocator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.assertj.core.api.Condition; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java index f5c4d185ecb4c..f93a2cec0c2ca 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java index 7029dd5f368dd..e8c133643eb73 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatValueComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatValueComparatorTest.java index b01fc96f446bc..a0f1983820625 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatValueComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatValueComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.FloatValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializerTest.java index 90a72244c1bc5..1569679e78635 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatValueSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.FloatValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/InstantComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/InstantComparatorTest.java index 91eee5d42f3d6..e5599c58b9e39 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/InstantComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/InstantComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.time.Instant; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/InstantSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/InstantSerializerTest.java index b17c1863c4050..1dc22491c8fa3 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/InstantSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/InstantSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.time.Instant; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java index 06ad4400b4e1d..976a90c484562 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java index 61c2db0774226..74853a9d42ebb 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntValueComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntValueComparatorTest.java index 005b73014d03a..310520327cb1d 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntValueComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntValueComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.IntValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntValueSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntValueSerializerTest.java index 48e87f9b04989..bd3ac9564ab64 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntValueSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntValueSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.IntValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ListSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ListSerializerTest.java index 9d1d600339b49..429d7734dda9f 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ListSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ListSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.ArrayList; import java.util.Collections; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ListSerializerUpgradeTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ListSerializerUpgradeTest.java index beb0e28ff32e0..b86f867a5231b 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ListSerializerUpgradeTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ListSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.assertj.core.api.Condition; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateComparatorTest.java index 56cf00f9126bf..5821e4b928c5b 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.time.LocalDate; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateSerializerTest.java index 0872bdefd2f98..d33f52abc9f4a 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.time.LocalDate; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeComparatorTest.java index 0329dc32c940f..bcdadf89da5f6 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.time.LocalDateTime; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeSerializerTest.java index 958530a889326..1f64fef052d44 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalDateTimeSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.time.LocalDateTime; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalTimeComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalTimeComparatorTest.java index 8746d48f63774..dab21e3d0c6aa 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalTimeComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalTimeComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.time.LocalTime; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalTimeSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalTimeSerializerTest.java index 1d7acd17e0284..deb4f13e3990c 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalTimeSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LocalTimeSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.time.LocalTime; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java index d5c27a07deaf8..eafce9d4d872f 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java index 0bc872e4849ee..3b4134581a9d2 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongValueComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongValueComparatorTest.java index 26b2624d00ff5..3bf56784e4d45 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongValueComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongValueComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.LongValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongValueSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongValueSerializerTest.java index bc81c782c68b1..6d3181b39d1f9 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongValueSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongValueSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.LongValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/MapSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/MapSerializerTest.java index f84a124e5e86b..cc5cc50b67d79 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/MapSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/MapSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Collections; import java.util.HashMap; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/MapSerializerUpgradeTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/MapSerializerUpgradeTest.java index 91e8aaa95d19c..d5ae052096cea 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/MapSerializerUpgradeTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/MapSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.assertj.core.api.Condition; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java index 1e11b81d70676..7f678e16834f8 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java index b643c84a7e79f..20a5007f43103 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortValueComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortValueComparatorTest.java index 13c0289d0c1d9..c94f8f37626b0 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortValueComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortValueComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.ShortValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializerTest.java index 05aeae0b3535b..56d252f109e2a 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortValueSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.ShortValue; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlDateComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlDateComparatorTest.java index e958025795a92..d3e720b495b16 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlDateComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlDateComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.sql.Date; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlDateSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlDateSerializerTest.java index b1dd74d50211c..7fc130579f161 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlDateSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlDateSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.sql.Date; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimeComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimeComparatorTest.java index f4ce0fea3699f..252e3d08bd41f 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimeComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimeComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.sql.Time; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimeSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimeSerializerTest.java index a49f6d954c124..c40f47f5a6e27 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimeSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimeSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.sql.Time; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimestampComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimestampComparatorTest.java index e0fd8c5eeeb77..2d595b852303f 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimestampComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimestampComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.sql.Timestamp; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimestampSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimestampSerializerTest.java index bb93fd4b340dc..018fe64f001f5 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimestampSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/SqlTimestampSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.sql.Timestamp; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringComparatorTest.java index 80daf14a6e3c4..15cb4f0b2b399 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; class StringComparatorTest extends ComparatorTestBase { diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringSerializerTest.java index c0623479d24fd..0b438bf38b7bf 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** A test for the {@link org.apache.flink.api.common.typeutils.base.StringSerializer}. */ class StringSerializerTest extends SerializerTestBase { diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringValueComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringValueComparatorTest.java index d3eeaf03cd41e..3dc0886ff01e1 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringValueComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringValueComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.StringValue; class StringValueComparatorTest extends ComparatorTestBase { diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringValueSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringValueSerializerTest.java index e20d451b280f8..d8305f717133e 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringValueSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/StringValueSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.StringValue; /** A test for the {@link StringValueSerializer}. */ diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializerTest.java index 153a8b08ab398..7df17f6529d09 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BooleanPrimitiveArraySerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base.array; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** A test for the {@link BooleanPrimitiveArraySerializer}. */ class BooleanPrimitiveArraySerializerTest extends SerializerTestBase { diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializerTest.java index 3a4cb2efb8636..b433546191c8f 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/BytePrimitiveArraySerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base.array; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializerTest.java index b167c6eb5663d..2899b8ceffaf0 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/CharPrimitiveArraySerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base.array; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** A test for the {@link CharPrimitiveArraySerializer}. */ class CharPrimitiveArraySerializerTest extends SerializerTestBase { diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializerTest.java index 6a772c5891e23..5a6d405b3322d 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/DoublePrimitiveArraySerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base.array; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** A test for the {@link DoublePrimitiveArraySerializer}. */ class DoublePrimitiveArraySerializerTest extends SerializerTestBase { diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializerTest.java index c82dac83ca358..e00f80a0bcab5 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/FloatPrimitiveArraySerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base.array; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** A test for the {@link FloatPrimitiveArraySerializer}. */ class FloatPrimitiveArraySerializerTest extends SerializerTestBase { diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializerTest.java index 142a79c1bf0f9..d2aa4f8832420 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/IntPrimitiveArraySerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base.array; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** A test for the {@link IntPrimitiveArraySerializer}. */ class IntPrimitiveArraySerializerTest extends SerializerTestBase { diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializerTest.java index f50877b46ccfb..264d47477e83a 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/LongPrimitiveArraySerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base.array; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** * A test for the {@link diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/PrimitiveArrayComparatorTestBase.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/PrimitiveArrayComparatorTestBase.java index e181ea6f9be9f..29df661556f65 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/PrimitiveArrayComparatorTestBase.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/PrimitiveArrayComparatorTestBase.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.typeinfo.PrimitiveArrayTypeInfo; import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; abstract class PrimitiveArrayComparatorTestBase extends ComparatorTestBase { private final PrimitiveArrayTypeInfo info; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/PrimitiveArraySerializerUpgradeTestSpecifications.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/PrimitiveArraySerializerUpgradeTestSpecifications.java index 52615f78c8ff1..16d2345eaf9e1 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/PrimitiveArraySerializerUpgradeTestSpecifications.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/PrimitiveArraySerializerUpgradeTestSpecifications.java @@ -20,9 +20,9 @@ import org.apache.flink.FlinkVersion; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.java.typeutils.TypeExtractor; diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializerTest.java index 7f96b2331a47c..ee9600677321e 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/ShortPrimitiveArraySerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base.array; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** A test for the {@link ShortPrimitiveArraySerializer}. */ class ShortPrimitiveArraySerializerTest extends SerializerTestBase { diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializerTest.java index 3c5946313fa07..68eee37760eba 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/array/StringArraySerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.common.typeutils.base.array; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.StringUtils; import org.junit.jupiter.api.Test; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/PojoTypeExtractionTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/PojoTypeExtractionTest.java index 22d62bf622e5e..321218dd42536 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/PojoTypeExtractionTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/PojoTypeExtractionTest.java @@ -27,8 +27,8 @@ import org.apache.flink.api.java.tuple.Tuple1; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.tuple.Tuple3; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.Value; import lombok.Getter; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/TupleTypeInfoTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/TupleTypeInfoTest.java index 0662bbb42ec0c..b6926d016b504 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/TupleTypeInfoTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/TupleTypeInfoTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeutils.TypeInformationTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple1; import org.junit.jupiter.api.Test; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/TypeExtractorTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/TypeExtractorTest.java index 84c2a9255f04b..9fb969138287a 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/TypeExtractorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/TypeExtractorTest.java @@ -39,7 +39,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; import org.apache.flink.api.common.typeutils.CompositeType.FlatFieldDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple; import org.apache.flink.api.java.tuple.Tuple0; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoFactoryTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoFactoryTest.java index 2c49bed28779b..bbf17077b48c8 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoFactoryTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/TypeInfoFactoryTest.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeinfo.TypeInfo; import org.apache.flink.api.common.typeinfo.TypeInfoFactory; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple1; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/ValueTypeInfoTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/ValueTypeInfoTest.java index ca20cfe96c989..04b6a21898db6 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/ValueTypeInfoTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/ValueTypeInfoTest.java @@ -19,8 +19,8 @@ package org.apache.flink.api.java.typeutils; import org.apache.flink.api.common.typeutils.TypeInformationTestBase; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.Record; import org.apache.flink.types.Value; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericArraySerializerTest.java index 0b0c76c134d4f..dfe3f1b904f56 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericArraySerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericArraySerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.SerializerTestInstance; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.GenericArraySerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.typeutils.runtime.AbstractGenericTypeSerializerTest.Book; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeComparatorTest.java index 20315c1f4034c..98c3356ad4532 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeSerializerTest.java index 112a4b7a3d0cd..efaeed58c3b32 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/AbstractGenericTypeSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.SerializerTestInstance; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.StringUtils; import org.junit.jupiter.api.Test; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/CopyableSerializerUpgradeTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/CopyableSerializerUpgradeTest.java index d5eba5333fa89..a688cbc7b7e21 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/CopyableSerializerUpgradeTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/CopyableSerializerUpgradeTest.java @@ -19,13 +19,13 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.java.typeutils.runtime.CopyableSerializerUpgradeTest.SimpleCopyable; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.CopyableValue; import org.assertj.core.api.Condition; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparatorTest.java index faa356604df54..23c2490e0213c 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/CopyableValueComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.StringValue; class CopyableValueComparatorTest extends ComparatorTestBase { diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/DataInputViewStreamTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/DataInputViewStreamTest.java index c721aecb8aa43..bbb29a481ad74 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/DataInputViewStreamTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/DataInputViewStreamTest.java @@ -18,7 +18,7 @@ package org.apache.flink.api.java.typeutils.runtime; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.junit.jupiter.api.Test; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializerCommonTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializerCommonTest.java index 5ccdfedf84dbf..d6dfab0840216 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializerCommonTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializerCommonTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.types.Either; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializerTest.java index 606d98637f10a..934ff8355bf0a 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializerTest.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase.TestInputView; import org.apache.flink.api.common.typeutils.ComparatorTestBase.TestOutputView; import org.apache.flink.api.common.typeutils.SerializerTestInstance; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.EitherTypeInfo; import org.apache.flink.api.java.typeutils.TupleTypeInfo; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericPairComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericPairComparatorTest.java index 65070b5258138..aceeb0923d25d 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericPairComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/GenericPairComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleComparator; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/NullableSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/NullableSerializerTest.java index 9726dcc495e33..43d166db02458 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/NullableSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/NullableSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/NullableSerializerUpgradeTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/NullableSerializerUpgradeTest.java index f20a4897e8de0..f0c31f4777320 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/NullableSerializerUpgradeTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/NullableSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.LongSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoComparatorTest.java index a0afc5fd80772..565268129e26d 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoComparatorTest.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.CompositeType; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.TypeExtractor; import java.util.Arrays; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoGenericTypeSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoGenericTypeSerializerTest.java index 0def347e821d7..7623022bb7a56 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoGenericTypeSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoGenericTypeSerializerTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.TypeExtractor; public class PojoGenericTypeSerializerTest extends AbstractGenericTypeSerializerTest { diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerSnapshotTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerSnapshotTest.java index 8cdd83f7efa92..3ac8c7819dd3d 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerSnapshotTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerSnapshotTest.java @@ -19,9 +19,9 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerTest.java index 709be364fd164..a54f728dfd23a 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerTest.java @@ -26,9 +26,9 @@ import org.apache.flink.api.common.typeutils.CompositeType.FlatFieldDescriptor; import org.apache.flink.api.common.typeutils.SerializerTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshotSerializationUtil; import org.apache.flink.api.java.tuple.Tuple1; import org.apache.flink.api.java.tuple.Tuple3; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerUpgradeTestSpecifications.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerUpgradeTestSpecifications.java index 6f2966c1f7d3b..ce2d61c32b777 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerUpgradeTestSpecifications.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSerializerUpgradeTestSpecifications.java @@ -22,9 +22,9 @@ import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeutils.ClassRelocator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.java.typeutils.TypeExtractor; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSubclassComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSubclassComparatorTest.java index 9a3bd1049e126..3faaada859c22 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSubclassComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSubclassComparatorTest.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.CompositeType; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.TypeExtractor; import java.util.Arrays; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSubclassSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSubclassSerializerTest.java index 58bffa6a97239..f40825a48aaca 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSubclassSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoSubclassSerializerTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.TypeExtractor; import org.junit.jupiter.api.Test; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowComparatorTest.java index bfcf67b6a734b..869c1bcfda0aa 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowComparatorTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.typeutils.RowTypeInfo; import org.apache.flink.api.java.typeutils.TupleTypeInfo; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowComparatorWithManyFieldsTests.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowComparatorWithManyFieldsTests.java index 82cd8deed48b3..36e151f891215 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowComparatorWithManyFieldsTests.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowComparatorWithManyFieldsTests.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.RowTypeInfo; import org.apache.flink.types.Row; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowSerializerTest.java index ba340df7bf76b..49650ce5f87e9 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowSerializerTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; import org.apache.flink.api.common.typeutils.SerializerTestInstance; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.typeutils.RowTypeInfo; import org.apache.flink.api.java.typeutils.TupleTypeInfo; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowSerializerUpgradeTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowSerializerUpgradeTest.java index d0e71596e07a3..5b5215b456305 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowSerializerUpgradeTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/RowSerializerUpgradeTest.java @@ -22,9 +22,9 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.java.typeutils.RowTypeInfo; import org.apache.flink.types.Row; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/SubclassFromInterfaceSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/SubclassFromInterfaceSerializerTest.java index 90fedeabaebd9..35793bf2e114b 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/SubclassFromInterfaceSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/SubclassFromInterfaceSerializerTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.TypeExtractor; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TestDataOutputSerializer.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TestDataOutputSerializer.java index 1bba8e641fd1b..bb59b29511ac7 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TestDataOutputSerializer.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TestDataOutputSerializer.java @@ -18,8 +18,8 @@ package org.apache.flink.api.java.typeutils.runtime; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemoryUtils; import java.io.EOFException; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java index 01bc5299c97e9..3280b1aa1d5bd 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java index 96e4dfcf9b9d1..2000f2b64985e 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleComparator; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java index 38cad2faace79..e76b26ff53f5c 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleComparator; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java index dcc056ba072b7..4224e7bf045dd 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.LongComparator; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java index c741566c66ea0..b8930af98e462 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleComparator; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD1Test.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD1Test.java index be9b383f18303..ea968c9b2fcd1 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD1Test.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD1Test.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD2Test.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD2Test.java index 8c99aed613954..af04efd75365b 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD2Test.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD2Test.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD3Test.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD3Test.java index 628e2b218bad5..3437a61b3769a 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD3Test.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorISD3Test.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleComparator; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorTTT1Test.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorTTT1Test.java index 27711e7e86135..a7009f1ad7661 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorTTT1Test.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorTTT1Test.java @@ -18,7 +18,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleComparator; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorTTT2Test.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorTTT2Test.java index 14aebf324b27a..5146570366eda 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorTTT2Test.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorTTT2Test.java @@ -18,7 +18,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleComparator; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorTTT3Test.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorTTT3Test.java index 356500663cb51..8f75524fe1bd6 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorTTT3Test.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorTTT3Test.java @@ -18,7 +18,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleComparator; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTest.java index 18c30c1883763..3027319a5263a 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeutils.SerializerTestInstance; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple; import org.apache.flink.api.java.tuple.Tuple0; import org.apache.flink.api.java.tuple.Tuple1; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerUpgradeTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerUpgradeTest.java index 89be5f0c570bd..e4d74966e8b5d 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerUpgradeTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueComparatorTest.java index ddbd4a47d35f2..d6be4ed0bd790 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueComparatorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.types.StringValue; class ValueComparatorTest extends ComparatorTestBase { diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueComparatorUUIDTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueComparatorUUIDTest.java index eefbd0a5f2eac..7e509d04f8d1f 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueComparatorUUIDTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueComparatorUUIDTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.UUID; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueID.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueID.java index 87c81812d4b49..de0d98623ca3d 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueID.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueID.java @@ -18,8 +18,8 @@ package org.apache.flink.api.java.typeutils.runtime; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.Value; import java.io.IOException; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializerUUIDTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializerUUIDTest.java index 8af451afcbf6d..394d6e1ba022d 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializerUUIDTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializerUUIDTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.UUID; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializerUpgradeTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializerUpgradeTest.java index 0b194f656366f..29f8a6fd30ddc 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializerUpgradeTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/ValueSerializerUpgradeTest.java @@ -19,12 +19,12 @@ package org.apache.flink.api.java.typeutils.runtime; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.Value; import org.assertj.core.api.Condition; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoClearedBufferTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoClearedBufferTest.java index e6cd620e0f824..9eb7059697236 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoClearedBufferTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoClearedBufferTest.java @@ -20,9 +20,9 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.configuration.ConfigConstants; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericArraySerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericArraySerializerTest.java index 25012b0a6dadd..6d3c65ec4c6f2 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericArraySerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericArraySerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime.kryo; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.AbstractGenericArraySerializerTest; public class KryoGenericArraySerializerTest extends AbstractGenericArraySerializerTest { diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericTypeComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericTypeComparatorTest.java index 02efd9f631a67..ee8179aea0c17 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericTypeComparatorTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericTypeComparatorTest.java @@ -19,7 +19,7 @@ package org.apache.flink.api.java.typeutils.runtime.kryo; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.AbstractGenericTypeComparatorTest; public class KryoGenericTypeComparatorTest extends AbstractGenericTypeComparatorTest { diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericTypeSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericTypeSerializerTest.java index 3b0942807b861..843445633243f 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericTypeSerializerTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericTypeSerializerTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeutils.ComparatorTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.AbstractGenericTypeSerializerTest; import org.apache.flink.api.java.typeutils.runtime.TestDataOutputSerializer; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerClassLoadingTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerClassLoadingTest.java index e161b429039f5..db8bdc85b6e8c 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerClassLoadingTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerClassLoadingTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple1; import org.apache.flink.testutils.ClassLoaderUtils; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerCompatibilityTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerCompatibilityTest.java index 9f1d54ace9619..f5b874287a54a 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerCompatibilityTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerCompatibilityTest.java @@ -19,8 +19,8 @@ package org.apache.flink.api.java.typeutils.runtime.kryo; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshotSerializationUtil; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerConcurrencyTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerConcurrencyTest.java index 7f5e43f26b554..74d09bec0c3c0 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerConcurrencyTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerConcurrencyTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.testutils.BlockerSync; import org.apache.flink.core.testutils.CheckedThread; diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerSnapshotTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerSnapshotTest.java index a6bf698743c57..bf69a27973312 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerSnapshotTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerSnapshotTest.java @@ -19,16 +19,17 @@ package org.apache.flink.api.java.typeutils.runtime.kryo; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeutils.TypeSerializerUtils; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoPojosForMigrationTests.Animal; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoPojosForMigrationTests.Dog; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoPojosForMigrationTests.DogKryoSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoPojosForMigrationTests.DogV2KryoSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoPojosForMigrationTests.Parrot; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.testutils.ClassLoaderUtils; @@ -118,7 +119,7 @@ private static TypeSerializerSnapshot kryoSnapshotWithMissingClass() throws IOException { DataInputView in = new DataInputDeserializer(unLoadableSnapshotBytes()); - return TypeSerializerSnapshot.readVersionedSnapshot( + return TypeSerializerUtils.readVersionedSnapshot( in, KryoSerializerSnapshotTest.class.getClassLoader()); } @@ -143,7 +144,7 @@ private static byte[] unLoadableSnapshotBytes() throws IOException { previousSerializer.snapshotConfiguration(); DataOutputSerializer out = new DataOutputSerializer(4096); - TypeSerializerSnapshot.writeVersionedSnapshot(out, previousSnapshot); + TypeSerializerUtils.writeVersionedSnapshot(out, previousSnapshot); return out.getCopyOfBuffer(); } finally { Thread.currentThread().setContextClassLoader(originalClassLoader); diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerUpgradeTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerUpgradeTest.java index ce72074228655..d56295f67caa4 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerUpgradeTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializerUpgradeTest.java @@ -20,9 +20,9 @@ import org.apache.flink.FlinkVersion; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoPojosForMigrationTests.Animal; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoPojosForMigrationTests.Cat; @@ -36,7 +36,7 @@ import java.util.Collection; import static org.apache.flink.api.common.typeutils.TypeSerializerConditions.hasSameCompatibilityAs; -import static org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility.compatibleWithReconfiguredSerializer; +import static org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility.compatibleWithReconfiguredSerializer; /** Tests migrations for {@link KryoSerializerSnapshot}. */ @SuppressWarnings("WeakerAccess") diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoWithCustomSerializersTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoWithCustomSerializersTest.java index 72d377bc88f8e..fdde23d6771af 100644 --- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoWithCustomSerializersTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoWithCustomSerializersTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.GenericTypeInfo; import org.apache.flink.api.java.typeutils.runtime.AbstractGenericTypeSerializerTest; diff --git a/flink-core/src/test/java/org/apache/flink/core/io/PostVersionedIOReadableWritableTest.java b/flink-core/src/test/java/org/apache/flink/core/io/PostVersionedIOReadableWritableTest.java index d1234688df335..3ac77a2ecbd07 100644 --- a/flink-core/src/test/java/org/apache/flink/core/io/PostVersionedIOReadableWritableTest.java +++ b/flink-core/src/test/java/org/apache/flink/core/io/PostVersionedIOReadableWritableTest.java @@ -20,8 +20,8 @@ import org.apache.flink.core.memory.ByteArrayInputStreamWithPos; import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.junit.jupiter.api.Test; diff --git a/flink-core/src/test/java/org/apache/flink/core/io/SimpleVersionedSerializerTypeSerializerProxyTest.java b/flink-core/src/test/java/org/apache/flink/core/io/SimpleVersionedSerializerTypeSerializerProxyTest.java index cb389398485d3..ca5cb628af485 100644 --- a/flink-core/src/test/java/org/apache/flink/core/io/SimpleVersionedSerializerTypeSerializerProxyTest.java +++ b/flink-core/src/test/java/org/apache/flink/core/io/SimpleVersionedSerializerTypeSerializerProxyTest.java @@ -19,7 +19,7 @@ package org.apache.flink.core.io; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.nio.charset.StandardCharsets; diff --git a/flink-core/src/test/java/org/apache/flink/core/io/VersionedIOWriteableTest.java b/flink-core/src/test/java/org/apache/flink/core/io/VersionedIOWriteableTest.java index de88d2af65b7e..5f6b693b14331 100644 --- a/flink-core/src/test/java/org/apache/flink/core/io/VersionedIOWriteableTest.java +++ b/flink-core/src/test/java/org/apache/flink/core/io/VersionedIOWriteableTest.java @@ -20,9 +20,9 @@ import org.apache.flink.core.memory.ByteArrayInputStreamWithPos; import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.junit.jupiter.api.Test; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/migration/SchemaCompatibilityTestingSerializer.java b/flink-core/src/test/java/org/apache/flink/testutils/migration/SchemaCompatibilityTestingSerializer.java index e9fe2a5490199..ef0b37644dc14 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/migration/SchemaCompatibilityTestingSerializer.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/migration/SchemaCompatibilityTestingSerializer.java @@ -18,11 +18,11 @@ package org.apache.flink.testutils.migration; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import javax.annotation.Nullable; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/AsciiStringType.java b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/AsciiStringType.java index fbd226815d165..c25a8315acc96 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/AsciiStringType.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/AsciiStringType.java @@ -19,8 +19,8 @@ package org.apache.flink.testutils.serialization.types; import org.apache.flink.configuration.ConfigConstants; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/BooleanType.java b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/BooleanType.java index 9f42369edd662..917d3ba135394 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/BooleanType.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/BooleanType.java @@ -18,8 +18,8 @@ package org.apache.flink.testutils.serialization.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ByteArrayType.java b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ByteArrayType.java index 85ee3d1523b1a..fdfaef8eca018 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ByteArrayType.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ByteArrayType.java @@ -18,8 +18,8 @@ package org.apache.flink.testutils.serialization.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Arrays; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ByteSubArrayType.java b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ByteSubArrayType.java index ebae2af8ded21..e0eb926cbbd68 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ByteSubArrayType.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ByteSubArrayType.java @@ -18,8 +18,8 @@ package org.apache.flink.testutils.serialization.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Arrays; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ByteType.java b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ByteType.java index f4c9b7a97b8ae..bbd7f24b484c2 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ByteType.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ByteType.java @@ -18,8 +18,8 @@ package org.apache.flink.testutils.serialization.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/CharType.java b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/CharType.java index cde59a50e8aea..cc529a2144f8d 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/CharType.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/CharType.java @@ -18,8 +18,8 @@ package org.apache.flink.testutils.serialization.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/DoubleType.java b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/DoubleType.java index 7a863ef403881..03bc94ce6f741 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/DoubleType.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/DoubleType.java @@ -18,8 +18,8 @@ package org.apache.flink.testutils.serialization.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/FloatType.java b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/FloatType.java index bebb41af61ab1..91daf53272a85 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/FloatType.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/FloatType.java @@ -18,8 +18,8 @@ package org.apache.flink.testutils.serialization.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/IntType.java b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/IntType.java index 48cb655277b05..d858295051bce 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/IntType.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/IntType.java @@ -18,8 +18,8 @@ package org.apache.flink.testutils.serialization.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/LongType.java b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/LongType.java index eb4ff77e1a0cb..3a8d414ef7f0c 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/LongType.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/LongType.java @@ -18,8 +18,8 @@ package org.apache.flink.testutils.serialization.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ShortType.java b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ShortType.java index 8f687d24490d6..93747092e4e2d 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ShortType.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/ShortType.java @@ -18,8 +18,8 @@ package org.apache.flink.testutils.serialization.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/UnsignedByteType.java b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/UnsignedByteType.java index b93cdbad78cdd..4d1b013b93d26 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/UnsignedByteType.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/UnsignedByteType.java @@ -18,8 +18,8 @@ package org.apache.flink.testutils.serialization.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/UnsignedShortType.java b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/UnsignedShortType.java index b5118689c2c41..9d24045ef0514 100644 --- a/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/UnsignedShortType.java +++ b/flink-core/src/test/java/org/apache/flink/testutils/serialization/types/UnsignedShortType.java @@ -18,8 +18,8 @@ package org.apache.flink.testutils.serialization.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Random; diff --git a/flink-core/src/test/java/org/apache/flink/types/JavaToValueConverterTest.java b/flink-core/src/test/java/org/apache/flink/types/JavaToValueConverterTest.java index 4f49976a65f36..a0345851a9193 100644 --- a/flink-core/src/test/java/org/apache/flink/types/JavaToValueConverterTest.java +++ b/flink-core/src/test/java/org/apache/flink/types/JavaToValueConverterTest.java @@ -18,8 +18,8 @@ package org.apache.flink.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.junit.jupiter.api.Test; diff --git a/flink-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java b/flink-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java index aff69b6d9e8d4..0adb92b6b425c 100644 --- a/flink-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java +++ b/flink-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java @@ -18,9 +18,9 @@ package org.apache.flink.types; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.junit.jupiter.api.BeforeEach; diff --git a/flink-core/src/test/java/org/apache/flink/types/RecordITCase.java b/flink-core/src/test/java/org/apache/flink/types/RecordITCase.java index 8d32b036c847f..fa4c5e087946d 100644 --- a/flink-core/src/test/java/org/apache/flink/types/RecordITCase.java +++ b/flink-core/src/test/java/org/apache/flink/types/RecordITCase.java @@ -18,9 +18,9 @@ package org.apache.flink.types; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.junit.jupiter.api.BeforeEach; diff --git a/flink-core/src/test/java/org/apache/flink/types/RecordTest.java b/flink-core/src/test/java/org/apache/flink/types/RecordTest.java index e513e782e162f..c480e606f6145 100644 --- a/flink-core/src/test/java/org/apache/flink/types/RecordTest.java +++ b/flink-core/src/test/java/org/apache/flink/types/RecordTest.java @@ -18,9 +18,9 @@ package org.apache.flink.types; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.junit.jupiter.api.BeforeEach; diff --git a/flink-core/src/test/java/org/apache/flink/util/InstantiationUtilTest.java b/flink-core/src/test/java/org/apache/flink/util/InstantiationUtilTest.java index 5a1a4f2422568..af8ba955bad2d 100644 --- a/flink-core/src/test/java/org/apache/flink/util/InstantiationUtilTest.java +++ b/flink-core/src/test/java/org/apache/flink/util/InstantiationUtilTest.java @@ -21,8 +21,8 @@ import org.apache.flink.api.common.typeutils.base.DoubleValueSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.io.IOReadableWritable; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.testutils.ClassLoaderUtils; import org.apache.flink.testutils.junit.utils.TempDirUtils; import org.apache.flink.types.DoubleValue; diff --git a/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/join/JoinExtension.java b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/join/JoinExtension.java new file mode 100644 index 0000000000000..de6d759458164 --- /dev/null +++ b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/join/JoinExtension.java @@ -0,0 +1,64 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.api.extension.join; + + +import org.apache.flink.datastream.api.extension.window.WindowExtension; +import org.apache.flink.datastream.api.function.TwoInputNonBroadcastStreamProcessFunction; + +public class JoinExtension { + public static final Class INSTANCE; + + static { + try { + INSTANCE = Class.forName("org.apache.flink.processfunction.builtin.JoinsImpl"); + } catch (ClassNotFoundException e) { + throw new RuntimeException( + "Please ensure that flink-process-function in your class path"); + } + } + + /** Non-Window join. */ + @SuppressWarnings("unchecked") + public TwoInputNonBroadcastStreamProcessFunction join( + JoinFunction joinFunction, JoinType joinType) { + try { + return (TwoInputNonBroadcastStreamProcessFunction) + INSTANCE.getMethod( + "join", + JoinFunction.class, + JoinType.class, + WindowExtension.TwoInputWindowBuilder.class) + .invoke( + null, + joinFunction, + joinType, + WindowExtension.GlobalWindows.createTwoInput()); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public enum JoinType { + INNER, + LEFT_OUTER, + RIGHT_OUTER, + FULL_OUTER + } +} diff --git a/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/join/JoinFunction.java b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/join/JoinFunction.java new file mode 100644 index 0000000000000..18dc2f749e0a7 --- /dev/null +++ b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/join/JoinFunction.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.api.extension.join; + +import org.apache.flink.api.common.functions.Function; +import org.apache.flink.api.common.state.StateDeclaration; +import org.apache.flink.datastream.api.common.Collector; +import org.apache.flink.datastream.api.context.RuntimeContext; + +import java.util.Collections; +import java.util.Set; + +public interface JoinFunction extends Function { + void processRecord(IN1 leftRecord, IN2 rightRecord, Collector output, RuntimeContext ctx) + throws Exception; + + /** + * Explicitly declares states upfront. Each specific state must be declared in this method + * before it can be used. + * + * @return all declared states used by this process function. + */ + default Set usesStates() { + return Collections.emptySet(); + } +} diff --git a/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/join/ReduceFunction.java b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/join/ReduceFunction.java new file mode 100644 index 0000000000000..4c9e05a8689ce --- /dev/null +++ b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/join/ReduceFunction.java @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.api.extension.join; + +import org.apache.flink.api.common.functions.Function; + +import java.io.Serializable; + +@FunctionalInterface +public interface ReduceFunction extends Function, Serializable { + + /** + * The core method of ReduceFunction, combining two values into one value of the same type. The + * reduce function is consecutively applied to all values of a group until only a single value + * remains. + * + * @param value1 The first value to combine. + * @param value2 The second value to combine. + * @return The combined value of both input values. + * @throws Exception This method may throw exceptions. Throwing an exception will cause the + * operation to fail and may trigger recovery. + */ + T reduce(T value1, T value2) throws Exception; +} diff --git a/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/TwoInputWindowProcessFunction.java b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/TwoInputWindowProcessFunction.java new file mode 100644 index 0000000000000..498a596c74f8e --- /dev/null +++ b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/TwoInputWindowProcessFunction.java @@ -0,0 +1,89 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.api.extension.window; + +import org.apache.flink.api.common.functions.Function; +import org.apache.flink.api.common.state.ListState; +import org.apache.flink.api.common.state.ListStateDeclaration; +import org.apache.flink.api.common.state.MapState; +import org.apache.flink.api.common.state.MapStateDeclaration; +import org.apache.flink.api.common.state.StateDeclaration; +import org.apache.flink.api.common.state.ValueState; +import org.apache.flink.api.common.state.ValueStateDeclaration; +import org.apache.flink.api.common.watermark.WatermarkDeclaration; +import org.apache.flink.datastream.api.common.Collector; +import org.apache.flink.datastream.api.context.RuntimeContext; +import org.apache.flink.datastream.api.extension.window.window.Window; + +import java.util.Collection; +import java.util.Collections; +import java.util.Optional; +import java.util.Set; + +public interface TwoInputWindowProcessFunction extends Function { + void processRecord( + IN1 input1, + IN2 input2, + Collector output, + RuntimeContext ctx, + WindowContext windowContext) + throws Exception; + + // TODO merge this common part with WindowProcessFunction. + /** + * Callback when a window is about to be cleaned up. It is the time to deletes any state in the + * {@code Context} when the Window expires (the watermark passes its {@code maxTimestamp} + + * {@code allowedLateness}). + * + * @param window The window which is to be cleared. + */ + default void endOfWindow(W window) throws Exception {} + + default Set useWindowStates() { + return Collections.emptySet(); + } + + default Set usesStates() { + return Collections.emptySet(); + } + + /** + * Explicitly declare watermarks upfront. Each specific watermark must be declared in this + * method before it can be used. + * + * @return all watermark declarations used by this application. + */ + default Collection watermarkDeclarations() { + return Collections.emptySet(); + } + + interface WindowContext { + /** Returns the window that is being evaluated. */ + W window(); + + Optional> getWindowState( + ListStateDeclaration stateDeclaration) throws Exception; + + Optional> getWindowState( + ValueStateDeclaration stateDeclaration) throws Exception; + + Optional> getWindowState( + MapStateDeclaration stateDeclaration) throws Exception; + } +} diff --git a/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/WindowExtension.java b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/WindowExtension.java new file mode 100644 index 0000000000000..0eb7008fa742b --- /dev/null +++ b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/WindowExtension.java @@ -0,0 +1,310 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.api.extension.window; + + +import org.apache.flink.datastream.api.extension.join.JoinExtension; +import org.apache.flink.datastream.api.extension.join.JoinFunction; +import org.apache.flink.datastream.api.extension.join.ReduceFunction; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.api.extension.window.utils.TaggedUnion; +import org.apache.flink.datastream.api.extension.window.window.Window; +import org.apache.flink.datastream.api.function.OneInputStreamProcessFunction; +import org.apache.flink.datastream.api.function.TwoInputNonBroadcastStreamProcessFunction; + + +import java.time.Duration; + +import static org.apache.flink.util.Preconditions.checkNotNull; + +/** Utils class for build window. */ +public class WindowExtension { + + private static final Class INSTANCE; + + static { + try { + INSTANCE = Class.forName("org.apache.flink.datastream.impl.extension.window.WindowExtensionImpl"); + } catch (ClassNotFoundException e) { + throw new RuntimeException( + "Please ensure that flink-process-function in your class path"); + } + } + + public static WindowBuilder builder( + WindowAssigner windowAssigner) { + return new WindowBuilder<>(windowAssigner); + } + + public static TwoInputWindowBuilder twoInputBuilder( + WindowAssigner, W> windowAssigner) { + return new TwoInputWindowBuilder<>(windowAssigner); + } + + public static class TwoInputWindowBuilder { + private final WindowAssigner, W> assigner; + + private Trigger, W> trigger; + + public TwoInputWindowBuilder(WindowAssigner, W> assigner) { + this.assigner = checkNotNull(assigner); + this.trigger = assigner.getDefaultTrigger(); + } + + public TwoInputWindowBuilder withTrigger( + Trigger, W> trigger) { + this.trigger = checkNotNull(trigger); + return this; + } + + public WindowAssigner, W> getAssigner() { + return assigner; + } + + public Trigger, W> getTrigger() { + return trigger; + } + } + + @SuppressWarnings("unchecked") + public static + TwoInputNonBroadcastStreamProcessFunction apply( + TwoInputWindowBuilder window, + TwoInputWindowProcessFunction, Iterable, OUT, W> + windowProcessFunction) { + try { + return (TwoInputNonBroadcastStreamProcessFunction) + INSTANCE.getMethod( + "apply", + TwoInputWindowProcessFunction.class, + WindowAssigner.class, + Trigger.class) + .invoke(null, windowProcessFunction, window.assigner, window.trigger); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @SuppressWarnings("unchecked") + public static + TwoInputNonBroadcastStreamProcessFunction apply( + TwoInputWindowBuilder window, + JoinFunction joinFunction, + JoinExtension.JoinType joinType) { + try { + return (TwoInputNonBroadcastStreamProcessFunction) + JoinExtension.INSTANCE + .getMethod( + "join", + JoinFunction.class, + JoinExtension.JoinType.class, + WindowExtension.TwoInputWindowBuilder.class) + .invoke(null, joinFunction, joinType, window); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public static class WindowBuilder { + private final WindowAssigner assigner; + + private Trigger trigger; + + public WindowBuilder(WindowAssigner assigner) { + this.assigner = checkNotNull(assigner); + this.trigger = assigner.getDefaultTrigger(); + } + + public WindowBuilder withTrigger(Trigger trigger) { + this.trigger = checkNotNull(trigger); + return this; + } + } + + @SuppressWarnings("unchecked") + public static OneInputStreamProcessFunction apply( + WindowBuilder window, + WindowProcessFunction, OUT, W> windowProcessFunction) { + try { + return (OneInputStreamProcessFunction) + INSTANCE.getMethod( + "process", + WindowProcessFunction.class, + WindowAssigner.class, + Trigger.class) + .invoke(null, windowProcessFunction, window.assigner, window.trigger); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @SuppressWarnings("unchecked") + public static OneInputStreamProcessFunction apply( + WindowBuilder window, ReduceFunction reduceFunction) { + try { + return (OneInputStreamProcessFunction) + INSTANCE.getMethod( + "reduce", + ReduceFunction.class, + WindowAssigner.class, + Trigger.class) + .invoke(null, reduceFunction, window.assigner, window.trigger); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * Pre-aggregate elements but provide more context than {@link #apply(WindowBuilder, + * ReduceFunction)}. + */ + @SuppressWarnings("unchecked") + public static OneInputStreamProcessFunction apply( + WindowBuilder window, + ReduceFunction reduceFunction, + WindowProcessFunction windowProcessFunction) { + try { + return (OneInputStreamProcessFunction) + INSTANCE.getMethod( + "reduce", + ReduceFunction.class, + WindowProcessFunction.class, + WindowAssigner.class, + Trigger.class) + .invoke( + null, + reduceFunction, + windowProcessFunction, + window.assigner, + window.trigger); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public static class GlobalWindows { + private static final Class INSTANCE; + + static { + try { + INSTANCE = + Class.forName( + "org.apache.flink.datastream.impl.extension.window.WindowExtensionImpl$GlobalWindowsImpl"); + } catch (ClassNotFoundException e) { + throw new RuntimeException( + "Please ensure that flink-process-function in your class path"); + } + } + + @SuppressWarnings("unchecked") + public static WindowBuilder create() { + try { + return new WindowBuilder<>( + (WindowAssigner) INSTANCE.getMethod("create").invoke(null)); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @SuppressWarnings("unchecked") + public static TwoInputWindowBuilder createTwoInput() { + try { + return new TwoInputWindowBuilder<>( + (WindowAssigner, Window>) + INSTANCE.getMethod("create").invoke(null)); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } + + public static class TimeWindows { + private static final Class INSTANCE; + + static { + try { + INSTANCE = + Class.forName( + "org.apache.flink.datastream.impl.extension.window.WindowExtensionImpl$TimeWindowsImpl"); + } catch (ClassNotFoundException e) { + throw new RuntimeException( + "Please ensure that flink-process-function in your class path"); + } + } + + @SuppressWarnings("unchecked") + public static WindowBuilder ofSliding( + Duration size, Duration slide, TimeType timeType) { + try { + return new WindowBuilder<>( + (WindowAssigner) + INSTANCE.getMethod( + "ofSliding", Duration.class, Duration.class, TimeType.class) + .invoke(null, size, slide, timeType)); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @SuppressWarnings("unchecked") + public static WindowBuilder ofTumbling(Duration size, TimeType timeType) { + try { + return new WindowBuilder<>( + (WindowAssigner) + INSTANCE.getMethod("ofTumbling", Duration.class, TimeType.class) + .invoke(null, size, timeType)); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @SuppressWarnings("unchecked") + public static TwoInputWindowBuilder ofTwoInputTumbling( + Duration size, TimeType timeType) { + try { + return new TwoInputWindowBuilder<>( + (WindowAssigner, Window>) + INSTANCE.getMethod("ofTumbling", Duration.class, TimeType.class) + .invoke(null, size, timeType)); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @SuppressWarnings("unchecked") + public static TwoInputWindowBuilder ofTwoInputSliding( + Duration size, Duration slide, TimeType timeType) { + try { + return new TwoInputWindowBuilder<>( + (WindowAssigner, Window>) + INSTANCE.getMethod( + "ofSliding", Duration.class, Duration.class, TimeType.class) + .invoke(null, size, slide, timeType)); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public enum TimeType { + PROCESSING, + EVENT + } + } +} diff --git a/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/WindowProcessFunction.java b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/WindowProcessFunction.java new file mode 100644 index 0000000000000..d5b862d505fd3 --- /dev/null +++ b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/WindowProcessFunction.java @@ -0,0 +1,86 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.api.extension.window; + +import org.apache.flink.api.common.functions.Function; +import org.apache.flink.api.common.state.ListState; +import org.apache.flink.api.common.state.ListStateDeclaration; +import org.apache.flink.api.common.state.MapState; +import org.apache.flink.api.common.state.MapStateDeclaration; +import org.apache.flink.api.common.state.StateDeclaration; +import org.apache.flink.api.common.state.ValueState; +import org.apache.flink.api.common.state.ValueStateDeclaration; +import org.apache.flink.api.common.watermark.WatermarkDeclaration; +import org.apache.flink.datastream.api.common.Collector; +import org.apache.flink.datastream.api.context.RuntimeContext; +import org.apache.flink.datastream.api.extension.window.window.Window; + +import java.util.Collection; +import java.util.Collections; +import java.util.Optional; +import java.util.Set; + +/** Special process function for window. */ +public interface WindowProcessFunction extends Function { + + void processRecord( + IN record, Collector output, RuntimeContext ctx, WindowContext windowContext) + throws Exception; + + /** + * Callback when a window is about to be cleaned up. It is the time to deletes any state in the + * {@code Context} when the Window expires (the watermark passes its {@code maxTimestamp} + + * {@code allowedLateness}). + * + * @param window The window which is to be cleared. + */ + default void endOfWindow(W window) throws Exception {} + + default Set useWindowStates() { + return Collections.emptySet(); + } + + default Set usesStates() { + return Collections.emptySet(); + } + + /** + * Explicitly declare watermarks upfront. Each specific watermark must be declared in this + * method before it can be used. + * + * @return all watermark declarations used by this application. + */ + default Collection watermarkDeclarations() { + return Collections.emptySet(); + } + + interface WindowContext { + /** Returns the window that is being evaluated. */ + W window(); + + Optional> getWindowState( + ListStateDeclaration stateDeclaration) throws Exception; + + Optional> getWindowState( + ValueStateDeclaration stateDeclaration) throws Exception; + + Optional> getWindowState( + MapStateDeclaration stateDeclaration) throws Exception; + } +} diff --git a/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/assigner/MergingWindowAssigner.java b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/assigner/MergingWindowAssigner.java new file mode 100644 index 0000000000000..1ec04cf4703ce --- /dev/null +++ b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/assigner/MergingWindowAssigner.java @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.api.extension.window.assigner; + + +import org.apache.flink.datastream.api.extension.window.window.Window; + +import java.util.Collection; + +public abstract class MergingWindowAssigner extends WindowAssigner { + private static final long serialVersionUID = 1L; + + /** + * Determines which windows (if any) should be merged. + * + * @param windows The window candidates. + * @param callback A callback that can be invoked to signal which windows should be merged. + */ + public abstract void mergeWindows(Collection windows, MergeCallback callback); + + /** + * Callback to be used in {@link #mergeWindows(Collection, MergeCallback)} for specifying which + * windows should be merged. + */ + public interface MergeCallback { + + /** + * Specifies that the given windows should be merged into the result window. + * + * @param toBeMerged The list of windows that should be merged into one window. + * @param mergeResult The resulting merged window. + */ + void merge(Collection toBeMerged, W mergeResult); + } +} diff --git a/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/assigner/WindowAssigner.java b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/assigner/WindowAssigner.java new file mode 100644 index 0000000000000..28b9021159403 --- /dev/null +++ b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/assigner/WindowAssigner.java @@ -0,0 +1,82 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.api.extension.window.assigner; + + +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.api.extension.window.window.Window; + +import java.io.Serializable; +import java.util.Collection; + +/** + * A {@code WindowAssigner} assigns zero or more {@link Window Windows} to an element. + * + *

In a window operation, elements are grouped by their key (if available) and by the windows to + * which it was assigned. The set of elements with the same key and window is called a pane. When a + * {@link Trigger} decides that a certain pane should fire the {@link + * org.apache.flink.streaming.api.functions.windowing.WindowFunction} is applied to produce output + * elements for that pane. + * + * @param The type of elements that this WindowAssigner can assign windows to. + * @param The type of {@code Window} that this assigner assigns. + */ +public abstract class WindowAssigner implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * Returns a {@code Collection} of windows that should be assigned to the element. + * + * @param element The element to which windows should be assigned. + * @param timestamp The timestamp of the element. + * @param context The {@link WindowAssignerContext} in which the assigner operates. + */ + public abstract Collection assignWindows( + T element, long timestamp, WindowAssignerContext context); + + // TODO this method remove the param compare to original, but I have check that env is no need. + /** Returns the default trigger associated with this {@code WindowAssigner}. */ + public abstract Trigger getDefaultTrigger(); + + /** + * Returns a {@link TypeSerializer} for serializing windows that are assigned by this {@code + * WindowAssigner}. + */ + // TODO this method change the param type compare to original. + public abstract TypeSerializer getWindowSerializer(); + + /** + * Returns {@code true} if elements are assigned to windows based on event time, {@code false} + * otherwise. + */ + public abstract boolean isEventTime(); + + /** + * A context provided to the {@link WindowAssigner} that allows it to query the current + * processing time. + */ + public abstract static class WindowAssignerContext { + + /** Returns the current processing time. */ + public abstract long getCurrentProcessingTime(); + + public abstract long getCurrentEventTime(); + } +} diff --git a/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/trigger/Trigger.java b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/trigger/Trigger.java new file mode 100644 index 0000000000000..ab6d0405a4ed9 --- /dev/null +++ b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/trigger/Trigger.java @@ -0,0 +1,240 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.api.extension.window.trigger; + +import org.apache.flink.api.common.state.ListState; +import org.apache.flink.api.common.state.ListStateDeclaration; +import org.apache.flink.api.common.state.MapState; +import org.apache.flink.api.common.state.MapStateDeclaration; +import org.apache.flink.api.common.state.StateDeclaration; +import org.apache.flink.api.common.state.ValueState; +import org.apache.flink.api.common.state.ValueStateDeclaration; +import org.apache.flink.datastream.api.extension.window.window.Window; +import org.apache.flink.metrics.MetricGroup; + +import java.io.Serializable; +import java.util.Optional; + +/** + * A {@code Trigger} determines when a pane of a window should be evaluated to emit the results for + * that part of the window. + * + *

A pane is the bucket of elements that have the same key (assigned by the {@link + * org.apache.flink.api.java.functions.KeySelector}) and same {@link Window}. An element can be in + * multiple panes if it was assigned to multiple windows by the {@link + * org.apache.flink.processfunction.api.windowing.assigner.WindowAssigner}. These panes all have + * their own instance of the {@code Trigger}. + * + *

Triggers must not maintain state internally since they can be re-created or reused for + * different keys. All necessary state should be persisted using the state abstraction available on + * the {@link TriggerContext}. + * + *

When used with a {@link + * org.apache.flink.processfunction.api.windowing.assigner.MergingWindowAssigner} the {@code + * Trigger} must return {@code true} from {@link #canMerge()} and {@link #onMerge(Window, + * OnMergeContext)} most be properly implemented. + * + * @param The type of elements on which this {@code Trigger} works. + * @param The type of {@link Window Windows} on which this {@code Trigger} can operate. + */ +public abstract class Trigger implements Serializable { + + private static final long serialVersionUID = -4104633972991191369L; + + /** + * Called for every element that gets added to a pane. The result of this will determine whether + * the pane is evaluated to emit results. + * + * @param element The element that arrived. + * @param timestamp The timestamp of the element that arrived. + * @param window The window to which the element is being added. + * @param ctx A context object that can be used to register timer callbacks. + */ + public abstract TriggerResult onElement(T element, long timestamp, W window, TriggerContext ctx) + throws Exception; + + /** + * Called when a processing-time timer that was set using the trigger context fires. + * + * @param time The timestamp at which the timer fired. + * @param window The window for which the timer fired. + * @param ctx A context object that can be used to register timer callbacks. + */ + public abstract TriggerResult onProcessingTime(long time, W window, TriggerContext ctx) + throws Exception; + + /** + * Called when a watermark that was set using the trigger context fires. + * + * @param watermark The received watermark. + * @param window The window for which the timer fired. + * @param ctx A context object that can be used to register timer callbacks. + */ + public abstract TriggerResult onEventTime( + long time, W window, TriggerContext ctx) throws Exception; + + /** + * Returns true if this trigger supports merging of trigger state and can therefore be used with + * a {@link org.apache.flink.processfunction.api.windowing.assigner.MergingWindowAssigner}. + * + *

If this returns {@code true} you must properly implement {@link #onMerge(Window, + * OnMergeContext)} + */ + public boolean canMerge() { + return false; + } + + /** + * Called when several windows have been merged into one window by the {@link + * org.apache.flink.processfunction.api.windowing.assigner.WindowAssigner}. + * + * @param window The new window that results from the merge. + * @param ctx A context object that can be used to register timer callbacks and access state. + */ + public void onMerge(W window, OnMergeContext ctx) throws Exception { + throw new UnsupportedOperationException("This trigger does not support merging."); + } + + /** + * Clears any state that the trigger might still hold for the given window. This is called when + * a window is purged. Timers set using {@link + * TriggerContext#registerWatermarkListener(ProcessWatermark)}} and {@link + * TriggerContext#registerProcessingTimeTimer(long)} should be deleted here as well as state + * acquired using {@code TriggerContext#getWindowState}. + */ + public abstract void clear(W window, TriggerContext ctx) throws Exception; + + // ------------------------------------------------------------------------ + + /** + * A context object that is given to {@link Trigger} methods to allow them to register timer + * callbacks and deal with state. + */ + public interface TriggerContext { + + /** Returns the current processing time. */ + long getCurrentProcessingTime(); + + /** Returns the current watermark time. */ + long getCurrentWatermark(); + + /** + * Register a system time callback. When the current system time passes the specified time + * {@link Trigger#onProcessingTime(long, Window, TriggerContext)} is called with the time + * specified here. + * + * @param time The time at which to invoke {@link Trigger#onProcessingTime(long, Window, + * TriggerContext)} + */ + void registerProcessingTimeTimer(long time); + + /** + * Register an watermark callback. When the current watermark passes the specified watermark + * {@link Trigger#onWatermark(ProcessWatermark, Window, TriggerContext)} is called with the + * time specified here. + * + * @param watermark The watermark at which to invoke {@link + * Trigger#onWatermark(ProcessWatermark, Window, TriggerContext)} + */ + void registerEventTimeListener(long time); + + /** Delete the processing time trigger for the given time. */ + void deleteProcessingTimeTimer(long time); + + void deleteEventTimeListener(long time); + + /** + * Retrieves a {@link ListState} object that can be used to interact with fault-tolerant + * state that is scoped to the window and key of the current trigger invocation. + */ + Optional> getWindowState( + ListStateDeclaration stateDeclaration); + + /** + * Retrieves a {@link MapState} object that can be used to interact with fault-tolerant + * state that is scoped to the window and key of the current trigger invocation. + */ + Optional> getWindowState( + MapStateDeclaration stateDeclaration); + + /** + * Retrieves a {@link ValueState} object that can be used to interact with fault-tolerant + * state that is scoped to the window and key of the current trigger invocation. + */ + Optional> getWindowState( + ValueStateDeclaration stateDeclaration); + + MetricGroup getMetricGroup(); + } + + /** + * Extension of {@link TriggerContext} that is given to {@link Trigger#onMerge(Window, + * OnMergeContext)}. + */ + public interface OnMergeContext extends TriggerContext { + void mergeWindowState(StateDeclaration StateDeclaration); + } + + /** + * Result type for trigger methods. This determines what happens with the window, for example + * whether the window function should be called, or the window should be discarded. + * + *

If a {@link Trigger} returns {@link #FIRE} or {@link #FIRE_AND_PURGE} but the window does + * not contain any data the window function will not be invoked, i.e. no data will be produced + * for the window. + */ + public enum TriggerResult { + + /** No action is taken on the window. */ + CONTINUE(false, false), + + /** {@code FIRE_AND_PURGE} evaluates the window function and emits the window result. */ + FIRE_AND_PURGE(true, true), + + /** + * On {@code FIRE}, the window is evaluated and results are emitted. The window is not + * purged, though, all elements are retained. + */ + FIRE(true, false), + + /** + * All elements in the window are cleared and the window is discarded, without evaluating + * the window function or emitting any elements. + */ + PURGE(false, true); + + // ------------------------------------------------------------------------ + + private final boolean fire; + private final boolean purge; + + TriggerResult(boolean fire, boolean purge) { + this.purge = purge; + this.fire = fire; + } + + public boolean isFire() { + return fire; + } + + public boolean isPurge() { + return purge; + } + } +} diff --git a/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/utils/TaggedUnion.java b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/utils/TaggedUnion.java new file mode 100644 index 0000000000000..52702e35d3543 --- /dev/null +++ b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/utils/TaggedUnion.java @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.api.extension.window.utils; + +import java.util.Objects; + +public class TaggedUnion { + private final T1 one; + private final T2 two; + + private TaggedUnion(T1 one, T2 two) { + this.one = one; + this.two = two; + } + + public boolean isOne() { + return one != null; + } + + public boolean isTwo() { + return two != null; + } + + public T1 getOne() { + return one; + } + + public T2 getTwo() { + return two; + } + + public static TaggedUnion one(T1 one) { + return new TaggedUnion<>(one, null); + } + + public static TaggedUnion two(T2 two) { + return new TaggedUnion<>(null, two); + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + + if (!(obj instanceof TaggedUnion)) { + return false; + } + + TaggedUnion other = (TaggedUnion) obj; + return Objects.equals(one, other.one) && Objects.equals(two, other.two); + } +} diff --git a/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/window/Window.java b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/window/Window.java new file mode 100644 index 0000000000000..43cd8d95337f7 --- /dev/null +++ b/flink-datastream-api/src/main/java/org/apache/flink/datastream/api/extension/window/window/Window.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.api.extension.window.window; + +/** + * A {@code Window} is a grouping of elements into finite buckets. + * + *

Subclasses should implement {@code equals()} and {@code hashCode()} so that logically same + * windows are treated the same. + */ +public interface Window {} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/join/JoinExtensionImpl.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/join/JoinExtensionImpl.java new file mode 100644 index 0000000000000..00bab3993bad3 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/join/JoinExtensionImpl.java @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.join; + + +import org.apache.flink.datastream.api.extension.join.JoinExtension; +import org.apache.flink.datastream.api.extension.join.JoinFunction; +import org.apache.flink.datastream.api.extension.window.WindowExtension; +import org.apache.flink.datastream.api.extension.window.window.Window; +import org.apache.flink.datastream.api.function.TwoInputNonBroadcastStreamProcessFunction; +import org.apache.flink.datastream.impl.extension.join.function.JoinedWindowProcessFunction; +import org.apache.flink.datastream.impl.extension.join.function.OutJoinedWindowProcessFunction; +import org.apache.flink.datastream.impl.extension.window.function.InternalTwoInputWindowFunction; + +public class JoinExtensionImpl { + public static + TwoInputNonBroadcastStreamProcessFunction join( + JoinFunction joinFunction, + JoinExtension.JoinType joinType, + WindowExtension.TwoInputWindowBuilder windowBuilder) { + switch (joinType) { + case INNER: + return new InternalTwoInputWindowFunction<>( + new JoinedWindowProcessFunction<>(joinFunction), + windowBuilder.getAssigner(), + windowBuilder.getTrigger()); + case LEFT_OUTER: + return new InternalTwoInputWindowFunction<>( + new OutJoinedWindowProcessFunction.LeftOuterJoinedWindowProcessFunction<>( + joinFunction), + windowBuilder.getAssigner(), + windowBuilder.getTrigger()); + case RIGHT_OUTER: + return new InternalTwoInputWindowFunction<>( + new OutJoinedWindowProcessFunction.RightOuterJoinedWindowProcessFunction<>( + joinFunction), + windowBuilder.getAssigner(), + windowBuilder.getTrigger()); + case FULL_OUTER: + return new InternalTwoInputWindowFunction<>( + new OutJoinedWindowProcessFunction.FullOuterJoinedWindowProcessFunction<>( + joinFunction), + windowBuilder.getAssigner(), + windowBuilder.getTrigger()); + default: + throw new UnsupportedOperationException("Unsupported join type : " + joinType); + } + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/join/function/JoinedWindowProcessFunction.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/join/function/JoinedWindowProcessFunction.java new file mode 100644 index 0000000000000..5a3395b86039e --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/join/function/JoinedWindowProcessFunction.java @@ -0,0 +1,54 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.join.function; + + +import org.apache.flink.datastream.api.common.Collector; +import org.apache.flink.datastream.api.context.RuntimeContext; +import org.apache.flink.datastream.api.extension.join.JoinFunction; +import org.apache.flink.datastream.api.extension.window.TwoInputWindowProcessFunction; +import org.apache.flink.datastream.api.extension.window.window.Window; + +public class JoinedWindowProcessFunction + implements TwoInputWindowProcessFunction, Iterable, OUT, W> { + private final JoinFunction joinFunction; + + public JoinedWindowProcessFunction(JoinFunction joinFunction) { + this.joinFunction = joinFunction; + } + + @Override + public void processRecord( + Iterable input1, + Iterable input2, + Collector output, + RuntimeContext ctx, + WindowContext windowContext) + throws Exception { + for (IN1 left : input1) { + for (IN2 right : input2) { + joinFunction.processRecord(left, right, output, ctx); + } + } + } + + public JoinFunction getJoinFunction() { + return joinFunction; + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/join/function/OutJoinedWindowProcessFunction.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/join/function/OutJoinedWindowProcessFunction.java new file mode 100644 index 0000000000000..33426af2b72c9 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/join/function/OutJoinedWindowProcessFunction.java @@ -0,0 +1,147 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.join.function; + + +import org.apache.flink.datastream.api.common.Collector; +import org.apache.flink.datastream.api.context.RuntimeContext; +import org.apache.flink.datastream.api.extension.join.JoinFunction; +import org.apache.flink.datastream.api.extension.window.TwoInputWindowProcessFunction; +import org.apache.flink.datastream.api.extension.window.window.Window; + +public abstract class OutJoinedWindowProcessFunction + implements TwoInputWindowProcessFunction, Iterable, OUT, W> { + private final JoinFunction joinFunction; + + OutJoinedWindowProcessFunction(JoinFunction joinFunction) { + this.joinFunction = joinFunction; + } + + @Override + public void processRecord( + Iterable input1, + Iterable input2, + Collector output, + RuntimeContext ctx, + WindowContext windowContext) + throws Exception { + join(input1, input2, output, ctx); + } + + protected void outputJoinedRecord( + IN1 left, IN2 right, Collector output, RuntimeContext ctx) throws Exception { + joinFunction.processRecord(left, right, output, ctx); + } + + protected abstract void join( + Iterable input1, Iterable input2, Collector output, RuntimeContext ctx) + throws Exception; + + public JoinFunction getJoinFunction() { + return joinFunction; + } + + /** Left Outer Join. */ + public static class LeftOuterJoinedWindowProcessFunction + extends OutJoinedWindowProcessFunction { + public LeftOuterJoinedWindowProcessFunction(JoinFunction joinFunction) { + super(joinFunction); + } + + @Override + protected void join( + Iterable left, Iterable right, Collector output, RuntimeContext ctx) + throws Exception { + if (!left.iterator().hasNext()) { + return; + } + if (!right.iterator().hasNext()) { + for (IN1 record : left) { + outputJoinedRecord(record, null, output, ctx); + } + } else { + for (IN1 leftRecord : left) { + for (IN2 rightRecord : right) { + outputJoinedRecord(leftRecord, rightRecord, output, ctx); + } + } + } + } + } + + /** Right Outer Join. */ + public static class RightOuterJoinedWindowProcessFunction + extends OutJoinedWindowProcessFunction { + public RightOuterJoinedWindowProcessFunction(JoinFunction joinFunction) { + super(joinFunction); + } + + @Override + protected void join( + Iterable left, Iterable right, Collector output, RuntimeContext ctx) + throws Exception { + if (!right.iterator().hasNext()) { + return; + } + if (!left.iterator().hasNext()) { + for (IN2 record : right) { + outputJoinedRecord(null, record, output, ctx); + } + } else { + for (IN1 leftRecord : left) { + for (IN2 rightRecord : right) { + outputJoinedRecord(leftRecord, rightRecord, output, ctx); + } + } + } + } + } + + /** Full Outer Join. */ + public static class FullOuterJoinedWindowProcessFunction + extends OutJoinedWindowProcessFunction { + public FullOuterJoinedWindowProcessFunction(JoinFunction joinFunction) { + super(joinFunction); + } + + @Override + protected void join( + Iterable left, Iterable right, Collector output, RuntimeContext ctx) + throws Exception { + if (!right.iterator().hasNext() && !left.iterator().hasNext()) { + return; + } + if (!left.iterator().hasNext()) { + for (IN2 record : right) { + outputJoinedRecord(null, record, output, ctx); + } + } else if (!right.iterator().hasNext()) { + for (IN1 record : left) { + outputJoinedRecord(record, null, output, ctx); + } + } else { + for (IN1 leftRecord : left) { + for (IN2 rightRecord : right) { + outputJoinedRecord(leftRecord, rightRecord, output, ctx); + } + } + } + } + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/MergingWindowSet.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/MergingWindowSet.java new file mode 100644 index 0000000000000..0910a43be69c3 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/MergingWindowSet.java @@ -0,0 +1,235 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window; + +import org.apache.flink.api.common.state.ListState; +import org.apache.flink.api.java.tuple.Tuple2; + +import org.apache.flink.datastream.api.extension.window.assigner.MergingWindowAssigner; +import org.apache.flink.datastream.api.extension.window.window.Window; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class MergingWindowSet { + private static final Logger LOG = LoggerFactory.getLogger(MergingWindowSet.class); + + /** + * Mapping from window to the window that keeps the window state. When we are incrementally + * merging windows starting from some window we keep that starting window as the state window to + * prevent costly state juggling. + */ + private final Map mapping; + + /** + * Mapping when we created the {@code MergingWindowSet}. We use this to decide whether we need + * to persist any changes to state. + */ + private final Map initialMapping; + + private final ListState> state; + + /** Our window assigner. */ + private final MergingWindowAssigner windowAssigner; + + /** Restores a {@link MergingWindowSet} from the given state. */ + public MergingWindowSet( + MergingWindowAssigner windowAssigner, ListState> state) + throws Exception { + this.windowAssigner = windowAssigner; + mapping = new HashMap<>(); + + Iterable> windowState = state.get(); + if (windowState != null) { + for (Tuple2 window : windowState) { + mapping.put(window.f0, window.f1); + } + } + + this.state = state; + + initialMapping = new HashMap<>(); + initialMapping.putAll(mapping); + } + + /** + * Persist the updated mapping to the given state if the mapping changed since initialization. + */ + public void persist() throws Exception { + if (!mapping.equals(initialMapping)) { + state.clear(); + for (Map.Entry window : mapping.entrySet()) { + state.add(new Tuple2<>(window.getKey(), window.getValue())); + } + } + } + + /** + * Returns the state window for the given in-flight {@code Window}. The state window is the + * {@code Window} in which we keep the actual state of a given in-flight window. Windows might + * expand but we keep to original state window for keeping the elements of the window to avoid + * costly state juggling. + * + * @param window The window for which to get the state window. + */ + public W getStateWindow(W window) { + return mapping.get(window); + } + + /** + * Removes the given window from the set of in-flight windows. + * + * @param window The {@code Window} to remove. + */ + public void retireWindow(W window) { + W removed = this.mapping.remove(window); + if (removed == null) { + throw new IllegalStateException( + "Window " + window + " is not in in-flight window set."); + } + } + + /** + * Adds a new {@code Window} to the set of in-flight windows. It might happen that this triggers + * merging of previously in-flight windows. In that case, the provided {@link MergeFunction} is + * called. + * + *

This returns the window that is the representative of the added window after adding. This + * can either be the new window itself, if no merge occurred, or the newly merged window. Adding + * an element to a window or calling trigger functions should only happen on the returned + * representative. This way, we never have to deal with a new window that is immediately + * swallowed up by another window. + * + *

If the new window is merged, the {@code MergeFunction} callback arguments also don't + * contain the new window as part of the list of merged windows. + * + * @param newWindow The new {@code Window} to add. + * @param mergeFunction The callback to be invoked in case a merge occurs. + * @return The {@code Window} that new new {@code Window} ended up in. This can also be the new + * {@code Window} itself in case no merge occurred. + * @throws Exception + */ + public W addWindow(W newWindow, MergeFunction mergeFunction) throws Exception { + + List windows = new ArrayList<>(); + + windows.addAll(this.mapping.keySet()); + windows.add(newWindow); + + final Map> mergeResults = new HashMap<>(); + windowAssigner.mergeWindows( + windows, + new MergingWindowAssigner.MergeCallback() { + @Override + public void merge(Collection toBeMerged, W mergeResult) { + if (LOG.isDebugEnabled()) { + LOG.debug("Merging {} into {}", toBeMerged, mergeResult); + } + mergeResults.put(mergeResult, toBeMerged); + } + }); + + W resultWindow = newWindow; + boolean mergedNewWindow = false; + + // perform the merge + for (Map.Entry> c : mergeResults.entrySet()) { + W mergeResult = c.getKey(); + Collection mergedWindows = c.getValue(); + + // if our new window is in the merged windows make the merge result the + // result window + if (mergedWindows.remove(newWindow)) { + mergedNewWindow = true; + resultWindow = mergeResult; + } + + // pick any of the merged windows and choose that window's state window + // as the state window for the merge result + W mergedStateWindow = this.mapping.get(mergedWindows.iterator().next()); + + // figure out the state windows that we are merging + List mergedStateWindows = new ArrayList<>(); + for (W mergedWindow : mergedWindows) { + W res = this.mapping.remove(mergedWindow); + if (res != null) { + mergedStateWindows.add(res); + } + } + + this.mapping.put(mergeResult, mergedStateWindow); + + // don't put the target state window into the merged windows + mergedStateWindows.remove(mergedStateWindow); + + // don't merge the new window itself, it never had any state associated with it + // i.e. if we are only merging one pre-existing window into itself + // without extending the pre-existing window + if (!(mergedWindows.contains(mergeResult) && mergedWindows.size() == 1)) { + mergeFunction.merge( + mergeResult, + mergedWindows, + this.mapping.get(mergeResult), + mergedStateWindows); + } + } + + // the new window created a new, self-contained window without merging + if (mergeResults.isEmpty() || (resultWindow.equals(newWindow) && !mergedNewWindow)) { + this.mapping.put(resultWindow, resultWindow); + } + + return resultWindow; + } + + /** + * Callback for {@link #addWindow(Window,MergeFunction)} (Window,MergeFunction)}. + * + * @param + */ + public interface MergeFunction { + + /** + * This gets called when a merge occurs. + * + * @param mergeResult The newly resulting merged {@code Window}. + * @param mergedWindows The merged {@code Window Windows}. + * @param stateWindowResult The state window of the merge result. + * @param mergedStateWindows The merged state windows. + * @throws Exception + */ + void merge( + W mergeResult, + Collection mergedWindows, + W stateWindowResult, + Collection mergedStateWindows) + throws Exception; + } + + @Override + public String toString() { + return "MergingWindowSet{" + "windows=" + mapping + '}'; + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/ParallelismAwareKeySelector.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/ParallelismAwareKeySelector.java new file mode 100644 index 0000000000000..e1aebfe50b96a --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/ParallelismAwareKeySelector.java @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window; + +import org.apache.flink.api.java.functions.KeySelector; +import org.apache.flink.util.function.SerializableSupplier; + +import javax.annotation.Nullable; + +import static org.apache.flink.util.Preconditions.checkNotNull; + +public class ParallelismAwareKeySelector implements KeySelector { + // TODO Maybe we should provide a enriched context in the future. + @Nullable private transient SerializableSupplier parallelismSupplier; + + @Override + public Integer getKey(T value) throws Exception { + return checkNotNull(parallelismSupplier).get(); + } + + public void setParallelismSupplier(SerializableSupplier parallelismSupplier) { + this.parallelismSupplier = checkNotNull(parallelismSupplier); + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/WindowExtensionImpl.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/WindowExtensionImpl.java new file mode 100644 index 0000000000000..567657e76fe5a --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/WindowExtensionImpl.java @@ -0,0 +1,95 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window; + + +import org.apache.flink.datastream.api.extension.eventtime.EventTimeExtension; +import org.apache.flink.datastream.api.extension.join.ReduceFunction; +import org.apache.flink.datastream.api.extension.window.WindowExtension; +import org.apache.flink.datastream.api.extension.window.WindowProcessFunction; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.api.extension.window.window.Window; +import org.apache.flink.datastream.api.function.OneInputStreamProcessFunction; +import org.apache.flink.datastream.impl.extension.window.assigner.GlobalWindowAssigner; +import org.apache.flink.datastream.impl.extension.window.assigner.SlidingEventTimeWindowsAssigner; +import org.apache.flink.datastream.impl.extension.window.assigner.SlidingProcessingTimeWindowsAssigner; +import org.apache.flink.datastream.impl.extension.window.assigner.TumblingEventTimeWindowsAssigner; +import org.apache.flink.datastream.impl.extension.window.assigner.TumblingProcessTimeWindowsAssigner; +import org.apache.flink.datastream.impl.extension.window.function.InternalReduceWindowFunction; +import org.apache.flink.datastream.impl.extension.window.function.InternalWindowFunction; +import org.apache.flink.datastream.impl.extension.window.function.PassThroughWindowProcessFunction; + +import java.time.Duration; + +public class WindowExtensionImpl { + public static OneInputStreamProcessFunction reduce( + ReduceFunction reduceFunction, + WindowAssigner windowAssigner, + Trigger trigger) { + return new InternalReduceWindowFunction<>( + new PassThroughWindowProcessFunction<>(), windowAssigner, trigger, reduceFunction); + } + + public static OneInputStreamProcessFunction reduce( + ReduceFunction reduceFunction, + WindowProcessFunction windowProcessFunction, + WindowAssigner windowAssigner, + Trigger trigger) { + return new InternalReduceWindowFunction<>( + windowProcessFunction, windowAssigner, trigger, reduceFunction); + } + + public static OneInputStreamProcessFunction process( + WindowProcessFunction, OUT, W> processFunction, + WindowAssigner windowAssigner, + Trigger trigger) { + return new InternalWindowFunction<>(processFunction, windowAssigner, trigger); + } + + public static class GlobalWindowsImpl { + public static WindowAssigner create() { + return GlobalWindowAssigner.create(); + } + } + + public static class TimeWindowsImpl { + public static WindowAssigner ofSliding( + Duration size, Duration slide, WindowExtension.TimeWindows.TimeType timeType) { + if (timeType == WindowExtension.TimeWindows.TimeType.PROCESSING) { + return SlidingProcessingTimeWindowsAssigner.of(size, slide); + } else if (timeType == WindowExtension.TimeWindows.TimeType.EVENT) { + return SlidingEventTimeWindowsAssigner.of(size, slide); + } else { + throw new IllegalArgumentException("unsupported time type : " + timeType); + } + } + + public static WindowAssigner ofTumbling( + Duration size, WindowExtension.TimeWindows.TimeType timeType) { + if (timeType == WindowExtension.TimeWindows.TimeType.PROCESSING) { + return TumblingProcessTimeWindowsAssigner.of(size); + } else if (timeType == WindowExtension.TimeWindows.TimeType.EVENT) { + return TumblingEventTimeWindowsAssigner.of(size); + } else { + throw new IllegalArgumentException("unsupported time type : " + timeType); + } + } + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/GlobalWindowAssigner.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/GlobalWindowAssigner.java new file mode 100644 index 0000000000000..4a6957000e181 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/GlobalWindowAssigner.java @@ -0,0 +1,98 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.assigner; + +import org.apache.flink.annotation.Internal; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.impl.extension.window.window.GlobalWindow; + +import java.util.Collection; +import java.util.Collections; + +public class GlobalWindowAssigner extends WindowAssigner { + private static final long serialVersionUID = 1L; + + private GlobalWindowAssigner() {} + + @Override + public Collection assignWindows( + Object element, long timestamp, WindowAssigner.WindowAssignerContext context) { + return Collections.singletonList(GlobalWindow.get()); + } + + @Override + public Trigger getDefaultTrigger() { + return new GlobalWindowAssigner.NeverTrigger(); + } + + @Override + public String toString() { + return "GlobalWindows()"; + } + + /** + * Creates a new {@code GlobalWindows} {@link WindowAssigner} that assigns all elements to the + * same {@link GlobalWindow}. + * + * @return The global window policy. + */ + public static GlobalWindowAssigner create() { + return new GlobalWindowAssigner(); + } + + /** A trigger that never fires, as default Trigger for GlobalWindows. */ + @Internal + public static class NeverTrigger extends Trigger { + private static final long serialVersionUID = 1L; + + @Override + public TriggerResult onElement( + Object element, long timestamp, GlobalWindow window, TriggerContext ctx) { + return TriggerResult.CONTINUE; + } + + public TriggerResult onEventTime( + long time, GlobalWindow window, TriggerContext ctx) throws Exception { + return TriggerResult.CONTINUE; + } + + @Override + public TriggerResult onProcessingTime(long time, GlobalWindow window, TriggerContext ctx) { + return TriggerResult.CONTINUE; + } + + @Override + public void clear(GlobalWindow window, TriggerContext ctx) throws Exception {} + + @Override + public void onMerge(GlobalWindow window, OnMergeContext ctx) {} + } + + @Override + public TypeSerializer getWindowSerializer() { + return new GlobalWindow.Serializer(); + } + + @Override + public boolean isEventTime() { + return false; + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/SlidingEventTimeWindowsAssigner.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/SlidingEventTimeWindowsAssigner.java new file mode 100644 index 0000000000000..73f14b025572c --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/SlidingEventTimeWindowsAssigner.java @@ -0,0 +1,141 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.assigner; + +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.impl.extension.window.trigger.EventTimeTrigger; +import org.apache.flink.datastream.impl.extension.window.window.TimeWindow; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +public class SlidingEventTimeWindowsAssigner extends WindowAssigner { + private static final long serialVersionUID = 1L; + + private final long size; + + private final long slide; + + private final long offset; + + private final long allowedLateness = 0; + + protected SlidingEventTimeWindowsAssigner(long size, long slide, long offset) { + if (Math.abs(offset) >= slide || size <= 0) { + throw new IllegalArgumentException( + "SlidingEventTimeWindows parameters must satisfy " + + "abs(offset) < slide and size > 0"); + } + + this.size = size; + this.slide = slide; + this.offset = offset; + } + + @Override + public Collection assignWindows( + Object element, long timestamp, WindowAssignerContext context) { + if (timestamp > Long.MIN_VALUE) { + List windows = new ArrayList<>((int) (size / slide)); + long lastStart = + org.apache.flink.streaming.api.windowing.windows.TimeWindow + .getWindowStartWithOffset(timestamp, offset, slide); + for (long start = lastStart; start > timestamp - size; start -= slide) { + windows.add(new TimeWindow(start, start + size, true)); + } + return windows; + } else { + throw new RuntimeException( + "Record has Long.MIN_VALUE timestamp (= no timestamp marker). " + + "Is the time characteristic set to 'ProcessingTime', or did you forget to call " + + "'DataStream.assignTimestampsAndWatermarks(...)'?"); + } + } + + public long getSize() { + return size; + } + + public long getSlide() { + return slide; + } + + @Override + public Trigger getDefaultTrigger() { + return EventTimeTrigger.create(); + } + + @Override + public String toString() { + return "SlidingEventTimeWindows(" + size + ", " + slide + ")"; + } + + @Override + public TypeSerializer getWindowSerializer() { + return new TimeWindow.Serializer(); + } + + @Override + public boolean isEventTime() { + return true; + } + + /** + * Creates a new {@code SlidingEventTimeWindows} {@link + * org.apache.flink.streaming.api.windowing.assigners.WindowAssigner} that assigns elements to + * sliding time windows based on the element timestamp. + * + * @param size The size of the generated windows. + * @param slide The slide interval of the generated windows. + * @return The time policy. + */ + public static SlidingEventTimeWindowsAssigner of(Duration size, Duration slide) { + return new SlidingEventTimeWindowsAssigner( + size.toMillis(), slide.toMillis(), 0); + } + + /** + * Creates a new {@code SlidingEventTimeWindows} {@link + * org.apache.flink.streaming.api.windowing.assigners.WindowAssigner} that assigns elements to + * time windows based on the element timestamp and offset. + * + *

For example, if you want window a stream by hour,but window begins at the 15th minutes of + * each hour, you can use {@code of(Time.hours(1),Time.minutes(15))},then you will get time + * windows start at 0:15:00,1:15:00,2:15:00,etc. + * + *

Rather than that,if you are living in somewhere which is not using UTC±00:00 time, such as + * China which is using UTC+08:00,and you want a time window with size of one day, and window + * begins at every 00:00:00 of local time,you may use {@code of(Time.days(1),Time.hours(-8))}. + * The parameter of offset is {@code Time.hours(-8))} since UTC+08:00 is 8 hours earlier than + * UTC time. + * + * @param size The size of the generated windows. + * @param slide The slide interval of the generated windows. + * @param offset The offset which window start would be shifted by. + * @return The time policy. + */ + public static SlidingEventTimeWindowsAssigner of(Duration size, Duration slide, Duration offset) { + return new SlidingEventTimeWindowsAssigner( + size.toMillis(), slide.toMillis(), offset.toMillis()); + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/SlidingProcessingTimeWindowsAssigner.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/SlidingProcessingTimeWindowsAssigner.java new file mode 100644 index 0000000000000..f6b9763d68da0 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/SlidingProcessingTimeWindowsAssigner.java @@ -0,0 +1,131 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.assigner; + +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.impl.extension.window.trigger.ProcessingTimeTrigger; +import org.apache.flink.datastream.impl.extension.window.window.TimeWindow; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +public class SlidingProcessingTimeWindowsAssigner extends WindowAssigner { + private static final long serialVersionUID = 1L; + + private final long size; + + private final long offset; + + private final long slide; + + private SlidingProcessingTimeWindowsAssigner(long size, long slide, long offset) { + if (Math.abs(offset) >= slide || size <= 0) { + throw new IllegalArgumentException( + "SlidingProcessingTimeWindows parameters must satisfy " + + "abs(offset) < slide and size > 0"); + } + + this.size = size; + this.slide = slide; + this.offset = offset; + } + + @Override + public Collection assignWindows( + Object element, long timestamp, WindowAssigner.WindowAssignerContext context) { + timestamp = context.getCurrentProcessingTime(); + List windows = new ArrayList<>((int) (size / slide)); + long lastStart = TimeWindow.getWindowStartWithOffset(timestamp, offset, slide); + for (long start = lastStart; start > timestamp - size; start -= slide) { + windows.add(new TimeWindow(start, start + size, false)); + } + return windows; + } + + public long getSize() { + return size; + } + + public long getSlide() { + return slide; + } + + @Override + public Trigger getDefaultTrigger() { + return ProcessingTimeTrigger.create(); + } + + @Override + public String toString() { + return "SlidingProcessingTimeWindows(" + size + ", " + slide + ")"; + } + + @Override + public TypeSerializer getWindowSerializer() { + return new TimeWindow.Serializer(); + } + + @Override + public boolean isEventTime() { + return false; + } + + /** + * Creates a new {@code SlidingProcessingTimeWindows} {@link + * org.apache.flink.streaming.api.windowing.assigners.WindowAssigner} that assigns elements to + * sliding time windows based on the element timestamp. + * + * @param size The size of the generated windows. + * @param slide The slide interval of the generated windows. + * @return The time policy. + */ + public static SlidingProcessingTimeWindowsAssigner of(Duration size, Duration slide) { + return new SlidingProcessingTimeWindowsAssigner( + size.toMillis(), slide.toMillis(), 0); + } + + /** + * Creates a new {@code SlidingProcessingTimeWindows} {@link + * org.apache.flink.streaming.api.windowing.assigners.WindowAssigner} that assigns elements to + * time windows based on the element timestamp and offset. + * + *

For example, if you want window a stream by hour,but window begins at the 15th minutes of + * each hour, you can use {@code of(Time.hours(1),Time.minutes(15))},then you will get time + * windows start at 0:15:00,1:15:00,2:15:00,etc. + * + *

Rather than that,if you are living in somewhere which is not using UTC±00:00 time, such as + * China which is using UTC+08:00,and you want a time window with size of one day, and window + * begins at every 00:00:00 of local time,you may use {@code of(Time.days(1),Time.hours(-8))}. + * The parameter of offset is {@code Time.hours(-8))} since UTC+08:00 is 8 hours earlier than + * UTC time. + * + * @param size The size of the generated windows. + * @param slide The slide interval of the generated windows. + * @param offset The offset which window start would be shifted by. + * @return The time policy. + */ + public static SlidingProcessingTimeWindowsAssigner of(Duration size, Duration slide, Duration offset) { + return new SlidingProcessingTimeWindowsAssigner( + size.toMillis(), slide.toMillis(), offset.toMillis()); + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/TumblingEventTimeWindowsAssigner.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/TumblingEventTimeWindowsAssigner.java new file mode 100644 index 0000000000000..daae4897a4fe5 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/TumblingEventTimeWindowsAssigner.java @@ -0,0 +1,149 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.assigner; + +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.impl.extension.window.trigger.EventTimeTrigger; +import org.apache.flink.datastream.impl.extension.window.window.TimeWindow; +import org.apache.flink.streaming.api.windowing.assigners.WindowStagger; + +import java.time.Duration; +import java.util.Collection; +import java.util.Collections; + +public class TumblingEventTimeWindowsAssigner extends WindowAssigner { + private static final long serialVersionUID = 1L; + + private final long size; + + private final long globalOffset; + + private Long staggerOffset = null; + + private final WindowStagger windowStagger; + + private final long allowedLateness = 0; + + protected TumblingEventTimeWindowsAssigner( + long size, long offset, WindowStagger windowStagger) { + if (Math.abs(offset) >= size) { + throw new IllegalArgumentException( + "TumblingEventTimeWindows parameters must satisfy abs(offset) < size"); + } + + this.size = size; + this.globalOffset = offset; + this.windowStagger = windowStagger; + } + + @Override + public Collection assignWindows( + Object element, long timestamp, WindowAssigner.WindowAssignerContext context) { + if (timestamp > Long.MIN_VALUE) { + if (staggerOffset == null) { + staggerOffset = + windowStagger.getStaggerOffset(context.getCurrentProcessingTime(), size); + } + // Long.MIN_VALUE is currently assigned when no timestamp is present + long start = + TimeWindow.getWindowStartWithOffset( + timestamp, (globalOffset + staggerOffset) % size, size); + return Collections.singletonList(new TimeWindow(start, start + size, true)); + } else { + throw new RuntimeException( + "Record has Long.MIN_VALUE timestamp (= no timestamp marker). " + + "Is the time characteristic set to 'ProcessingTime', or did you forget to call " + + "'DataStream.assignTimestampsAndWatermarks(...)'?"); + } + } + + @Override + public Trigger getDefaultTrigger() { + return EventTimeTrigger.create(); + } + + @Override + public String toString() { + return "TumblingEventTimeWindows(" + size + ")"; + } + + @Override + public TypeSerializer getWindowSerializer() { + return new TimeWindow.Serializer(); + } + + @Override + public boolean isEventTime() { + return true; + } + + /** + * Creates a new {@code TumblingEventTimeWindows} {@link + * org.apache.flink.streaming.api.windowing.assigners.WindowAssigner} that assigns elements to + * time windows based on the element timestamp. + * + * @param size The size of the generated windows. + * @return The time policy. + */ + public static TumblingEventTimeWindowsAssigner of(Duration size) { + return new TumblingEventTimeWindowsAssigner( + size.toMillis(), 0, WindowStagger.ALIGNED); + } + + /** + * Creates a new {@code TumblingEventTimeWindows} {@link + * org.apache.flink.streaming.api.windowing.assigners.WindowAssigner} that assigns elements to + * time windows based on the element timestamp and offset. + * + *

For example, if you want window a stream by hour,but window begins at the 15th minutes of + * each hour, you can use {@code of(Time.hours(1),Time.minutes(15))},then you will get time + * windows start at 0:15:00,1:15:00,2:15:00,etc. + * + *

Rather than that,if you are living in somewhere which is not using UTC±00:00 time, such as + * China which is using UTC+08:00,and you want a time window with size of one day, and window + * begins at every 00:00:00 of local time,you may use {@code of(Time.days(1),Time.hours(-8))}. + * The parameter of offset is {@code Time.hours(-8))} since UTC+08:00 is 8 hours earlier than + * UTC time. + * + * @param size The size of the generated windows. + * @param offset The offset which window start would be shifted by. + */ + public static TumblingEventTimeWindowsAssigner of(Duration size, Duration offset) { + return new TumblingEventTimeWindowsAssigner( + size.toMillis(), offset.toMillis(), WindowStagger.ALIGNED); + } + + /** + * Creates a new {@code TumblingEventTimeWindows} {@link + * org.apache.flink.streaming.api.windowing.assigners.WindowAssigner} that assigns elements to + * time windows based on the element timestamp, offset and a staggering offset, depending on the + * staggering policy. + * + * @param size The size of the generated windows. + * @param offset The globalOffset which window start would be shifted by. + * @param windowStagger The utility that produces staggering offset in runtime. + */ + public static TumblingEventTimeWindowsAssigner of( + Duration size, Duration offset, WindowStagger windowStagger) { + return new TumblingEventTimeWindowsAssigner( + size.toMillis(), offset.toMillis(), windowStagger); + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/TumblingProcessTimeWindowsAssigner.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/TumblingProcessTimeWindowsAssigner.java new file mode 100644 index 0000000000000..86feb07ac8366 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/assigner/TumblingProcessTimeWindowsAssigner.java @@ -0,0 +1,149 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.assigner; + +import org.apache.flink.annotation.PublicEvolving; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.impl.extension.window.trigger.ProcessingTimeTrigger; +import org.apache.flink.datastream.impl.extension.window.window.TimeWindow; +import org.apache.flink.streaming.api.windowing.assigners.WindowStagger; + +import java.time.Duration; +import java.util.Collection; +import java.util.Collections; + +import static org.apache.flink.datastream.impl.extension.window.window.TimeWindow.getWindowStartWithOffset; + + +public class TumblingProcessTimeWindowsAssigner extends WindowAssigner { + private static final long serialVersionUID = 1L; + + private final long size; + + private final long globalOffset; + + private Long staggerOffset = null; + + private final WindowStagger windowStagger; + + private TumblingProcessTimeWindowsAssigner( + long size, long offset, WindowStagger windowStagger) { + if (Math.abs(offset) >= size) { + throw new IllegalArgumentException( + "TumblingProcessingTimeWindows parameters must satisfy abs(offset) < size"); + } + + this.size = size; + this.globalOffset = offset; + this.windowStagger = windowStagger; + } + + @Override + public Collection assignWindows( + Object element, long timestamp, WindowAssignerContext context) { + final long now = context.getCurrentProcessingTime(); + if (staggerOffset == null) { + staggerOffset = + windowStagger.getStaggerOffset(context.getCurrentProcessingTime(), size); + } + long start = getWindowStartWithOffset(now, (globalOffset + staggerOffset) % size, size); + return Collections.singletonList(new TimeWindow(start, start + size, false)); + } + + public long getSize() { + return size; + } + + @Override + public Trigger getDefaultTrigger() { + return ProcessingTimeTrigger.create(); + } + + @Override + public String toString() { + return "TumblingProcessingTimeWindows(" + size + ")"; + } + + @Override + public TypeSerializer getWindowSerializer() { + return new TimeWindow.Serializer(); + } + + @Override + public boolean isEventTime() { + return false; + } + + /** + * Creates a new {@code TumblingProcessingTimeWindows} {@link + * org.apache.flink.streaming.api.windowing.assigners.WindowAssigner} that assigns elements to + * time windows based on the element timestamp. + * + * @param size The size of the generated windows. + * @return The time policy. + */ + public static TumblingProcessTimeWindowsAssigner of(Duration size) { + return new TumblingProcessTimeWindowsAssigner( + size.toMillis(), 0, WindowStagger.ALIGNED); + } + + /** + * Creates a new {@code TumblingProcessingTimeWindows} {@link + * org.apache.flink.streaming.api.windowing.assigners.WindowAssigner} that assigns elements to + * time windows based on the element timestamp and offset. + * + *

For example, if you want window a stream by hour,but window begins at the 15th minutes of + * each hour, you can use {@code of(Time.hours(1),Time.minutes(15))},then you will get time + * windows start at 0:15:00,1:15:00,2:15:00,etc. + * + *

Rather than that,if you are living in somewhere which is not using UTC±00:00 time, such as + * China which is using UTC+08:00,and you want a time window with size of one day, and window + * begins at every 00:00:00 of local time,you may use {@code of(Time.days(1),Time.hours(-8))}. + * The parameter of offset is {@code Time.hours(-8))} since UTC+08:00 is 8 hours earlier than + * UTC time. + * + * @param size The size of the generated windows. + * @param offset The offset which window start would be shifted by. + * @return The time policy. + */ + public static TumblingProcessTimeWindowsAssigner of(Duration size, Duration offset) { + return new TumblingProcessTimeWindowsAssigner( + size.toMillis(), offset.toMillis(), WindowStagger.ALIGNED); + } + + /** + * Creates a new {@code TumblingProcessingTimeWindows} {@link + * org.apache.flink.streaming.api.windowing.assigners.WindowAssigner} that assigns elements to + * time windows based on the element timestamp, offset and a staggering offset, depending on the + * staggering policy. + * + * @param size The size of the generated windows. + * @param offset The offset which window start would be shifted by. + * @param windowStagger The utility that produces staggering offset in runtime. + * @return The time policy. + */ + @PublicEvolving + public static TumblingProcessTimeWindowsAssigner of( + Duration size, Duration offset, WindowStagger windowStagger) { + return new TumblingProcessTimeWindowsAssigner( + size.toMillis(), offset.toMillis(), windowStagger); + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/function/InternalReduceWindowFunction.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/function/InternalReduceWindowFunction.java new file mode 100644 index 0000000000000..6ce673fcabe3e --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/function/InternalReduceWindowFunction.java @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.function; + + +import org.apache.flink.api.common.state.StateDeclaration; +import org.apache.flink.datastream.api.extension.join.ReduceFunction; +import org.apache.flink.datastream.api.extension.window.WindowProcessFunction; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.api.extension.window.window.Window; + +import java.util.Set; + +public class InternalReduceWindowFunction + extends InternalWindowFunction { + private final ReduceFunction reduceFunction; + + public InternalReduceWindowFunction( + WindowProcessFunction windowProcessFunction, + WindowAssigner assigner, + Trigger trigger, + ReduceFunction reduceFunction) { + super(windowProcessFunction, assigner, trigger); + this.reduceFunction = reduceFunction; + } + + public ReduceFunction getReduceFunction() { + return reduceFunction; + } + + @Override + public Set usesStates() { + return getWindowProcessFunction().usesStates(); + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/function/InternalTwoInputWindowFunction.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/function/InternalTwoInputWindowFunction.java new file mode 100644 index 0000000000000..11c25f339444a --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/function/InternalTwoInputWindowFunction.java @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.function; + + +import org.apache.flink.api.common.state.StateDeclaration; +import org.apache.flink.datastream.api.common.Collector; +import org.apache.flink.datastream.api.context.PartitionedContext; +import org.apache.flink.datastream.api.extension.window.TwoInputWindowProcessFunction; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.api.extension.window.utils.TaggedUnion; +import org.apache.flink.datastream.api.extension.window.window.Window; +import org.apache.flink.datastream.api.function.TwoInputNonBroadcastStreamProcessFunction; + +import java.util.Set; + +public class InternalTwoInputWindowFunction + implements TwoInputNonBroadcastStreamProcessFunction { + + private final TwoInputWindowProcessFunction windowProcessFunction; + + private final WindowAssigner, W> assigner; + + private final Trigger, W> trigger; + + public InternalTwoInputWindowFunction( + TwoInputWindowProcessFunction windowProcessFunction, + WindowAssigner, W> assigner, + Trigger, W> trigger) { + this.windowProcessFunction = windowProcessFunction; + this.assigner = assigner; + this.trigger = trigger; + } + + @Override + public void processRecordFromFirstInput(IN1 record, Collector output, PartitionedContext ctx) + throws Exception { + // Do nothing as this will translator to windowOperator instead of processOperator. + } + + @Override + public void processRecordFromSecondInput(IN2 record, Collector output, PartitionedContext ctx) + throws Exception { + // Do nothing as this will translator to windowOperator instead of processOperator. + } + + public TwoInputWindowProcessFunction getWindowProcessFunction() { + return windowProcessFunction; + } + + @Override + public Set usesStates() { + return windowProcessFunction.usesStates(); + } + + public WindowAssigner, W> getAssigner() { + return assigner; + } + + public Trigger, W> getTrigger() { + return trigger; + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/function/InternalWindowFunction.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/function/InternalWindowFunction.java new file mode 100644 index 0000000000000..169a5641570e3 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/function/InternalWindowFunction.java @@ -0,0 +1,74 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.function; + + +import org.apache.flink.api.common.state.StateDeclaration; +import org.apache.flink.datastream.api.common.Collector; +import org.apache.flink.datastream.api.context.PartitionedContext; +import org.apache.flink.datastream.api.context.RuntimeContext; +import org.apache.flink.datastream.api.extension.window.WindowProcessFunction; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.api.extension.window.window.Window; +import org.apache.flink.datastream.api.function.OneInputStreamProcessFunction; + +import java.util.Set; + +/** This is only a container for window related things. */ +public class InternalWindowFunction + implements OneInputStreamProcessFunction { + private final WindowProcessFunction windowProcessFunction; + + private final WindowAssigner assigner; + + private final Trigger trigger; + + public InternalWindowFunction( + WindowProcessFunction windowProcessFunction, + WindowAssigner assigner, + Trigger trigger) { + this.windowProcessFunction = windowProcessFunction; + this.assigner = assigner; + this.trigger = trigger; + } + + @Override + public void processRecord(IN record, Collector output, PartitionedContext ctx) + throws Exception { + // Do nothing as this will translator to windowOperator instead of processOperator. + } + + public WindowAssigner getAssigner() { + return assigner; + } + + public Trigger getTrigger() { + return trigger; + } + + public WindowProcessFunction getWindowProcessFunction() { + return windowProcessFunction; + } + + @Override + public Set usesStates() { + return windowProcessFunction.usesStates(); + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/function/PassThroughWindowProcessFunction.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/function/PassThroughWindowProcessFunction.java new file mode 100644 index 0000000000000..44d0695b4db28 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/function/PassThroughWindowProcessFunction.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.function; + +import org.apache.flink.datastream.api.common.Collector; +import org.apache.flink.datastream.api.context.RuntimeContext; +import org.apache.flink.datastream.api.extension.window.WindowProcessFunction; +import org.apache.flink.datastream.api.extension.window.window.Window; + +public class PassThroughWindowProcessFunction + implements WindowProcessFunction { + @Override + public void processRecord( + IN record, Collector output, RuntimeContext ctx, WindowContext windowContext) + throws Exception { + output.collect(record); + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/operators/TwoInputWindowProcessOperator.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/operators/TwoInputWindowProcessOperator.java new file mode 100644 index 0000000000000..0240d122946ea --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/operators/TwoInputWindowProcessOperator.java @@ -0,0 +1,697 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.operators; + +import org.apache.flink.api.common.state.AppendingState; +import org.apache.flink.api.common.state.ListState; +import org.apache.flink.api.common.state.ListStateDeclaration; +import org.apache.flink.api.common.state.ListStateDescriptor; +import org.apache.flink.api.common.state.MapState; +import org.apache.flink.api.common.state.MapStateDeclaration; +import org.apache.flink.api.common.state.State; +import org.apache.flink.api.common.state.StateDeclaration; +import org.apache.flink.api.common.state.StateDescriptor; +import org.apache.flink.api.common.state.ValueState; +import org.apache.flink.api.common.state.ValueStateDeclaration; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.java.typeutils.TypeExtractor; +import org.apache.flink.datastream.api.extension.window.TwoInputWindowProcessFunction; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.api.extension.window.utils.TaggedUnion; +import org.apache.flink.datastream.api.extension.window.window.Window; +import org.apache.flink.datastream.impl.extension.window.ParallelismAwareKeySelector; +import org.apache.flink.datastream.impl.extension.window.function.InternalTwoInputWindowFunction; +import org.apache.flink.datastream.impl.extension.window.window.BoundedWindow; +import org.apache.flink.datastream.impl.extension.window.window.TimeWindow; +import org.apache.flink.datastream.impl.operators.KeyedTwoInputNonBroadcastProcessOperator; +import org.apache.flink.datastream.impl.operators.TwoInputNonBroadcastProcessOperator; +import org.apache.flink.datastream.impl.utils.StateDeclarationConverter; +import org.apache.flink.metrics.Counter; +import org.apache.flink.metrics.MetricGroup; +import org.apache.flink.runtime.state.internal.InternalAppendingState; +import org.apache.flink.runtime.state.internal.InternalMergingState; +import org.apache.flink.streaming.api.operators.ChainingStrategy; +import org.apache.flink.streaming.api.operators.InternalTimer; +import org.apache.flink.streaming.api.operators.InternalTimerService; +import org.apache.flink.streaming.api.operators.Triggerable; +import org.apache.flink.streaming.api.watermark.Watermark; +import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; +import org.apache.flink.util.OutputTag; + +import java.util.Collection; +import java.util.Optional; + +public class TwoInputWindowProcessOperator + extends TwoInputNonBroadcastProcessOperator implements Triggerable { + private static final long serialVersionUID = 1L; + + // ------------------------------------------------------------------------ + // Configuration values and user functions + // ------------------------------------------------------------------------ + + protected final WindowAssigner, W> windowAssigner; + + private final Trigger, ? super W> trigger; + + private final StateDescriptor, ?> leftWindowStateDescriptor; + + private final StateDescriptor, ?> + rightWindowStateDescriptor; + + /** For serializing the window in checkpoints. */ + protected final TypeSerializer windowSerializer; + + private static final String LATE_ELEMENTS_DROPPED_METRIC_NAME = "numLateRecordsDropped"; + + protected transient Counter numLateRecordsDropped; + + // ------------------------------------------------------------------------ + // State that is not checkpointed + // ------------------------------------------------------------------------ + + /** The state in which the window contents is stored. Each window is a namespace */ + private transient InternalAppendingState leftWindowState; + + /** The state in which the window contents is stored. Each window is a namespace */ + private transient InternalAppendingState rightWindowState; + + private transient WindowStateStore windowStateStore; + + private final ACC1 acc1InitValue; + + private final ACC2 acc2InitValue; + + // ------------------------------------------------------------------------ + // Context + // ------------------------------------------------------------------------ + + protected transient WindowTriggerContext triggerContext; + + protected transient WindowFunctionContext windowFunctionContext; + + protected transient InternalWindowAssignerContext windowAssignerContext; + + /** + * The allowed lateness for elements. This is used for: + * + *

    + *
  • Deciding if an element should be dropped from a window due to lateness. + *
  • Clearing the state of a window if the system time passes the {@code window.maxTimestamp + * + allowedLateness} landmark. + *
+ */ + protected final long allowedLateness; + + protected final OutputTag leftLateOutputTag; + + protected final OutputTag rightLateOutputTag; + + // ------------------------------------------------------------------------ + // State that needs to be checkpointed + // ------------------------------------------------------------------------ + + protected transient InternalTimerService internalTimerService; + + private final TwoInputWindowProcessFunction windowProcessFunction; + + public TwoInputWindowProcessOperator( + InternalTwoInputWindowFunction windowFunction, + WindowAssigner, W> windowAssigner, + Trigger, ? super W> trigger, + TypeSerializer windowSerializer, + StateDescriptor, ?> windowStateDescriptor1, + StateDescriptor, ?> windowStateDescriptor2, + long allowedLateness, + OutputTag leftLateOutputTag, + OutputTag rightLateOutputTag, + ACC1 acc1InitValue, + ACC2 acc2InitValue) { + super(windowFunction); + this.windowProcessFunction = windowFunction.getWindowProcessFunction(); + this.windowAssigner = windowAssigner; + this.trigger = trigger; + this.windowSerializer = windowSerializer; + this.leftWindowStateDescriptor = windowStateDescriptor1; + this.rightWindowStateDescriptor = windowStateDescriptor2; + this.allowedLateness = allowedLateness; + this.leftLateOutputTag = leftLateOutputTag; + this.rightLateOutputTag = rightLateOutputTag; + this.acc1InitValue = acc1InitValue; + this.acc2InitValue = acc2InitValue; + + // TODO: +// setChainingStrategy(ChainingStrategy.ALWAYS); + } + + @Override + public void open() throws Exception { + super.open(); + + // inject parallelism for ParallelismAwareKeySelector. + if (getStateKeySelector1() instanceof ParallelismAwareKeySelector) { + ((ParallelismAwareKeySelector) getStateKeySelector1()) + .setParallelismSupplier(() -> getRuntimeContext().getTaskInfo().getIndexOfThisSubtask()); + } + + numLateRecordsDropped = metrics.counter(LATE_ELEMENTS_DROPPED_METRIC_NAME); + + internalTimerService = + getInternalTimerService("process-window-timers", windowSerializer, this); + + triggerContext = new WindowTriggerContext(null, null); + windowFunctionContext = new WindowFunctionContext(); + windowStateStore = new WindowStateStore(); + windowAssignerContext = new InternalWindowAssignerContext(); + + // create (or restore) the state that hold the actual window contents + // NOTE - the state may be null in the case of the overriding evicting window operator + if (leftWindowStateDescriptor != null) { + leftWindowState = + (InternalAppendingState) + getOrCreateKeyedState(windowSerializer, leftWindowStateDescriptor); + } + + if (rightWindowStateDescriptor != null) { + rightWindowState = + (InternalAppendingState) + getOrCreateKeyedState(windowSerializer, rightWindowStateDescriptor); + } + } + + @Override + public void processElement1(StreamRecord element) throws Exception { + final Collection elementWindows = + windowAssigner.assignWindows( + TaggedUnion.one(element.getValue()), + element.getTimestamp(), + windowAssignerContext); + + // if element is handled by none of assigned elementWindows + boolean isSkippedElement = true; + + final K key = this.getKeyedStateBackend().getCurrentKey(); + + for (W window : elementWindows) { + // drop if the window is already late + if (isWindowLate(window)) { + continue; + } + isSkippedElement = false; + + leftWindowState.setCurrentNamespace(window); + leftWindowState.add(element.getValue()); + + triggerContext.key = key; + triggerContext.window = window; + + Trigger.TriggerResult triggerResult = triggerContext.onElement1(element); + + if (triggerResult.isFire()) { + ACC1 leftContent = leftWindowState.get(); + ACC2 rightContent = rightWindowState.get(); + if (leftContent == null && rightContent == null) { + continue; + } + if (leftContent == null) { + leftContent = acc1InitValue; + } + if (rightContent == null) { + rightContent = acc2InitValue; + } + emitWindowContents(window, leftContent, rightContent); + } + + if (triggerResult.isPurge()) { + leftWindowState.clear(); + rightWindowState.clear(); + } + if (window instanceof BoundedWindow) { + ((BoundedWindow) window).registerCleaner(triggerContext); + } + } + + // side output input event if element not handled by any window late arriving tag has been + // set windowAssigner is event time and current timestamp + allowed lateness no less than + // element timestamp. + if (isSkippedElement && isElementLate(element)) { + if (leftLateOutputTag != null) { + leftSideOutput(element); + } else { + this.numLateRecordsDropped.inc(); + } + } + } + + @Override + public void processElement2(StreamRecord element) throws Exception { + final Collection elementWindows = + windowAssigner.assignWindows( + TaggedUnion.two(element.getValue()), + element.getTimestamp(), + windowAssignerContext); + + // if element is handled by none of assigned elementWindows + boolean isSkippedElement = true; + + final K key = this.getKeyedStateBackend().getCurrentKey(); + + for (W window : elementWindows) { + // drop if the window is already late + if (isWindowLate(window)) { + continue; + } + isSkippedElement = false; + + rightWindowState.setCurrentNamespace(window); + rightWindowState.add(element.getValue()); + + triggerContext.key = key; + triggerContext.window = window; + + Trigger.TriggerResult triggerResult = triggerContext.onElement2(element); + + if (triggerResult.isFire()) { + ACC1 leftContent = leftWindowState.get(); + ACC2 rightContent = rightWindowState.get(); + if (leftContent == null && rightContent == null) { + continue; + } + if (leftContent == null) { + leftContent = acc1InitValue; + } + if (rightContent == null) { + rightContent = acc2InitValue; + } + emitWindowContents(window, leftContent, rightContent); + } + + if (triggerResult.isPurge()) { + leftWindowState.clear(); + rightWindowState.clear(); + } + if (window instanceof BoundedWindow) { + ((BoundedWindow) window).registerCleaner(triggerContext); + } + } + + // side output input event if element not handled by any window late arriving tag has been + // set windowAssigner is event time and current timestamp + allowed lateness no less than + // element timestamp. + if (isSkippedElement && isElementLate(element)) { + if (rightLateOutputTag != null) { + rightSideOutput(element); + } else { + this.numLateRecordsDropped.inc(); + } + } + } + + @Override + public void onEventTime(InternalTimer timer) throws Exception { + triggerContext.key = timer.getKey(); + triggerContext.window = timer.getNamespace(); + + leftWindowState.setCurrentNamespace(triggerContext.window); + rightWindowState.setCurrentNamespace(triggerContext.window); + + Trigger.TriggerResult triggerResult = + triggerContext.onEventTime(timer.getTimestamp()); + + if (triggerResult.isFire()) { + ACC1 leftContent = leftWindowState.get(); + ACC2 rightContent = rightWindowState.get(); + if (leftContent != null || rightContent != null) { + if (leftContent == null) { + leftContent = acc1InitValue; + } + if (rightContent == null) { + rightContent = acc2InitValue; + } + emitWindowContents(triggerContext.window, leftContent, rightContent); + } + } + + if (triggerResult.isPurge()) { + leftWindowState.clear(); + rightWindowState.clear(); + } + + // TODO this can be removed in the future + if (windowAssigner.isEventTime() && triggerContext.window instanceof TimeWindow) { + windowAssignerContext.currentEventTime = timer.getTimestamp(); + if (((TimeWindow) triggerContext.window).isBoundaryReached(windowAssignerContext)) { + clearAllState(triggerContext.window, leftWindowState, rightWindowState); + } + } + } + + @Override + public void onProcessingTime(InternalTimer timer) throws Exception { + triggerContext.key = timer.getKey(); + triggerContext.window = timer.getNamespace(); + + leftWindowState.setCurrentNamespace(triggerContext.window); + rightWindowState.setCurrentNamespace(triggerContext.window); + + Trigger.TriggerResult triggerResult = triggerContext.onProcessingTime(timer.getTimestamp()); + + if (triggerResult.isFire()) { + ACC1 leftContent = leftWindowState.get(); + ACC2 rightContent = rightWindowState.get(); + if (leftContent != null || rightContent != null) { + if (leftContent == null) { + leftContent = acc1InitValue; + } + if (rightContent == null) { + rightContent = acc2InitValue; + } + emitWindowContents(triggerContext.window, leftContent, rightContent); + } + } + + if (triggerResult.isPurge()) { + leftWindowState.clear(); + rightWindowState.clear(); + } + + if (!windowAssigner.isEventTime() && triggerContext.window instanceof TimeWindow) { + if (((TimeWindow) triggerContext.window).isBoundaryReached(windowAssignerContext)) { + clearAllState(triggerContext.window, leftWindowState, rightWindowState); + } + } + } + + + /** + * Drops all state for the given window and calls {@link Trigger#clear(Window, + * Trigger.TriggerContext)}. + * + *

The caller must ensure that the correct key is set in the state backend and the + * triggerContext object. + */ + private void clearAllState( + W window, AppendingState leftState, AppendingState rightState) + throws Exception { + leftState.clear(); + rightState.clear(); + triggerContext.clear(); + windowFunctionContext.window = window; + windowProcessFunction.endOfWindow(window); + } + + /** Emits the contents of the given window using the {@link InternalTwoInputWindowFunction}. */ + @SuppressWarnings("unchecked") + private void emitWindowContents(W window, ACC1 leftContents, ACC2 rightContents) + throws Exception { + // only time window touch the time concept. + if (window instanceof TimeWindow) { + collector.setTimestamp(((TimeWindow) window).maxTimeStamp()); + } + windowFunctionContext.window = window; + windowProcessFunction.processRecord( + leftContents, rightContents, collector, context, windowFunctionContext); + } + + /** + * Write skipped late arriving element to SideOutput. + * + * @param element skipped late arriving element to side output + */ + protected void leftSideOutput(StreamRecord element) { + output.collect(leftLateOutputTag, element); + } + + protected void rightSideOutput(StreamRecord element) { + output.collect(rightLateOutputTag, element); + } + + /** + * Returns {@code true} if the watermark is after the end timestamp plus the allowed lateness of + * the given window. + */ + // TODO Provide a common later strategy. + protected boolean isWindowLate(W window) { + if (window instanceof TimeWindow) { + return ((TimeWindow) window).isWindowLate(internalTimerService.currentWatermark()); + } + return false; + } + + /** + * Decide if a record is currently late, based on current watermark and allowed lateness. + * + * @param element The element to check + * @return The element for which should be considered when sideoutputs + */ + protected boolean isElementLate(StreamRecord element) { + return (windowAssigner.isEventTime()) + && (element.getTimestamp() + allowedLateness + <= internalTimerService.currentWatermark()); + } + + // ------------------------------------------------------------------------- + // Window State Store + // ------------------------------------------------------------------------- + + private class WindowStateStore { + @SuppressWarnings("unchecked") + public Optional> getWindowState( + ListStateDeclaration stateDeclaration, W namespace) { + if (!windowProcessFunction.useWindowStates().contains(stateDeclaration)) { + return Optional.empty(); + } + + ListStateDescriptor listStateDescriptor = new ListStateDescriptor( + stateDeclaration.getName(), + TypeExtractor.createTypeInfo(stateDeclaration + .getTypeDescriptor() + .getTypeClass())); + + StateDeclaration.RedistributionMode redistributionMode = + stateDeclaration.getRedistributionMode(); + if (redistributionMode == StateDeclaration.RedistributionMode.NONE) { + try { + return Optional.ofNullable( + getPartitionedState(namespace, windowSerializer, listStateDescriptor)); + } catch (Exception e) { + return Optional.empty(); + } + } else { + throw new UnsupportedOperationException( + "RedistributionMode " + + redistributionMode.name() + + " is not supported for window state."); + } + } + + public Optional> getWindowState( + MapStateDeclaration stateDeclaration, W namespace) { + // TODO impl + return null; + } + + public Optional> getWindowState( + ValueStateDeclaration stateDeclaration, W namespace) { + // TODO impl; + return null; + } + } + + // ------------------------------------------------------------------------- + // Trigger Context + // ------------------------------------------------------------------------- + + /** + * {@code Context} is a utility for handling {@link Trigger} invocations. It can be reused by + * setting the {@code key} and {@code window} fields. No internal state must be kept in the + * {@code Context} + */ + private class WindowTriggerContext implements Trigger.OnMergeContext { + protected K key; + protected W window; + + protected Collection mergedWindows; + + public WindowTriggerContext(K key, W window) { + this.key = key; + this.window = window; + } + + @Override + public void mergeWindowState(StateDeclaration stateDeclaration) { + if (mergedWindows != null && mergedWindows.size() > 0) { + try { + State rawState = + getKeyedStateBackend() + .getOrCreateKeyedState( + windowSerializer, + StateDeclarationConverter.getStateDescriptor( + stateDeclaration)); + + if (rawState instanceof InternalMergingState) { + @SuppressWarnings("unchecked") + InternalMergingState mergingState = + (InternalMergingState) rawState; + mergingState.mergeNamespaces(window, mergedWindows); + } else { + throw new IllegalArgumentException( + "The given state declaration does not refer to a mergeable state (MergingState)"); + } + } catch (Exception e) { + throw new RuntimeException("Error while merging state.", e); + } + } + } + + @Override + public MetricGroup getMetricGroup() { + return TwoInputWindowProcessOperator.this.getMetricGroup(); + } + + public long getCurrentWatermark() { + return internalTimerService.currentWatermark(); + } + + @Override + public long getCurrentProcessingTime() { + return internalTimerService.currentProcessingTime(); + } + + @Override + public void registerProcessingTimeTimer(long time) { + internalTimerService.registerProcessingTimeTimer(window, time); + } + + @Override + public void registerEventTimeListener(long time) { + internalTimerService.registerEventTimeTimer( + window, time); + // TODO handle generalized watermark. + } + + public void deleteProcessingTimeTimer(long time) { + internalTimerService.deleteProcessingTimeTimer(window, time); + } + + @Override + public void deleteEventTimeListener(long time) { + internalTimerService.deleteProcessingTimeTimer( + window, time); + } + + @SuppressWarnings("unchecked") + @Override + public Optional> getWindowState( + ListStateDeclaration stateDeclaration) { + return windowStateStore.getWindowState(stateDeclaration, window); + } + + @Override + public Optional> getWindowState( + MapStateDeclaration stateDeclaration) { + return windowStateStore.getWindowState(stateDeclaration, window); + } + + @Override + public Optional> getWindowState( + ValueStateDeclaration stateDeclaration) { + return windowStateStore.getWindowState(stateDeclaration, window); + } + + public Trigger.TriggerResult onElement1(StreamRecord element) throws Exception { + return trigger.onElement( + TaggedUnion.one(element.getValue()), element.getTimestamp(), window, this); + } + + public Trigger.TriggerResult onElement2(StreamRecord element) throws Exception { + return trigger.onElement( + TaggedUnion.two(element.getValue()), element.getTimestamp(), window, this); + } + + public Trigger.TriggerResult onProcessingTime(long time) throws Exception { + return trigger.onProcessingTime(time, window, this); + } + + public Trigger.TriggerResult onEventTime(long time) throws Exception { + return trigger.onEventTime(time, window, this); + } + + public void onMerge(W mergeResult, Collection mergedWindows) throws Exception { + this.mergedWindows = mergedWindows; + trigger.onMerge(window, this); + } + + public void clear() throws Exception { + trigger.clear(window, this); + } + + @Override + public String toString() { + return "Context{" + "key=" + key + ", window=" + window + '}'; + } + } + + // ------------------------------------------------------------------------- + // Window Assigner Context + // ------------------------------------------------------------------------- + private class InternalWindowAssignerContext extends WindowAssigner.WindowAssignerContext { + private long currentEventTime; + + @Override + public long getCurrentProcessingTime() { + return internalTimerService.currentProcessingTime(); + } + + @Override + public long getCurrentEventTime() { + return currentEventTime; + } + }; + + // ------------------------------------------------------------------------- + // Window Context + // ------------------------------------------------------------------------- + public class WindowFunctionContext implements TwoInputWindowProcessFunction.WindowContext { + private W window; + + @Override + public W window() { + return window; + } + + @Override + public Optional> getWindowState( + ListStateDeclaration stateDeclaration) throws Exception { + return windowStateStore.getWindowState(stateDeclaration, window); + } + + @Override + public Optional> getWindowState( + ValueStateDeclaration stateDeclaration) throws Exception { + return windowStateStore.getWindowState(stateDeclaration, window); + } + + @Override + public Optional> getWindowState( + MapStateDeclaration stateDeclaration) throws Exception { + return windowStateStore.getWindowState(stateDeclaration, window); + } + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/operators/WindowProcessOperator.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/operators/WindowProcessOperator.java new file mode 100644 index 0000000000000..134ecf28f768a --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/operators/WindowProcessOperator.java @@ -0,0 +1,786 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.operators; + +import org.apache.flink.api.common.state.AppendingState; +import org.apache.flink.api.common.state.ListState; +import org.apache.flink.api.common.state.ListStateDeclaration; +import org.apache.flink.api.common.state.ListStateDescriptor; +import org.apache.flink.api.common.state.MapState; +import org.apache.flink.api.common.state.MapStateDeclaration; +import org.apache.flink.api.common.state.State; +import org.apache.flink.api.common.state.StateDeclaration; +import org.apache.flink.api.common.state.StateDescriptor; +import org.apache.flink.api.common.state.ValueState; +import org.apache.flink.api.common.state.ValueStateDeclaration; +import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.api.java.typeutils.TypeExtractor; +import org.apache.flink.api.java.typeutils.runtime.TupleSerializer; +import org.apache.flink.datastream.api.extension.window.WindowProcessFunction; +import org.apache.flink.datastream.api.extension.window.assigner.MergingWindowAssigner; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger.TriggerResult; +import org.apache.flink.datastream.api.extension.window.window.Window; +import org.apache.flink.datastream.impl.extension.window.MergingWindowSet; +import org.apache.flink.datastream.impl.extension.window.ParallelismAwareKeySelector; +import org.apache.flink.datastream.impl.extension.window.function.InternalWindowFunction; +import org.apache.flink.datastream.impl.extension.window.window.BoundedWindow; +import org.apache.flink.datastream.impl.extension.window.window.TimeWindow; +import org.apache.flink.datastream.impl.operators.KeyedProcessOperator; +import org.apache.flink.datastream.impl.operators.ProcessOperator; +import org.apache.flink.datastream.impl.utils.StateDeclarationConverter; +import org.apache.flink.metrics.Counter; +import org.apache.flink.metrics.MetricGroup; +import org.apache.flink.runtime.state.VoidNamespace; +import org.apache.flink.runtime.state.VoidNamespaceSerializer; +import org.apache.flink.runtime.state.internal.InternalAppendingState; +import org.apache.flink.runtime.state.internal.InternalListState; +import org.apache.flink.runtime.state.internal.InternalMergingState; +import org.apache.flink.streaming.api.operators.ChainingStrategy; +import org.apache.flink.streaming.api.operators.InternalTimer; +import org.apache.flink.streaming.api.operators.InternalTimerService; +import org.apache.flink.streaming.api.operators.Triggerable; +import org.apache.flink.streaming.api.watermark.Watermark; +import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; +import org.apache.flink.util.OutputTag; + +import java.util.Collection; +import java.util.Optional; + +import static org.apache.flink.util.Preconditions.checkArgument; + +// TODO: should be keyed operator +/** Process operator for window. */ +public class WindowProcessOperator + extends ProcessOperator implements Triggerable { + + private static final long serialVersionUID = 1L; + + // ------------------------------------------------------------------------ + // Configuration values and user functions + // ------------------------------------------------------------------------ + + protected final WindowAssigner windowAssigner; + + private final Trigger trigger; + + protected transient WindowTriggerContext triggerContext = new WindowTriggerContext(null, null); + + protected transient WindowFunctionContext windowFunctionContext; + + private final StateDescriptor, ?> windowStateDescriptor; + + /** For serializing the key in checkpoints. */ + protected final TypeSerializer keySerializer; + + /** For serializing the window in checkpoints. */ + protected final TypeSerializer windowSerializer; + + /** + * The allowed lateness for elements. This is used for: + * + *

    + *
  • Deciding if an element should be dropped from a window due to lateness. + *
  • Clearing the state of a window if the system time passes the {@code window.maxTimestamp + * + allowedLateness} landmark. + *
+ */ + protected final long allowedLateness; + + /** + * {@link OutputTag} to use for late arriving events. Elements for which {@code + * window.maxTimestamp + allowedLateness} is smaller than the current watermark will be emitted + * to this. + */ + protected final OutputTag lateDataOutputTag; + + private static final String LATE_ELEMENTS_DROPPED_METRIC_NAME = "numLateRecordsDropped"; + + protected transient Counter numLateRecordsDropped; + + // ------------------------------------------------------------------------ + // State that is not checkpointed + // ------------------------------------------------------------------------ + + /** The state in which the window contents is stored. Each window is a namespace */ + private transient InternalAppendingState windowState; + + private transient WindowStateStore windowStateStore; + + /** + * The {@link #windowState}, typed to merging state for merging windows. Null if the window + * state is not mergeable. + */ + private transient InternalMergingState windowMergingState; + + /** The state that holds the merging window metadata (the sets that describe what is merged). */ + private transient InternalListState> mergingSetsState; + + protected transient InternalWindowAssignerContext windowAssignerContext; + + // ------------------------------------------------------------------------ + // State that needs to be checkpointed + // ------------------------------------------------------------------------ + + protected transient InternalTimerService internalTimerService; + + private final WindowProcessFunction windowFunction; + + public WindowProcessOperator( + InternalWindowFunction windowFunction, + WindowAssigner windowAssigner, + Trigger trigger, + TypeSerializer windowSerializer, + TypeSerializer keySerializer, + StateDescriptor, ?> windowStateDescriptor, + long allowedLateness, + OutputTag lateDataOutputTag) { + super(windowFunction); + + checkArgument(allowedLateness >= 0); + + checkArgument( + windowStateDescriptor == null || windowStateDescriptor.isSerializerInitialized(), + "window state serializer is not properly initialized"); + + this.windowFunction = windowFunction.getWindowProcessFunction(); + this.windowAssigner = windowAssigner; + this.trigger = trigger; + this.windowSerializer = windowSerializer; + this.keySerializer = keySerializer; + this.windowStateDescriptor = windowStateDescriptor; + this.allowedLateness = allowedLateness; + this.lateDataOutputTag = lateDataOutputTag; + + // TODO: +// setChainingStrategy(ChainingStrategy.ALWAYS); + } + + @Override + public void open() throws Exception { + super.open(); + + // inject parallelism for ParallelismAwareKeySelector. + if (getStateKeySelector1() instanceof ParallelismAwareKeySelector) { + ((ParallelismAwareKeySelector) getStateKeySelector1()) + .setParallelismSupplier(() -> getRuntimeContext().getTaskInfo().getIndexOfThisSubtask()); + } + + numLateRecordsDropped = metrics.counter(LATE_ELEMENTS_DROPPED_METRIC_NAME); + + internalTimerService = + getInternalTimerService("process-window-timers", windowSerializer, this); + + triggerContext = new WindowTriggerContext(null, null); + windowFunctionContext = new WindowFunctionContext(); + windowStateStore = new WindowStateStore(); + + windowAssignerContext = new InternalWindowAssignerContext(); + + // create (or restore) the state that hold the actual window contents + // NOTE - the state may be null in the case of the overriding evicting window operator + if (windowStateDescriptor != null) { + windowState = + (InternalAppendingState) + getOrCreateKeyedState(windowSerializer, windowStateDescriptor); + } + + // create the typed and helper states for merging windows + if (windowAssigner instanceof MergingWindowAssigner) { + + // store a typed reference for the state of merging windows - sanity check + if (windowState instanceof InternalMergingState) { + windowMergingState = (InternalMergingState) windowState; + } else if (windowState != null) { + throw new IllegalStateException( + "The window uses a merging assigner, but the window state is not mergeable."); + } + + @SuppressWarnings("unchecked") + final Class> typedTuple = (Class>) (Class) Tuple2.class; + + final TupleSerializer> tupleSerializer = + new TupleSerializer<>( + typedTuple, new TypeSerializer[] {windowSerializer, windowSerializer}); + + final ListStateDescriptor> mergingSetsStateDescriptor = + new ListStateDescriptor<>("merging-window-set", tupleSerializer); + + // get the state that stores the merging sets + mergingSetsState = + (InternalListState>) + getOrCreateKeyedState( + VoidNamespaceSerializer.INSTANCE, mergingSetsStateDescriptor); + mergingSetsState.setCurrentNamespace(VoidNamespace.INSTANCE); + } + } + + @Override + public void close() throws Exception { + super.close(); + triggerContext = null; + windowFunctionContext = null; + windowAssignerContext = null; + } + + @Override + public void processElement(StreamRecord element) throws Exception { + final Collection elementWindows = + windowAssigner.assignWindows( + element.getValue(), element.getTimestamp(), windowAssignerContext); + + // if element is handled by none of assigned elementWindows + boolean isSkippedElement = true; + + final K key = this.getKeyedStateBackend().getCurrentKey(); + + if (windowAssigner instanceof MergingWindowAssigner) { + MergingWindowSet mergingWindows = getMergingWindowSet(); + + for (W window : elementWindows) { + + // adding the new window might result in a merge, in that case the actualWindow + // is the merged window and we work with that. If we don't merge then + // actualWindow == window + W actualWindow = + mergingWindows.addWindow( + window, + new MergingWindowSet.MergeFunction() { + @Override + public void merge( + W mergeResult, + Collection mergedWindows, + W stateWindowResult, + Collection mergedStateWindows) + throws Exception { + triggerContext.key = key; + triggerContext.window = mergeResult; + + triggerContext.onMerge(mergeResult, mergedWindows); + + for (W m : mergedWindows) { + triggerContext.window = m; + triggerContext.clear(); + if (m instanceof BoundedWindow) { + ((BoundedWindow) m) + .unRegisterCleaner(triggerContext); + } + } + + // merge the merged state windows into the newly resulting + // state window + windowMergingState.mergeNamespaces( + stateWindowResult, mergedStateWindows); + } + }); + + // drop if the window is already late + if (isWindowLate(actualWindow)) { + mergingWindows.retireWindow(actualWindow); + continue; + } + isSkippedElement = false; + + W stateWindow = mergingWindows.getStateWindow(actualWindow); + if (stateWindow == null) { + throw new IllegalStateException( + "Window " + window + " is not in in-flight window set."); + } + + windowState.setCurrentNamespace(stateWindow); + windowState.add(element.getValue()); + + triggerContext.key = key; + triggerContext.window = actualWindow; + + Trigger.TriggerResult triggerResult = triggerContext.onElement(element); + + if (triggerResult.isFire()) { + ACC contents = windowState.get(); + if (contents == null) { + continue; + } + emitWindowContents(actualWindow, contents); + } + + if (triggerResult.isPurge()) { + windowState.clear(); + } + if (window instanceof BoundedWindow) { + ((BoundedWindow) window).registerCleaner(triggerContext); + } + } + + // need to make sure to update the merging state in state + mergingWindows.persist(); + } else { + for (W window : elementWindows) { + + // drop if the window is already late + if (isWindowLate(window)) { + continue; + } + isSkippedElement = false; + + windowState.setCurrentNamespace(window); + windowState.add(element.getValue()); + + triggerContext.key = key; + triggerContext.window = window; + + Trigger.TriggerResult triggerResult = triggerContext.onElement(element); + + if (triggerResult.isFire()) { + ACC contents = windowState.get(); + if (contents == null) { + continue; + } + emitWindowContents(window, contents); + } + + if (triggerResult.isPurge()) { + windowState.clear(); + } + if (window instanceof BoundedWindow) { + ((BoundedWindow) window).registerCleaner(triggerContext); + } + } + } + + // side output input event if element not handled by any window late arriving tag has been + // set windowAssigner is event time and current timestamp + allowed lateness no less than + // element timestamp. + if (isSkippedElement && isElementLate(element)) { + if (lateDataOutputTag != null) { + sideOutput(element); + } else { + this.numLateRecordsDropped.inc(); + } + } + } + + @Override + public void onEventTime(InternalTimer timer) throws Exception { + triggerContext.key = timer.getKey(); + triggerContext.window = timer.getNamespace(); + + MergingWindowSet mergingWindows; + + if (windowAssigner instanceof MergingWindowAssigner) { + mergingWindows = getMergingWindowSet(); + W stateWindow = mergingWindows.getStateWindow(triggerContext.window); + if (stateWindow == null) { + // Timer firing for non-existent window, this can only happen if a + // trigger did not clean up timers. We have already cleared the merging + // window and therefore the Trigger state, however, so nothing to do. + return; + } else { + windowState.setCurrentNamespace(stateWindow); + } + } else { + windowState.setCurrentNamespace(triggerContext.window); + mergingWindows = null; + } + + TriggerResult triggerResult = + triggerContext.onEventTime(timer.getTimestamp()); + + if (triggerResult.isFire()) { + ACC contents = windowState.get(); + if (contents != null) { + emitWindowContents(triggerContext.window, contents); + } + } + + if (triggerResult.isPurge()) { + windowState.clear(); + } + + // TODO this can be removed in the future + if (windowAssigner.isEventTime()) { + if (triggerContext.window instanceof TimeWindow) { + windowAssignerContext.currentEventTime = timer.getTimestamp(); + if (((TimeWindow) triggerContext.window).isBoundaryReached(windowAssignerContext)) { + clearAllState(triggerContext.window, windowState, mergingWindows); + } + } + } + + if (mergingWindows != null) { + // need to make sure to update the merging state in state + mergingWindows.persist(); + } + } + + @Override + public void onProcessingTime(InternalTimer timer) throws Exception { + triggerContext.key = timer.getKey(); + triggerContext.window = timer.getNamespace(); + + MergingWindowSet mergingWindows; + + if (windowAssigner instanceof MergingWindowAssigner) { + mergingWindows = getMergingWindowSet(); + W stateWindow = mergingWindows.getStateWindow(triggerContext.window); + if (stateWindow == null) { + // Timer firing for non-existent window, this can only happen if a + // trigger did not clean up timers. We have already cleared the merging + // window and therefore the Trigger state, however, so nothing to do. + return; + } else { + windowState.setCurrentNamespace(stateWindow); + } + } else { + windowState.setCurrentNamespace(triggerContext.window); + mergingWindows = null; + } + + TriggerResult triggerResult = triggerContext.onProcessingTime(timer.getTimestamp()); + + if (triggerResult.isFire()) { + ACC contents = windowState.get(); + if (contents != null) { + emitWindowContents(triggerContext.window, contents); + } + } + + if (triggerResult.isPurge()) { + windowState.clear(); + } + + if (!windowAssigner.isEventTime() && triggerContext.window instanceof TimeWindow) { + if (((TimeWindow) triggerContext.window).isBoundaryReached(windowAssignerContext)) { + clearAllState(triggerContext.window, windowState, mergingWindows); + } + } + + if (mergingWindows != null) { + // need to make sure to update the merging state in state + mergingWindows.persist(); + } + } + + /** + * Drops all state for the given window and calls {@link Trigger#clear(Window, + * Trigger.TriggerContext)}. + * + *

The caller must ensure that the correct key is set in the state backend and the + * triggerContext object. + */ + private void clearAllState( + W window, AppendingState windowState, MergingWindowSet mergingWindows) + throws Exception { + windowState.clear(); + triggerContext.clear(); + windowFunctionContext.window = window; + windowFunction.endOfWindow(window); + if (mergingWindows != null) { + mergingWindows.retireWindow(window); + mergingWindows.persist(); + } + } + + /** + * Emits the contents of the given window using the {@link + * org.apache.flink.streaming.runtime.operators.windowing.functions.InternalWindowFunction}. + */ + @SuppressWarnings("unchecked") + private void emitWindowContents(W window, ACC contents) throws Exception { + // only time window touch the time concept. + if (window instanceof TimeWindow) { + outputCollector.setTimestamp(((TimeWindow) window).maxTimeStamp()); + } + windowFunctionContext.window = window; + windowFunction.processRecord(contents, outputCollector, context, windowFunctionContext); + } + + /** + * Write skipped late arriving element to SideOutput. + * + * @param element skipped late arriving element to side output + */ + protected void sideOutput(StreamRecord element) { + output.collect(lateDataOutputTag, element); + } + + /** + * Retrieves the {@link MergingWindowSet} for the currently active key. The caller must ensure + * that the correct key is set in the state backend. + * + *

The caller must also ensure to properly persist changes to state using {@link + * MergingWindowSet#persist()}. + */ + protected MergingWindowSet getMergingWindowSet() throws Exception { + @SuppressWarnings("unchecked") + MergingWindowAssigner mergingAssigner = + (MergingWindowAssigner) windowAssigner; + return new MergingWindowSet<>(mergingAssigner, mergingSetsState); + } + + /** + * Returns {@code true} if the watermark is after the end timestamp plus the allowed lateness of + * the given window. + */ + // TODO Provide a common later strategy. + protected boolean isWindowLate(W window) { + if (window instanceof TimeWindow) { + return ((TimeWindow) window).isWindowLate(internalTimerService.currentWatermark()); + } + return false; + } + + /** + * Decide if a record is currently late, based on current watermark and allowed lateness. + * + * @param element The element to check + * @return The element for which should be considered when sideoutputs + */ + protected boolean isElementLate(StreamRecord element) { + return (windowAssigner.isEventTime()) + && (element.getTimestamp() + allowedLateness + <= internalTimerService.currentWatermark()); + } + + // ------------------------------------------------------------------------- + // Window State Store + // ------------------------------------------------------------------------- + + private class WindowStateStore { + @SuppressWarnings("unchecked") + public Optional> getWindowState( + ListStateDeclaration stateDeclaration, W namespace) { + if (!windowFunction.useWindowStates().contains(stateDeclaration)) { + return Optional.empty(); + } + + ListStateDescriptor listStateDescriptor = new ListStateDescriptor<>( + stateDeclaration.getName(), + TypeExtractor.createTypeInfo(stateDeclaration + .getTypeDescriptor() + .getTypeClass())); + + StateDeclaration.RedistributionMode redistributionMode = + stateDeclaration.getRedistributionMode(); + if (redistributionMode == StateDeclaration.RedistributionMode.NONE) { + try { + return Optional.ofNullable( + WindowProcessOperator.this.getPartitionedState( + namespace, windowSerializer, listStateDescriptor)); + } catch (Exception e) { + return Optional.empty(); + } + } else { + throw new UnsupportedOperationException( + "RedistributionMode " + + redistributionMode.name() + + " is not supported for window state."); + } + } + + public Optional> getWindowState( + MapStateDeclaration stateDeclaration, W namespace) { + // TODO impl + return null; + } + + public Optional> getWindowState( + ValueStateDeclaration stateDeclaration, W namespace) { + // TODO impl; + return null; + } + } + + // ------------------------------------------------------------------------- + // Trigger Context + // ------------------------------------------------------------------------- + + /** + * {@code Context} is a utility for handling {@link Trigger} invocations. It can be reused by + * setting the {@code key} and {@code window} fields. No internal state must be kept in the + * {@code Context} + */ + private class WindowTriggerContext implements Trigger.OnMergeContext { + protected K key; + protected W window; + + protected Collection mergedWindows; + + public WindowTriggerContext(K key, W window) { + this.key = key; + this.window = window; + } + + @Override + public void mergeWindowState(StateDeclaration stateDeclaration) { + if (mergedWindows != null && mergedWindows.size() > 0) { + try { + State rawState = + getKeyedStateBackend() + .getOrCreateKeyedState( + windowSerializer, + StateDeclarationConverter.getStateDescriptor( + stateDeclaration)); + + if (rawState instanceof InternalMergingState) { + @SuppressWarnings("unchecked") + InternalMergingState mergingState = + (InternalMergingState) rawState; + mergingState.mergeNamespaces(window, mergedWindows); + } else { + throw new IllegalArgumentException( + "The given state declaration does not refer to a mergeable state (MergingState)"); + } + } catch (Exception e) { + throw new RuntimeException("Error while merging state.", e); + } + } + } + + @Override + public MetricGroup getMetricGroup() { + return WindowProcessOperator.this.getMetricGroup(); + } + + public long getCurrentWatermark() { + return internalTimerService.currentWatermark(); + } + + @Override + public long getCurrentProcessingTime() { + return internalTimerService.currentProcessingTime(); + } + + @Override + public void registerProcessingTimeTimer(long time) { + internalTimerService.registerProcessingTimeTimer(window, time); + } + + @Override + public void registerEventTimeListener(long time) { + internalTimerService.registerEventTimeTimer( + window, time); + // TODO handle generalized watermark. + } + + public void deleteProcessingTimeTimer(long time) { + internalTimerService.deleteProcessingTimeTimer(window, time); + } + + @Override + public void deleteEventTimeListener(long time) { + internalTimerService.deleteProcessingTimeTimer( + window, time); + } + + @SuppressWarnings("unchecked") + @Override + public Optional> getWindowState( + ListStateDeclaration stateDeclaration) { + return windowStateStore.getWindowState(stateDeclaration, window); + } + + @Override + public Optional> getWindowState( + MapStateDeclaration stateDeclaration) { + return windowStateStore.getWindowState(stateDeclaration, window); + } + + @Override + public Optional> getWindowState( + ValueStateDeclaration stateDeclaration) { + return windowStateStore.getWindowState(stateDeclaration, window); + } + + public Trigger.TriggerResult onElement(StreamRecord element) throws Exception { + return trigger.onElement(element.getValue(), element.getTimestamp(), window, this); + } + + public Trigger.TriggerResult onProcessingTime(long time) throws Exception { + return trigger.onProcessingTime(time, window, this); + } + + public Trigger.TriggerResult onEventTime(long time) throws Exception { + return trigger.onEventTime(time, window, this); + } + + public void onMerge(W mergeResult, Collection mergedWindows) throws Exception { + this.mergedWindows = mergedWindows; + trigger.onMerge(window, this); + } + + public void clear() throws Exception { + trigger.clear(window, this); + } + + @Override + public String toString() { + return "Context{" + "key=" + key + ", window=" + window + '}'; + } + } + + // ------------------------------------------------------------------------- + // Window Assigner Context + // ------------------------------------------------------------------------- + private class InternalWindowAssignerContext extends WindowAssigner.WindowAssignerContext { + private long currentEventTime; + + @Override + public long getCurrentProcessingTime() { + return internalTimerService.currentProcessingTime(); + } + + @Override + public long getCurrentEventTime() { + return currentEventTime; + } + }; + + // ------------------------------------------------------------------------- + // Window Context + // ------------------------------------------------------------------------- + public class WindowFunctionContext implements WindowProcessFunction.WindowContext { + private W window; + + @Override + public W window() { + return window; + } + + @Override + public Optional> getWindowState( + ListStateDeclaration stateDeclaration) throws Exception { + return windowStateStore.getWindowState(stateDeclaration, window); + } + + @Override + public Optional> getWindowState( + ValueStateDeclaration stateDeclaration) throws Exception { + return windowStateStore.getWindowState(stateDeclaration, window); + } + + @Override + public Optional> getWindowState( + MapStateDeclaration stateDeclaration) throws Exception { + return windowStateStore.getWindowState(stateDeclaration, window); + } + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/trigger/EventTimeTrigger.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/trigger/EventTimeTrigger.java new file mode 100644 index 0000000000000..8c6a85e4e3ba3 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/trigger/EventTimeTrigger.java @@ -0,0 +1,91 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.trigger; + + +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.impl.extension.window.window.TimeWindow; + +public class EventTimeTrigger extends Trigger { + private static final long serialVersionUID = 1L; + + private EventTimeTrigger() {} + + @Override + public TriggerResult onElement( + Object element, long timestamp, TimeWindow window, Trigger.TriggerContext ctx) + throws Exception { + if (window.maxTimeStamp() <= ctx.getCurrentWatermark()) { + // if the watermark is already past the window fire immediately + return TriggerResult.FIRE; + } else { + ctx.registerEventTimeListener(window.maxTimeStamp()); + return TriggerResult.CONTINUE; + } + } + + public TriggerResult onEventTime( + long time, TimeWindow window, TriggerContext ctx) throws Exception { + return time == window.maxTimeStamp() + ? TriggerResult.FIRE + : TriggerResult.CONTINUE; + } + + @Override + public TriggerResult onProcessingTime(long time, TimeWindow window, Trigger.TriggerContext ctx) + throws Exception { + return TriggerResult.CONTINUE; + } + + @Override + public void clear(TimeWindow window, Trigger.TriggerContext ctx) throws Exception { + ctx.deleteEventTimeListener(window.maxTimeStamp()); + } + + @Override + public boolean canMerge() { + return true; + } + + @Override + public void onMerge(TimeWindow window, Trigger.OnMergeContext ctx) { + // only register a timer if the watermark is not yet past the end of the merged window + // this is in line with the logic in onElement(). If the watermark is past the end of + // the window onElement() will fire and setting a timer here would fire the window twice. + long windowMaxTimestamp = window.maxTimeStamp(); + if (windowMaxTimestamp > ctx.getCurrentWatermark()) { + ctx.registerEventTimeListener(windowMaxTimestamp); + } + } + + @Override + public String toString() { + return "EventTimeTrigger()"; + } + + /** + * Creates an event-time trigger that fires once the watermark passes the end of the window. + * + *

Once the trigger fires all elements are discarded. Elements that arrive late immediately + * trigger window evaluation with just this one element. + */ + public static EventTimeTrigger create() { + return new EventTimeTrigger(); + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/trigger/ProcessingTimeTrigger.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/trigger/ProcessingTimeTrigger.java new file mode 100644 index 0000000000000..6186c27420251 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/trigger/ProcessingTimeTrigger.java @@ -0,0 +1,78 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.trigger; + + +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.impl.extension.window.window.TimeWindow; + +public class ProcessingTimeTrigger extends Trigger { + private static final long serialVersionUID = 1L; + + private ProcessingTimeTrigger() {} + + @Override + public TriggerResult onElement( + Object element, long timestamp, TimeWindow window, Trigger.TriggerContext ctx) { + ctx.registerProcessingTimeTimer(window.maxBoundary()); + return TriggerResult.CONTINUE; + } + + public TriggerResult onEventTime( + long time, TimeWindow window, TriggerContext ctx) throws Exception { + return TriggerResult.CONTINUE; + } + + @Override + public TriggerResult onProcessingTime( + long time, TimeWindow window, Trigger.TriggerContext ctx) { + return TriggerResult.FIRE; + } + + @Override + public void clear(TimeWindow window, Trigger.TriggerContext ctx) throws Exception { + ctx.deleteProcessingTimeTimer(window.maxBoundary()); + } + + @Override + public boolean canMerge() { + return true; + } + + @Override + public void onMerge(TimeWindow window, Trigger.OnMergeContext ctx) { + // only register a timer if the time is not yet past the end of the merged window + // this is in line with the logic in onElement(). If the time is past the end of + // the window onElement() will fire and setting a timer here would fire the window twice. + long windowMaxTimestamp = window.maxBoundary(); + if (windowMaxTimestamp > ctx.getCurrentProcessingTime()) { + ctx.registerProcessingTimeTimer(windowMaxTimestamp); + } + } + + @Override + public String toString() { + return "ProcessingTimeTrigger()"; + } + + /** Creates a new trigger that fires once system time passes the end of the window. */ + public static ProcessingTimeTrigger create() { + return new ProcessingTimeTrigger(); + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/window/BoundedWindow.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/window/BoundedWindow.java new file mode 100644 index 0000000000000..d9ca4b7897ba3 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/window/BoundedWindow.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.window; + + +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.datastream.api.extension.window.window.Window; + +public interface BoundedWindow extends Window { + BOUND maxBoundary(); + + boolean isBoundaryReached(WindowAssigner.WindowAssignerContext context); + + /** Registers a timer to clean up the content of the window. */ + void registerCleaner(Trigger.TriggerContext triggerContext); + + /** Unregister a timer to clean up the content of the window. */ + void unRegisterCleaner(Trigger.TriggerContext triggerContext); +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/window/GlobalWindow.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/window/GlobalWindow.java new file mode 100644 index 0000000000000..e845dbc26e590 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/window/GlobalWindow.java @@ -0,0 +1,124 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.window; + +import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; + +import java.io.IOException; + +public class GlobalWindow implements UnboundedWindow { + private static final GlobalWindow INSTANCE = new GlobalWindow(); + + private GlobalWindow() {} + + public static GlobalWindow get() { + return INSTANCE; + } + + @Override + public boolean equals(Object o) { + return this == o || !(o == null || getClass() != o.getClass()); + } + + @Override + public int hashCode() { + return 0; + } + + @Override + public String toString() { + return "GlobalWindow"; + } + + /** A {@link TypeSerializer} for {@link GlobalWindow}. */ + public static class Serializer extends TypeSerializerSingleton { + private static final long serialVersionUID = 1L; + + @Override + public boolean isImmutableType() { + return true; + } + + @Override + public GlobalWindow createInstance() { + return GlobalWindow.INSTANCE; + } + + @Override + public GlobalWindow copy(GlobalWindow from) { + return from; + } + + @Override + public GlobalWindow copy(GlobalWindow from, GlobalWindow reuse) { + return from; + } + + @Override + public int getLength() { + return Byte.BYTES; + } + + @Override + public void serialize(GlobalWindow record, DataOutputView target) throws IOException { + target.writeByte(0); + } + + @Override + public GlobalWindow deserialize(DataInputView source) throws IOException { + source.readByte(); + return GlobalWindow.INSTANCE; + } + + @Override + public GlobalWindow deserialize(GlobalWindow reuse, DataInputView source) + throws IOException { + source.readByte(); + return GlobalWindow.INSTANCE; + } + + @Override + public void copy(DataInputView source, DataOutputView target) throws IOException { + source.readByte(); + target.writeByte(0); + } + + // ------------------------------------------------------------------------ + + @Override + public TypeSerializerSnapshot snapshotConfiguration() { + return new GlobalWindow.Serializer.GlobalWindowSerializerSnapshot(); + } + + /** Serializer configuration snapshot for compatibility and format evolution. */ + @SuppressWarnings("WeakerAccess") + public static final class GlobalWindowSerializerSnapshot + extends SimpleTypeSerializerSnapshot { + + public GlobalWindowSerializerSnapshot() { + super(GlobalWindow.Serializer::new); + } + } + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/window/TimeWindow.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/window/TimeWindow.java new file mode 100644 index 0000000000000..be6f6e4c0b084 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/window/TimeWindow.java @@ -0,0 +1,306 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.window; + +import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; +import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; +import org.apache.flink.datastream.api.extension.eventtime.EventTimeManager; +import org.apache.flink.datastream.api.extension.window.assigner.MergingWindowAssigner; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.trigger.Trigger; +import org.apache.flink.util.MathUtils; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +public class TimeWindow implements BoundedWindow { + private final long start; + private final long end; + + private final boolean isEventTime; + + private EventTimeManager eventTimeManager; + + public TimeWindow(long start, long end, boolean isEventTime) { + this.start = start; + this.end = end; + this.isEventTime = isEventTime; + } + + /** + * Gets the starting timestamp of the window. This is the first timestamp that belongs to this + * window. + * + * @return The starting timestamp of this window. + */ + public long getStart() { + return start; + } + + /** + * Gets the end timestamp of this window. The end timestamp is exclusive, meaning it is the + * first timestamp that does not belong to this window any more. + * + * @return The exclusive end timestamp of this window. + */ + public long getEnd() { + return end; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + TimeWindow that = (TimeWindow) o; + return getStart() == that.getStart() && getEnd() == that.getEnd(); + } + + @Override + public int hashCode() { + return MathUtils.longToIntWithBitMixing(start + end); + } + + @Override + public String toString() { + return "TimeWindow{" + "start=" + start + ", end=" + end + '}'; + } + + /** + * Returns {@code true} if this window intersects the given window or if this window is just + * after or before the given window. + */ + public boolean intersects(TimeWindow other) { + return this.start <= other.end && this.end >= other.start; + } + + /** Returns the minimal window covers both this window and the given window. */ + public TimeWindow cover(TimeWindow other) { + return new TimeWindow(Math.min(start, other.start), Math.max(end, other.end), isEventTime); + } + + /** + * Gets the largest timestamp that still belongs to this window. + * + *

This timestamp is identical to {@code getEnd() - 1}. + * + * @return The largest timestamp that still belongs to this window. + * @see #getEnd() + */ + @Override + public Long maxBoundary() { + if (isEventTime) { + long cleanupTime = maxTimeStamp() + 0; + return cleanupTime >= maxTimeStamp() ? cleanupTime : Long.MAX_VALUE; + } else { + return maxTimeStamp(); + } + } + + @Override + public boolean isBoundaryReached(WindowAssigner.WindowAssignerContext context) { + if (isEventTime) { + return context.getCurrentEventTime() == maxBoundary(); + } else { + return context.getCurrentProcessingTime() == maxBoundary(); + } + } + + public boolean isWindowLate(long currentWatermark) { + return isEventTime && maxBoundary() <= currentWatermark; + } + + @Override + public void registerCleaner(Trigger.TriggerContext triggerContext) { + if (isEventTime) { + triggerContext.registerEventTimeListener(maxBoundary()); + } else { + triggerContext.registerProcessingTimeTimer(maxBoundary()); + } + } + + @Override + public void unRegisterCleaner(Trigger.TriggerContext triggerContext) { + if (isEventTime) { + triggerContext.deleteEventTimeListener(maxBoundary()); + } else { + triggerContext.deleteProcessingTimeTimer(maxBoundary()); + } + } + + public long maxTimeStamp() { + return end - 1; + } + // ------------------------------------------------------------------------ + // Serializer + // ------------------------------------------------------------------------ + + /** The serializer used to write the TimeWindow type. */ + public static class Serializer extends TypeSerializerSingleton { + private static final long serialVersionUID = 1L; + + @Override + public boolean isImmutableType() { + return true; + } + + @Override + public TimeWindow createInstance() { + return new TimeWindow(0L, 1L, false); + } + + @Override + public TimeWindow copy(TimeWindow from) { + return from; + } + + @Override + public TimeWindow copy(TimeWindow from, TimeWindow reuse) { + return from; + } + + @Override + public int getLength() { + return Long.BYTES + Long.BYTES; + } + + @Override + public void serialize(TimeWindow record, DataOutputView target) throws IOException { + target.writeLong(record.start); + target.writeLong(record.end); + target.writeBoolean(record.isEventTime); + } + + @Override + public TimeWindow deserialize(DataInputView source) throws IOException { + long start = source.readLong(); + long end = source.readLong(); + boolean isEventTime = source.readBoolean(); + return new TimeWindow(start, end, isEventTime); + } + + @Override + public TimeWindow deserialize(TimeWindow reuse, DataInputView source) throws IOException { + return deserialize(source); + } + + @Override + public void copy(DataInputView source, DataOutputView target) throws IOException { + target.writeLong(source.readLong()); + target.writeLong(source.readLong()); + target.writeBoolean(source.readBoolean()); + } + + // ------------------------------------------------------------------------ + + @Override + public TypeSerializerSnapshot snapshotConfiguration() { + return new TimeWindow.Serializer.TimeWindowSerializerSnapshot(); + } + + /** Serializer configuration snapshot for compatibility and format evolution. */ + @SuppressWarnings("WeakerAccess") + public static final class TimeWindowSerializerSnapshot + extends SimpleTypeSerializerSnapshot { + + public TimeWindowSerializerSnapshot() { + super(TimeWindow.Serializer::new); + } + } + } + + // ------------------------------------------------------------------------ + // Utilities + // ------------------------------------------------------------------------ + + /** + * Merge overlapping {@link TimeWindow}s. For use by merging {@link WindowAssigner + * WindowAssigners}. + */ + public static void mergeWindows( + Collection windows, MergingWindowAssigner.MergeCallback c) { + + // sort the windows by the start time and then merge overlapping windows + + List sortedWindows = new ArrayList<>(windows); + + Collections.sort(sortedWindows, (o1, o2) -> Long.compare(o1.getStart(), o2.getStart())); + + List>> merged = new ArrayList<>(); + Tuple2> currentMerge = null; + + for (TimeWindow candidate : sortedWindows) { + if (currentMerge == null) { + currentMerge = new Tuple2<>(); + currentMerge.f0 = candidate; + currentMerge.f1 = new HashSet<>(); + currentMerge.f1.add(candidate); + } else if (currentMerge.f0.intersects(candidate)) { + currentMerge.f0 = currentMerge.f0.cover(candidate); + currentMerge.f1.add(candidate); + } else { + merged.add(currentMerge); + currentMerge = new Tuple2<>(); + currentMerge.f0 = candidate; + currentMerge.f1 = new HashSet<>(); + currentMerge.f1.add(candidate); + } + } + + if (currentMerge != null) { + merged.add(currentMerge); + } + + for (Tuple2> m : merged) { + if (m.f1.size() > 1) { + c.merge(m.f1, m.f0); + } + } + } + + /** + * Method to get the window start for a timestamp. + * + * @param timestamp epoch millisecond to get the window start. + * @param offset The offset which window start would be shifted by. + * @param windowSize The size of the generated windows. + * @return window start + */ + public static long getWindowStartWithOffset(long timestamp, long offset, long windowSize) { + final long remainder = (timestamp - offset) % windowSize; + // handle both positive and negative cases + if (remainder < 0) { + return timestamp - (remainder + windowSize); + } else { + return timestamp - remainder; + } + } +} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/window/UnboundedWindow.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/window/UnboundedWindow.java new file mode 100644 index 0000000000000..cacf4dba486a1 --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/extension/window/window/UnboundedWindow.java @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.extension.window.window; + + +import org.apache.flink.datastream.api.extension.window.window.Window; + +/** The window without boundary. */ +public interface UnboundedWindow extends Window {} diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/stream/GlobalStreamImpl.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/stream/GlobalStreamImpl.java index 137917bca4ff8..144fa62a61f90 100644 --- a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/stream/GlobalStreamImpl.java +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/stream/GlobalStreamImpl.java @@ -21,9 +21,11 @@ import org.apache.flink.api.common.attribute.Attribute; import org.apache.flink.api.common.state.StateDeclaration; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.api.common.typeinfo.Types; import org.apache.flink.api.connector.dsv2.Sink; import org.apache.flink.api.dag.Transformation; import org.apache.flink.api.java.functions.KeySelector; +import org.apache.flink.api.java.functions.NullByteKeySelector; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.datastream.api.function.OneInputStreamProcessFunction; import org.apache.flink.datastream.api.function.TwoInputNonBroadcastStreamProcessFunction; @@ -35,6 +37,7 @@ import org.apache.flink.datastream.api.stream.ProcessConfigurable; import org.apache.flink.datastream.impl.ExecutionEnvironmentImpl; import org.apache.flink.datastream.impl.attribute.AttributeParser; +import org.apache.flink.datastream.impl.extension.window.function.InternalWindowFunction; import org.apache.flink.datastream.impl.operators.ProcessOperator; import org.apache.flink.datastream.impl.operators.TwoInputNonBroadcastProcessOperator; import org.apache.flink.datastream.impl.operators.TwoOutputProcessOperator; @@ -70,13 +73,26 @@ public ProcessConfigurableAndGlobalStream process( TypeInformation outType = StreamUtils.getOutputTypeForOneInputProcessFunction(processFunction, getType()); - ProcessOperator operator = new ProcessOperator<>(processFunction); - return StreamUtils.wrapWithConfigureHandle( - transform( - "Global Process", - outType, - operator, - AttributeParser.parseAttribute(processFunction))); + + + if (processFunction instanceof InternalWindowFunction) { + // Transform to keyed stream. + KeyedPartitionStreamImpl keyedStream = + new KeyedPartitionStreamImpl<>( + this, getTransformation(), new NullByteKeySelector<>(), Types.BYTE); + Transformation outTransformation = + keyedStream.transformWindow(outType, processFunction); + outTransformation.setParallelism(1, true); + return StreamUtils.wrapWithConfigureHandle(new GlobalStreamImpl<>(keyedStream.environment, outTransformation)); + } else { + ProcessOperator operator = new ProcessOperator<>(processFunction); + return StreamUtils.wrapWithConfigureHandle( + transform( + "Global Process", + outType, + operator, + AttributeParser.parseAttribute(processFunction))); + } } @Override diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/stream/KeyedPartitionStreamImpl.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/stream/KeyedPartitionStreamImpl.java index 6fca168b4265a..95c06d37c9501 100644 --- a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/stream/KeyedPartitionStreamImpl.java +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/stream/KeyedPartitionStreamImpl.java @@ -18,6 +18,9 @@ package org.apache.flink.datastream.impl.stream; +import org.apache.flink.api.common.functions.ReduceFunction; +import org.apache.flink.api.common.state.ListStateDescriptor; +import org.apache.flink.api.common.state.ReducingStateDescriptor; import org.apache.flink.api.common.state.StateDeclaration; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.connector.dsv2.Sink; @@ -25,6 +28,10 @@ import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.TypeExtractor; +import org.apache.flink.configuration.Configuration; +import org.apache.flink.configuration.ExecutionOptions; +import org.apache.flink.datastream.api.extension.window.assigner.WindowAssigner; +import org.apache.flink.datastream.api.extension.window.utils.TaggedUnion; import org.apache.flink.datastream.api.function.OneInputStreamProcessFunction; import org.apache.flink.datastream.api.function.TwoInputBroadcastStreamProcessFunction; import org.apache.flink.datastream.api.function.TwoInputNonBroadcastStreamProcessFunction; @@ -37,13 +44,22 @@ import org.apache.flink.datastream.api.stream.NonKeyedPartitionStream.ProcessConfigurableAndTwoNonKeyedPartitionStream; import org.apache.flink.datastream.api.stream.ProcessConfigurable; import org.apache.flink.datastream.impl.attribute.AttributeParser; +import org.apache.flink.datastream.impl.extension.window.function.InternalReduceWindowFunction; +import org.apache.flink.datastream.impl.extension.window.function.InternalTwoInputWindowFunction; +import org.apache.flink.datastream.impl.extension.window.function.InternalWindowFunction; +import org.apache.flink.datastream.impl.extension.window.operators.TwoInputWindowProcessOperator; +import org.apache.flink.datastream.impl.extension.window.operators.WindowProcessOperator; import org.apache.flink.datastream.impl.operators.KeyedProcessOperator; import org.apache.flink.datastream.impl.operators.KeyedTwoInputBroadcastProcessOperator; import org.apache.flink.datastream.impl.operators.KeyedTwoInputNonBroadcastProcessOperator; import org.apache.flink.datastream.impl.operators.KeyedTwoOutputProcessOperator; import org.apache.flink.datastream.impl.utils.StreamUtils; import org.apache.flink.streaming.api.graph.StreamGraphGenerator; +import org.apache.flink.streaming.api.operators.ChainingStrategy; +import org.apache.flink.streaming.api.operators.OneInputStreamOperator; +import org.apache.flink.streaming.api.operators.SimpleUdfStreamOperatorFactory; import org.apache.flink.streaming.api.transformations.DataStreamV2SinkTransformation; +import org.apache.flink.streaming.api.transformations.OneInputTransformation; import org.apache.flink.streaming.api.transformations.PartitionTransformation; import org.apache.flink.streaming.runtime.partitioner.GlobalPartitioner; import org.apache.flink.streaming.runtime.partitioner.KeyGroupStreamPartitioner; @@ -115,16 +131,118 @@ public ProcessConfigurableAndNonKeyedPartitionStream process( TypeInformation outType; outType = StreamUtils.getOutputTypeForOneInputProcessFunction(processFunction, getType()); - KeyedProcessOperator operator = new KeyedProcessOperator<>(processFunction); - Transformation transform = - StreamUtils.getOneInputKeyedTransformation( - "KeyedProcess", this, outType, operator, keySelector, keyType); + Transformation transform; + Configuration configuration = getEnvironment().getConfiguration(); + boolean sortInputs = configuration.get(ExecutionOptions.SORT_INPUTS); + + if (processFunction instanceof InternalWindowFunction) { + transform = transformWindow(outType, processFunction); + } else { + KeyedProcessOperator operator = new KeyedProcessOperator<>(processFunction); + transform = + StreamUtils.getOneInputKeyedTransformation( + "KeyedProcess", this, outType, operator, keySelector, keyType); + } transform.setAttribute(AttributeParser.parseAttribute(processFunction)); environment.addOperator(transform); return StreamUtils.wrapWithConfigureHandle( new NonKeyedPartitionStreamImpl<>(environment, transform)); } + public Transformation transformTwoInputWindow( + TypeInformation outType, + TwoInputNonBroadcastStreamProcessFunction processFunction, + KeyedPartitionStreamImpl otherStream) { + // for iterable window. + if (processFunction instanceof InternalTwoInputWindowFunction) { + InternalTwoInputWindowFunction internalWindowFunction = + (InternalTwoInputWindowFunction) processFunction; + WindowAssigner, ?> assigner = + internalWindowFunction.getAssigner(); + ListStateDescriptor leftStateDesc = + new ListStateDescriptor<>( + "two-input-window-iterator-left-state", + getType().createSerializer(environment.getExecutionConfig().getSerializerConfig())); + ListStateDescriptor rightStateDesc = + new ListStateDescriptor<>( + "two-input-window-iterator-right-state", + getType().createSerializer(environment.getExecutionConfig().getSerializerConfig())); + + TwoInputWindowProcessOperator windowProcessOperator = + new TwoInputWindowProcessOperator( + internalWindowFunction, + assigner, + internalWindowFunction.getTrigger(), + assigner.getWindowSerializer(), + leftStateDesc, + rightStateDesc, + 0, + null, + null, + Collections.EMPTY_LIST, + Collections.EMPTY_LIST); + return StreamUtils.getTwoInputTransformation( + "Keyed-TwoInput-Window", this, otherStream, outType, windowProcessOperator); + } else { + throw new UnsupportedOperationException( + processFunction + "is not supported as two input window."); + } + } + + public Transformation transformWindow( + TypeInformation outType, + OneInputStreamProcessFunction processFunction) { + Transformation transform; + if (processFunction instanceof InternalReduceWindowFunction) { + InternalReduceWindowFunction internalWindowFunction = + (InternalReduceWindowFunction) processFunction; + WindowAssigner assigner = internalWindowFunction.getAssigner(); + ReducingStateDescriptor stateDesc = + new ReducingStateDescriptor<>( + "window-reduce-state", + // TODO We can directly pass Functions.ReduceFunction after remove old + // datastream api. + (ReduceFunction) internalWindowFunction.getReduceFunction()::reduce, + getType().createSerializer(environment.getExecutionConfig().getSerializerConfig())); + + WindowProcessOperator windowProcessOperator = + new WindowProcessOperator( + internalWindowFunction, + assigner, + internalWindowFunction.getTrigger(), + assigner.getWindowSerializer(), + keyType.createSerializer(environment.getExecutionConfig().getSerializerConfig()), + stateDesc, + 0L, + null); + transform = oneInputTransformWithOperator("Window", outType, windowProcessOperator); + } else if (processFunction instanceof InternalWindowFunction) { + InternalWindowFunction internalWindowFunction = + (InternalWindowFunction) processFunction; + WindowAssigner assigner = internalWindowFunction.getAssigner(); + ListStateDescriptor stateDesc = + new ListStateDescriptor<>( + "window-iterator-state", + getType().createSerializer(environment.getExecutionConfig().getSerializerConfig())); + + WindowProcessOperator windowProcessOperator = + new WindowProcessOperator( + internalWindowFunction, + assigner, + internalWindowFunction.getTrigger(), + assigner.getWindowSerializer(), + keyType.createSerializer(environment.getExecutionConfig().getSerializerConfig()), + stateDesc, + 0L, + null); + transform = oneInputTransformWithOperator("Window", outType, windowProcessOperator); + } else { + throw new IllegalArgumentException("Unsupported window function " + processFunction); + } + return transform; + } + + @Override public ProcessConfigurableAndKeyedPartitionStream process( OneInputStreamProcessFunction processFunction, @@ -263,15 +381,24 @@ public ProcessConfigurableAndNonKeyedPartitionStream connect getType(), ((KeyedPartitionStreamImpl) other).getType()); - KeyedTwoInputNonBroadcastProcessOperator processOperator = - new KeyedTwoInputNonBroadcastProcessOperator<>(processFunction); - Transformation outTransformation = - StreamUtils.getTwoInputTransformation( - "Keyed-TwoInput-Process", - this, - (KeyedPartitionStreamImpl) other, - outTypeInfo, - processOperator); + Transformation outTransformation; + if (processFunction instanceof InternalTwoInputWindowFunction) { + outTransformation = + transformTwoInputWindow( + outTypeInfo, + processFunction, + (KeyedPartitionStreamImpl) other); + } else { + KeyedTwoInputNonBroadcastProcessOperator processOperator = + new KeyedTwoInputNonBroadcastProcessOperator<>(processFunction); + outTransformation = + StreamUtils.getTwoInputTransformation( + "Keyed-TwoInput-Process", + this, + (KeyedPartitionStreamImpl) other, + outTypeInfo, + processOperator); + } outTransformation.setAttribute(AttributeParser.parseAttribute(processFunction)); environment.addOperator(outTransformation); return StreamUtils.wrapWithConfigureHandle( @@ -389,6 +516,31 @@ public ProcessConfigurableAndKeyedPartitionStream connect TypeExtractor.getKeySelectorTypes(newKeySelector, outputStream.getType()))); } + private Transformation oneInputTransformWithOperator( + String operatorName, + TypeInformation outputTypeInfo, + OneInputStreamOperator operator) { + // read the output type of the input Transform to coax out errors about MissingTypeInfo + transformation.getOutputType(); + + OneInputTransformation resultTransform = + new OneInputTransformation<>( + this.transformation, + operatorName, + SimpleUdfStreamOperatorFactory.of(operator), + outputTypeInfo, + environment.getParallelism(), + false); + + environment.addOperator(resultTransform); + + // inject the key selector and key type + resultTransform.setStateKeySelector(keySelector); + resultTransform.setStateKeyType(keyType); + + return resultTransform; + } + public TypeInformation getKeyType() { return keyType; } diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/stream/NonKeyedPartitionStreamImpl.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/stream/NonKeyedPartitionStreamImpl.java index c7dff10c309d1..1413a05f4b3ad 100644 --- a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/stream/NonKeyedPartitionStreamImpl.java +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/stream/NonKeyedPartitionStreamImpl.java @@ -20,6 +20,7 @@ import org.apache.flink.api.common.state.StateDeclaration; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.api.common.typeinfo.Types; import org.apache.flink.api.connector.dsv2.Sink; import org.apache.flink.api.dag.Transformation; import org.apache.flink.api.java.functions.KeySelector; @@ -35,6 +36,9 @@ import org.apache.flink.datastream.api.stream.ProcessConfigurable; import org.apache.flink.datastream.impl.ExecutionEnvironmentImpl; import org.apache.flink.datastream.impl.attribute.AttributeParser; +import org.apache.flink.datastream.impl.extension.window.ParallelismAwareKeySelector; +import org.apache.flink.datastream.impl.extension.window.function.InternalTwoInputWindowFunction; +import org.apache.flink.datastream.impl.extension.window.function.InternalWindowFunction; import org.apache.flink.datastream.impl.operators.ProcessOperator; import org.apache.flink.datastream.impl.operators.TwoInputBroadcastProcessOperator; import org.apache.flink.datastream.impl.operators.TwoInputNonBroadcastProcessOperator; @@ -88,6 +92,18 @@ public ProcessConfigurableAndNonKeyedPartitionStream process( StreamUtils.getOneInputTransformation( "Event-Time-Extractor", this, outType, operator); outputTransform.setParallelism(getTransformation().getParallelism()); + } else if (processFunction instanceof InternalWindowFunction) { + // Transform to keyed stream. + KeyedPartitionStreamImpl keyedStream = + new KeyedPartitionStreamImpl<>( + this, + getTransformation(), + new ParallelismAwareKeySelector<>(), + Types.INT); + Transformation transformedWindow = keyedStream.transformWindow( + outType, + processFunction); + return StreamUtils.wrapWithConfigureHandle(new NonKeyedPartitionStreamImpl<>(keyedStream.environment, transformedWindow)); } else { operator = new ProcessOperator<>(processFunction); outputTransform = @@ -136,6 +152,12 @@ public ProcessConfigurableAndTwoNonKeyedPartitionStream public ProcessConfigurableAndNonKeyedPartitionStream connectAndProcess( NonKeyedPartitionStream other, TwoInputNonBroadcastStreamProcessFunction processFunction) { + if (processFunction instanceof InternalTwoInputWindowFunction) { + // TODO support this. + throw new UnsupportedOperationException( + "Two input window is not supported for non-keyed stream now."); + } + validateStates( processFunction.usesStates(), new HashSet<>( diff --git a/flink-datastream/src/main/java/org/apache/flink/datastream/impl/utils/StateDeclarationConverter.java b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/utils/StateDeclarationConverter.java new file mode 100644 index 0000000000000..8a5bae280a80f --- /dev/null +++ b/flink-datastream/src/main/java/org/apache/flink/datastream/impl/utils/StateDeclarationConverter.java @@ -0,0 +1,72 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.utils; + +import org.apache.flink.api.common.state.ListStateDeclaration; +import org.apache.flink.api.common.state.ListStateDescriptor; +import org.apache.flink.api.common.state.MapStateDeclaration; +import org.apache.flink.api.common.state.MapStateDescriptor; +import org.apache.flink.api.common.state.StateDescriptor; +import org.apache.flink.api.common.state.ValueStateDeclaration; +import org.apache.flink.api.common.state.ValueStateDescriptor; +import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.api.common.state.StateDeclaration; +import org.apache.flink.api.java.typeutils.TypeExtractor; + +/** Utils to convert {@link StateDeclaration} to {@link StateDescriptor}. */ +public class StateDeclarationConverter { + public static StateDescriptor getStateDescriptor(StateDeclaration stateDeclaration) { + if (stateDeclaration instanceof ListStateDeclaration) { + return getListStateDescriptor((ListStateDeclaration) stateDeclaration); + } else if (stateDeclaration instanceof MapStateDeclaration) { + return getMapStateDescriptor((MapStateDeclaration) stateDeclaration); + } else if (stateDeclaration instanceof ValueStateDeclaration) { + return getValueStateDescriptor((ValueStateDeclaration) stateDeclaration); + } else { + throw new IllegalArgumentException( + "state declaration : " + stateDeclaration + " is not supported at the moment."); + } + } + + public static ListStateDescriptor getListStateDescriptor( + ListStateDeclaration stateDeclaration) { + //noinspection unchecked + return new ListStateDescriptor<>( + stateDeclaration.getName(), + TypeExtractor.createTypeInfo(stateDeclaration.getTypeDescriptor().getTypeClass())); + } + + public static ValueStateDescriptor getValueStateDescriptor( + ValueStateDeclaration stateDeclaration) { + //noinspection unchecked + return new ValueStateDescriptor<>( + stateDeclaration.getName(), + TypeExtractor.createTypeInfo(stateDeclaration.getTypeDescriptor().getTypeClass())); + } + + public static MapStateDescriptor getMapStateDescriptor( + MapStateDeclaration stateDeclaration) { + //noinspection unchecked + return new MapStateDescriptor( + stateDeclaration.getName(), + TypeExtractor.createTypeInfo(stateDeclaration.getKeyTypeDescriptor().getTypeClass()), + TypeExtractor.createTypeInfo(stateDeclaration.getValueTypeDescriptor().getTypeClass()) + ); + } +} diff --git a/flink-datastream/src/test/java/org/apache/flink/datastream/impl/operators/JoinTest.java b/flink-datastream/src/test/java/org/apache/flink/datastream/impl/operators/JoinTest.java new file mode 100644 index 0000000000000..34e82fd68ad98 --- /dev/null +++ b/flink-datastream/src/test/java/org/apache/flink/datastream/impl/operators/JoinTest.java @@ -0,0 +1,115 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.operators; + +import org.apache.flink.api.common.eventtime.TimestampAssignerSupplier; +import org.apache.flink.api.common.eventtime.WatermarkStrategy; + +import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.api.connector.dsv2.WrappedSink; +import org.apache.flink.api.connector.dsv2.WrappedSource; +import org.apache.flink.connector.datagen.source.DataGeneratorSource; +import org.apache.flink.connector.datagen.source.GeneratorFunction; +import org.apache.flink.datastream.api.ExecutionEnvironment; + +import org.apache.flink.datastream.api.common.Collector; +import org.apache.flink.datastream.api.context.PartitionedContext; +import org.apache.flink.datastream.api.context.RuntimeContext; +import org.apache.flink.datastream.api.extension.eventtime.EventTimeExtension; +import org.apache.flink.datastream.api.extension.join.JoinExtension; +import org.apache.flink.datastream.api.extension.join.JoinFunction; +import org.apache.flink.datastream.api.extension.window.WindowExtension; +import org.apache.flink.datastream.api.function.OneInputStreamProcessFunction; +import org.apache.flink.datastream.api.stream.KeyedPartitionStream; +import org.apache.flink.datastream.api.stream.NonKeyedPartitionStream; +import org.apache.flink.datastream.impl.operators.WindowOperatorTest.ValueWithTimestamp; + + +import org.apache.flink.streaming.api.functions.sink.PrintSink; + +import org.junit.jupiter.api.Test; + +import java.io.Serializable; +import java.time.Duration; + +class JoinTest implements Serializable { + @Test + public void testJoin() throws Exception { + ExecutionEnvironment env = ExecutionEnvironment.getInstance(); + + KeyedPartitionStream source1 = env.fromSource( + new WrappedSource(new DataGeneratorSource( + new WindowOperatorTest.TestGeneratorFunction(), + 100_000, + TypeInformation.of(ValueWithTimestamp.class))), + "source") + .process(EventTimeExtension.extractEventTime(element -> element.getTimestamp())) + .process(new OneInputStreamProcessFunction() { + @Override + public void processRecord( + ValueWithTimestamp record, + Collector output, + PartitionedContext ctx) throws Exception { + output.collect((long) record.getValue()); + } + }) + .keyBy(x -> x % 2); + + KeyedPartitionStream source2 = env.fromSource( + new WrappedSource(new DataGeneratorSource( + new WindowOperatorTest.TestGeneratorFunction(), + 100_000, + TypeInformation.of(ValueWithTimestamp.class))), + "source") + .process(EventTimeExtension.extractEventTime(element -> element.getTimestamp())) + .process(new OneInputStreamProcessFunction() { + @Override + public void processRecord( + ValueWithTimestamp record, + Collector output, + PartitionedContext ctx) throws Exception { + output.collect((long) record.getValue()); + } + }) + .keyBy(x -> x % 2); + + source1.connectAndProcess( + source2, + WindowExtension.apply( + WindowExtension.TimeWindows.ofTwoInputTumbling( + Duration.ofSeconds(5), WindowExtension.TimeWindows.TimeType.EVENT), + new JoinFunction() { + @Override + public void processRecord( + Long leftRecord, + Long rightRecord, + Collector output, + RuntimeContext ctx) + throws Exception { + output.collect( + String.format( + "joined: (%s, %s)", + leftRecord, rightRecord)); + } + }, + JoinExtension.JoinType.INNER)) + .toSink(new WrappedSink<>(new PrintSink<>())); + env.execute("testJoin"); + } +} diff --git a/flink-datastream/src/test/java/org/apache/flink/datastream/impl/operators/WindowOperatorTest.java b/flink-datastream/src/test/java/org/apache/flink/datastream/impl/operators/WindowOperatorTest.java new file mode 100644 index 0000000000000..f97035338a073 --- /dev/null +++ b/flink-datastream/src/test/java/org/apache/flink/datastream/impl/operators/WindowOperatorTest.java @@ -0,0 +1,377 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.datastream.impl.operators; + +import org.apache.flink.api.common.eventtime.TimestampAssigner; +import org.apache.flink.api.common.eventtime.TimestampAssignerSupplier; +import org.apache.flink.api.common.eventtime.Watermark; +import org.apache.flink.api.common.eventtime.WatermarkGenerator; +import org.apache.flink.api.common.eventtime.WatermarkGeneratorSupplier; +import org.apache.flink.api.common.eventtime.WatermarkOutput; +import org.apache.flink.api.common.eventtime.WatermarkStrategy; +import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.api.connector.dsv2.WrappedSink; +import org.apache.flink.api.connector.dsv2.WrappedSource; +import org.apache.flink.connector.datagen.source.DataGeneratorSource; +import org.apache.flink.connector.datagen.source.GeneratorFunction; +import org.apache.flink.datastream.api.ExecutionEnvironment; +import org.apache.flink.datastream.api.common.Collector; +import org.apache.flink.datastream.api.context.PartitionedContext; +import org.apache.flink.datastream.api.context.RuntimeContext; +import org.apache.flink.datastream.api.extension.eventtime.EventTimeExtension; +import org.apache.flink.datastream.api.extension.join.ReduceFunction; +import org.apache.flink.datastream.api.extension.window.WindowExtension; +import org.apache.flink.datastream.api.extension.window.WindowProcessFunction; +import org.apache.flink.datastream.api.extension.window.window.Window; +import org.apache.flink.datastream.api.function.OneInputStreamProcessFunction; +import org.apache.flink.datastream.api.stream.GlobalStream; +import org.apache.flink.datastream.api.stream.NonKeyedPartitionStream; +import org.apache.flink.streaming.api.functions.sink.PrintSink; +import org.apache.flink.util.IterableUtils; + +import org.junit.jupiter.api.Test; + +import java.io.Serializable; +import java.time.Duration; +import java.util.List; +import java.util.stream.Collectors; + +public class WindowOperatorTest implements Serializable { + @Test + void testProcess() throws Exception { + ExecutionEnvironment env = ExecutionEnvironment.getInstance(); + + NonKeyedPartitionStream.ProcessConfigurableAndNonKeyedPartitionStream source = env.fromSource( + new WrappedSource(new DataGeneratorSource( + new TestGeneratorFunction(), + 100_000, + TypeInformation.of(ValueWithTimestamp.class))), + "source"); + + NonKeyedPartitionStream.ProcessConfigurableAndNonKeyedPartitionStream process = + source.process(EventTimeExtension.extractEventTime(element -> element.timestamp)) + .process(new OneInputStreamProcessFunction() { + @Override + public void processRecord( + ValueWithTimestamp record, + Collector output, + PartitionedContext ctx) throws Exception { + output.collect((long) record.getValue()); + } + }) + .keyBy(x -> x) + .process( + WindowExtension.apply( + WindowExtension.TimeWindows.ofTumbling( + Duration.ofSeconds(5), + WindowExtension.TimeWindows.TimeType.EVENT), + new WindowProcessFunction< + Iterable, String, Window>() { + @Override + public void processRecord( + Iterable record, + Collector output, + RuntimeContext ctx, + WindowContext windowContext) + throws Exception { + Window window = windowContext.window(); + // handle records; + List collect = + IterableUtils.toStream(record) + .collect(Collectors.toList()); + output.collect(collect.toString()); + } + })); + + process.toSink(new WrappedSink<>(new PrintSink<>())); + env.execute("test process"); + } + + @Test + void testReduce() throws Exception { + ExecutionEnvironment env = ExecutionEnvironment.getInstance(); + NonKeyedPartitionStream.ProcessConfigurableAndNonKeyedPartitionStream source = env.fromSource( + new WrappedSource(new DataGeneratorSource( + new TestGeneratorFunction(), + 100_000, + TypeInformation.of(ValueWithTimestamp.class))), + "source"); + + NonKeyedPartitionStream.ProcessConfigurableAndNonKeyedPartitionStream process = source + .process(EventTimeExtension.extractEventTime(element -> element.timestamp)) + .process(new OneInputStreamProcessFunction() { + @Override + public void processRecord( + ValueWithTimestamp record, + Collector output, + PartitionedContext ctx) throws Exception { + output.collect((long) record.getValue()); + } + }) + .keyBy(x -> x) + .process( + WindowExtension.apply( + WindowExtension.TimeWindows.ofTumbling( + Duration.ofSeconds(5), + WindowExtension.TimeWindows.TimeType.EVENT), + (ReduceFunction) Long::sum)); + process.toSink(new WrappedSink<>(new PrintSink<>())); + env.execute("test reduce"); + } + + @Test + void testReduceWithProcessFunction() throws Exception { + ExecutionEnvironment env = ExecutionEnvironment.getInstance(); + NonKeyedPartitionStream.ProcessConfigurableAndNonKeyedPartitionStream source = env.fromSource( + new WrappedSource(new DataGeneratorSource( + new TestGeneratorFunction(), + 100_000, + TypeInformation.of(ValueWithTimestamp.class))), + "source"); + + NonKeyedPartitionStream.ProcessConfigurableAndNonKeyedPartitionStream process = source + .process(EventTimeExtension.extractEventTime(element -> element.timestamp)) + .process(new OneInputStreamProcessFunction() { + @Override + public void processRecord( + ValueWithTimestamp record, + Collector output, + PartitionedContext ctx) throws Exception { + output.collect((long) record.getValue()); + } + }) + .keyBy(x -> x) + .process( + WindowExtension.apply( + WindowExtension.TimeWindows.ofTumbling( + Duration.ofSeconds(5), + WindowExtension.TimeWindows.TimeType.EVENT), + (ReduceFunction) Long::sum, + new WindowProcessFunction() { + @Override + public void processRecord( + Long record, + Collector output, + RuntimeContext ctx, + WindowContext windowContext) + throws Exception { + output.collect(record); + } + })); + process.toSink(new WrappedSink<>(new PrintSink<>())); + env.execute("test reduce with process"); + } + + @Test + void testNonKeyed() throws Exception { + ExecutionEnvironment env = ExecutionEnvironment.getInstance(); + NonKeyedPartitionStream.ProcessConfigurableAndNonKeyedPartitionStream source = env.fromSource( + new WrappedSource(new DataGeneratorSource( + new TestGeneratorFunction(), + 100_000, + TypeInformation.of(ValueWithTimestamp.class))), + "source"); + + NonKeyedPartitionStream.ProcessConfigurableAndNonKeyedPartitionStream process = source + .process(EventTimeExtension.extractEventTime(element -> element.timestamp)) + .process(new OneInputStreamProcessFunction() { + @Override + public void processRecord( + ValueWithTimestamp record, + Collector output, + PartitionedContext ctx) throws Exception { + output.collect((long) record.getValue()); + } + }) + .process( + WindowExtension.apply( + WindowExtension.TimeWindows.ofTumbling( + Duration.ofSeconds(5), + WindowExtension.TimeWindows.TimeType.EVENT), + new ReduceFunction() { + @Override + public Long reduce(Long value1, Long value2) + throws Exception { + return value1 + value2; + } + }, + new WindowProcessFunction() { + @Override + public void processRecord( + Long record, + Collector output, + RuntimeContext ctx, + WindowContext windowContext) + throws Exception { + output.collect(record); + } + })); + process.toSink(new WrappedSink<>(new PrintSink<>())); + env.execute("test non keyed"); + } + + @Test + void testGlobal() throws Exception { + + ExecutionEnvironment env = ExecutionEnvironment.getInstance(); + NonKeyedPartitionStream.ProcessConfigurableAndNonKeyedPartitionStream source = env.fromSource( + new WrappedSource(new DataGeneratorSource( + new TestGeneratorFunction(), + 100_000, + TypeInformation.of(ValueWithTimestamp.class))), + "source"); + + GlobalStream.ProcessConfigurableAndGlobalStream process = source + .process(EventTimeExtension.extractEventTime(element -> element.timestamp)) + .process(new OneInputStreamProcessFunction() { + @Override + public void processRecord( + ValueWithTimestamp record, + Collector output, + PartitionedContext ctx) throws Exception { + output.collect((long) record.getValue()); + } + }).withParallelism(2) + .global() + .process( + WindowExtension.apply( + WindowExtension.TimeWindows.ofTumbling( + Duration.ofSeconds(5), + WindowExtension.TimeWindows.TimeType.EVENT), + new ReduceFunction() { + @Override + public Long reduce(Long value1, Long value2) + throws Exception { + return value1 + value2; + } + }, + new WindowProcessFunction() { + @Override + public void processRecord( + Long record, + Collector output, + RuntimeContext ctx, + WindowContext windowContext) + throws Exception { + output.collect(record); + } + })); + process.toSink(new WrappedSink<>(new PrintSink<>())); + env.execute("test global"); + } + + private static class PerElementWatermarkGenerator implements WatermarkGenerator { + + private long maxTimestamp; + + public PerElementWatermarkGenerator() { + maxTimestamp = Long.MIN_VALUE; + } + + @Override + public void onEvent(Long event, long eventTimestamp, WatermarkOutput output) { + if (eventTimestamp > maxTimestamp) { + maxTimestamp = eventTimestamp; + output.emitWatermark(new Watermark(eventTimestamp)); + } + } + + @Override + public void onPeriodicEmit(WatermarkOutput output) {} + + public static WatermarkGeneratorSupplier getSupplier() { + return (ctx) -> new PerElementWatermarkGenerator(); + } + } + + private static class ElementValueTimestampAssigner implements TimestampAssigner { + + @Override + public long extractTimestamp(Long element, long recordTimestamp) { + return element; + } + } + + public static class PerElementValueWithTimestampWatermarkGenerator + implements WatermarkGenerator { + + private long maxTimestamp; + + public PerElementValueWithTimestampWatermarkGenerator() { + maxTimestamp = Long.MIN_VALUE; + } + + @Override + public void onEvent(ValueWithTimestamp event, long eventTimestamp, WatermarkOutput output) { + if (eventTimestamp > maxTimestamp) { + maxTimestamp = eventTimestamp; + output.emitWatermark(new Watermark(eventTimestamp)); + } + } + + @Override + public void onPeriodicEmit(WatermarkOutput output) {} + + public static WatermarkGeneratorSupplier getSupplier() { + return (ctx) -> new PerElementValueWithTimestampWatermarkGenerator(); + } + } + + public static class ValueWithTimestampAssigner + implements TimestampAssigner { + + @Override + public long extractTimestamp(ValueWithTimestamp element, long recordTimestamp) { + return element.timestamp; + } + } + + public static class ValueWithTimestamp { + private final long timestamp; + + private final int value; + + public ValueWithTimestamp(long timestamp, int value) { + this.timestamp = timestamp; + this.value = value; + } + + public long getTimestamp() { + return timestamp; + } + + public int getValue() { + return value; + } + } + + public static class TestGeneratorFunction implements GeneratorFunction { + + private long curTime = 1689847907000L; + + private int elementValue = 0; + + @Override + public ValueWithTimestamp map(Long value) throws Exception { + curTime = + curTime + Duration.ofSeconds(1).toMillis(); + return new ValueWithTimestamp(curTime, elementValue++); + } + } +} diff --git a/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/DataStreamAllroundTestJobFactory.java b/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/DataStreamAllroundTestJobFactory.java index 85107ebb2228d..e0e5e912a9035 100644 --- a/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/DataStreamAllroundTestJobFactory.java +++ b/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/DataStreamAllroundTestJobFactory.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.ResultTypeQueryable; diff --git a/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/SingleThreadAccessCheckingTypeInfo.java b/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/SingleThreadAccessCheckingTypeInfo.java index d5ac8d1a54b8f..07c451a030544 100644 --- a/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/SingleThreadAccessCheckingTypeInfo.java +++ b/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/SingleThreadAccessCheckingTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.SingleThreadAccessCheckingTypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Objects; diff --git a/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/artificialstate/StatefulComplexPayloadSerializer.java b/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/artificialstate/StatefulComplexPayloadSerializer.java index 6cf9efad71bae..1914c4cc1409c 100644 --- a/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/artificialstate/StatefulComplexPayloadSerializer.java +++ b/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/artificialstate/StatefulComplexPayloadSerializer.java @@ -19,10 +19,10 @@ package org.apache.flink.streaming.tests.artificialstate; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.DataInputViewStream; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; import java.io.IOException; diff --git a/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/artificialstate/builder/ArtificialMapStateBuilder.java b/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/artificialstate/builder/ArtificialMapStateBuilder.java index 2ad4f963b6ffb..3c7c85e7c349c 100644 --- a/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/artificialstate/builder/ArtificialMapStateBuilder.java +++ b/flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/artificialstate/builder/ArtificialMapStateBuilder.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.JoinFunction; import org.apache.flink.api.common.state.MapState; import org.apache.flink.api.common.state.MapStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.FunctionInitializationContext; import java.util.Iterator; diff --git a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/TtlVerifyUpdateFunction.java b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/TtlVerifyUpdateFunction.java index afc1d790d0bd5..d8b676c8f092b 100644 --- a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/TtlVerifyUpdateFunction.java +++ b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/TtlVerifyUpdateFunction.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateTtlConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.runtime.state.FunctionInitializationContext; import org.apache.flink.runtime.state.FunctionSnapshotContext; diff --git a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/AbstractTtlStateVerifier.java b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/AbstractTtlStateVerifier.java index 8280dcf19cb29..5518bb6dde986 100644 --- a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/AbstractTtlStateVerifier.java +++ b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/AbstractTtlStateVerifier.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.state.StateTtlConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.FunctionInitializationContext; import org.apache.flink.util.StringUtils; diff --git a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlAggregatingStateVerifier.java b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlAggregatingStateVerifier.java index abbccbf029819..e58daad47dd5c 100644 --- a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlAggregatingStateVerifier.java +++ b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlAggregatingStateVerifier.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.AggregatingState; import org.apache.flink.api.common.state.AggregatingStateDescriptor; import org.apache.flink.api.common.state.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.runtime.state.FunctionInitializationContext; diff --git a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlListStateVerifier.java b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlListStateVerifier.java index 3ac3b06ec1319..8415b538c1828 100644 --- a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlListStateVerifier.java +++ b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlListStateVerifier.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.runtime.state.FunctionInitializationContext; diff --git a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlMapStateVerifier.java b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlMapStateVerifier.java index 1abfb0dba91db..c41d20bfc13ef 100644 --- a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlMapStateVerifier.java +++ b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlMapStateVerifier.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.MapState; import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.runtime.TupleSerializer; diff --git a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlReducingStateVerifier.java b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlReducingStateVerifier.java index 23eb1a5a63184..0c74bc5be987c 100644 --- a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlReducingStateVerifier.java +++ b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlReducingStateVerifier.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.ReducingState; import org.apache.flink.api.common.state.ReducingStateDescriptor; import org.apache.flink.api.common.state.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.runtime.state.FunctionInitializationContext; diff --git a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlStateVerifier.java b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlStateVerifier.java index 500128a54b0ae..07a4c99da0066 100644 --- a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlStateVerifier.java +++ b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/TtlStateVerifier.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateTtlConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.FunctionInitializationContext; import javax.annotation.Nonnull; diff --git a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/ValueWithTs.java b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/ValueWithTs.java index efdd6ff04b89e..57a7dadba4f87 100644 --- a/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/ValueWithTs.java +++ b/flink-end-to-end-tests/flink-stream-state-ttl-test/src/main/java/org/apache/flink/streaming/tests/verify/ValueWithTs.java @@ -20,8 +20,8 @@ import org.apache.flink.api.common.typeutils.CompositeSerializer; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.util.FlinkRuntimeException; import javax.annotation.Nonnull; diff --git a/flink-end-to-end-tests/flink-stream-stateful-job-upgrade-test/src/main/java/org/apache/flink/streaming/tests/StatefulStreamJobUpgradeTestProgram.java b/flink-end-to-end-tests/flink-stream-stateful-job-upgrade-test/src/main/java/org/apache/flink/streaming/tests/StatefulStreamJobUpgradeTestProgram.java index a280c256b417d..5cec9c11ba63d 100644 --- a/flink-end-to-end-tests/flink-stream-stateful-job-upgrade-test/src/main/java/org/apache/flink/streaming/tests/StatefulStreamJobUpgradeTestProgram.java +++ b/flink-end-to-end-tests/flink-stream-stateful-job-upgrade-test/src/main/java/org/apache/flink/streaming/tests/StatefulStreamJobUpgradeTestProgram.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.functions.JoinFunction; import org.apache.flink.api.common.functions.MapFunction; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/AvroSerializer.java b/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/AvroSerializer.java index 69e9073d9b19e..a0efc75bc96c2 100644 --- a/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/AvroSerializer.java +++ b/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/AvroSerializer.java @@ -19,10 +19,10 @@ package org.apache.flink.formats.avro.typeutils; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.formats.avro.utils.DataInputDecoder; import org.apache.flink.formats.avro.utils.DataOutputEncoder; diff --git a/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/AvroSerializerSnapshot.java b/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/AvroSerializerSnapshot.java index 1643faf76d6db..f681877082abc 100644 --- a/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/AvroSerializerSnapshot.java +++ b/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/AvroSerializerSnapshot.java @@ -19,11 +19,11 @@ package org.apache.flink.formats.avro.typeutils; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.avro.Schema; import org.apache.avro.SchemaCompatibility; diff --git a/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/AvroTypeInfo.java b/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/AvroTypeInfo.java index a9c4931a9b909..0a583e2a70dc7 100644 --- a/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/AvroTypeInfo.java +++ b/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/AvroTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.GenericTypeInfo; import org.apache.flink.api.java.typeutils.PojoField; import org.apache.flink.api.java.typeutils.PojoTypeInfo; diff --git a/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/GenericRecordAvroTypeInfo.java b/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/GenericRecordAvroTypeInfo.java index a68c725f90c99..ee5426fd58ab4 100644 --- a/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/GenericRecordAvroTypeInfo.java +++ b/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/typeutils/GenericRecordAvroTypeInfo.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; diff --git a/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/utils/AvroKryoSerializerUtils.java b/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/utils/AvroKryoSerializerUtils.java index 55df2f78f4b62..dd461fbaa2b36 100644 --- a/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/utils/AvroKryoSerializerUtils.java +++ b/flink-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/utils/AvroKryoSerializerUtils.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.AvroUtils; import org.apache.flink.api.java.typeutils.runtime.KryoRegistration; import org.apache.flink.api.java.typeutils.runtime.kryo.Serializers; diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/AvroRecordInputFormatTest.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/AvroRecordInputFormatTest.java index a3e2e6c0914d3..e6c17e34254c9 100644 --- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/AvroRecordInputFormatTest.java +++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/AvroRecordInputFormatTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.GenericTypeInfo; import org.apache.flink.api.java.typeutils.TypeExtractor; import org.apache.flink.api.java.typeutils.runtime.kryo.Serializers; diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericArraySerializerTest.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericArraySerializerTest.java index 7ab9d25f94887..3f9d9f506ecea 100644 --- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericArraySerializerTest.java +++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericArraySerializerTest.java @@ -18,7 +18,7 @@ package org.apache.flink.formats.avro.typeutils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.AbstractGenericArraySerializerTest; /** Test for the {@link AvroSerializer}. */ diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericRecordTypeInfoTest.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericRecordTypeInfoTest.java index 2e5127fb672c1..37cdafa311375 100644 --- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericRecordTypeInfoTest.java +++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericRecordTypeInfoTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeutils.TypeInformationTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.formats.avro.utils.AvroTestUtils; import org.apache.avro.generic.GenericRecord; diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericTypeComparatorTest.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericTypeComparatorTest.java index 2dfac4d63571d..899cc2be17bb7 100644 --- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericTypeComparatorTest.java +++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericTypeComparatorTest.java @@ -18,7 +18,7 @@ package org.apache.flink.formats.avro.typeutils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.AbstractGenericTypeComparatorTest; /** Test for the {@link AvroSerializer}. */ diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericTypeSerializerTest.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericTypeSerializerTest.java index cb649cd959f47..76e2fe67998e5 100644 --- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericTypeSerializerTest.java +++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroGenericTypeSerializerTest.java @@ -18,7 +18,7 @@ package org.apache.flink.formats.avro.typeutils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.AbstractGenericTypeSerializerTest; /** Test for the {@link AvroSerializer}. */ diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerConcurrencyTest.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerConcurrencyTest.java index 6feb84af6b5ce..2af1c46822075 100644 --- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerConcurrencyTest.java +++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerConcurrencyTest.java @@ -19,7 +19,7 @@ package org.apache.flink.formats.avro.typeutils; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.testutils.BlockerSync; import org.apache.flink.core.testutils.CheckedThread; diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerGenericRecordTest.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerGenericRecordTest.java index cb103481dead3..d8489ac26c4f3 100644 --- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerGenericRecordTest.java +++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerGenericRecordTest.java @@ -19,7 +19,7 @@ package org.apache.flink.formats.avro.typeutils; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.formats.avro.utils.AvroTestUtils; import org.apache.avro.Schema; diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerLargeGenericRecordTest.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerLargeGenericRecordTest.java index 29092e810ed3e..9e461cac1de91 100644 --- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerLargeGenericRecordTest.java +++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerLargeGenericRecordTest.java @@ -19,7 +19,7 @@ package org.apache.flink.formats.avro.typeutils; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.formats.avro.utils.AvroTestUtils; import org.apache.avro.Schema; diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerSnapshotTest.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerSnapshotTest.java index c0838e9b842f9..2862b8d9746f7 100644 --- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerSnapshotTest.java +++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerSnapshotTest.java @@ -18,11 +18,11 @@ package org.apache.flink.formats.avro.typeutils; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshotSerializationUtil; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.formats.avro.generated.Address; import org.apache.flink.formats.avro.generated.User; diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerTest.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerTest.java index 8ff1317124035..d4aea4760ebf6 100644 --- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerTest.java +++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.formats.avro.typeutils; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.formats.avro.generated.User; import org.apache.flink.formats.avro.utils.TestDataGenerator; diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerUpgradeTest.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerUpgradeTest.java index b77111d5f1dc3..273d482c16a02 100644 --- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerUpgradeTest.java +++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.formats.avro.typeutils; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.formats.avro.generated.Address; diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroTypeInfoTest.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroTypeInfoTest.java index 27f9c7facf5be..5fa47fce3dd1d 100644 --- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroTypeInfoTest.java +++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroTypeInfoTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeutils.TypeInformationTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.formats.avro.generated.Address; import org.apache.flink.formats.avro.generated.User; diff --git a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroUnionLogicalSerializerTest.java b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroUnionLogicalSerializerTest.java index 31307172cd303..6486377b23922 100644 --- a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroUnionLogicalSerializerTest.java +++ b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroUnionLogicalSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.formats.avro.typeutils; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.formats.avro.generated.UnionLogicalType; import java.time.Instant; diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/PatternStreamBuilder.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/PatternStreamBuilder.java index 28f67706ff0f9..785fb44c38891 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/PatternStreamBuilder.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/PatternStreamBuilder.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.functions.NullByteKeySelector; import org.apache.flink.cep.functions.PatternProcessFunction; diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/DeweyNumber.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/DeweyNumber.java index 724739c0a7082..afc87f3cf7217 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/DeweyNumber.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/DeweyNumber.java @@ -19,11 +19,11 @@ package org.apache.flink.cep.nfa; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.io.Serializable; diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/NFAStateSerializer.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/NFAStateSerializer.java index a2b9cd6c0bba6..e7c30eac9e0b4 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/NFAStateSerializer.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/NFAStateSerializer.java @@ -18,14 +18,14 @@ package org.apache.flink.cep.nfa; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; import org.apache.flink.cep.nfa.sharedbuffer.EventId; import org.apache.flink.cep.nfa.sharedbuffer.NodeId; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.types.StringValue; diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/NFAStateSerializerSnapshot.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/NFAStateSerializerSnapshot.java index fe532be318ad6..735c7ffcd4254 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/NFAStateSerializerSnapshot.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/NFAStateSerializerSnapshot.java @@ -19,12 +19,12 @@ package org.apache.flink.cep.nfa; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.cep.nfa.sharedbuffer.EventId; import org.apache.flink.cep.nfa.sharedbuffer.NodeId; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/EventId.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/EventId.java index 3c3f10838667a..d76d4ee16c62b 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/EventId.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/EventId.java @@ -19,11 +19,11 @@ package org.apache.flink.cep.nfa.sharedbuffer; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Comparator; diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/Lockable.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/Lockable.java index f80539125773a..3a3fde8f7c6de 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/Lockable.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/Lockable.java @@ -21,11 +21,11 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerUtil; import org.apache.flink.api.common.typeutils.LegacySerializerSnapshotTransformer; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.IntSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Objects; diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/LockableTypeSerializerSnapshot.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/LockableTypeSerializerSnapshot.java index d2a8dd4fd7f85..3bf14a226e4ae 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/LockableTypeSerializerSnapshot.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/LockableTypeSerializerSnapshot.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; /** A {@link TypeSerializerSnapshot} for the {@link Lockable.LockableTypeSerializer}. */ @Internal diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/NodeId.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/NodeId.java index f605e4f6236c7..8e3efff57be3b 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/NodeId.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/NodeId.java @@ -19,11 +19,11 @@ package org.apache.flink.cep.nfa.sharedbuffer; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.StringValue; import java.io.IOException; diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBuffer.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBuffer.java index d01c7e77360e4..29a829d7f67af 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBuffer.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBuffer.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.KeyedStateStore; import org.apache.flink.api.common.state.MapState; import org.apache.flink.api.common.state.MapStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.cep.configuration.SharedBufferCacheConfig; diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBufferEdge.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBufferEdge.java index 1fa02645fdcd9..542b514c03382 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBufferEdge.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBufferEdge.java @@ -19,12 +19,12 @@ package org.apache.flink.cep.nfa.sharedbuffer; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; import org.apache.flink.cep.nfa.DeweyNumber; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBufferNodeSerializer.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBufferNodeSerializer.java index f5ec400d889f2..a11a6065da11d 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBufferNodeSerializer.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBufferNodeSerializer.java @@ -18,11 +18,11 @@ package org.apache.flink.cep.nfa.sharedbuffer; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.ArrayList; diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBufferNodeSerializerSnapshotV2.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBufferNodeSerializerSnapshotV2.java index 06d6ca578b479..a30a4dbfb5c03 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBufferNodeSerializerSnapshotV2.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/nfa/sharedbuffer/SharedBufferNodeSerializerSnapshotV2.java @@ -19,7 +19,7 @@ package org.apache.flink.cep.nfa.sharedbuffer; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** Serializer configuration snapshot for compatibility and format evolution. */ public final class SharedBufferNodeSerializerSnapshotV2 diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/operator/CepOperator.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/operator/CepOperator.java index afc7e99a95d71..971b73d13c450 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/operator/CepOperator.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/operator/CepOperator.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/operator/CepRuntimeContext.java b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/operator/CepRuntimeContext.java index ee8f7dd77dd8e..200ddba5427ae 100644 --- a/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/operator/CepRuntimeContext.java +++ b/flink-libraries/flink-cep/src/main/java/org/apache/flink/cep/operator/CepRuntimeContext.java @@ -41,7 +41,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.metrics.groups.OperatorMetricGroup; import java.io.Serializable; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/Event.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/Event.java index d53bce115d330..6d51c83f29377 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/Event.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/Event.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.TypeExtractor; import java.util.Objects; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/NFASerializerUpgradeTest.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/NFASerializerUpgradeTest.java index d9f23927af31a..a0e8e1a60158f 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/NFASerializerUpgradeTest.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/NFASerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.cep; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.cep.nfa.DeweyNumber; import org.apache.flink.cep.nfa.NFAState; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/sharedbuffer/LockableTypeSerializerUpgradeTest.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/sharedbuffer/LockableTypeSerializerUpgradeTest.java index 201463252bb67..fa30e2b3c8a8c 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/sharedbuffer/LockableTypeSerializerUpgradeTest.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/sharedbuffer/LockableTypeSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.cep.nfa.sharedbuffer; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.test.util.MigrationTest; diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/utils/TestSharedBuffer.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/utils/TestSharedBuffer.java index 169df8eafa8eb..2f60f6cca2f12 100644 --- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/utils/TestSharedBuffer.java +++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/utils/TestSharedBuffer.java @@ -29,7 +29,7 @@ import org.apache.flink.api.common.state.ReducingStateDescriptor; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.cep.configuration.SharedBufferCacheConfig; import org.apache.flink.cep.nfa.sharedbuffer.SharedBuffer; diff --git a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/EvictingWindowSavepointReader.java b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/EvictingWindowSavepointReader.java index 1bfdf3841b8a4..24376d8a42437 100644 --- a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/EvictingWindowSavepointReader.java +++ b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/EvictingWindowSavepointReader.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.AggregateFunction; import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.StateBackend; import org.apache.flink.state.api.functions.WindowReaderFunction; import org.apache.flink.state.api.input.KeyedStateInputFormat; diff --git a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/SavepointReader.java b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/SavepointReader.java index ec4850e8f24d5..aa084556ff3ee 100644 --- a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/SavepointReader.java +++ b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/SavepointReader.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.TupleTypeInfo; import org.apache.flink.api.java.typeutils.TypeExtractor; diff --git a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/StateBootstrapTransformation.java b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/StateBootstrapTransformation.java index fa59485a878d8..74f7c97f5a8ad 100644 --- a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/StateBootstrapTransformation.java +++ b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/StateBootstrapTransformation.java @@ -22,7 +22,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.execution.CheckpointingMode; diff --git a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/WindowSavepointReader.java b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/WindowSavepointReader.java index e661a64eedc30..6a57355f8e47b 100644 --- a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/WindowSavepointReader.java +++ b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/WindowSavepointReader.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.AggregateFunction; import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.StateBackend; import org.apache.flink.state.api.functions.WindowReaderFunction; import org.apache.flink.state.api.input.KeyedStateInputFormat; diff --git a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/input/StreamOperatorContextBuilder.java b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/input/StreamOperatorContextBuilder.java index e52b1a1bd7076..0ff49b435b72d 100644 --- a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/input/StreamOperatorContextBuilder.java +++ b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/input/StreamOperatorContextBuilder.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.RuntimeContext; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.StateChangelogOptions; import org.apache.flink.core.fs.CloseableRegistry; diff --git a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/input/operator/StateReaderOperator.java b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/input/operator/StateReaderOperator.java index 2fbb635daa0f1..a74c602627714 100644 --- a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/input/operator/StateReaderOperator.java +++ b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/input/operator/StateReaderOperator.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.functions.SerializerFactory; import org.apache.flink.api.common.functions.util.FunctionUtils; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.KeyedStateBackend; import org.apache.flink.state.api.runtime.SavepointRuntimeContext; diff --git a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/input/operator/WindowReaderOperator.java b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/input/operator/WindowReaderOperator.java index 2f09cacb79ce2..fefb77a9a1ba4 100644 --- a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/input/operator/WindowReaderOperator.java +++ b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/input/operator/WindowReaderOperator.java @@ -33,7 +33,7 @@ import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.DefaultKeyedStateStore; diff --git a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/runtime/SavepointRuntimeContext.java b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/runtime/SavepointRuntimeContext.java index e39d18c68a6fc..6b93a0137c412 100644 --- a/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/runtime/SavepointRuntimeContext.java +++ b/flink-libraries/flink-state-processing-api/src/main/java/org/apache/flink/state/api/runtime/SavepointRuntimeContext.java @@ -43,7 +43,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.metrics.groups.OperatorMetricGroup; import org.apache.flink.util.Preconditions; diff --git a/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/CustomIntSerializer.java b/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/CustomIntSerializer.java index 081ac2ceeb629..afa16603a5d24 100644 --- a/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/CustomIntSerializer.java +++ b/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/CustomIntSerializer.java @@ -19,11 +19,11 @@ package org.apache.flink.state.api; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/input/MultiStateKeyIteratorTest.java b/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/input/MultiStateKeyIteratorTest.java index 334bd3b75fe53..3640052f537d0 100644 --- a/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/input/MultiStateKeyIteratorTest.java +++ b/flink-libraries/flink-state-processing-api/src/test/java/org/apache/flink/state/api/input/MultiStateKeyIteratorTest.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.fs.CloseableRegistry; diff --git a/flink-python/src/main/java/org/apache/flink/api/common/python/PythonBridgeUtils.java b/flink-python/src/main/java/org/apache/flink/api/common/python/PythonBridgeUtils.java index 1205e79d2a8a8..bf50e4c54a1dc 100644 --- a/flink-python/src/main/java/org/apache/flink/api/common/python/PythonBridgeUtils.java +++ b/flink-python/src/main/java/org/apache/flink/api/common/python/PythonBridgeUtils.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeinfo.PrimitiveArrayTypeInfo; import org.apache.flink.api.common.typeinfo.SqlTimeTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple; import org.apache.flink.api.java.typeutils.ListTypeInfo; import org.apache.flink.api.java.typeutils.MapTypeInfo; diff --git a/flink-python/src/main/java/org/apache/flink/python/util/PythonConfigUtil.java b/flink-python/src/main/java/org/apache/flink/python/util/PythonConfigUtil.java index 004fca5dd6754..771d5e460ca13 100644 --- a/flink-python/src/main/java/org/apache/flink/python/util/PythonConfigUtil.java +++ b/flink-python/src/main/java/org/apache/flink/python/util/PythonConfigUtil.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.typeinfo.PrimitiveArrayTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.dag.Transformation; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.PipelineOptions; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/embedded/EmbeddedPythonWindowOperator.java b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/embedded/EmbeddedPythonWindowOperator.java index 7c64933cf8b11..fe91501d7213c 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/embedded/EmbeddedPythonWindowOperator.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/embedded/EmbeddedPythonWindowOperator.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.RowTypeInfo; import org.apache.flink.configuration.Configuration; import org.apache.flink.fnexecution.v1.FlinkFnApi; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/AbstractExternalDataStreamPythonFunctionOperator.java b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/AbstractExternalDataStreamPythonFunctionOperator.java index 73712e895eef8..295d28bf8d05c 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/AbstractExternalDataStreamPythonFunctionOperator.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/AbstractExternalDataStreamPythonFunctionOperator.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.fnexecution.v1.FlinkFnApi; import org.apache.flink.streaming.api.functions.python.DataStreamPythonFunctionInfo; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/AbstractExternalOneInputPythonFunctionOperator.java b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/AbstractExternalOneInputPythonFunctionOperator.java index ed4e1d4020f82..1a1b76dbbffc9 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/AbstractExternalOneInputPythonFunctionOperator.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/AbstractExternalOneInputPythonFunctionOperator.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.memory.ByteArrayInputStreamWithPos; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/AbstractExternalTwoInputPythonFunctionOperator.java b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/AbstractExternalTwoInputPythonFunctionOperator.java index 16638fd1efc71..b619919a054f4 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/AbstractExternalTwoInputPythonFunctionOperator.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/AbstractExternalTwoInputPythonFunctionOperator.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.typeutils.RowTypeInfo; import org.apache.flink.configuration.Configuration; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/ExternalPythonKeyedCoProcessOperator.java b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/ExternalPythonKeyedCoProcessOperator.java index 6ce86e5a40855..b56a880d32a61 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/ExternalPythonKeyedCoProcessOperator.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/ExternalPythonKeyedCoProcessOperator.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.RowTypeInfo; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.memory.ManagedMemoryUseCase; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/ExternalPythonKeyedProcessOperator.java b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/ExternalPythonKeyedProcessOperator.java index 2f2a785334ac7..9be46a852efb9 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/ExternalPythonKeyedProcessOperator.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/ExternalPythonKeyedProcessOperator.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.RowTypeInfo; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.memory.ManagedMemoryUseCase; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/timer/TimerRegistration.java b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/timer/TimerRegistration.java index dde1558b362be..fa61ba9d84153 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/timer/TimerRegistration.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/operators/python/process/timer/TimerRegistration.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.operators.python.process.timer; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.ByteArrayInputStreamWithPos; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.runtime.state.KeyedStateBackend; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/BeamDataStreamPythonFunctionRunner.java b/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/BeamDataStreamPythonFunctionRunner.java index 71bd715c47085..1b818a4c748d3 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/BeamDataStreamPythonFunctionRunner.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/BeamDataStreamPythonFunctionRunner.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.runners.python.beam; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.fnexecution.v1.FlinkFnApi; import org.apache.flink.python.env.process.ProcessPythonEnvironmentManager; import org.apache.flink.python.metric.process.FlinkMetricContainer; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/BeamPythonFunctionRunner.java b/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/BeamPythonFunctionRunner.java index 0029db937d4e9..27bf32d3c210d 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/BeamPythonFunctionRunner.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/BeamPythonFunctionRunner.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.configuration.ReadableConfig; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamBagStateHandler.java b/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamBagStateHandler.java index 96c6089651a3d..52623c63c5304 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamBagStateHandler.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamBagStateHandler.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.runners.python.beam.state; import org.apache.flink.api.common.state.ListState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.ByteArrayInputStreamWithPos; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.runtime.state.internal.InternalListState; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamKeyedStateStore.java b/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamKeyedStateStore.java index 83981df889be9..e7fd8dfae92a7 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamKeyedStateStore.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamKeyedStateStore.java @@ -26,7 +26,7 @@ import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.state.StateTtlConfig; import org.apache.flink.api.common.typeinfo.PrimitiveArrayTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.ByteArrayInputStreamWithPos; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.fnexecution.v1.FlinkFnApi; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamOperatorStateStore.java b/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamOperatorStateStore.java index 63b24fa6830a7..965974a981e59 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamOperatorStateStore.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamOperatorStateStore.java @@ -26,7 +26,7 @@ import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.state.StateTtlConfig; import org.apache.flink.api.common.typeinfo.PrimitiveArrayTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.fnexecution.v1.FlinkFnApi; import org.apache.flink.python.util.ProtoUtils; import org.apache.flink.runtime.state.OperatorStateBackend; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamStateRequestHandler.java b/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamStateRequestHandler.java index edcdb921073ab..47027de126f3c 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamStateRequestHandler.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/runners/python/beam/state/BeamStateRequestHandler.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.MapState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.ReadableConfig; import org.apache.flink.runtime.state.KeyedStateBackend; import org.apache.flink.runtime.state.OperatorStateBackend; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/typeinfo/python/PickledByteArrayTypeInfo.java b/flink-python/src/main/java/org/apache/flink/streaming/api/typeinfo/python/PickledByteArrayTypeInfo.java index 1b86edd152d44..efa90187ef234 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/typeinfo/python/PickledByteArrayTypeInfo.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/typeinfo/python/PickledByteArrayTypeInfo.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArraySerializer; /** diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/utils/ByteArrayWrapperSerializer.java b/flink-python/src/main/java/org/apache/flink/streaming/api/utils/ByteArrayWrapperSerializer.java index f3bea10ef6bc7..3641d03fbfcce 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/utils/ByteArrayWrapperSerializer.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/utils/ByteArrayWrapperSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Arrays; diff --git a/flink-python/src/main/java/org/apache/flink/streaming/api/utils/PythonTypeUtils.java b/flink-python/src/main/java/org/apache/flink/streaming/api/utils/PythonTypeUtils.java index 8a44c16927d15..58973ba75d1e1 100644 --- a/flink-python/src/main/java/org/apache/flink/streaming/api/utils/PythonTypeUtils.java +++ b/flink-python/src/main/java/org/apache/flink/streaming/api/utils/PythonTypeUtils.java @@ -29,7 +29,7 @@ import org.apache.flink.api.common.typeinfo.SqlTimeTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.BigIntSerializer; import org.apache.flink.api.common.typeutils.base.BooleanSerializer; import org.apache.flink.api.common.typeutils.base.ByteSerializer; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunction.java b/flink-python/src/main/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunction.java index f0312e76f9706..91e56cf9a9918 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunction.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunction.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.ResultTypeQueryable; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/AbstractPythonStreamAggregateOperator.java b/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/AbstractPythonStreamAggregateOperator.java index 5ee074cbfaf24..e827ecb8b07fe 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/AbstractPythonStreamAggregateOperator.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/AbstractPythonStreamAggregateOperator.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.memory.ByteArrayInputStreamWithPos; import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/PythonStreamGroupWindowAggregateOperator.java b/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/PythonStreamGroupWindowAggregateOperator.java index c33c4a44ff1a3..bcd5322d2ae77 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/PythonStreamGroupWindowAggregateOperator.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/PythonStreamGroupWindowAggregateOperator.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.configuration.Configuration; import org.apache.flink.fnexecution.v1.FlinkFnApi; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/arrow/stream/StreamArrowPythonGroupWindowAggregateFunctionOperator.java b/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/arrow/stream/StreamArrowPythonGroupWindowAggregateFunctionOperator.java index fef7c28421d92..00c9756b7c93a 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/arrow/stream/StreamArrowPythonGroupWindowAggregateFunctionOperator.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/aggregate/arrow/stream/StreamArrowPythonGroupWindowAggregateFunctionOperator.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.configuration.Configuration; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/scalar/PythonScalarFunctionOperator.java b/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/scalar/PythonScalarFunctionOperator.java index 240995a8982e1..1caa3711f506f 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/scalar/PythonScalarFunctionOperator.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/scalar/PythonScalarFunctionOperator.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.python.scalar; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.configuration.Configuration; import org.apache.flink.fnexecution.v1.FlinkFnApi; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/table/PythonTableFunctionOperator.java b/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/table/PythonTableFunctionOperator.java index 34acb94cb26a4..3b768ca0a9996 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/table/PythonTableFunctionOperator.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/operators/python/table/PythonTableFunctionOperator.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.python.table; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.configuration.Configuration; import org.apache.flink.fnexecution.v1.FlinkFnApi; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/runners/python/beam/BeamTablePythonFunctionRunner.java b/flink-python/src/main/java/org/apache/flink/table/runtime/runners/python/beam/BeamTablePythonFunctionRunner.java index 60158397e6286..b81d9258f7721 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/runners/python/beam/BeamTablePythonFunctionRunner.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/runners/python/beam/BeamTablePythonFunctionRunner.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.runners.python.beam; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.fnexecution.v1.FlinkFnApi; import org.apache.flink.python.env.process.ProcessPythonEnvironmentManager; import org.apache.flink.python.metric.process.FlinkMetricContainer; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/PythonTypeUtils.java b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/PythonTypeUtils.java index 20278c60567f3..81044a28a3d87 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/PythonTypeUtils.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/PythonTypeUtils.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.BooleanSerializer; import org.apache.flink.api.common.typeutils.base.ByteSerializer; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/ArrayDataSerializer.java b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/ArrayDataSerializer.java index 0c5eea84aea5e..cdf4ff200de55 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/ArrayDataSerializer.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/ArrayDataSerializer.java @@ -19,13 +19,13 @@ package org.apache.flink.table.runtime.typeutils.serializers.python; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.typeutils.runtime.DataInputViewStream; import org.apache.flink.api.java.typeutils.runtime.DataOutputViewStream; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.table.data.ArrayData; import org.apache.flink.table.data.binary.BinaryArrayData; import org.apache.flink.table.data.writer.BinaryArrayWriter; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/BigDecSerializer.java b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/BigDecSerializer.java index d896944db9f06..84ed4c67b9da4 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/BigDecSerializer.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/BigDecSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.table.runtime.util.StringUtf8Utils; import java.io.IOException; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/DateSerializer.java b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/DateSerializer.java index ea9bc0b85d4ea..d7370bf434ea6 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/DateSerializer.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/DateSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.table.utils.DateTimeUtils; import java.io.IOException; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/DecimalDataSerializer.java b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/DecimalDataSerializer.java index e1043e9774191..9e75c3cdbe29c 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/DecimalDataSerializer.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/DecimalDataSerializer.java @@ -19,11 +19,11 @@ package org.apache.flink.table.runtime.typeutils.serializers.python; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.runtime.util.StringUtf8Utils; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/MapDataSerializer.java b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/MapDataSerializer.java index 4e42e737c1f53..6ba7a35eda794 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/MapDataSerializer.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/MapDataSerializer.java @@ -19,13 +19,13 @@ package org.apache.flink.table.runtime.typeutils.serializers.python; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.typeutils.runtime.DataInputViewStream; import org.apache.flink.api.java.typeutils.runtime.DataOutputViewStream; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.table.data.ArrayData; import org.apache.flink.table.data.GenericMapData; import org.apache.flink.table.data.MapData; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/RowDataSerializer.java b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/RowDataSerializer.java index 5b0d41141e01d..159dffbf2873d 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/RowDataSerializer.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/RowDataSerializer.java @@ -21,13 +21,13 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerUtil; import org.apache.flink.api.common.typeutils.NestedSerializersSnapshotDelegate; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.typeutils.runtime.DataInputViewStream; import org.apache.flink.api.java.typeutils.runtime.DataOutputViewStream; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.LogicalType; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/StringSerializer.java b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/StringSerializer.java index 3355b4327ea8f..dec87b94785e5 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/StringSerializer.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/StringSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.table.runtime.util.StringUtf8Utils; import java.io.IOException; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimeSerializer.java b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimeSerializer.java index 84716e3dcdecb..e4345f3c2ee63 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimeSerializer.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimeSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.sql.Time; diff --git a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimestampSerializer.java b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimestampSerializer.java index 2969f919d819f..f87e11b7860bb 100644 --- a/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimestampSerializer.java +++ b/flink-python/src/main/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimestampSerializer.java @@ -19,12 +19,12 @@ package org.apache.flink.table.runtime.typeutils.serializers.python; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.sql.Timestamp; diff --git a/flink-python/src/test/java/org/apache/flink/streaming/api/utils/ByteArrayWrapperSerializerTest.java b/flink-python/src/test/java/org/apache/flink/streaming/api/utils/ByteArrayWrapperSerializerTest.java index bac68f41d0df3..ad9a4798ad8b0 100644 --- a/flink-python/src/test/java/org/apache/flink/streaming/api/utils/ByteArrayWrapperSerializerTest.java +++ b/flink-python/src/test/java/org/apache/flink/streaming/api/utils/ByteArrayWrapperSerializerTest.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.utils; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.Random; diff --git a/flink-python/src/test/java/org/apache/flink/streaming/api/utils/PythonTypeUtilsTest.java b/flink-python/src/test/java/org/apache/flink/streaming/api/utils/PythonTypeUtilsTest.java index a45e4b6e3bf0b..7339f5cafeb93 100644 --- a/flink-python/src/test/java/org/apache/flink/streaming/api/utils/PythonTypeUtilsTest.java +++ b/flink-python/src/test/java/org/apache/flink/streaming/api/utils/PythonTypeUtilsTest.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.typeinfo.SqlTimeTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.BigIntSerializer; import org.apache.flink.api.common.typeutils.base.BooleanSerializer; import org.apache.flink.api.common.typeutils.base.ByteSerializer; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunctionTestBase.java b/flink-python/src/test/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunctionTestBase.java index 365ec56d27f1e..51e5348198881 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunctionTestBase.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/arrow/sources/ArrowSourceFunctionTestBase.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.arrow.sources; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.testutils.MultiShotLatch; import org.apache.flink.core.testutils.OneShotLatch; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/operators/python/scalar/PythonScalarFunctionOperatorTest.java b/flink-python/src/test/java/org/apache/flink/table/runtime/operators/python/scalar/PythonScalarFunctionOperatorTest.java index 5e22a51d31cf4..f09d978c67918 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/operators/python/scalar/PythonScalarFunctionOperatorTest.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/operators/python/scalar/PythonScalarFunctionOperatorTest.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.python.scalar; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.python.PythonFunctionRunner; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/operators/python/scalar/PythonScalarFunctionOperatorTestBase.java b/flink-python/src/test/java/org/apache/flink/table/runtime/operators/python/scalar/PythonScalarFunctionOperatorTestBase.java index 8c63e432fca2f..ace9f6fe9d926 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/operators/python/scalar/PythonScalarFunctionOperatorTestBase.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/operators/python/scalar/PythonScalarFunctionOperatorTestBase.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.python.scalar; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.MemorySize; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/operators/python/scalar/arrow/ArrowPythonScalarFunctionOperatorTest.java b/flink-python/src/test/java/org/apache/flink/table/runtime/operators/python/scalar/arrow/ArrowPythonScalarFunctionOperatorTest.java index 0f926a342f97f..9f465c835f289 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/operators/python/scalar/arrow/ArrowPythonScalarFunctionOperatorTest.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/operators/python/scalar/arrow/ArrowPythonScalarFunctionOperatorTest.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.python.scalar.arrow; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.python.PythonFunctionRunner; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/PythonTypeUtilsTest.java b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/PythonTypeUtilsTest.java index c061d2d3ce032..791056023f92a 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/PythonTypeUtilsTest.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/PythonTypeUtilsTest.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.typeutils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.fnexecution.v1.FlinkFnApi; import org.apache.flink.table.catalog.UnresolvedIdentifier; import org.apache.flink.table.data.GenericRowData; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/ArrayDataSerializerTest.java b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/ArrayDataSerializerTest.java index 825944f70701b..977e32de86173 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/ArrayDataSerializerTest.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/ArrayDataSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils.serializers.python; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.table.data.ArrayData; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/BigDecSerializerTest.java b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/BigDecSerializerTest.java index c474df086fa6b..c2ea30a8d7fbe 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/BigDecSerializerTest.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/BigDecSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils.serializers.python; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.math.BigDecimal; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/DateSerializerTest.java b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/DateSerializerTest.java index 6d705698d3b35..1df56d45c316a 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/DateSerializerTest.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/DateSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils.serializers.python; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.sql.Date; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/DecimalDataSerializerTest.java b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/DecimalDataSerializerTest.java index 6336a16f65640..df806dd8eaf10 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/DecimalDataSerializerTest.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/DecimalDataSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils.serializers.python; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.DecimalData; /** Test for {@link DecimalDataSerializer}. */ diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/MapDataSerializerTest.java b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/MapDataSerializerTest.java index f413bbb1d7059..410865650b50b 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/MapDataSerializerTest.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/MapDataSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils.serializers.python; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.FloatSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.table.api.DataTypes; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/RowDataSerializerTest.java b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/RowDataSerializerTest.java index 083bc87441e2a..89aa86cbceb32 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/RowDataSerializerTest.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/RowDataSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils.serializers.python; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.binary.BinaryRowData; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/StringSerializerTest.java b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/StringSerializerTest.java index 4a6db2dd13010..d9bb360c6a658 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/StringSerializerTest.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/StringSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils.serializers.python; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** Test for {@link StringSerializer}. */ class StringSerializerTest extends SerializerTestBase { diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimeSerializerTest.java b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimeSerializerTest.java index 4a6db4306fab2..9d406a94f717f 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimeSerializerTest.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimeSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils.serializers.python; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.sql.Time; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimestampSerializerTest.java b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimestampSerializerTest.java index 5d5900092bcbe..39779a85f7a3f 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimestampSerializerTest.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/typeutils/serializers/python/TimestampSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils.serializers.python; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.sql.Timestamp; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/utils/PassThroughStreamAggregatePythonFunctionRunner.java b/flink-python/src/test/java/org/apache/flink/table/runtime/utils/PassThroughStreamAggregatePythonFunctionRunner.java index 7d970e2a5293f..1bb27c75cfa4f 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/utils/PassThroughStreamAggregatePythonFunctionRunner.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/utils/PassThroughStreamAggregatePythonFunctionRunner.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.utils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.fnexecution.v1.FlinkFnApi; import org.apache.flink.python.env.process.ProcessPythonEnvironmentManager; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/utils/PassThroughStreamGroupWindowAggregatePythonFunctionRunner.java b/flink-python/src/test/java/org/apache/flink/table/runtime/utils/PassThroughStreamGroupWindowAggregatePythonFunctionRunner.java index 48c56cd434d22..ad533d5b23157 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/utils/PassThroughStreamGroupWindowAggregatePythonFunctionRunner.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/utils/PassThroughStreamGroupWindowAggregatePythonFunctionRunner.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.utils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.fnexecution.v1.FlinkFnApi; import org.apache.flink.python.env.process.ProcessPythonEnvironmentManager; import org.apache.flink.python.metric.process.FlinkMetricContainer; diff --git a/flink-python/src/test/java/org/apache/flink/table/runtime/utils/PassThroughStreamTableAggregatePythonFunctionRunner.java b/flink-python/src/test/java/org/apache/flink/table/runtime/utils/PassThroughStreamTableAggregatePythonFunctionRunner.java index d962463d6803d..b28d88a22f9a7 100644 --- a/flink-python/src/test/java/org/apache/flink/table/runtime/utils/PassThroughStreamTableAggregatePythonFunctionRunner.java +++ b/flink-python/src/test/java/org/apache/flink/table/runtime/utils/PassThroughStreamTableAggregatePythonFunctionRunner.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.utils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.fnexecution.v1.FlinkFnApi; import org.apache.flink.python.env.process.ProcessPythonEnvironmentManager; diff --git a/flink-python/src/test/java/org/apache/flink/table/utils/TestCollectionTableFactory.java b/flink-python/src/test/java/org/apache/flink/table/utils/TestCollectionTableFactory.java index d59ad6939260c..be25d553a83c5 100644 --- a/flink-python/src/test/java/org/apache/flink/table/utils/TestCollectionTableFactory.java +++ b/flink-python/src/test/java/org/apache/flink/table/utils/TestCollectionTableFactory.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.OpenContext; import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; diff --git a/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/QueryableStateClient.java b/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/QueryableStateClient.java index 85bd07c19c9da..9342b482c1fc1 100644 --- a/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/QueryableStateClient.java +++ b/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/QueryableStateClient.java @@ -26,7 +26,7 @@ import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.typeinfo.TypeHint; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.queryablestate.client.state.ImmutableAggregatingState; import org.apache.flink.queryablestate.client.state.ImmutableListState; diff --git a/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/VoidNamespaceSerializer.java b/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/VoidNamespaceSerializer.java index 73c1b26817f3b..40810b7962c14 100644 --- a/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/VoidNamespaceSerializer.java +++ b/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/VoidNamespaceSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/VoidNamespaceTypeInfo.java b/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/VoidNamespaceTypeInfo.java index 545d677086059..2d785e696fc22 100644 --- a/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/VoidNamespaceTypeInfo.java +++ b/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/VoidNamespaceTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** * {@link TypeInformation} for {@link VoidNamespace}. diff --git a/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/state/serialization/KvStateSerializer.java b/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/state/serialization/KvStateSerializer.java index 5903777ca241a..ca6c1d8318d6d 100644 --- a/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/state/serialization/KvStateSerializer.java +++ b/flink-queryable-state/flink-queryable-state-client-java/src/main/java/org/apache/flink/queryablestate/client/state/serialization/KvStateSerializer.java @@ -18,7 +18,7 @@ package org.apache.flink.queryablestate.client.state.serialization; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; diff --git a/flink-queryable-state/flink-queryable-state-client-java/src/test/java/org/apache/flink/queryablestate/client/state/ImmutableListStateTest.java b/flink-queryable-state/flink-queryable-state-client-java/src/test/java/org/apache/flink/queryablestate/client/state/ImmutableListStateTest.java index ccf4dd0c4e588..4bbe1dc7ecdc6 100644 --- a/flink-queryable-state/flink-queryable-state-client-java/src/test/java/org/apache/flink/queryablestate/client/state/ImmutableListStateTest.java +++ b/flink-queryable-state/flink-queryable-state-client-java/src/test/java/org/apache/flink/queryablestate/client/state/ImmutableListStateTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.junit.jupiter.api.BeforeEach; diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KvStateRequestSerializerTest.java b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KvStateRequestSerializerTest.java index dfeda1f159065..f02efcdbcc557 100644 --- a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KvStateRequestSerializerTest.java +++ b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KvStateRequestSerializerTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.MapStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KvStateServerHandlerTest.java b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KvStateServerHandlerTest.java index 172207d74d27d..c62b6b635776b 100644 --- a/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KvStateServerHandlerTest.java +++ b/flink-queryable-state/flink-queryable-state-runtime/src/test/java/org/apache/flink/queryablestate/network/KvStateServerHandlerTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/asyncprocessing/operators/AbstractAsyncStateStreamOperator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/asyncprocessing/operators/AbstractAsyncStateStreamOperator.java index f5a395d2c4a3b..273a7703804df 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/asyncprocessing/operators/AbstractAsyncStateStreamOperator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/asyncprocessing/operators/AbstractAsyncStateStreamOperator.java @@ -23,7 +23,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.operators.MailboxExecutor; import org.apache.flink.api.common.state.v2.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.runtime.asyncprocessing.AsyncExecutionController; import org.apache.flink.runtime.asyncprocessing.AsyncStateException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/asyncprocessing/operators/AbstractAsyncStateStreamOperatorV2.java b/flink-runtime/src/main/java/org/apache/flink/runtime/asyncprocessing/operators/AbstractAsyncStateStreamOperatorV2.java index 92c256066b47a..3d6ab16ba0b07 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/asyncprocessing/operators/AbstractAsyncStateStreamOperatorV2.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/asyncprocessing/operators/AbstractAsyncStateStreamOperatorV2.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.state.v2.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.runtime.asyncprocessing.AsyncExecutionController; import org.apache.flink.runtime.asyncprocessing.AsyncStateException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/broadcast/BroadcastVariableMaterialization.java b/flink-runtime/src/main/java/org/apache/flink/runtime/broadcast/BroadcastVariableMaterialization.java index 345013089a19b..63528f2a9a8c4 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/broadcast/BroadcastVariableMaterialization.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/broadcast/BroadcastVariableMaterialization.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.broadcast; import org.apache.flink.api.common.functions.BroadcastVariableInitializer; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.runtime.io.network.api.reader.MutableReader; import org.apache.flink.runtime.operators.BatchTask; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/event/WatermarkEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/event/WatermarkEvent.java index cd1c321b1bbba..8c51be6f01716 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/event/WatermarkEvent.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/event/WatermarkEvent.java @@ -22,8 +22,8 @@ import org.apache.flink.api.common.watermark.BoolWatermark; import org.apache.flink.api.common.watermark.LongWatermark; import org.apache.flink.api.common.watermark.Watermark; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Objects; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/ChannelReaderInputViewIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/ChannelReaderInputViewIterator.java index 02d33a0a33a64..9d72563b3ae17 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/ChannelReaderInputViewIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/ChannelReaderInputViewIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.io.disk; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.AbstractChannelReaderInputView; import org.apache.flink.runtime.io.disk.iomanager.BlockChannelReader; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelInputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelInputView.java index f963235b707c6..a95981fad917f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelInputView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelInputView.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.io.disk; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.BlockChannelReader; import org.apache.flink.runtime.memory.AbstractPagedInputView; @@ -32,7 +33,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; /** - * A {@link org.apache.flink.core.memory.DataInputView} that is backed by a {@link + * A {@link DataInputView} that is backed by a {@link * BlockChannelReader}, making it effectively a data input stream. The view reads it data in blocks * from the underlying channel. The view can read data that has been written by a {@link * FileChannelOutputView}, or that was written in blocks in another fashion. diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelOutputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelOutputView.java index f415867c281fe..8e67a46673992 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelOutputView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/FileChannelOutputView.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.io.disk; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.BlockChannelWriter; import org.apache.flink.runtime.memory.AbstractPagedOutputView; @@ -30,7 +31,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; /** - * A {@link org.apache.flink.core.memory.DataOutputView} that is backed by a {@link + * A {@link DataOutputView} that is backed by a {@link * BlockChannelWriter}, making it effectively a data output stream. The view writes it data in * blocks to the underlying channel. */ diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/InputViewIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/InputViewIterator.java index 03ba42e1f7193..1b448223637f8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/InputViewIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/InputViewIterator.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.io.disk; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.util.MutableObjectIterator; import java.io.EOFException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SeekableFileChannelInputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SeekableFileChannelInputView.java index 1613765b3436a..c1ec3500b6da9 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SeekableFileChannelInputView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SeekableFileChannelInputView.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.io.disk; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.BlockChannelReader; import org.apache.flink.runtime.io.disk.iomanager.FileIOChannel; @@ -33,7 +34,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; /** - * A {@link org.apache.flink.core.memory.DataInputView} that is backed by a {@link + * A {@link DataInputView} that is backed by a {@link * BlockChannelReader}, making it effectively a data input stream. The view reads it data in blocks * from the underlying channel. The view can read data that has been written by a {@link * FileChannelOutputView}, or that was written in blocks in another fashion. diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SpillingBuffer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SpillingBuffer.java index 1c5763468104d..975a0e4fd5f37 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SpillingBuffer.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/SpillingBuffer.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.io.disk; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentSource; import org.apache.flink.runtime.io.disk.iomanager.BlockChannelReader; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AbstractChannelReaderInputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AbstractChannelReaderInputView.java index e9f6cdff7759a..d08e9c0d663d8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AbstractChannelReaderInputView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AbstractChannelReaderInputView.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.io.disk.iomanager; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.memory.AbstractPagedInputView; @@ -25,7 +26,7 @@ import java.util.List; /** - * A {@link org.apache.flink.core.memory.DataInputView} that is backed by a {@link FileIOChannel}, + * A {@link DataInputView} that is backed by a {@link FileIOChannel}, * making it effectively a data input stream. The view reads it data in blocks from the underlying * channel. The view can only read data that has been written by a {@link ChannelWriterOutputView}, * due to block formatting. diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AbstractChannelWriterOutputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AbstractChannelWriterOutputView.java index 9e8f34d2c917c..d6ab887e4e1a5 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AbstractChannelWriterOutputView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/AbstractChannelWriterOutputView.java @@ -18,12 +18,13 @@ package org.apache.flink.runtime.io.disk.iomanager; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.memory.AbstractPagedOutputView; import java.io.IOException; /** - * A {@link org.apache.flink.core.memory.DataOutputView} that is backed by a {@link FileIOChannel}, + * A {@link DataOutputView} that is backed by a {@link FileIOChannel}, * making it effectively a data output stream. The view writes it data in blocks to the underlying * channel. */ diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java index 0d7252c3097b0..cf3bdc2f189ac 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelReaderInputView.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.io.disk.iomanager; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.memory.AbstractPagedInputView; @@ -28,7 +29,7 @@ import java.util.concurrent.LinkedBlockingQueue; /** - * A {@link org.apache.flink.core.memory.DataInputView} that is backed by a {@link + * A {@link DataInputView} that is backed by a {@link * BlockChannelReader}, making it effectively a data input stream. The view reads it data in blocks * from the underlying channel. The view can only read data that has been written by a {@link * ChannelWriterOutputView}, due to block formatting. diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelWriterOutputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelWriterOutputView.java index 465bd6d9c1889..294b18fc059ba 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelWriterOutputView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/ChannelWriterOutputView.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.io.disk.iomanager; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.memory.AbstractPagedOutputView; @@ -27,7 +28,7 @@ import java.util.concurrent.LinkedBlockingQueue; /** - * A {@link org.apache.flink.core.memory.DataOutputView} that is backed by a {@link + * A {@link DataOutputView} that is backed by a {@link * BlockChannelWriter}, making it effectively a data output stream. The view writes its data in * blocks to the underlying channel, adding a minimal header to each block. The data can be re-read * by a {@link ChannelReaderInputView}, if it uses the same block size. diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/HeaderlessChannelReaderInputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/HeaderlessChannelReaderInputView.java index 6783ad542e256..6de6ed789432a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/HeaderlessChannelReaderInputView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/disk/iomanager/HeaderlessChannelReaderInputView.java @@ -18,6 +18,7 @@ package org.apache.flink.runtime.io.disk.iomanager; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.EOFException; @@ -27,7 +28,7 @@ import static org.apache.flink.util.Preconditions.checkArgument; /** - * A {@link org.apache.flink.core.memory.DataInputView} that is backed by a {@link + * A {@link DataInputView} that is backed by a {@link * BlockChannelReader}, making it effectively a data input stream. This view is similar to the * {@link ChannelReaderInputView}, but does not expect a header for each block, giving a direct * stream abstraction over sequence of written blocks. It therefore requires specification of the diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/CancelCheckpointMarker.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/CancelCheckpointMarker.java index 793c9f36bae5a..373a86111e50a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/CancelCheckpointMarker.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/CancelCheckpointMarker.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.io.network.api; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.RuntimeEvent; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/CheckpointBarrier.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/CheckpointBarrier.java index 5a411a5861394..52dd4545b7224 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/CheckpointBarrier.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/CheckpointBarrier.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.io.network.api; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.checkpoint.CheckpointOptions; import org.apache.flink.runtime.event.RuntimeEvent; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfData.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfData.java index 96c2b5ebe804b..f7b0af74f3cce 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfData.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfData.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.io.network.api; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.RuntimeEvent; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfPartitionEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfPartitionEvent.java index d937b33edc495..a9a3c64a3ed6a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfPartitionEvent.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfPartitionEvent.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.io.network.api; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.RuntimeEvent; /** This event marks a subpartition as fully consumed. */ diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfSegmentEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfSegmentEvent.java index 2f9376aa5e3a5..5538c4a3bd0fe 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfSegmentEvent.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfSegmentEvent.java @@ -19,8 +19,8 @@ package org.apache.flink.runtime.io.network.api; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.RuntimeEvent; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfSuperstepEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfSuperstepEvent.java index 7323b3ba59d62..7fc9113bab7ec 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfSuperstepEvent.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EndOfSuperstepEvent.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.io.network.api; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.RuntimeEvent; /** Marks the end of a superstep of one particular iteration superstep. */ diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EventAnnouncement.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EventAnnouncement.java index 83da93f9b63a1..31a54756d2e5d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EventAnnouncement.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/EventAnnouncement.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.io.network.api; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.AbstractEvent; import org.apache.flink.runtime.event.RuntimeEvent; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RecoveryMetadata.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RecoveryMetadata.java index 73de2009ca8da..e3c85b8d44133 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RecoveryMetadata.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/RecoveryMetadata.java @@ -19,8 +19,8 @@ package org.apache.flink.runtime.io.network.api; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.RuntimeEvent; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/SubtaskConnectionDescriptor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/SubtaskConnectionDescriptor.java index b46d5f2958557..3bb8b19fe0e7d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/SubtaskConnectionDescriptor.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/SubtaskConnectionDescriptor.java @@ -17,8 +17,8 @@ package org.apache.flink.runtime.io.network.api; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.RuntimeEvent; import java.util.Objects; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/serialization/NonSpanningWrapper.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/serialization/NonSpanningWrapper.java index c0adfdc1a1044..ad543c3edea4d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/serialization/NonSpanningWrapper.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/serialization/NonSpanningWrapper.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.io.network.api.serialization; import org.apache.flink.core.io.IOReadableWritable; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.runtime.io.network.api.serialization.RecordDeserializer.DeserializationResult; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/serialization/SpanningWrapper.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/serialization/SpanningWrapper.java index 894998693f458..b444173dd8b53 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/serialization/SpanningWrapper.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/api/serialization/SpanningWrapper.java @@ -19,7 +19,7 @@ import org.apache.flink.core.fs.RefCountedFile; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.core.memory.MemorySegment; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/EndOfChannelStateEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/EndOfChannelStateEvent.java index ea0f71aa17b7a..d5e229095edda 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/EndOfChannelStateEvent.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/partition/consumer/EndOfChannelStateEvent.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.io.network.partition.consumer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.RuntimeEvent; /** diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java index ccc366e989fc8..afa4ead813069 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannel.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.iterative.concurrent; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.iterative.io.SerializedUpdateBuffer; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/IterationEventWithAggregators.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/IterationEventWithAggregators.java index c0deeac181c25..040b59f6dcdeb 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/IterationEventWithAggregators.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/IterationEventWithAggregators.java @@ -19,9 +19,9 @@ package org.apache.flink.runtime.iterative.event; import org.apache.flink.api.common.aggregators.Aggregator; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.event.TaskEvent; import org.apache.flink.types.Value; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/TerminationEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/TerminationEvent.java index 6df04a9af3cc6..dbc2e5d730538 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/TerminationEvent.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/TerminationEvent.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.iterative.event; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.TaskEvent; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/WorkerDoneEvent.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/WorkerDoneEvent.java index 6267dc78325f1..5f7bcb89161d3 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/WorkerDoneEvent.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/event/WorkerDoneEvent.java @@ -19,8 +19,8 @@ package org.apache.flink.runtime.iterative.event; import org.apache.flink.api.common.aggregators.Aggregator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.Value; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/HashPartitionIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/HashPartitionIterator.java index 6778b850c26cc..e5282fbc14801 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/HashPartitionIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/HashPartitionIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.iterative.io; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.operators.hash.HashPartition; import org.apache.flink.util.MutableObjectIterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetObjectsUpdateOutputCollector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetObjectsUpdateOutputCollector.java index d0f9dc59b4f71..eccc86a07a397 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetObjectsUpdateOutputCollector.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/SolutionSetObjectsUpdateOutputCollector.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.iterative.io; import org.apache.flink.api.common.operators.util.JoinHashMap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.Collector; /** diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/WorksetUpdateOutputCollector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/WorksetUpdateOutputCollector.java index c422c9eff008f..9610e117aa536 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/WorksetUpdateOutputCollector.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/io/WorksetUpdateOutputCollector.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.iterative.io; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.Collector; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativeTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativeTask.java index abcd491288a08..20f82372f6b75 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativeTask.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/AbstractIterativeTask.java @@ -27,10 +27,10 @@ import org.apache.flink.api.common.functions.Function; import org.apache.flink.api.common.functions.IterationRuntimeContext; import org.apache.flink.api.common.operators.util.JoinHashMap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.core.fs.Path; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.metrics.groups.OperatorMetricGroup; import org.apache.flink.runtime.execution.Environment; import org.apache.flink.runtime.externalresource.ExternalResourceInfoProvider; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadTask.java index 9402a8a3acb57..280140052b450 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadTask.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/iterative/task/IterationHeadTask.java @@ -22,10 +22,10 @@ import org.apache.flink.api.common.operators.util.JoinHashMap; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypeComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.core.io.IOReadableWritable; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.execution.Environment; import org.apache.flink.runtime.io.disk.InputViewIterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/memory/AbstractPagedInputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/memory/AbstractPagedInputView.java index 1c7662f6a2917..e1755a8c9e6e7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/memory/AbstractPagedInputView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/memory/AbstractPagedInputView.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.memory; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import java.io.EOFException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/memory/AbstractPagedOutputView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/memory/AbstractPagedOutputView.java index 8481e57c00251..62b27620997e3 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/memory/AbstractPagedOutputView.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/memory/AbstractPagedOutputView.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.memory; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentWritable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/dump/MetricDumpSerialization.java b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/dump/MetricDumpSerialization.java index 838a3e4ffe38a..ba36b9fc98b85 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/dump/MetricDumpSerialization.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/metrics/dump/MetricDumpSerialization.java @@ -20,7 +20,7 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.metrics.Counter; import org.apache.flink.metrics.Gauge; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideJoinDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideJoinDriver.java index 6e9812014f696..f56741b773006 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideJoinDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideJoinDriver.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.AlgorithmOptions; import org.apache.flink.metrics.Counter; import org.apache.flink.runtime.operators.hash.NonReusingBuildFirstReOpenableHashJoinIterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractOuterJoinDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractOuterJoinDriver.java index ebd0f7df1a040..e67fbcdd1b1f3 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractOuterJoinDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractOuterJoinDriver.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.metrics.Counter; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.memory.MemoryManager; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupCombineDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupCombineDriver.java index 31a81d758124d..10eb15204efaa 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupCombineDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupCombineDriver.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.GroupCombineFunction; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.metrics.Counter; import org.apache.flink.runtime.operators.util.metrics.CountingCollector; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java index bd17cb94d5ce3..25c942c3d4541 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllGroupReduceDriver.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.GroupCombineFunction; import org.apache.flink.api.common.functions.GroupReduceFunction; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.operators.util.TaskConfig; import org.apache.flink.runtime.util.NonReusingMutableToRegularIteratorWrapper; import org.apache.flink.runtime.util.ReusingMutableToRegularIteratorWrapper; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java index aa12f17613a98..678eb6438835d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AllReduceDriver.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.ReduceFunction; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.metrics.Counter; import org.apache.flink.runtime.operators.util.TaskConfig; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java index 2759c05b15dc8..a6b515c41f385 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupDriver.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.CoGroupFunction; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.metrics.Counter; import org.apache.flink.runtime.operators.sort.NonReusingSortMergeCoGroupIterator; import org.apache.flink.runtime.operators.sort.ReusingSortMergeCoGroupIterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java index 878cd08e18c8a..7735c548df928 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetFirstDriver.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeutils.TypeComparatorFactory; import org.apache.flink.api.common.typeutils.TypePairComparator; import org.apache.flink.api.common.typeutils.TypePairComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.iterative.concurrent.SolutionSetBroker; import org.apache.flink.runtime.iterative.task.AbstractIterativeTask; import org.apache.flink.runtime.operators.hash.CompactingHashTable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java index da2e70118ba0e..861282e4c0f38 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CoGroupWithSolutionSetSecondDriver.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeutils.TypeComparatorFactory; import org.apache.flink.api.common.typeutils.TypePairComparator; import org.apache.flink.api.common.typeutils.TypePairComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.iterative.concurrent.SolutionSetBroker; import org.apache.flink.runtime.iterative.task.AbstractIterativeTask; import org.apache.flink.runtime.operators.hash.CompactingHashTable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java index 6bd7462464a1e..88e3cafb34856 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/CrossDriver.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.CrossFunction; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.metrics.Counter; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.runtime.operators.resettable.BlockResettableMutableObjectIterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java index 2aa53ca277c56..c442c24151a5f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSinkTask.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.io.OutputFormat.InitializationContext; import org.apache.flink.api.common.io.RichOutputFormat; import org.apache.flink.api.common.typeutils.TypeComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.io.IOReadableWritable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java index 148fd870badbf..d43fcb4800cd1 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/DataSourceTask.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.RuntimeContext; import org.apache.flink.api.common.io.InputFormat; import org.apache.flink.api.common.io.RichInputFormat; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.io.InputSplit; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/FullOuterJoinDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/FullOuterJoinDriver.java index 1cda379422858..d97b1f5a0fc66 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/FullOuterJoinDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/FullOuterJoinDriver.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.operators.base.OuterJoinOperatorBase.OuterJoinType; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.runtime.operators.hash.NonReusingBuildFirstHashJoinIterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java index 4b06e3f6f0e48..eaf18ee57b37e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceCombineDriver.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.GroupCombineFunction; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.memory.MemoryManager; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java index 8ea62d0df8711..061c274323c97 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/GroupReduceDriver.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.GroupReduceFunction; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.metrics.Counter; import org.apache.flink.runtime.operators.util.TaskConfig; import org.apache.flink.runtime.operators.util.metrics.CountingCollector; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinDriver.java index 050e506d4dc47..2cd7768d34d9f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinDriver.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.AlgorithmOptions; import org.apache.flink.metrics.Counter; import org.apache.flink.runtime.io.disk.iomanager.IOManager; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java index 7e550ceb2f57d..b108fbd2f460b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetFirstDriver.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeutils.TypeComparatorFactory; import org.apache.flink.api.common.typeutils.TypePairComparator; import org.apache.flink.api.common.typeutils.TypePairComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.iterative.concurrent.SolutionSetBroker; import org.apache.flink.runtime.iterative.task.AbstractIterativeTask; import org.apache.flink.runtime.operators.hash.CompactingHashTable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java index ff6d68edeedd2..09e4dbea482f4 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinWithSolutionSetSecondDriver.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeutils.TypeComparatorFactory; import org.apache.flink.api.common.typeutils.TypePairComparator; import org.apache.flink.api.common.typeutils.TypePairComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.iterative.concurrent.SolutionSetBroker; import org.apache.flink.runtime.iterative.task.AbstractIterativeTask; import org.apache.flink.runtime.operators.hash.CompactingHashTable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/LeftOuterJoinDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/LeftOuterJoinDriver.java index b3de0651b69ba..63b576c1d88ca 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/LeftOuterJoinDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/LeftOuterJoinDriver.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.operators.base.OuterJoinOperatorBase.OuterJoinType; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.runtime.operators.hash.NonReusingBuildFirstHashJoinIterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java index 5f23519d91f4d..33304e7752988 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceCombineDriver.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.metrics.Counter; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java index 821858fa91d1b..4ff64b90b9c73 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/ReduceDriver.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.metrics.Counter; import org.apache.flink.runtime.operators.util.TaskConfig; import org.apache.flink.runtime.operators.util.metrics.CountingCollector; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RightOuterJoinDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RightOuterJoinDriver.java index 4a3d041e54f66..a35104d146044 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RightOuterJoinDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/RightOuterJoinDriver.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.operators.base.OuterJoinOperatorBase.OuterJoinType; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.runtime.operators.hash.NonReusingBuildFirstHashJoinIterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/TempBarrier.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/TempBarrier.java index c248052169ee8..2711bed4db71f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/TempBarrier.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/TempBarrier.java @@ -18,9 +18,9 @@ package org.apache.flink.runtime.operators; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.InputViewIterator; import org.apache.flink.runtime.io.disk.SpillingBuffer; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriver.java index 78b518777e9b1..5a2f197dca0bb 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedAllReduceDriver.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.functions.Function; import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.functions.util.FunctionUtils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedReduceCombineDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedReduceCombineDriver.java index c40164f932779..aeb40f1b51e24 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedReduceCombineDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/ChainedReduceCombineDriver.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.functions.util.FunctionUtils; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/SynchronousChainedCombineDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/SynchronousChainedCombineDriver.java index 4f16705c15050..5281540ae03ec 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/SynchronousChainedCombineDriver.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/chaining/SynchronousChainedCombineDriver.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.functions.util.FunctionUtils; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypeComparatorFactory; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.memory.MemorySegment; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/AbstractMutableHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/AbstractMutableHashTable.java index 69965b512d120..557ef2c2e8dec 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/AbstractMutableHashTable.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/AbstractMutableHashTable.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.util.MutableObjectIterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java index 02dedb6c2958c..9a17ebc585157 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/CompactingHashTable.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.memory.ListMemorySegmentSource; import org.apache.flink.runtime.util.IntArrayList; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashJoinIteratorBase.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashJoinIteratorBase.java index 3934caa709a97..ca7e58cf53268 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashJoinIteratorBase.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashJoinIteratorBase.java @@ -19,7 +19,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java index f43da4eba2488..b3a65e3595445 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/HashPartition.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.operators.hash; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentSource; import org.apache.flink.core.memory.SeekableDataInputView; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/InMemoryPartition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/InMemoryPartition.java index f1a93be847dc5..4bca182320092 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/InMemoryPartition.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/InMemoryPartition.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.hash; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentSource; import org.apache.flink.core.memory.SeekableDataInputView; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTable.java index 9ffdefeded7e5..580a363b81433 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTable.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTable.java @@ -22,8 +22,8 @@ import org.apache.flink.api.common.typeutils.SameTypePairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.RandomAccessInputView; import org.apache.flink.runtime.memory.AbstractPagedOutputView; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java index e2e874c06bc50..7ebdca4fcca9d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/MutableHashTable.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentSource; import org.apache.flink.core.memory.SeekableDataOutputView; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildFirstHashJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildFirstHashJoinIterator.java index 95cdba8016910..bde01759a1108 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildFirstHashJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildFirstHashJoinIterator.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildFirstReOpenableHashJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildFirstReOpenableHashJoinIterator.java index 35c367ecfee6e..8423047bb2376 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildFirstReOpenableHashJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildFirstReOpenableHashJoinIterator.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildSecondHashJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildSecondHashJoinIterator.java index 58ba5c7eb996c..6c7504071b51d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildSecondHashJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildSecondHashJoinIterator.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildSecondReOpenableHashJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildSecondReOpenableHashJoinIterator.java index 822e96917ecd0..c4fe3a7145fd5 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildSecondReOpenableHashJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/NonReusingBuildSecondReOpenableHashJoinIterator.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java index fc805cab042db..42e05d50f0a12 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableHashPartition.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.hash; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentSource; import org.apache.flink.runtime.io.disk.iomanager.BlockChannelWriter; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java index 90c6dc0624c33..b16aa49110fe0 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReOpenableMutableHashTable.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.FileIOChannel; import org.apache.flink.runtime.io.disk.iomanager.IOManager; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildFirstHashJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildFirstHashJoinIterator.java index aa8bd69cca494..98d2f7ad99b69 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildFirstHashJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildFirstHashJoinIterator.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildFirstReOpenableHashJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildFirstReOpenableHashJoinIterator.java index 2c8543e31dc87..2fb8c2ecad989 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildFirstReOpenableHashJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildFirstReOpenableHashJoinIterator.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildSecondHashJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildSecondHashJoinIterator.java index 87fad3f8b91b0..33bd030705058 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildSecondHashJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildSecondHashJoinIterator.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildSecondReOpenableHashJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildSecondReOpenableHashJoinIterator.java index de1a2a9e78dd1..9a3d5c18c8a77 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildSecondReOpenableHashJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/hash/ReusingBuildSecondReOpenableHashJoinIterator.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java index 52a5d140ae88b..e165961d8f80a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/AbstractBlockResettableIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.resettable; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.RandomAccessInputView; import org.apache.flink.runtime.io.disk.SimpleCollectingOutputView; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java index 06b3ca799977f..da287aa70b535 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.resettable; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryAllocationException; import org.apache.flink.runtime.memory.MemoryManager; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/NonReusingBlockResettableIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/NonReusingBlockResettableIterator.java index d759063524aae..af440faa81af6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/NonReusingBlockResettableIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/NonReusingBlockResettableIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.resettable; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryAllocationException; import org.apache.flink.runtime.memory.MemoryManager; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/ReusingBlockResettableIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/ReusingBlockResettableIterator.java index 251dff724087f..5eaef2558ac68 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/ReusingBlockResettableIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/ReusingBlockResettableIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.resettable; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryAllocationException; import org.apache.flink.runtime.memory.MemoryManager; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java index b421a84647c7b..c15629933384c 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIterator.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.operators.resettable; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.SpillingBuffer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java index e33ce4fe24556..b7fbdd345904f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIterator.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.operators.resettable; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.SpillingBuffer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/OutputCollector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/OutputCollector.java index ceb440b813141..06f3bdbf8e96a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/OutputCollector.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/shipping/OutputCollector.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.shipping; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.network.api.writer.RecordWriter; import org.apache.flink.runtime.plugable.SerializationDelegate; import org.apache.flink.util.Collector; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeInnerJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeInnerJoinIterator.java index f7d69e5d12075..365271f25a440 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeInnerJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeInnerJoinIterator.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryAllocationException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeIterator.java index 612eab77ac3a6..80bfa3fbf556b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeIterator.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeOuterJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeOuterJoinIterator.java index 2b1908f0b4e53..87c1c54b18116 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeOuterJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeOuterJoinIterator.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.operators.base.OuterJoinOperatorBase.OuterJoinType; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryAllocationException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningSpillingBehaviour.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningSpillingBehaviour.java index a4d472b0f7dcb..d1f5c5e57c960 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningSpillingBehaviour.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/CombiningSpillingBehaviour.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.GroupCombineFunction; import org.apache.flink.api.common.functions.util.FunctionUtils; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.io.disk.iomanager.ChannelWriterOutputView; import org.apache.flink.runtime.util.NonReusingKeyGroupedIterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/DefaultInMemorySorterFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/DefaultInMemorySorterFactory.java index ab7455a74e655..1c20424d23d65 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/DefaultInMemorySorterFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/DefaultInMemorySorterFactory.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.operators.sort; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import javax.annotation.Nonnull; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/DefaultSpillingBehaviour.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/DefaultSpillingBehaviour.java index 0cbdbdc2c70dd..4ccfe316d03f7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/DefaultSpillingBehaviour.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/DefaultSpillingBehaviour.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.sort; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.ChannelWriterOutputView; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExternalSorter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExternalSorter.java index ffbff34678a0e..d6e99161f399f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExternalSorter.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExternalSorter.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.jobgraph.tasks.TaskInvokable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExternalSorterBuilder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExternalSorterBuilder.java index 84fcda93fb349..e1beebee6f927 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExternalSorterBuilder.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ExternalSorterBuilder.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.GroupCombineFunction; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.AlgorithmOptions; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.memory.MemorySegment; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorter.java index 646e00bb759c9..7394d2a0be237 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorter.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorter.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.operators.sort; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.ChannelWriterOutputView; import org.apache.flink.runtime.memory.AbstractPagedInputView; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/LargeRecordHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/LargeRecordHandler.java index 1d7a9dcf597f1..70381e2b3762c 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/LargeRecordHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/LargeRecordHandler.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.java.tuple.Tuple; import org.apache.flink.api.java.typeutils.TypeExtractor; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeIterator.java index 8e92dd0740e94..5a4658e955825 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/MergeIterator.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.operators.sort; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.MutableObjectIterator; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NonReusingMergeInnerJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NonReusingMergeInnerJoinIterator.java index 2fc91101367e1..001347b3aeb17 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NonReusingMergeInnerJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NonReusingMergeInnerJoinIterator.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryAllocationException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NonReusingMergeOuterJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NonReusingMergeOuterJoinIterator.java index 659aaf1c4199f..d988ce6c94411 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NonReusingMergeOuterJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NonReusingMergeOuterJoinIterator.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.operators.base.OuterJoinOperatorBase.OuterJoinType; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryAllocationException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeCoGroupIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeCoGroupIterator.java index e2cad860f43ea..ba4faf898dace 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeCoGroupIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeCoGroupIterator.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.operators.util.CoGroupTaskIterator; import org.apache.flink.runtime.util.NonReusingKeyGroupedIterator; import org.apache.flink.util.MutableObjectIterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java index 81b5d2481e9df..b93b11c02c01a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/NormalizedKeySorter.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.operators.sort; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.RandomAccessInputView; import org.apache.flink.runtime.io.disk.SimpleCollectingOutputView; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ReusingMergeInnerJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ReusingMergeInnerJoinIterator.java index 8c4271ae46e7b..28d657f969cf5 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ReusingMergeInnerJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ReusingMergeInnerJoinIterator.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryAllocationException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ReusingMergeOuterJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ReusingMergeOuterJoinIterator.java index 8e99ca0024bef..5c5b4cb945220 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ReusingMergeOuterJoinIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ReusingMergeOuterJoinIterator.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.operators.base.OuterJoinOperatorBase.OuterJoinType; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryAllocationException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeCoGroupIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeCoGroupIterator.java index 0f65791f4eee5..48fadf7152605 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeCoGroupIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeCoGroupIterator.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.operators.util.CoGroupTaskIterator; import org.apache.flink.runtime.util.ReusingKeyGroupedIterator; import org.apache.flink.util.MutableObjectIterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/SpillingThread.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/SpillingThread.java index 75de315acb703..dedf4a1afebeb 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/SpillingThread.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/SpillingThread.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.operators.sort; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.ChannelReaderInputViewIterator; import org.apache.flink.runtime.io.disk.iomanager.BlockChannelReader; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/WriterCollector.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/WriterCollector.java index a0eaa8bf4362c..ed7796cc6f0ec 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/WriterCollector.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/WriterCollector.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.sort; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.ChannelWriterOutputView; import org.apache.flink.util.Collector; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/ReaderIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/ReaderIterator.java index f2af4dfcbcb55..4f187e9a6622d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/ReaderIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/util/ReaderIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.util; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.network.api.reader.MutableReader; import org.apache.flink.runtime.plugable.DeserializationDelegate; import org.apache.flink.runtime.plugable.NonReusingDeserializationDelegate; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/NonReusingDeserializationDelegate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/NonReusingDeserializationDelegate.java index 3ee917c351e03..07593d7ff3005 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/NonReusingDeserializationDelegate.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/NonReusingDeserializationDelegate.java @@ -18,9 +18,9 @@ package org.apache.flink.runtime.plugable; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/ReusingDeserializationDelegate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/ReusingDeserializationDelegate.java index 84cc4ad9a4bf5..02cdcd00e0e73 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/ReusingDeserializationDelegate.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/ReusingDeserializationDelegate.java @@ -18,9 +18,9 @@ package org.apache.flink.runtime.plugable; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/SerializationDelegate.java b/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/SerializationDelegate.java index cd530b9e3239d..2534462c1938c 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/SerializationDelegate.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/plugable/SerializationDelegate.java @@ -18,10 +18,10 @@ package org.apache.flink.runtime.plugable; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.io.IOReadableWritable; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/query/KvStateInfo.java b/flink-runtime/src/main/java/org/apache/flink/runtime/query/KvStateInfo.java index f3a6e5a0d25bd..3681efbb92f34 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/query/KvStateInfo.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/query/KvStateInfo.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.query; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalKvState; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/AbstractKeyedStateBackend.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/AbstractKeyedStateBackend.java index a45c2838e4052..a574291b0811e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/AbstractKeyedStateBackend.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/AbstractKeyedStateBackend.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.InternalCheckpointListener; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.runtime.checkpoint.CheckpointOptions; import org.apache.flink.runtime.checkpoint.SnapshotType; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/AbstractKeyedStateBackendBuilder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/AbstractKeyedStateBackendBuilder.java index c8fe9ef465280..3f4f5babfaa6d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/AbstractKeyedStateBackendBuilder.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/AbstractKeyedStateBackendBuilder.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.runtime.query.TaskKvStateRegistry; import org.apache.flink.runtime.state.metrics.LatencyTrackingStateConfig; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ArrayListSerializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ArrayListSerializer.java index 44fbb82f7db8e..2772cfc544fc2 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ArrayListSerializer.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ArrayListSerializer.java @@ -17,10 +17,10 @@ */ package org.apache.flink.runtime.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.ArrayList; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ArrayListSerializerSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ArrayListSerializerSnapshot.java index fb8ec70a36269..496ec36090ef2 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ArrayListSerializerSnapshot.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ArrayListSerializerSnapshot.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import java.util.ArrayList; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/AsyncKeyedStateBackend.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/AsyncKeyedStateBackend.java index d6e606529aa19..cbce2ee71787b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/AsyncKeyedStateBackend.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/AsyncKeyedStateBackend.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.state.InternalCheckpointListener; import org.apache.flink.api.common.state.v2.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.asyncprocessing.AsyncExecutionController; import org.apache.flink.runtime.asyncprocessing.RecordContext; import org.apache.flink.runtime.asyncprocessing.StateExecutor; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/CompositeKeySerializationUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/CompositeKeySerializationUtils.java index eddb5345df55b..3edf298cc7d25 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/CompositeKeySerializationUtils.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/CompositeKeySerializationUtils.java @@ -17,11 +17,11 @@ package org.apache.flink.runtime.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import javax.annotation.Nonnull; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/DefaultOperatorStateBackend.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/DefaultOperatorStateBackend.java index 921409ad31a40..c5fd4437ff961 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/DefaultOperatorStateBackend.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/DefaultOperatorStateBackend.java @@ -24,8 +24,8 @@ import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.MapStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.runtime.checkpoint.CheckpointOptions; import org.apache.flink.runtime.state.v2.StateDescriptorUtils; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/DefaultOperatorStateBackendSnapshotStrategy.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/DefaultOperatorStateBackendSnapshotStrategy.java index 793c8f3e9b387..d23ee38406f10 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/DefaultOperatorStateBackendSnapshotStrategy.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/DefaultOperatorStateBackendSnapshotStrategy.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.checkpoint.CheckpointOptions; import org.apache.flink.runtime.state.filemerging.EmptyFileMergingOperatorStreamStateHandle; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/FullSnapshotAsyncWriter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/FullSnapshotAsyncWriter.java index 10f6c84f63b7f..52c2c92e5ed2f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/FullSnapshotAsyncWriter.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/FullSnapshotAsyncWriter.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArraySerializer; import org.apache.flink.core.fs.CloseableRegistry; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.checkpoint.SnapshotType; import org.apache.flink.util.IOUtils; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/FullSnapshotResources.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/FullSnapshotResources.java index 3ef5bdf262c20..b4eafd70ebba2 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/FullSnapshotResources.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/FullSnapshotResources.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.metainfo.StateMetaInfoSnapshot; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/HeapBroadcastState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/HeapBroadcastState.java index 78ff61945b44e..4a7b676788d84 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/HeapBroadcastState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/HeapBroadcastState.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.BroadcastState; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.core.fs.FSDataOutputStream; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/HeapPriorityQueuesManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/HeapPriorityQueuesManager.java index 869812ca103e4..c6a9082aac7c7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/HeapPriorityQueuesManager.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/HeapPriorityQueuesManager.java @@ -19,8 +19,8 @@ package org.apache.flink.runtime.state; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.runtime.state.heap.HeapPriorityQueueElement; import org.apache.flink.runtime.state.heap.HeapPriorityQueueSet; import org.apache.flink.runtime.state.heap.HeapPriorityQueueSetFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/JavaSerializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/JavaSerializer.java index c3f2c2d895272..0e4f250c586d2 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/JavaSerializer.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/JavaSerializer.java @@ -20,13 +20,14 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; import org.apache.flink.api.java.typeutils.runtime.DataInputViewStream; import org.apache.flink.api.java.typeutils.runtime.DataOutputViewStream; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.InstantiationUtil; @@ -34,7 +35,7 @@ import java.io.Serializable; /** - * A {@link org.apache.flink.api.common.typeutils.TypeSerializer} that uses Java serialization. This + * A {@link TypeSerializer} that uses Java serialization. This * should not be used for anything. */ @Internal diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyGroupPartitioner.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyGroupPartitioner.java index 825fdabeab172..15ee46ffdb811 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyGroupPartitioner.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyGroupPartitioner.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.state; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.Preconditions; import javax.annotation.Nonnegative; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedBackendSerializationProxy.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedBackendSerializationProxy.java index b80d50cf187b2..79e7307d89c63 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedBackendSerializationProxy.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedBackendSerializationProxy.java @@ -18,12 +18,12 @@ package org.apache.flink.runtime.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshotSerializationUtil; import org.apache.flink.core.io.VersionedIOReadableWritable; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.metainfo.StateMetaInfoReader; import org.apache.flink.runtime.state.metainfo.StateMetaInfoSnapshot; import org.apache.flink.runtime.state.metainfo.StateMetaInfoSnapshotReadersWriters; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedStateBackend.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedStateBackend.java index 82a904ab3a529..0a9e914dccea2 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedStateBackend.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedStateBackend.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.util.Disposable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedStateBackendParametersImpl.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedStateBackendParametersImpl.java index e1928e90c1b74..4c0f8b88a16ea 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedStateBackendParametersImpl.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedStateBackendParametersImpl.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.JobID; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.metrics.MetricGroup; import org.apache.flink.runtime.execution.Environment; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedStateFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedStateFactory.java index 42e127dfcfb8d..c42d322734786 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedStateFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/KeyedStateFactory.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.StateSnapshotTransformer.StateSnapshotTransformFactory; import org.apache.flink.runtime.state.internal.InternalKvState; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ListDelimitedSerializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ListDelimitedSerializer.java index 0574c6f491ea1..0db34d3534051 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ListDelimitedSerializer.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ListDelimitedSerializer.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorBackendSerializationProxy.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorBackendSerializationProxy.java index 75e4a54cc3987..573581315b689 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorBackendSerializationProxy.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorBackendSerializationProxy.java @@ -19,8 +19,8 @@ package org.apache.flink.runtime.state; import org.apache.flink.core.io.VersionedIOReadableWritable; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.metainfo.StateMetaInfoReader; import org.apache.flink.runtime.state.metainfo.StateMetaInfoSnapshot; import org.apache.flink.runtime.state.metainfo.StateMetaInfoSnapshotReadersWriters; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorStateRestoreOperation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorStateRestoreOperation.java index e7ba144d5b775..329baa5933922 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorStateRestoreOperation.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/OperatorStateRestoreOperation.java @@ -18,11 +18,11 @@ package org.apache.flink.runtime.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.UnloadableDummyTypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.core.fs.FSDataInputStream; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.runtime.state.filemerging.EmptyFileMergingOperatorStreamStateHandle; import org.apache.flink.runtime.state.metainfo.StateMetaInfoSnapshot; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/PartitionableListState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/PartitionableListState.java index 35d6c78e7eff5..86a913a5917fd 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/PartitionableListState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/PartitionableListState.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.state.ListState; import org.apache.flink.core.fs.FSDataOutputStream; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/PriorityQueueSetFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/PriorityQueueSetFactory.java index d3ab93bc87d90..ef9a32c0fb72b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/PriorityQueueSetFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/PriorityQueueSetFactory.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.heap.HeapPriorityQueueElement; import javax.annotation.Nonnull; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredBroadcastStateBackendMetaInfo.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredBroadcastStateBackendMetaInfo.java index 4fcfe5951d2bb..245232e3cd31f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredBroadcastStateBackendMetaInfo.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredBroadcastStateBackendMetaInfo.java @@ -18,9 +18,9 @@ package org.apache.flink.runtime.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.runtime.state.metainfo.StateMetaInfoSnapshot; import org.apache.flink.util.CollectionUtil; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredKeyValueStateBackendMetaInfo.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredKeyValueStateBackendMetaInfo.java index 1e5abbe3b3fc6..b25a3ebb33db8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredKeyValueStateBackendMetaInfo.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredKeyValueStateBackendMetaInfo.java @@ -19,9 +19,9 @@ package org.apache.flink.runtime.state; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.runtime.state.StateSnapshotTransformer.StateSnapshotTransformFactory; import org.apache.flink.runtime.state.metainfo.StateMetaInfoSnapshot; import org.apache.flink.util.CollectionUtil; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredOperatorStateBackendMetaInfo.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredOperatorStateBackendMetaInfo.java index 2260d0f32b97a..0c62e0d2c8a99 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredOperatorStateBackendMetaInfo.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredOperatorStateBackendMetaInfo.java @@ -18,9 +18,9 @@ package org.apache.flink.runtime.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.runtime.state.metainfo.StateMetaInfoSnapshot; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredPriorityQueueStateBackendMetaInfo.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredPriorityQueueStateBackendMetaInfo.java index 693a74e2a6708..c2ff96c44a668 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredPriorityQueueStateBackendMetaInfo.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/RegisteredPriorityQueueStateBackendMetaInfo.java @@ -18,9 +18,9 @@ package org.apache.flink.runtime.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.runtime.state.metainfo.StateMetaInfoSnapshot; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/SerializedCompositeKeyBuilder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/SerializedCompositeKeyBuilder.java index 382bf043259ee..b79231c4171a3 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/SerializedCompositeKeyBuilder.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/SerializedCompositeKeyBuilder.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.util.FlinkRuntimeException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateBackend.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateBackend.java index 544704adc2cb1..47ffd53a38dff 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateBackend.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateBackend.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Experimental; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.JobID; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.execution.RecoveryClaimMode; import org.apache.flink.core.execution.SavepointFormatType; import org.apache.flink.core.fs.CloseableRegistry; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateSerializerProvider.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateSerializerProvider.java index 4ed106e88cc72..45326a55feed6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateSerializerProvider.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateSerializerProvider.java @@ -19,9 +19,9 @@ package org.apache.flink.runtime.state; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.UnloadableDummyTypeSerializer; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateSnapshot.java index 3095a9ee64abd..5081c09e00d48 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateSnapshot.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateSnapshot.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.metainfo.StateMetaInfoSnapshot; import javax.annotation.Nonnegative; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateSnapshotKeyGroupReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateSnapshotKeyGroupReader.java index 8beef7df17280..34fc8aa4d9697 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateSnapshotKeyGroupReader.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/StateSnapshotKeyGroupReader.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.runtime.state.heap.StateTable; import javax.annotation.Nonnegative; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/VoidNamespaceSerializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/VoidNamespaceSerializer.java index 119f42afc1a1d..27703d2481f04 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/VoidNamespaceSerializer.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/VoidNamespaceSerializer.java @@ -19,10 +19,10 @@ package org.apache.flink.runtime.state; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/VoidNamespaceTypeInfo.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/VoidNamespaceTypeInfo.java index dcde022cac039..6a6518c0f373f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/VoidNamespaceTypeInfo.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/VoidNamespaceTypeInfo.java @@ -22,7 +22,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** {@link TypeInformation} for {@link VoidNamespace}. */ @Public diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapAppendingState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapAppendingState.java index 2660245f88414..d882a25ec6308 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapAppendingState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapAppendingState.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.heap; import org.apache.flink.api.common.state.AppendingState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalAppendingState; /** diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapMergingState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapMergingState.java index 585fbaadf16f6..e2a3179b148f8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapMergingState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapMergingState.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.heap; import org.apache.flink.api.common.state.MergingState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.StateTransformationFunction; import org.apache.flink.runtime.state.internal.InternalMergingState; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapState.java index 0de3ba1a77772..37cac3ab514e1 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractHeapState.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.state.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.queryablestate.client.state.serialization.KvStateSerializer; import org.apache.flink.runtime.state.internal.InternalKvState; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractStateTableSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractStateTableSnapshot.java index c41263632f81b..c69b30c3c3920 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractStateTableSnapshot.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/AbstractStateTableSnapshot.java @@ -19,8 +19,8 @@ package org.apache.flink.runtime.state.heap; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.IterableStateSnapshot; import org.apache.flink.runtime.state.StateEntry; import org.apache.flink.runtime.state.StateSnapshot; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateMap.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateMap.java index bc99c767dd2bb..1e62c11d08806 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateMap.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateMap.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.heap; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.StateEntry; import org.apache.flink.runtime.state.StateTransformationFunction; import org.apache.flink.runtime.state.internal.InternalKvState; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateMapSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateMapSnapshot.java index d6c06f0f0d3ab..bb2756cca51a1 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateMapSnapshot.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateMapSnapshot.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.StateEntry; import org.apache.flink.runtime.state.StateSnapshotTransformer; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTable.java index 787b4031ba010..d134bc8efeca3 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTable.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTable.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTableSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTableSnapshot.java index 51548014d9354..f986b9094ff7b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTableSnapshot.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTableSnapshot.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.heap; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.StateSnapshotTransformer; import javax.annotation.Nonnull; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapAggregatingState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapAggregatingState.java index 59a86de87f992..a0689081dafbc 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapAggregatingState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapAggregatingState.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.AggregatingStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.StateTransformationFunction; import org.apache.flink.runtime.state.internal.InternalAggregatingState; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyValueStateIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyValueStateIterator.java index 3f37640c85ed3..2b9e1ed297178 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyValueStateIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyValueStateIterator.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.heap; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.core.memory.DataOutputSerializer; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackend.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackend.java index daabc9302c86b..8d09e7ed39d16 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackend.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackend.java @@ -24,8 +24,8 @@ import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.runtime.checkpoint.CheckpointOptions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackendBuilder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackendBuilder.java index 0406f1bd60d9b..bd04bb8e23ee9 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackendBuilder.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapKeyedStateBackendBuilder.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.heap; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.runtime.query.TaskKvStateRegistry; import org.apache.flink.runtime.state.AbstractKeyedStateBackendBuilder; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapListState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapListState.java index 919700f539d6a..54863ceb211d6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapListState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapListState.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapMapState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapMapState.java index 0e7eda514d0f9..72d36803827e1 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapMapState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapMapState.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.MapState; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.queryablestate.client.state.serialization.KvStateSerializer; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapPriorityQueueSetFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapPriorityQueueSetFactory.java index 6646d5fe340de..4bfb8958b8663 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapPriorityQueueSetFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapPriorityQueueSetFactory.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.KeyExtractorFunction; import org.apache.flink.runtime.state.KeyGroupRange; import org.apache.flink.runtime.state.Keyed; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapPriorityQueueSnapshotRestoreWrapper.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapPriorityQueueSnapshotRestoreWrapper.java index 38dd0e87c573b..e39f89759f631 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapPriorityQueueSnapshotRestoreWrapper.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapPriorityQueueSnapshotRestoreWrapper.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.KeyExtractorFunction; import org.apache.flink.runtime.state.KeyGroupPartitioner; import org.apache.flink.runtime.state.KeyGroupRange; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapPriorityQueueStateSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapPriorityQueueStateSnapshot.java index fb597cf246eed..a2704a250b919 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapPriorityQueueStateSnapshot.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapPriorityQueueStateSnapshot.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.KeyExtractorFunction; import org.apache.flink.runtime.state.KeyGroupPartitioner; import org.apache.flink.runtime.state.KeyGroupPartitioner.PartitioningResult; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapReducingState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapReducingState.java index b7926af7d6fc7..2013f06352477 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapReducingState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapReducingState.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.ReducingStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.StateTransformationFunction; import org.apache.flink.runtime.state.internal.InternalReducingState; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapRestoreOperation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapRestoreOperation.java index fcf0777452c6d..211c3aac15b85 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapRestoreOperation.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapRestoreOperation.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.core.fs.FSDataInputStream; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapSavepointRestoreOperation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapSavepointRestoreOperation.java index 984b4de31bd4d..e1531a993f096 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapSavepointRestoreOperation.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapSavepointRestoreOperation.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.core.memory.DataInputDeserializer; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapSnapshotResources.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapSnapshotResources.java index ad35d3e7e4130..30d7a7cfff481 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapSnapshotResources.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapSnapshotResources.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.heap; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.FullSnapshotResources; import org.apache.flink.runtime.state.KeyGroupRange; import org.apache.flink.runtime.state.KeyValueStateIterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapSnapshotStrategy.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapSnapshotStrategy.java index 69da532a6f3a0..7012b6c94ee92 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapSnapshotStrategy.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapSnapshotStrategy.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.checkpoint.CheckpointOptions; import org.apache.flink.runtime.state.CheckpointStateOutputStream; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapValueState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapValueState.java index 3f97c3a51e25e..4a2136d0c3c6b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapValueState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/HeapValueState.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.state.ValueState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalValueState; /** diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateMapSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateMapSnapshot.java index cafad96cf55ea..a33608509bbb9 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateMapSnapshot.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateMapSnapshot.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.StateEntry; import org.apache.flink.runtime.state.StateSnapshotTransformer; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateTable.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateTable.java index af48a7f4e0872..6de06e4ea3d9b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateTable.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateTable.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.heap; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.IterableStateSnapshot; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateTableByKeyGroupReaders.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateTableByKeyGroupReaders.java index d025aad7758c0..43bf7e7225021 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateTableByKeyGroupReaders.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateTableByKeyGroupReaders.java @@ -19,9 +19,9 @@ package org.apache.flink.runtime.state.heap; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple3; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.runtime.state.KeyGroupPartitioner; import org.apache.flink.runtime.state.StateSnapshotKeyGroupReader; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateTableFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateTableFactory.java index 617d716e1a69e..0a49fce8251d6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateTableFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/heap/StateTableFactory.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/internal/InternalKvState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/internal/InternalKvState.java index 2194fad30c2bf..d5201b4f55535 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/internal/InternalKvState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/internal/InternalKvState.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.internal; import org.apache.flink.api.common.state.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.StateEntry; import java.util.Collection; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoReader.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoReader.java index d0f412553f0dd..b6f61238d2440 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoReader.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoReader.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.metainfo; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import javax.annotation.Nonnull; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoSnapshot.java index 193f61fb402fd..2e9a91b217292 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoSnapshot.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoSnapshot.java @@ -19,8 +19,8 @@ package org.apache.flink.runtime.state.metainfo; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; import javax.annotation.Nonnull; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoSnapshotReadersWriters.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoSnapshotReadersWriters.java index 9cb47cdfaab71..9f101f2d9d5c6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoSnapshotReadersWriters.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoSnapshotReadersWriters.java @@ -18,10 +18,10 @@ package org.apache.flink.runtime.state.metainfo; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshotSerializationUtil; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.CollectionUtil; import javax.annotation.Nonnull; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoWriter.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoWriter.java index 38669ea3732fe..4a7cac97cbbdd 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoWriter.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/metainfo/StateMetaInfoWriter.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.metainfo; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import javax.annotation.Nonnull; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/metrics/AbstractLatencyTrackState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/metrics/AbstractLatencyTrackState.java index dd092d8b59b2e..687794f936c20 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/metrics/AbstractLatencyTrackState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/metrics/AbstractLatencyTrackState.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.metrics; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalKvState; import org.apache.flink.util.function.SupplierWithException; import org.apache.flink.util.function.ThrowingRunnable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/restore/FullSnapshotRestoreOperation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/restore/FullSnapshotRestoreOperation.java index 8147ea5612554..b766e875b8ee6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/restore/FullSnapshotRestoreOperation.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/restore/FullSnapshotRestoreOperation.java @@ -19,12 +19,12 @@ package org.apache.flink.runtime.state.restore; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArraySerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.fs.FSDataInputStream; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.runtime.state.KeyGroupRange; import org.apache.flink.runtime.state.KeyGroupsStateHandle; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/AbstractTtlState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/AbstractTtlState.java index 1f4a36d9e2095..5c1b2122ac852 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/AbstractTtlState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/AbstractTtlState.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.ttl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalKvState; import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.function.SupplierWithException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializer.java index 0aff73eb97e27..a975fec6932e4 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializer.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializer.java @@ -18,12 +18,12 @@ package org.apache.flink.runtime.state.ttl; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.function.SupplierWithException; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerSnapshot.java index bed9402f3107a..c24a230ff40c3 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerSnapshot.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerSnapshot.java @@ -18,11 +18,12 @@ package org.apache.flink.runtime.state.ttl; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; +import org.apache.flink.api.common.typeutils.TypeSerializerUtils; import java.io.IOException; @@ -69,7 +70,7 @@ public int getCurrentVersion() { @Override public void writeSnapshot(DataOutputView out) throws IOException { out.writeBoolean(isTtlEnabled); - TypeSerializerSnapshot.writeVersionedSnapshot(out, typeSerializerSnapshot); + TypeSerializerUtils.writeVersionedSnapshot(out, typeSerializerSnapshot); } @Override @@ -77,7 +78,7 @@ public void readSnapshot(int readVersion, DataInputView in, ClassLoader userCode throws IOException { this.isTtlEnabled = in.readBoolean(); this.typeSerializerSnapshot = - TypeSerializerSnapshot.readVersionedSnapshot(in, userCodeClassLoader); + TypeSerializerUtils.readVersionedSnapshot(in, userCodeClassLoader); } @Override diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerSnapshotWrapper.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerSnapshotWrapper.java index b903118139a45..4c4cafcc97539 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerSnapshotWrapper.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerSnapshotWrapper.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerUtil; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.ListSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.MapSerializerSnapshot; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlListState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlListState.java index fa4d50fa6b0c8..86c064d089adb 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlListState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlListState.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.ttl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.runtime.state.internal.InternalListState; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlMapState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlMapState.java index 2dc2df3a03186..f3a082b28481c 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlMapState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlMapState.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.ttl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.runtime.state.internal.InternalMapState; import org.apache.flink.util.CollectionUtil; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlStateContext.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlStateContext.java index 994b68c9fa748..09eae7aa43b40 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlStateContext.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlStateContext.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.ttl; import org.apache.flink.api.common.state.StateTtlConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; public class TtlStateContext { /** Wrapped original state handler. */ diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlStateFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlStateFactory.java index 991e91ed4e0b7..a2158be66f809 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlStateFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlStateFactory.java @@ -28,8 +28,8 @@ import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeutils.CompositeSerializer; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/AbstractKeyedState.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/AbstractKeyedState.java index d149241099296..4e79b84201560 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/AbstractKeyedState.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/AbstractKeyedState.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.state.v2.State; import org.apache.flink.api.common.state.v2.StateFuture; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.asyncprocessing.AsyncExecutionController; import org.apache.flink.runtime.asyncprocessing.StateRequestHandler; import org.apache.flink.runtime.asyncprocessing.StateRequestType; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/MapStateDescriptor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/MapStateDescriptor.java index 64138e340ddf0..21bf549f27544 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/MapStateDescriptor.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/MapStateDescriptor.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.state.v2.MapState; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import javax.annotation.Nonnull; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/RegisteredKeyValueStateBackendMetaInfo.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/RegisteredKeyValueStateBackendMetaInfo.java index 7f4667e940846..9ba93bf16b596 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/RegisteredKeyValueStateBackendMetaInfo.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/RegisteredKeyValueStateBackendMetaInfo.java @@ -18,9 +18,9 @@ package org.apache.flink.runtime.state.v2; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.runtime.state.RegisteredStateMetaInfoBase; import org.apache.flink.runtime.state.StateSerializerProvider; import org.apache.flink.runtime.state.StateSnapshotTransformer.StateSnapshotTransformFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/StateDescriptor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/StateDescriptor.java index 24ad4e3aee34e..855148029201e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/StateDescriptor.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/StateDescriptor.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.state.StateTtlConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import javax.annotation.Nonnull; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/adaptor/AsyncKeyedStateBackendAdaptor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/adaptor/AsyncKeyedStateBackendAdaptor.java index 28c6993c9c4a4..bbc805d92bd01 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/adaptor/AsyncKeyedStateBackendAdaptor.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/adaptor/AsyncKeyedStateBackendAdaptor.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.CheckpointListener; import org.apache.flink.api.common.state.InternalCheckpointListener; import org.apache.flink.api.common.state.v2.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.asyncprocessing.RecordContext; import org.apache.flink.runtime.asyncprocessing.StateExecutor; import org.apache.flink.runtime.asyncprocessing.StateRequestHandler; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/ttl/TtlStateFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/ttl/TtlStateFactory.java index 1f3050734fbe6..8b6afc06a9ad6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/ttl/TtlStateFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/state/v2/ttl/TtlStateFactory.java @@ -24,8 +24,8 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.CompositeSerializer; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.AsyncKeyedStateBackend; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/NonReusingMutableToRegularIteratorWrapper.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/NonReusingMutableToRegularIteratorWrapper.java index 4de3aa3f6d50c..77e9a9f040f8b 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/NonReusingMutableToRegularIteratorWrapper.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/NonReusingMutableToRegularIteratorWrapper.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.util; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.MutableObjectIterator; import org.apache.flink.util.TraversableOnceException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/RegularToMutableObjectIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/RegularToMutableObjectIterator.java index 88084c05c2048..b0935293d3f75 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/RegularToMutableObjectIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/RegularToMutableObjectIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.util; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.MutableObjectIterator; import java.util.Iterator; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/ReusingKeyGroupedIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/ReusingKeyGroupedIterator.java index 111e546f63f43..0f7a72b4692c1 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/ReusingKeyGroupedIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/ReusingKeyGroupedIterator.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.util; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.MutableObjectIterator; import org.apache.flink.util.TraversableOnceException; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/ReusingMutableToRegularIteratorWrapper.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/ReusingMutableToRegularIteratorWrapper.java index 7c20d8b6cc2f1..3113f8a4d819d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/ReusingMutableToRegularIteratorWrapper.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/ReusingMutableToRegularIteratorWrapper.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.util; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.MutableObjectIterator; import org.apache.flink.util.TraversableOnceException; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageTypeInfo.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageTypeInfo.java index 16cf1b9454efa..b0ab485eba108 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageTypeInfo.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/connector/sink2/CommittableMessageTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Experimental; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.io.SimpleVersionedSerializerTypeSerializerProxy; import org.apache.flink.util.function.SerializableSupplier; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java index c1bb29928d374..a0c64cfff6430 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/AllWindowedStream.java @@ -27,7 +27,7 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.ReducingStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.functions.NullByteKeySelector; import org.apache.flink.api.java.typeutils.TypeExtractor; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/CoGroupedStreams.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/CoGroupedStreams.java index 16b9fae928433..09fb1b86022ab 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/CoGroupedStreams.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/CoGroupedStreams.java @@ -27,12 +27,12 @@ import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.typeutils.TypeExtractor; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.streaming.api.functions.windowing.WindowFunction; import org.apache.flink.streaming.api.windowing.assigners.WindowAssigner; import org.apache.flink.streaming.api.windowing.evictors.Evictor; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java index 5a1511aec808f..2ae2ec2a37958 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java @@ -39,7 +39,7 @@ import org.apache.flink.api.common.serialization.SerializationSchema; import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.sink2.Sink; import org.apache.flink.api.dag.Transformation; import org.apache.flink.api.java.functions.KeySelector; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/QueryableStateStream.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/QueryableStateStream.java index e876f82babd2d..34cca57b83a25 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/QueryableStateStream.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/datastream/QueryableStateStream.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.Preconditions; /** diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumAggregator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumAggregator.java index 2603cbed4bd78..919713cd08642 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumAggregator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/aggregation/SumAggregator.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple; import org.apache.flink.api.java.typeutils.TupleTypeInfo; import org.apache.flink.streaming.util.typeutils.FieldAccessor; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperator.java index 02a23b40763d0..fc7bf0e545bed 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/ContinuousFileReaderOperator.java @@ -26,7 +26,7 @@ import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.metrics.Counter; import org.apache.flink.runtime.state.JavaSerializer; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/legacy/FromElementsFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/legacy/FromElementsFunction.java index 245943203b278..1f8622bca5159 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/legacy/FromElementsFunction.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/legacy/FromElementsFunction.java @@ -23,10 +23,10 @@ import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.connector.source.Boundedness; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.state.FunctionInitializationContext; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/legacy/InputFormatSourceFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/legacy/InputFormatSourceFunction.java index abdda31b7d72c..9cbb86b307d9f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/legacy/InputFormatSourceFunction.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/legacy/InputFormatSourceFunction.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.io.InputFormat; import org.apache.flink.api.common.io.RichInputFormat; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.io.InputSplit; import org.apache.flink.metrics.Counter; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamConfig.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamConfig.java index 4fd124e0808d6..c69e8174d9aea 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamConfig.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamConfig.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.attribute.Attribute; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.configuration.CheckpointingOptions; import org.apache.flink.configuration.ConfigOption; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java index 976ab784cb0af..140c66460d2af 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java @@ -28,7 +28,7 @@ import org.apache.flink.api.common.io.OutputFormat; import org.apache.flink.api.common.operators.ResourceSpec; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.dag.Pipeline; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamNode.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamNode.java index bc782ca579c2a..578a427c02689 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamNode.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamNode.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.io.InputFormat; import org.apache.flink.api.common.io.OutputFormat; import org.apache.flink.api.common.operators.ResourceSpec; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.core.memory.ManagedMemoryUseCase; import org.apache.flink.runtime.jobgraph.IntermediateDataSetID; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java index 0c148365d48df..ac2fefee4a307 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/graph/StreamingJobGraphGenerator.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.attribute.Attribute; import org.apache.flink.api.common.cache.DistributedCache; import org.apache.flink.api.common.operators.ResourceSpec; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.configuration.CheckpointingOptions; import org.apache.flink.configuration.Configuration; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java index 72081a4ae32b8..ff8bf46e26d4f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperator.java @@ -28,7 +28,7 @@ import org.apache.flink.api.common.state.KeyedStateStore; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.MetricOptions; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorV2.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorV2.java index 76b13cecc9988..dc3c0f2970be5 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorV2.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/AbstractStreamOperatorV2.java @@ -27,7 +27,7 @@ import org.apache.flink.api.common.state.KeyedStateStore; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.MetricOptions; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/BatchGroupedReduceOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/BatchGroupedReduceOperator.java index 6d5d402416f7d..d41a36eb257ef 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/BatchGroupedReduceOperator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/BatchGroupedReduceOperator.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.VoidNamespace; import org.apache.flink.runtime.state.VoidNamespaceSerializer; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManager.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManager.java index 84e110289f873..c9a41e42d4b22 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManager.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManager.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.operators; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.asyncprocessing.AsyncExecutionController; import org.apache.flink.runtime.metrics.groups.TaskIOMetricGroup; import org.apache.flink.runtime.state.KeyGroupRange; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManagerImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManagerImpl.java index 3b5f81697f81e..f51ebffbcf2e3 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManagerImpl.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimeServiceManagerImpl.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.asyncprocessing.AsyncExecutionController; import org.apache.flink.runtime.metrics.groups.TaskIOMetricGroup; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImpl.java index 269ba493b1802..86949c63f275d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImpl.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImpl.java @@ -19,8 +19,8 @@ package org.apache.flink.streaming.api.operators; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.runtime.metrics.groups.TaskIOMetricGroup; import org.apache.flink.runtime.state.InternalPriorityQueue; import org.apache.flink.runtime.state.KeyGroupRange; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceSerializationProxy.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceSerializationProxy.java index 929e6220d8380..bff8baeaf2ca1 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceSerializationProxy.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimerServiceSerializationProxy.java @@ -19,10 +19,10 @@ package org.apache.flink.streaming.api.operators; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.io.PostVersionedIOReadableWritable; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Map; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshot.java index 69447979f31d4..92a21fd8c9b49 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshot.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshot.java @@ -18,8 +18,8 @@ package org.apache.flink.streaming.api.operators; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.util.Preconditions; import javax.annotation.Nullable; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshotReaderWriters.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshotReaderWriters.java index 444ef38393599..1c964021f86f8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshotReaderWriters.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/InternalTimersSnapshotReaderWriters.java @@ -19,11 +19,12 @@ package org.apache.flink.streaming.api.operators; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeutils.TypeSerializerUtils; import org.apache.flink.api.common.typeutils.base.LongSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.CollectionUtil; import javax.annotation.Nonnull; @@ -149,9 +150,9 @@ public InternalTimersSnapshotWriterV2( @Override protected void writeKeyAndNamespaceSerializers(DataOutputView out) throws IOException { - TypeSerializerSnapshot.writeVersionedSnapshot( + TypeSerializerUtils.writeVersionedSnapshot( out, timersSnapshot.getKeySerializerSnapshot()); - TypeSerializerSnapshot.writeVersionedSnapshot( + TypeSerializerUtils.writeVersionedSnapshot( out, timersSnapshot.getNamespaceSerializerSnapshot()); } } @@ -264,9 +265,9 @@ protected void restoreKeyAndNamespaceSerializers( throws IOException { restoredTimersSnapshot.setKeySerializerSnapshot( - TypeSerializerSnapshot.readVersionedSnapshot(in, userCodeClassLoader)); + TypeSerializerUtils.readVersionedSnapshot(in, userCodeClassLoader)); restoredTimersSnapshot.setNamespaceSerializerSnapshot( - TypeSerializerSnapshot.readVersionedSnapshot(in, userCodeClassLoader)); + TypeSerializerUtils.readVersionedSnapshot(in, userCodeClassLoader)); } } diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamGroupedReduceOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamGroupedReduceOperator.java index fa6b5fe1aaebe..ed198502d920c 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamGroupedReduceOperator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamGroupedReduceOperator.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; /** diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateContext.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateContext.java index e991af3d4375a..160428f90dc54 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateContext.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateContext.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.AsyncKeyedStateBackend; import org.apache.flink.runtime.state.CheckpointableKeyedStateBackend; import org.apache.flink.runtime.state.KeyGroupStatePartitionStreamProvider; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandler.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandler.java index 7ab8636f2feda..917191268c1f0 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandler.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamOperatorStateHandler.java @@ -27,7 +27,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.execution.SavepointFormatType; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.runtime.checkpoint.CheckpointException; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamProject.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamProject.java index eac3c67853634..9e997c0363c76 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamProject.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamProject.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializer.java index 8142437d8faad..3df295e7bc2c7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializer.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializer.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.metrics.MetricGroup; import org.apache.flink.runtime.jobgraph.OperatorID; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImpl.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImpl.java index 892f74f45e6fa..b1138f0750f64 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImpl.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImpl.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.TaskInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.core.fs.FSDataInputStream; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializer.java index 0949236e06728..e1170a7865543 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializer.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializer.java @@ -19,9 +19,9 @@ package org.apache.flink.streaming.api.operators; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.MathUtils; import javax.annotation.Nonnull; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializerSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializerSnapshot.java index 7a805611502b2..d3f892cc71fd1 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializerSnapshot.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/TimerSerializerSnapshot.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** Snapshot class for the {@link TimerSerializer}. */ @Internal diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperator.java index 614b26979e689..4afbb36053d9f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperator.java @@ -23,13 +23,13 @@ import org.apache.flink.api.common.state.MapState; import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.StateInitializationContext; import org.apache.flink.streaming.api.functions.co.ProcessJoinFunction; import org.apache.flink.streaming.api.operators.AbstractUdfStreamOperator; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/AbstractCollectResultBuffer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/AbstractCollectResultBuffer.java index 835d0b51a7214..6a2b3cdc78ee9 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/AbstractCollectResultBuffer.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/AbstractCollectResultBuffer.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators.collect; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.Preconditions; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CheckpointedCollectResultBuffer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CheckpointedCollectResultBuffer.java index a101f726f2918..bfb35c16780b7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CheckpointedCollectResultBuffer.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CheckpointedCollectResultBuffer.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators.collect; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** * A buffer which encapsulates the logic of dealing with the response from the {@link diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationRequest.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationRequest.java index 18deafc4c5fb0..c35564ec018fc 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationRequest.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationRequest.java @@ -17,11 +17,11 @@ package org.apache.flink.streaming.api.operators.collect; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.operators.coordination.CoordinationRequest; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationResponse.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationResponse.java index 13fad44c1e0f5..9c0384d6efe92 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationResponse.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectCoordinationResponse.java @@ -17,14 +17,14 @@ package org.apache.flink.streaming.api.operators.collect; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArraySerializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.operators.coordination.CoordinationResponse; import java.io.ByteArrayInputStream; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectResultIterator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectResultIterator.java index cd475abd4d58f..bd5c04bdfe505 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectResultIterator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectResultIterator.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.operators.collect; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.RpcOptions; import org.apache.flink.core.execution.CheckpointingMode; import org.apache.flink.core.execution.JobClient; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunction.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunction.java index b1ef9f2d71950..7be7d7b7f0552 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunction.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunction.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.state.CheckpointListener; import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArraySerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.configuration.TaskManagerOptions; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperator.java index 65b2cfd67de0e..13f6e5e835651 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperator.java @@ -17,7 +17,7 @@ package org.apache.flink.streaming.api.operators.collect; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.operators.coordination.OperatorEvent; import org.apache.flink.runtime.operators.coordination.OperatorEventGateway; import org.apache.flink.runtime.operators.coordination.OperatorEventHandler; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorFactory.java index 7f9d01cfe6063..55e722c9e1664 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorFactory.java @@ -17,7 +17,7 @@ package org.apache.flink.streaming.api.operators.collect; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; import org.apache.flink.configuration.MemorySize; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/SocketConnection.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/SocketConnection.java index deaba8483fe00..25d84ee4f26e4 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/SocketConnection.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/SocketConnection.java @@ -19,9 +19,9 @@ package org.apache.flink.streaming.api.operators.collect; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.util.Preconditions; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/UncheckpointedCollectResultBuffer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/UncheckpointedCollectResultBuffer.java index 12d04cd2f7142..43893acda6407 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/UncheckpointedCollectResultBuffer.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/collect/UncheckpointedCollectResultBuffer.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators.collect; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** * A buffer which encapsulates the logic of dealing with the response from the {@link diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparator.java index 3c94cec7b138c..e0c027c34cf26 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/KeyAndValueSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/KeyAndValueSerializer.java index 096372572c7e2..6050a133469da 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/KeyAndValueSerializer.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/KeyAndValueSerializer.java @@ -18,11 +18,11 @@ package org.apache.flink.streaming.api.operators.sort; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInput.java index 12c4ff4c7f2bc..6dd41cd77f9ff 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInput.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInput.java @@ -19,7 +19,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.configuration.AlgorithmOptions; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/SortingDataInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/SortingDataInput.java index 06b4dc48b8f5c..4d0b3756a7846 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/SortingDataInput.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/SortingDataInput.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.configuration.AlgorithmOptions; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparator.java index 747e6ec7e6c43..a11741ab94016 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/AbstractBatchExecutionKeyState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/AbstractBatchExecutionKeyState.java index 2356578188f4b..0618384994019 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/AbstractBatchExecutionKeyState.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/AbstractBatchExecutionKeyState.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators.sorted.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalKvState; import java.util.HashMap; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeServiceManager.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeServiceManager.java index 57f0b3f6f0552..6bd9f2151dcb6 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeServiceManager.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionInternalTimeServiceManager.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators.sorted.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.asyncprocessing.AsyncExecutionController; import org.apache.flink.runtime.metrics.groups.TaskIOMetricGroup; import org.apache.flink.runtime.state.KeyGroupRange; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyAggregatingState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyAggregatingState.java index 7dec9f21d373c..1cf1d3bba7352 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyAggregatingState.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyAggregatingState.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.AggregatingStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalAggregatingState; /** An {@link AggregatingState} which keeps value for a single key at a time. */ diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyListState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyListState.java index cdc17d68a2c85..e2202fbc37628 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyListState.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyListState.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalListState; import java.util.ArrayList; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyMapState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyMapState.java index 855c87c811f9c..4a196c2257fa5 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyMapState.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyMapState.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.MapState; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalMapState; import java.util.Collections; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyReducingState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyReducingState.java index 8ff81b6338906..6af85816cd6fd 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyReducingState.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyReducingState.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.ReducingStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalReducingState; /** A {@link ReducingState} which keeps value for a single key at a time. */ diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyValueState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyValueState.java index 4d5b6a85e94fa..f63900eef9a8a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyValueState.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyValueState.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.state.ValueState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalValueState; /** A {@link ValueState} which keeps value for a single key at a time. */ diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyedStateBackend.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyedStateBackend.java index a7f8d46c1b733..8d5ce9a7e7e26 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyedStateBackend.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionKeyedStateBackend.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.checkpoint.CheckpointOptions; import org.apache.flink.runtime.state.CheckpointStreamFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/MergingAbstractBatchExecutionKeyState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/MergingAbstractBatchExecutionKeyState.java index 4994f2d8a6d6e..66b2ebe43eb47 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/MergingAbstractBatchExecutionKeyState.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sorted/state/MergingAbstractBatchExecutionKeyState.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators.sorted.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalMergingState; import java.util.Collection; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparator.java index 3768b621c9855..d58fcc94c9e72 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparator.java @@ -21,8 +21,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializer.java index 2788880b7b307..813a53a82cb09 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializer.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializer.java @@ -18,11 +18,11 @@ package org.apache.flink.streaming.api.operators.sortpartition; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Arrays; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyedSortPartitionOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyedSortPartitionOperator.java index e986efffee3bb..8cc2649f97f4e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyedSortPartitionOperator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/KeyedSortPartitionOperator.java @@ -27,7 +27,7 @@ import org.apache.flink.api.common.typeinfo.Types; import org.apache.flink.api.common.typeutils.CompositeType; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.TypeExtractor; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/SortPartitionOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/SortPartitionOperator.java index a361c7fd48420..e784fa1c07d81 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/SortPartitionOperator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/SortPartitionOperator.java @@ -27,7 +27,7 @@ import org.apache.flink.api.common.typeinfo.Types; import org.apache.flink.api.common.typeutils.CompositeType; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.TypeExtractor; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparator.java index 98c648f6f4028..516f9f7f82518 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparator.java @@ -21,8 +21,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/util/SimpleVersionedListState.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/util/SimpleVersionedListState.java index cb45429a0784b..026053a1b3f2d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/util/SimpleVersionedListState.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/operators/util/SimpleVersionedListState.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.operators.util; import org.apache.flink.api.common.state.ListState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.io.SimpleVersionedSerialization; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.util.FlinkRuntimeException; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/GlobalWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/GlobalWindows.java index 879e884f933dc..c75ef3e0c0507 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/GlobalWindows.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/GlobalWindows.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.triggers.TriggerResult; import org.apache.flink.streaming.api.windowing.windows.GlobalWindow; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingEventTimeWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingEventTimeWindows.java index 0191ad928eba1..529cbb769faa8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingEventTimeWindows.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingEventTimeWindows.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.windowing.triggers.EventTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java index 3bae280e03f39..0114cc858aafe 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.windowing.triggers.ProcessingTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingEventTimeWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingEventTimeWindows.java index 498a948bce824..3be0db52ab37a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingEventTimeWindows.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingEventTimeWindows.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.windowing.triggers.EventTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java index 4c620816d23ed..c0d2fef72ad87 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.windowing.triggers.ProcessingTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java index 4206797173f28..69dcebda34dd9 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.Window; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/GlobalWindow.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/GlobalWindow.java index 5324a645a1fad..8ceb49b1d451e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/GlobalWindow.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/GlobalWindow.java @@ -20,11 +20,11 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/TimeWindow.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/TimeWindow.java index 93c1bf16f6bf1..8fedea234f1f7 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/TimeWindow.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/windows/TimeWindow.java @@ -20,11 +20,11 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.streaming.api.windowing.assigners.MergingWindowAssigner; import org.apache.flink.util.MathUtils; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/AbstractStreamTaskNetworkInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/AbstractStreamTaskNetworkInput.java index c29263e38040f..21abe5d151b7a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/AbstractStreamTaskNetworkInput.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/AbstractStreamTaskNetworkInput.java @@ -17,7 +17,7 @@ package org.apache.flink.streaming.runtime.io; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.watermark.Watermark; import org.apache.flink.runtime.checkpoint.channel.InputChannelInfo; import org.apache.flink.runtime.event.AbstractEvent; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java index 815fa13bc3963..705ffa3c54ebb 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/RecordWriterOutput.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.runtime.io; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.metrics.Counter; import org.apache.flink.metrics.Gauge; import org.apache.flink.metrics.SimpleCounter; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamMultipleInputProcessorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamMultipleInputProcessorFactory.java index 78877a3d62ec6..a68bddca67f19 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamMultipleInputProcessorFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamMultipleInputProcessorFactory.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.TaskInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.memory.ManagedMemoryUseCase; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInput.java index a855ff471a4b0..e73e29eebba63 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInput.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInput.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.runtime.io; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.checkpoint.CheckpointException; import org.apache.flink.runtime.checkpoint.CheckpointFailureReason; import org.apache.flink.runtime.checkpoint.channel.ChannelStateWriter; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInputFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInputFactory.java index 46c9cd96936e3..1dfdc982cefea 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInputFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTaskNetworkInputFactory.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.runtime.io; import org.apache.flink.api.common.TaskInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.checkpoint.InflightDataRescalingDescriptor; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.streaming.runtime.io.checkpointing.CheckpointedInputGate; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputProcessorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputProcessorFactory.java index 2a0c675710b34..73f6eab91f321 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputProcessorFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/StreamTwoInputProcessorFactory.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.TaskInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.memory.ManagedMemoryUseCase; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RecordFilter.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RecordFilter.java index a0f805f27b582..664e7989649c9 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RecordFilter.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RecordFilter.java @@ -17,7 +17,7 @@ package org.apache.flink.streaming.runtime.io.recovery; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.network.api.writer.ChannelSelector; import org.apache.flink.runtime.plugable.SerializationDelegate; import org.apache.flink.streaming.runtime.streamrecord.StreamElementSerializer; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RescalingStreamTaskNetworkInput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RescalingStreamTaskNetworkInput.java index 91ddaa2548268..6f9ce66e7ff3a 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RescalingStreamTaskNetworkInput.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/io/recovery/RescalingStreamTaskNetworkInput.java @@ -19,7 +19,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.TaskInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.checkpoint.CheckpointException; import org.apache.flink.runtime.checkpoint.InflightDataRescalingDescriptor; import org.apache.flink.runtime.checkpoint.channel.ChannelStateWriter; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/GlobalCommitterSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/GlobalCommitterSerializer.java index 4fe1cd35733fe..eb65d768f587d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/GlobalCommitterSerializer.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/GlobalCommitterSerializer.java @@ -22,7 +22,7 @@ import org.apache.flink.core.io.SimpleVersionedSerialization; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.metrics.groups.SinkCommitterMetricGroup; import org.apache.flink.streaming.runtime.operators.sink.committables.CommittableCollector; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperator.java index 2e89fdf2dfc06..13154a49e0d42 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperator.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.serialization.SerializationSchema.InitializationContext; import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.BooleanSerializer; import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArraySerializer; import org.apache.flink.api.connector.sink2.CommittingSinkWriter; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializer.java index 7a9121b0b650e..d54ddf36cc85d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializer.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/CommittableCollectorSerializer.java @@ -22,9 +22,9 @@ import org.apache.flink.core.io.SimpleVersionedSerialization; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.metrics.groups.SinkCommitterMetricGroup; import org.apache.flink.util.CollectionUtil; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/SinkV1CommittableDeserializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/SinkV1CommittableDeserializer.java index c7372ca639785..14d593e8f6062 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/SinkV1CommittableDeserializer.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/sink/committables/SinkV1CommittableDeserializer.java @@ -22,7 +22,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.core.io.SimpleVersionedSerialization; import org.apache.flink.core.io.SimpleVersionedSerializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import java.io.IOException; import java.util.List; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java index a484d21335ec0..05b5b75fd2408 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.AppendingState; import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.metrics.MetricGroup; import org.apache.flink.runtime.state.internal.InternalListState; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorFactory.java index f0ec136eb7d7b..e12d2f9638b7d 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorFactory.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.AppendingState; import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.streaming.api.operators.StreamOperator; import org.apache.flink.streaming.api.operators.StreamOperatorParameters; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java index 4bdc82c5e5bc9..0e515ee56e7dd 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java @@ -38,7 +38,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.runtime.TupleSerializer; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorBuilder.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorBuilder.java index 96b10303c6b4c..aa4088a7243c2 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorBuilder.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorBuilder.java @@ -30,7 +30,7 @@ import org.apache.flink.api.common.state.ReducingStateDescriptor; import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.streaming.api.functions.windowing.AggregateApplyWindowFunction; import org.apache.flink.streaming.api.functions.windowing.ProcessWindowFunction; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorFactory.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorFactory.java index f61fafee4813b..62005b8f44954 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorFactory.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorFactory.java @@ -22,7 +22,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.state.AppendingState; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.streaming.api.operators.AbstractStreamOperatorFactory; import org.apache.flink.streaming.api.operators.OneInputStreamOperatorFactory; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializer.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializer.java index e33c2ac6f9ad2..071e55c27c8fc 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializer.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializer.java @@ -20,9 +20,9 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.streaming.api.watermark.InternalWatermark; import org.apache.flink.streaming.api.watermark.Watermark; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/CopyingChainingOutput.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/CopyingChainingOutput.java index c27d3a834904a..131f9e746fff9 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/CopyingChainingOutput.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/CopyingChainingOutput.java @@ -17,7 +17,7 @@ package org.apache.flink.streaming.runtime.tasks; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.metrics.Counter; import org.apache.flink.metrics.groups.OperatorMetricGroup; import org.apache.flink.streaming.api.operators.Input; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java index 9025210b8e033..9a69744fcd660 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.ManagedMemoryUseCase; import org.apache.flink.metrics.Counter; import org.apache.flink.runtime.event.WatermarkEvent; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java index da3855c006410..82df4758b4c25 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/tasks/OperatorChain.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.runtime.tasks; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.metrics.Counter; import org.apache.flink.metrics.SimpleCounter; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractOneInputTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractOneInputTransformationTranslator.java index 3f5269c97a77b..219e2fdc0a342 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractOneInputTransformationTranslator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractOneInputTransformationTranslator.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.dag.Transformation; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.streaming.api.graph.SimpleTransformationTranslator; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractTwoInputTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractTwoInputTransformationTranslator.java index 653c1f430243e..a187256fd5b69 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractTwoInputTransformationTranslator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/AbstractTwoInputTransformationTranslator.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.dag.Transformation; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.streaming.api.graph.SimpleTransformationTranslator; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/LegacySinkTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/LegacySinkTransformationTranslator.java index a6b7b31193c36..cce68ccca2b26 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/LegacySinkTransformationTranslator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/LegacySinkTransformationTranslator.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.dag.Transformation; import org.apache.flink.streaming.api.graph.SimpleTransformationTranslator; import org.apache.flink.streaming.api.graph.StreamConfig; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/MultiInputTransformationTranslator.java b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/MultiInputTransformationTranslator.java index c52ade1d638eb..511336fe10e50 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/MultiInputTransformationTranslator.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/runtime/translators/MultiInputTransformationTranslator.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.dag.Transformation; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.streaming.api.graph.SimpleTransformationTranslator; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/IntegerTaskEvent.java b/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/IntegerTaskEvent.java index c35b63867c66f..5a8852e639cfd 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/IntegerTaskEvent.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/IntegerTaskEvent.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.event.task; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.TaskEvent; import java.io.IOException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/StringTaskEvent.java b/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/StringTaskEvent.java index 8ed547fa87f05..0f414d5372f54 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/StringTaskEvent.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/event/task/StringTaskEvent.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.event.task; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.TaskEvent; import org.apache.flink.util.StringUtils; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java index b76c5eb41a76b..cfd6ed3e1c6e7 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/ChannelViewsTest.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.io.disk; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.BlockChannelReader; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java index e600da1c864ea..e1d727b7f3dcd 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java @@ -18,9 +18,9 @@ package org.apache.flink.runtime.io.disk; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.io.disk.iomanager.IOManagerAsync; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java index ee7cff8f5ead8..720021740bc00 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/iomanager/IOManagerITCase.java @@ -19,8 +19,8 @@ package org.apache.flink.runtime.io.disk.iomanager; import org.apache.flink.core.io.IOReadableWritable; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryManager; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/reader/AbstractReaderTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/reader/AbstractReaderTest.java index 4f335ff0c1253..31e0cde3b0912 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/reader/AbstractReaderTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/reader/AbstractReaderTest.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.io.network.api.reader; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.TaskEvent; import org.apache.flink.runtime.io.network.api.EndOfPartitionEvent; import org.apache.flink.runtime.io.network.api.EndOfSuperstepEvent; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordOrEventCollectingResultPartitionWriter.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordOrEventCollectingResultPartitionWriter.java index a192090f4de38..5123393f8fd7e 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordOrEventCollectingResultPartitionWriter.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordOrEventCollectingResultPartitionWriter.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.io.network.api.writer; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.event.AbstractEvent; import org.apache.flink.runtime.io.network.api.EndOfData; import org.apache.flink.runtime.io.network.api.StopMode; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java index 22903144e8d0a..07f7810c58a86 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/writer/RecordWriterTest.java @@ -19,8 +19,8 @@ package org.apache.flink.runtime.io.network.api.writer; import org.apache.flink.core.io.IOReadableWritable; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.checkpoint.CheckpointOptions; import org.apache.flink.runtime.checkpoint.channel.InputChannelInfo; import org.apache.flink.runtime.event.AbstractEvent; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/LargeObjectType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/LargeObjectType.java index 03a561f52f986..1baf67ac20864 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/LargeObjectType.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/serialization/types/LargeObjectType.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.io.network.serialization.types; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.testutils.serialization.types.SerializationTestType; import java.io.IOException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestTaskEvent.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestTaskEvent.java index 09def6814e63b..1d278021c27c2 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestTaskEvent.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/util/TestTaskEvent.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.io.network.util; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.TaskEvent; import java.io.IOException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelTest.java index ba80c6f3f2678..a8ade15bf175d 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/iterative/concurrent/BlockingBackChannelTest.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.iterative.concurrent; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.iterative.io.SerializedUpdateBuffer; import org.junit.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/AbstractOuterJoinTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/AbstractOuterJoinTaskExternalITCase.java index 125cd07905f70..dc89765c965be 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/AbstractOuterJoinTaskExternalITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/AbstractOuterJoinTaskExternalITCase.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/AbstractOuterJoinTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/AbstractOuterJoinTaskTest.java index 7808d856a1306..90853bfcaf333 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/AbstractOuterJoinTaskTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/AbstractOuterJoinTaskTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java index fc4a7caf2cd8f..5a1696048249d 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskTest.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.functions.GroupReduceFunction; import org.apache.flink.api.common.functions.RichGroupReduceFunction; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombinerOversizedRecordsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombinerOversizedRecordsTest.java index 44f8b6a9db125..fe3fe2f1dca5e 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombinerOversizedRecordsTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombinerOversizedRecordsTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.GroupCombineFunction; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/GatheringCollector.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/GatheringCollector.java index 4010c798f1c34..ca8f375bcaf31 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/GatheringCollector.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/GatheringCollector.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.drivers; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.Collector; import java.util.ArrayList; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/TestTaskContext.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/TestTaskContext.java index b53626979fb1f..238e90225a0f0 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/TestTaskContext.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/drivers/TestTaskContext.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.api.java.typeutils.runtime.RuntimeSerializerFactory; import org.apache.flink.configuration.Configuration; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/CompactingHashTableTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/CompactingHashTableTest.java index 61846a8afe650..d233ddfd8553f 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/CompactingHashTableTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/CompactingHashTableTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.typeutils.SameTypePairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongComparator; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.MemorySegment; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java index 7392bd0aefa64..887d5673c33a3 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.io.disk.iomanager.IOManagerAsync; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTablePerformanceComparison.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTablePerformanceComparison.java index 67fe973ea3b60..3d389013fefc4 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTablePerformanceComparison.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTablePerformanceComparison.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.runtime.io.disk.iomanager.IOManager; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableTest.java index e2bb51626a585..ae958bc015433 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ByteValueSerializer; import org.apache.flink.api.common.typeutils.base.LongComparator; import org.apache.flink.api.common.typeutils.base.LongSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTableTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTableTest.java index 929f35c94677c..5b4dcfd2e4ccf 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTableTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/InPlaceMutableHashTableTest.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.typeutils.SameTypePairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongComparator; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/MutableHashTableTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/MutableHashTableTestBase.java index 7ca38fa280340..c813b3345d182 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/MutableHashTableTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/MutableHashTableTestBase.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongComparator; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/NonReusingHashJoinIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/NonReusingHashJoinIteratorITCase.java index 1932de3269564..0d7ba7e91abd2 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/NonReusingHashJoinIteratorITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/NonReusingHashJoinIteratorITCase.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.io.disk.iomanager.IOManagerAsync; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java index 3fde62042971f..95f00e472c62c 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableTestBase.java index cdfa71933cbc3..bad2b5202027e 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableTestBase.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.io.disk.iomanager.IOManagerAsync; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReusingHashJoinIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReusingHashJoinIteratorITCase.java index 49187930a26f4..01884bcfdc6c2 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReusingHashJoinIteratorITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReusingHashJoinIteratorITCase.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.io.disk.iomanager.IOManagerAsync; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java index 44e4c3c3c7fd7..ce77aaec8083d 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.resettable; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.runtime.memory.MemoryManagerBuilder; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/NonReusingBlockResettableIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/NonReusingBlockResettableIteratorTest.java index 8dc15dabaf2a5..12e877af50d28 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/NonReusingBlockResettableIteratorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/NonReusingBlockResettableIteratorTest.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.resettable; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.runtime.memory.MemoryManagerBuilder; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/ReusingBlockResettableIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/ReusingBlockResettableIteratorTest.java index 3a5ad4d190636..279dbddc2eef0 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/ReusingBlockResettableIteratorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/ReusingBlockResettableIteratorTest.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.resettable; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.runtime.memory.MemoryManagerBuilder; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java index cdb5ff96d25e8..636efb1654a46 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableIteratorTest.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.resettable; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntValueSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.io.disk.iomanager.IOManagerAsync; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java index 8b3114be0dae0..ee689a59012f1 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.operators.resettable; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.io.disk.iomanager.IOManagerAsync; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/AbstractSortMergeOuterJoinIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/AbstractSortMergeOuterJoinIteratorITCase.java index 37ee170d66594..b004f0f695969 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/AbstractSortMergeOuterJoinIteratorITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/AbstractSortMergeOuterJoinIteratorITCase.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningExternalSorterITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningExternalSorterITCase.java index 405d818b6aa40..9c4862ee75b79 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningExternalSorterITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningExternalSorterITCase.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.OpenContext; import org.apache.flink.api.common.functions.RichGroupReduceFunction; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortLargeRecordsITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortLargeRecordsITCase.java index f9b3041bce53a..fe71a91008341 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortLargeRecordsITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ExternalSortLargeRecordsITCase.java @@ -23,12 +23,12 @@ import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.TupleTypeInfo; import org.apache.flink.api.java.typeutils.ValueTypeInfo; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.io.disk.iomanager.IOManagerAsync; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorterTest.java index d8e9a44a8604e..aa97d45b7e9d6 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorterTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/FixedLengthRecordSorterTest.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.operators.sort; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.ChannelReaderInputViewIterator; import org.apache.flink.runtime.io.disk.iomanager.BlockChannelReader; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/LargeRecordHandlerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/LargeRecordHandlerITCase.java index b4c74ff3379ab..c9d339d8beca4 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/LargeRecordHandlerITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/LargeRecordHandlerITCase.java @@ -23,12 +23,12 @@ import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.typeutils.TupleTypeInfo; import org.apache.flink.api.java.typeutils.ValueTypeInfo; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.FileChannelOutputView; import org.apache.flink.runtime.io.disk.SeekableFileChannelInputView; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/LargeRecordHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/LargeRecordHandlerTest.java index 7196abe6db947..68c4d65e80733 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/LargeRecordHandlerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/LargeRecordHandlerTest.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.typeinfo.TypeHint; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.typeutils.TupleTypeInfo; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeCoGroupIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeCoGroupIteratorITCase.java index 3ef8154cd318e..7a982298bde35 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeCoGroupIteratorITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeCoGroupIteratorITCase.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.operators.testutils.TestData; import org.apache.flink.runtime.operators.testutils.TestData.TupleGenerator; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeInnerJoinIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeInnerJoinIteratorITCase.java index 5f63458fc21f3..43c30145a3a94 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeInnerJoinIteratorITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeInnerJoinIteratorITCase.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeOuterJoinIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeOuterJoinIteratorITCase.java index a0d2694819839..1ef187a0e67e7 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeOuterJoinIteratorITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/NonReusingSortMergeOuterJoinIteratorITCase.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.operators.base.OuterJoinOperatorBase.OuterJoinType; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryManager; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeCoGroupIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeCoGroupIteratorITCase.java index d6f0f89c1ce05..986ed0e7c8550 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeCoGroupIteratorITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeCoGroupIteratorITCase.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.operators.testutils.TestData; import org.apache.flink.runtime.operators.testutils.TestData.TupleGenerator; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeInnerJoinIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeInnerJoinIteratorITCase.java index 2d2a03c7d61f0..cbc5ec9db5c22 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeInnerJoinIteratorITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeInnerJoinIteratorITCase.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.typeutils.GenericPairComparator; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeOuterJoinIteratorITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeOuterJoinIteratorITCase.java index 84f30fe9b7de6..d8070d4400e51 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeOuterJoinIteratorITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/ReusingSortMergeOuterJoinIteratorITCase.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.operators.base.OuterJoinOperatorBase.OuterJoinType; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryManager; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/BinaryOperatorTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/BinaryOperatorTestBase.java index ea4b0a34188e2..ca894fde9fb50 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/BinaryOperatorTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/BinaryOperatorTestBase.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.functions.Function; import org.apache.flink.api.common.functions.util.FunctionUtils; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.api.java.typeutils.runtime.RuntimeSerializerFactory; import org.apache.flink.configuration.Configuration; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/PairGenerator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/PairGenerator.java index c4fd457481f4d..bf55724b179ec 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/PairGenerator.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/PairGenerator.java @@ -18,8 +18,8 @@ package org.apache.flink.runtime.operators.testutils; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.StringValue; import org.apache.flink.types.Value; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TestData.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TestData.java index 5a1495797184f..255263e1566b7 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TestData.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TestData.java @@ -21,15 +21,15 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.java.tuple.Tuple; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.TupleTypeInfo; import org.apache.flink.configuration.Configuration; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.operators.testutils.types.IntPair; import org.apache.flink.types.IntValue; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnaryOperatorTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnaryOperatorTestBase.java index 6c35e6eb2b7af..a96dacaca9a85 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnaryOperatorTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/UnaryOperatorTestBase.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.functions.Function; import org.apache.flink.api.common.functions.util.FunctionUtils; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.api.java.typeutils.runtime.RuntimeSerializerFactory; import org.apache.flink.configuration.Configuration; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java index 4ae48c23b26c5..368b919cdd4f0 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.base.IntComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListSerializer.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListSerializer.java index 951cb9eb745c4..13cf07ff01a68 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListSerializer.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntListSerializer.java @@ -18,10 +18,10 @@ package org.apache.flink.runtime.operators.testutils.types; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.Arrays; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java index dc1fe9e53c32c..341a1cab1a175 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.base.IntComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairSerializer.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairSerializer.java index 8d44b03ce0d8d..63dae0964be7c 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairSerializer.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/IntPairSerializer.java @@ -18,12 +18,12 @@ package org.apache.flink.runtime.operators.testutils.types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.configuration.Configuration; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java index 83e0a2486dc19..a51a29b87ac1c 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairComparator.java @@ -20,8 +20,8 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.base.StringComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.StringValue; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairSerializer.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairSerializer.java index e268111f1df90..c2ef047715b53 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairSerializer.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/types/StringPairSerializer.java @@ -18,10 +18,10 @@ package org.apache.flink.runtime.operators.testutils.types; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.StringValue; import java.io.IOException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java index c134adfab3321..d8c4a1cfddafa 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java @@ -21,9 +21,9 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.network.api.writer.ChannelSelector; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/query/KvStateRegistryTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/query/KvStateRegistryTest.java index febf369a262b3..f224a417d1462 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/query/KvStateRegistryTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/query/KvStateRegistryTest.java @@ -19,11 +19,11 @@ package org.apache.flink.runtime.query; import org.apache.flink.api.common.JobID; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.IntSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.queryablestate.KvStateID; import org.apache.flink.runtime.highavailability.HighAvailabilityServices; import org.apache.flink.runtime.jobgraph.JobVertexID; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ArrayListSerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ArrayListSerializerUpgradeTest.java index cb2acc70e3a3a..ccbdf422d7ade 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ArrayListSerializerUpgradeTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ArrayListSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.runtime.state; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/CompositeKeySerializationUtilsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/CompositeKeySerializationUtilsTest.java index b6b28dc9d75c3..7006666eee6b0 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/CompositeKeySerializationUtilsTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/CompositeKeySerializationUtilsTest.java @@ -24,7 +24,7 @@ import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/InternalPriorityQueueTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/InternalPriorityQueueTestBase.java index 6856f02d07cd8..1efe733b07080 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/InternalPriorityQueueTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/InternalPriorityQueueTestBase.java @@ -18,12 +18,12 @@ package org.apache.flink.runtime.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.state.heap.AbstractHeapPriorityQueueElement; import org.apache.flink.util.CloseableIterator; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/JavaSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/JavaSerializerTest.java index 939dfb90e89b4..e5e7e6850cdf3 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/JavaSerializerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/JavaSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple1; import org.apache.flink.testutils.ClassLoaderUtils; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/JavaSerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/JavaSerializerUpgradeTest.java index 1330c9921d8fa..80889ee3183e8 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/JavaSerializerUpgradeTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/JavaSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.runtime.state; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.assertj.core.api.Condition; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/KeyGroupPartitionerTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/KeyGroupPartitionerTestBase.java index 55c3c093fe473..ffd0ba89010b4 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/KeyGroupPartitionerTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/KeyGroupPartitionerTestBase.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state; import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.util.CollectionUtil; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/KeyedStateCheckpointOutputStreamTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/KeyedStateCheckpointOutputStreamTest.java index bc336487a59f5..2c509b3b27e1f 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/KeyedStateCheckpointOutputStreamTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/KeyedStateCheckpointOutputStreamTest.java @@ -18,9 +18,9 @@ package org.apache.flink.runtime.state; import org.apache.flink.core.fs.FSDataInputStream; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/OperatorStateBackendTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/OperatorStateBackendTest.java index 3d684426e7a74..148f7e6a743a7 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/OperatorStateBackendTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/OperatorStateBackendTest.java @@ -26,15 +26,15 @@ import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.core.fs.Path; import org.apache.flink.core.fs.local.LocalFileSystem; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.testutils.OneShotLatch; import org.apache.flink.runtime.checkpoint.CheckpointOptions; import org.apache.flink.runtime.checkpoint.StateObjectCollection; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/OperatorStateOutputCheckpointStreamTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/OperatorStateOutputCheckpointStreamTest.java index 74b700b0723ba..8701d32550670 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/OperatorStateOutputCheckpointStreamTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/OperatorStateOutputCheckpointStreamTest.java @@ -19,9 +19,9 @@ package org.apache.flink.runtime.state; import org.apache.flink.core.fs.FSDataInputStream; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/SerializationProxiesTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/SerializationProxiesTest.java index f80ecd472205b..61dc2d81a5b81 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/SerializationProxiesTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/SerializationProxiesTest.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/SerializedCompositeKeyBuilderTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/SerializedCompositeKeyBuilderTest.java index 1b2b26b7e77a5..e6dff011d394e 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/SerializedCompositeKeyBuilderTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/SerializedCompositeKeyBuilderTest.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.core.memory.DataInputDeserializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendMigrationTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendMigrationTestBase.java index b6ac09dc2dad8..9c5034a3aa051 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendMigrationTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendMigrationTestBase.java @@ -26,14 +26,14 @@ import org.apache.flink.api.common.state.StateTtlConfig; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.core.fs.CloseableRegistry; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.metrics.groups.UnregisteredMetricsGroup; import org.apache.flink.runtime.checkpoint.CheckpointOptions; import org.apache.flink.runtime.checkpoint.StateObjectCollection; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java index c0756af7bad84..8041793081faf 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java @@ -35,7 +35,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; import org.apache.flink.api.common.typeutils.base.FloatSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestUtils.java index eca13bc180fed..4f12263b93243 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestUtils.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestUtils.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.asyncprocessing.MockStateExecutor; import org.apache.flink.runtime.asyncprocessing.StateExecutor; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateSerializerProviderTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateSerializerProviderTest.java index 65908573facd6..046e93cd59b9e 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateSerializerProviderTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateSerializerProviderTest.java @@ -18,11 +18,11 @@ package org.apache.flink.runtime.state; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.testutils.statemigration.TestType; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/VoidNamespaceSerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/VoidNamespaceSerializerUpgradeTest.java index cbd2f99c607ce..7c9c45936ba96 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/VoidNamespaceSerializerUpgradeTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/VoidNamespaceSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.runtime.state; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.assertj.core.api.Condition; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTableTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTableTest.java index 537c0edd37f1a..57aa378a4aa19 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTableTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/heap/CopyOnWriteStateTableTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.typeutils.base.FloatSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.InternalKeyContextImpl; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/heap/TestDuplicateSerializer.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/heap/TestDuplicateSerializer.java index e1c729cd10bdb..6a39b44f2a19a 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/heap/TestDuplicateSerializer.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/heap/TestDuplicateSerializer.java @@ -18,10 +18,10 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingAggregatingStateTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingAggregatingStateTest.java index 57580c19dd3e8..e7d069085b05f 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingAggregatingStateTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingAggregatingStateTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.AggregateFunction; import org.apache.flink.api.common.state.AggregatingStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.runtime.state.AbstractKeyedStateBackend; import org.apache.flink.runtime.state.VoidNamespace; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingListStateTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingListStateTest.java index 4435c5cb5c894..bb7b83d4dfbd0 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingListStateTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingListStateTest.java @@ -21,7 +21,7 @@ package org.apache.flink.runtime.state.metrics; import org.apache.flink.api.common.state.ListStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.runtime.state.AbstractKeyedStateBackend; import org.apache.flink.runtime.state.VoidNamespace; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingMapStateTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingMapStateTest.java index ab21051fb9d9a..b69d726c78c94 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingMapStateTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingMapStateTest.java @@ -21,7 +21,7 @@ package org.apache.flink.runtime.state.metrics; import org.apache.flink.api.common.state.MapStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.runtime.state.AbstractKeyedStateBackend; import org.apache.flink.runtime.state.VoidNamespace; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingReducingStateTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingReducingStateTest.java index 2f2983b767fbd..79d70fc1b0bdf 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingReducingStateTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingReducingStateTest.java @@ -21,7 +21,7 @@ package org.apache.flink.runtime.state.metrics; import org.apache.flink.api.common.state.ReducingStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.runtime.state.AbstractKeyedStateBackend; import org.apache.flink.runtime.state.VoidNamespace; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingStateTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingStateTestBase.java index c03968033232d..c1cc0140676ed 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingStateTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/metrics/LatencyTrackingStateTestBase.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.StateLatencyTrackOptions; import org.apache.flink.core.fs.CloseableRegistry; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerSnapshotWrapperTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerSnapshotWrapperTest.java index 769909223f5f7..6bca385dbf90b 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerSnapshotWrapperTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerSnapshotWrapperTest.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.ttl; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializerSnapshot; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerTest.java index c3dba42401a94..3f82d452517fa 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerTest.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.ttl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerUpgradeTest.java index fff29aa44175b..e9c7f3e9e8f65 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerUpgradeTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlAwareSerializerUpgradeTest.java @@ -19,14 +19,14 @@ package org.apache.flink.runtime.state.ttl; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; import org.assertj.core.api.Condition; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlListStateTestContextBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlListStateTestContextBase.java index c42f874eafea2..cd4101b50c1d5 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlListStateTestContextBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlListStateTestContextBase.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import java.util.ArrayList; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlSerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlSerializerUpgradeTest.java index 8f9d7d8806c82..2742538bee99b 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlSerializerUpgradeTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/TtlSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.runtime.state.ttl; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalAggregatingState.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalAggregatingState.java index 9349a66d4477c..5e54a5ff02fad 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalAggregatingState.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalAggregatingState.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.AggregatingStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalAggregatingState; /** In memory mock internal aggregating state. */ diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalKvState.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalKvState.java index d3a00f1343f2a..f4011dce57f61 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalKvState.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalKvState.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.ttl.mock; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalKvState; import java.util.Map; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalListState.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalListState.java index e8c80303d4e00..7299212c6896b 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalListState.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalListState.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalListState; import java.util.ArrayList; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalMapState.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalMapState.java index 1646317f3f178..eaef2378323e7 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalMapState.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalMapState.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalMapState; import java.util.HashMap; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalReducingState.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalReducingState.java index eefe9b037fd72..2d8af67b1f171 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalReducingState.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalReducingState.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.ReducingStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalReducingState; /** In memory mock internal reducing state. */ diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalValueState.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalValueState.java index 2e7999181dca7..64558d8905ea2 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalValueState.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockInternalValueState.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalValueState; /** In memory mock internal value state. */ diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockKeyedStateBackend.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockKeyedStateBackend.java index 807356afa322d..cb091ca7e7d79 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockKeyedStateBackend.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockKeyedStateBackend.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.runtime.checkpoint.CheckpointOptions; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockKeyedStateBackendBuilder.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockKeyedStateBackendBuilder.java index 14f36ecfd2eb8..394651ea7337c 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockKeyedStateBackendBuilder.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/ttl/mock/MockKeyedStateBackendBuilder.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.ttl.mock; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.runtime.query.TaskKvStateRegistry; import org.apache.flink.runtime.state.AbstractKeyedStateBackendBuilder; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/AbstractKeyedStateTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/AbstractKeyedStateTestBase.java index 56ae6c1347020..2a5784f1a9db6 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/AbstractKeyedStateTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/AbstractKeyedStateTestBase.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.v2; import org.apache.flink.api.common.state.v2.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.asyncprocessing.AsyncExecutionController; import org.apache.flink.runtime.asyncprocessing.StateExecutor; import org.apache.flink.runtime.asyncprocessing.StateRequest; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/StateBackendTestV2Base.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/StateBackendTestV2Base.java index 3e4a26fe83fab..8aa8d0ce927e2 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/StateBackendTestV2Base.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/StateBackendTestV2Base.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.v2.ValueState; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.core.fs.CloseableRegistry; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/StateDescriptorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/StateDescriptorTest.java index 75a690092236e..8287341e857cd 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/StateDescriptorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/v2/StateDescriptorTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.StateTtlConfig; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.GenericTypeInfo; import org.apache.flink.core.testutils.CommonTestUtils; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordComparator.java index 65138b4296d6a..fbd2293fad12e 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordComparator.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordComparator.java @@ -19,8 +19,8 @@ package org.apache.flink.runtime.testutils.recordutils; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.types.KeyFieldOutOfBoundsException; import org.apache.flink.types.NormalizableKey; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializer.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializer.java index a246c520b01de..a12b15eb1fe9d 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializer.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializer.java @@ -18,10 +18,10 @@ package org.apache.flink.runtime.testutils.recordutils; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.Record; import java.io.IOException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializerFactory.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializerFactory.java index 39294cdebcf90..e4cf35c250cee 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializerFactory.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializerFactory.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.testutils.recordutils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; import org.apache.flink.configuration.Configuration; import org.apache.flink.types.Record; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/TestType.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/TestType.java index aa2a4148c6ab0..8195e2642ae93 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/TestType.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/TestType.java @@ -18,11 +18,11 @@ package org.apache.flink.runtime.testutils.statemigration; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.Keyed; import org.apache.flink.runtime.state.PriorityComparable; import org.apache.flink.runtime.state.heap.AbstractHeapPriorityQueueElement; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/V1TestTypeSerializerSnapshot.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/V1TestTypeSerializerSnapshot.java index 22742b245c34d..ff8336747d7d3 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/V1TestTypeSerializerSnapshot.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/V1TestTypeSerializerSnapshot.java @@ -18,11 +18,11 @@ package org.apache.flink.runtime.testutils.statemigration; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.testutils.statemigration.TestType.IncompatibleTestTypeSerializer.IncompatibleTestTypeSerializerSnapshot; import org.apache.flink.runtime.testutils.statemigration.TestType.ReconfigurationRequiringTestTypeSerializer.ReconfigurationRequiringTestTypeSerializerSnapshot; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/V2TestTypeSerializerSnapshot.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/V2TestTypeSerializerSnapshot.java index 5cf819efcf058..e17cefcccc9d6 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/V2TestTypeSerializerSnapshot.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/statemigration/V2TestTypeSerializerSnapshot.java @@ -18,11 +18,11 @@ package org.apache.flink.runtime.testutils.statemigration; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.testutils.statemigration.TestType.IncompatibleTestTypeSerializer.IncompatibleTestTypeSerializerSnapshot; import org.apache.flink.runtime.testutils.statemigration.TestType.ReconfigurationRequiringTestTypeSerializer.ReconfigurationRequiringTestTypeSerializerSnapshot; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerTest.java index 4a8f0326fd581..04789d26f68d9 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; import org.apache.flink.streaming.api.datastream.CoGroupedStreams.TaggedUnion; import org.apache.flink.streaming.api.datastream.CoGroupedStreams.UnionSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerUpgradeTest.java index 59df994f73147..ea41287c41dd5 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerUpgradeTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/datastream/UnionSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.streaming.api.datastream; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/FromElementsFunctionTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/FromElementsFunctionTest.java index 9aa340c3fe04d..32083aa86e57b 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/FromElementsFunctionTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/functions/FromElementsFunctionTest.java @@ -22,13 +22,13 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.typeutils.GenericTypeInfo; import org.apache.flink.api.java.typeutils.TypeExtractor; import org.apache.flink.api.java.typeutils.ValueTypeInfo; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.testutils.CheckedThread; import org.apache.flink.runtime.checkpoint.OperatorSubtaskState; import org.apache.flink.streaming.api.functions.source.legacy.FromElementsFunction; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceAsyncImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceAsyncImplTest.java index 1bf396bad81de..70a779d2209ba 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceAsyncImplTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceAsyncImplTest.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.core.state.StateFutureImpl.AsyncFrameworkExceptionHandler; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImplTest.java index 544cc9128a513..9cb4f585f0d75 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImplTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/InternalTimerServiceImplTest.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.tuple.Tuple3; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/MailboxWatermarkProcessorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/MailboxWatermarkProcessorTest.java index 87f19f4032d2c..f86766aa31a49 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/MailboxWatermarkProcessorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/MailboxWatermarkProcessorTest.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.asyncprocessing.AsyncExecutionController; import org.apache.flink.runtime.state.KeyedStateCheckpointOutputStream; import org.apache.flink.streaming.api.watermark.Watermark; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateDescriptorPassingTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateDescriptorPassingTest.java index 9ab8c8e073603..5535a4036d6f3 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateDescriptorPassingTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateDescriptorPassingTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.ReduceFunction; import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateInitializationContextImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateInitializationContextImplTest.java index d18e6eb3c8f44..fa283cb339d2e 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateInitializationContextImplTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StateInitializationContextImplTest.java @@ -24,9 +24,9 @@ import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.core.fs.FSDataInputStream; import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.metrics.groups.UnregisteredMetricsGroup; import org.apache.flink.runtime.checkpoint.JobManagerTaskRestore; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImplTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImplTest.java index ef93d9c5b2690..5607a2d27b070 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImplTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamTaskStateInitializerImplTest.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.operators; import org.apache.flink.api.common.JobID; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.metrics.groups.UnregisteredMetricsGroup; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContextTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContextTest.java index 1098fc67ad715..78603f627cc29 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContextTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContextTest.java @@ -34,7 +34,7 @@ import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerTest.java index 47a33b023c3a5..918fbb92c5389 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.operators; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerUpgradeTest.java index 65b66d99fe969..c88067a8b8c44 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerUpgradeTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/TimerSerializerUpgradeTest.java @@ -18,9 +18,9 @@ package org.apache.flink.streaming.api.operators; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/BufferEntrySerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/BufferEntrySerializerUpgradeTest.java index df9521e99652d..ddfe5dd662ede 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/BufferEntrySerializerUpgradeTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/BufferEntrySerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.streaming.api.operators.co; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.streaming.api.operators.co.IntervalJoinOperator.BufferEntry; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperatorTest.java index eb52889e0ee02..2b7d50b9de66b 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperatorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/co/IntervalJoinOperatorTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.MapState; import org.apache.flink.api.common.typeinfo.TypeHint; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.checkpoint.OperatorSubtaskState; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultBufferTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultBufferTest.java index 1976df86e74a4..d56383e170c6c 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultBufferTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultBufferTest.java @@ -17,9 +17,9 @@ package org.apache.flink.streaming.api.operators.collect; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.junit.jupiter.api.Test; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultIteratorTest.java index 94e088c7c4785..8f97d79f07ebf 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultIteratorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectResultIteratorTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.JobStatus; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.execution.JobClient; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorCoordinatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorCoordinatorTest.java index b4e6de5841f7f..ae30676f4e8f7 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorCoordinatorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkOperatorCoordinatorTest.java @@ -19,7 +19,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.RowTypeInfo; import org.apache.flink.core.testutils.FlinkAssertions; import org.apache.flink.runtime.operators.coordination.CoordinationRequest; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/AbstractTestCoordinationRequestHandler.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/AbstractTestCoordinationRequestHandler.java index e837044517d88..c0f216e7c99ac 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/AbstractTestCoordinationRequestHandler.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/AbstractTestCoordinationRequestHandler.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.operators.collect.utils; import org.apache.flink.api.common.accumulators.SerializedListAccumulator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArraySerializer; import org.apache.flink.runtime.operators.coordination.CoordinationRequest; import org.apache.flink.runtime.operators.coordination.CoordinationRequestHandler; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/CollectTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/CollectTestUtils.java index 3613af245ce09..71b37a61f6062 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/CollectTestUtils.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/CollectTestUtils.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators.collect.utils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.streaming.api.operators.collect.CollectCoordinationResponse; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestCheckpointedCoordinationRequestHandler.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestCheckpointedCoordinationRequestHandler.java index 12403c01ad254..90ddc700d8f45 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestCheckpointedCoordinationRequestHandler.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestCheckpointedCoordinationRequestHandler.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators.collect.utils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.operators.coordination.CoordinationRequestHandler; import java.util.ArrayList; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestUncheckpointedCoordinationRequestHandler.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestUncheckpointedCoordinationRequestHandler.java index 9e912899dce61..3c908fa622fb3 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestUncheckpointedCoordinationRequestHandler.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/TestUncheckpointedCoordinationRequestHandler.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators.collect.utils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.operators.coordination.CoordinationRequestHandler; import java.util.Collections; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparatorTest.java index 66d71c5056c0b..c6ff6a1e7fbe7 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparatorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthByteKeyComparatorTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthKeyAndValueSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthKeyAndValueSerializerTest.java index 67c6f6e8b9a38..b230501c61f64 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthKeyAndValueSerializerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/FixedLengthKeyAndValueSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.operators.sort; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/LargeSortingDataInputITCase.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/LargeSortingDataInputITCase.java index 1a80f0af3afce..cdd793f0cf3bc 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/LargeSortingDataInputITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/LargeSortingDataInputITCase.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.operators.sort; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArraySerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInputsTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInputsTest.java index 67d89c984804d..1acf10af7406f 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInputsTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/MultiInputSortingDataInputsTest.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.operators.sort; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.configuration.Configuration; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparatorTest.java index 2d5568c750973..72c8cabdbf5b0 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparatorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthByteKeyComparatorTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.operators.Order; import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthKeyAndValueSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthKeyAndValueSerializerTest.java index 6dd4042e5dd95..55a3c658e6152 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthKeyAndValueSerializerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sort/VariableLengthKeyAndValueSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.operators.sort; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackendTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackendTest.java index 70232ddfcda7e..30f4e693ebac9 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackendTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sorted/state/BatchExecutionStateBackendTest.java @@ -31,7 +31,7 @@ import org.apache.flink.api.common.state.ReducingStateDescriptor; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.runtime.state.CheckpointableKeyedStateBackend; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparatorTest.java index a7065a1e2ad9b..0da82e3e01403 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparatorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/FixedLengthByteKeyAndValueComparatorTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializerTest.java index 879468e9f90ee..3ec502a4c40d5 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/KeyAndValueSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.api.operators.sortpartition; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparatorTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparatorTest.java index ecd82815b53a2..52fe5db3e2751 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparatorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/sortpartition/VariableLengthByteKeyAndValueComparatorTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeutils.ComparatorTestBase; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/TestEvent.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/TestEvent.java index 7acf2403f515b..b24a982314ef9 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/TestEvent.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/io/TestEvent.java @@ -18,8 +18,8 @@ package org.apache.flink.streaming.runtime.io; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.event.AbstractEvent; import org.apache.flink.util.StringUtils; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorContractTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorContractTest.java index 088cd914aa42b..c51deb64cdf5a 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorContractTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorContractTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.streaming.api.windowing.assigners.WindowAssigner; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SimpleTriggerTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SimpleTriggerTestHarness.java index 038e6c758a5bf..97b2966f5f55c 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SimpleTriggerTestHarness.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/SimpleTriggerTestHarness.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.runtime.operators.windowing; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.triggers.TriggerResult; import org.apache.flink.streaming.api.windowing.windows.Window; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowSerializerTest.java index 42483ce928dbd..efc9fe6c9c069 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowSerializerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TimeWindowSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.runtime.operators.windowing; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; /** Tests for {@link TimeWindow.Serializer}. */ diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TriggerTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TriggerTestHarness.java index 02454dd4d6822..83f7328cd690b 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TriggerTestHarness.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/TriggerTestHarness.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.MergingState; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.fs.CloseableRegistry; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowSerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowSerializerUpgradeTest.java index 53481f3af4511..39aaa3ca5264d 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowSerializerUpgradeTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.streaming.runtime.operators.windowing; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.streaming.api.windowing.windows.GlobalWindow; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerTest.java index 3c4137756f5db..6df19389c3f00 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerTest.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.runtime.streamrecord; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.core.memory.DataInputDeserializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerUpgradeTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerUpgradeTest.java index 63f3f5fe5ac7e..510206256863c 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerUpgradeTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/streamrecord/StreamElementSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.streaming.runtime.streamrecord; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamConfigChainer.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamConfigChainer.java index 7411a3e2fd9e4..5e2830e4669ee 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamConfigChainer.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamConfigChainer.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.runtime.tasks; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.memory.ManagedMemoryUseCase; import org.apache.flink.runtime.io.network.partition.ResultPartitionType; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java index 9fb6b73376275..26eb7854a9aa9 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamMockEnvironment.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.JobInfoImpl; import org.apache.flink.api.common.TaskInfo; import org.apache.flink.api.common.TaskInfoImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.fs.Path; import org.apache.flink.runtime.accumulators.AccumulatorRegistry; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestStateBackend.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestStateBackend.java index ab2a0629fcc65..3f1024b56e518 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestStateBackend.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/TestStateBackend.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.runtime.checkpoint.CheckpointOptions; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarness.java index e600f66620424..7e565f41d21a6 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarness.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarness.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.JobID; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.TypeExtractor; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.memory.ManagedMemoryUseCase; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarnessTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarnessTest.java index ba2fe3c767b48..4ab460cea6eff 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarnessTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/util/AbstractStreamOperatorTestHarnessTest.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.runtime.checkpoint.OperatorSubtaskState; import org.apache.flink.runtime.state.KeyedStateBackend; diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/util/OneInputStreamOperatorTestHarness.java b/flink-runtime/src/test/java/org/apache/flink/streaming/util/OneInputStreamOperatorTestHarness.java index f7c86e3e65dea..a995d7761cd4d 100644 --- a/flink-runtime/src/test/java/org/apache/flink/streaming/util/OneInputStreamOperatorTestHarness.java +++ b/flink-runtime/src/test/java/org/apache/flink/streaming/util/OneInputStreamOperatorTestHarness.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.util; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.runtime.operators.testutils.MockEnvironment; import org.apache.flink.streaming.api.operators.BoundedOneInput; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/AbstractChangelogState.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/AbstractChangelogState.java index 6b9b41cd37c48..5b75177a9ff2d 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/AbstractChangelogState.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/AbstractChangelogState.java @@ -18,7 +18,7 @@ package org.apache.flink.state.changelog; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalKvState; import static org.apache.flink.util.Preconditions.checkArgument; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/AbstractStateChangeLogger.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/AbstractStateChangeLogger.java index 0f62613542933..59d2cb2c4c857 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/AbstractStateChangeLogger.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/AbstractStateChangeLogger.java @@ -18,7 +18,7 @@ package org.apache.flink.state.changelog; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; import org.apache.flink.runtime.state.RegisteredPriorityQueueStateBackendMetaInfo; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyGroupedPriorityQueue.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyGroupedPriorityQueue.java index 1d9d7e3edd481..70024bd756cf2 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyGroupedPriorityQueue.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyGroupedPriorityQueue.java @@ -18,7 +18,7 @@ package org.apache.flink.state.changelog; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue; import org.apache.flink.state.changelog.restore.ChangelogApplierFactory; import org.apache.flink.state.changelog.restore.StateChangeApplier; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyedStateBackend.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyedStateBackend.java index 4c32c0bc3a1c0..747df562e47fa 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyedStateBackend.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogKeyedStateBackend.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.state.InternalCheckpointListener; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.metrics.MetricGroup; import org.apache.flink.runtime.checkpoint.CheckpointOptions; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogMapState.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogMapState.java index 0beebacc9e3c8..dcb16b94f8ad8 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogMapState.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogMapState.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.MapState; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.typeutils.base.MapSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.changelog.StateChange; import org.apache.flink.runtime.state.internal.InternalKvState; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogStateFactory.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogStateFactory.java index aa0ee6777323f..775be266753c4 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogStateFactory.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/ChangelogStateFactory.java @@ -19,7 +19,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/KvStateChangeLoggerImpl.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/KvStateChangeLoggerImpl.java index 04a8b659fedee..6e1e427adac7f 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/KvStateChangeLoggerImpl.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/KvStateChangeLoggerImpl.java @@ -18,9 +18,9 @@ package org.apache.flink.state.changelog; import org.apache.flink.api.common.state.StateTtlConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; import org.apache.flink.runtime.state.RegisteredStateMetaInfoBase; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/PriorityQueueStateChangeLoggerImpl.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/PriorityQueueStateChangeLoggerImpl.java index b1785e3282296..f168554d2f6f3 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/PriorityQueueStateChangeLoggerImpl.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/PriorityQueueStateChangeLoggerImpl.java @@ -17,8 +17,8 @@ package org.apache.flink.state.changelog; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.RegisteredPriorityQueueStateBackendMetaInfo; import org.apache.flink.runtime.state.RegisteredStateMetaInfoBase; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/StateChangeLogger.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/StateChangeLogger.java index 86e6f80ac5fb2..0943fbdc40e81 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/StateChangeLogger.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/StateChangeLogger.java @@ -19,7 +19,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.state.ListState; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.function.ThrowingConsumer; import java.io.Closeable; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/StateChangeLoggingIterator.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/StateChangeLoggingIterator.java index 39802665e3ee0..5c884a494aed7 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/StateChangeLoggingIterator.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/StateChangeLoggingIterator.java @@ -17,7 +17,7 @@ package org.apache.flink.state.changelog; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.CloseableIterator; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.function.BiConsumerWithException; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/AggregatingStateChangeApplier.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/AggregatingStateChangeApplier.java index d990cb507a10d..595774a3d9a77 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/AggregatingStateChangeApplier.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/AggregatingStateChangeApplier.java @@ -17,7 +17,7 @@ package org.apache.flink.state.changelog.restore; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.internal.InternalAggregatingState; import org.apache.flink.runtime.state.internal.InternalKvState; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogApplierFactory.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogApplierFactory.java index 12a864bbdc829..c6d8afb524f34 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogApplierFactory.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogApplierFactory.java @@ -18,7 +18,7 @@ package org.apache.flink.state.changelog.restore; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue; import org.apache.flink.runtime.state.internal.InternalAggregatingState; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogApplierFactoryImpl.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogApplierFactoryImpl.java index 7c4476e36730b..72f14811747ce 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogApplierFactoryImpl.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogApplierFactoryImpl.java @@ -17,7 +17,7 @@ package org.apache.flink.state.changelog.restore; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue; import org.apache.flink.runtime.state.internal.InternalAggregatingState; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogBackendLogApplier.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogBackendLogApplier.java index 52a005ff0677f..4224aa368bff8 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogBackendLogApplier.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogBackendLogApplier.java @@ -27,7 +27,7 @@ import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.api.java.typeutils.runtime.DataInputViewStream; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; import org.apache.flink.runtime.state.RegisteredPriorityQueueStateBackendMetaInfo; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogMigrationRestoreTarget.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogMigrationRestoreTarget.java index be3727a410a74..529b5cf20ac77 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogMigrationRestoreTarget.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogMigrationRestoreTarget.java @@ -19,9 +19,9 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.checkpoint.CheckpointOptions; import org.apache.flink.runtime.state.AbstractKeyedStateBackend; import org.apache.flink.runtime.state.CheckpointStreamFactory; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogRestoreTarget.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogRestoreTarget.java index 94453a5f93561..3d11ed36a118e 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogRestoreTarget.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ChangelogRestoreTarget.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.CheckpointableKeyedStateBackend; import org.apache.flink.runtime.state.KeyGroupRange; import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/KvStateChangeApplier.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/KvStateChangeApplier.java index 19248f179c997..f61ae677c03f6 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/KvStateChangeApplier.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/KvStateChangeApplier.java @@ -17,7 +17,7 @@ package org.apache.flink.state.changelog.restore; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.KeyGroupRangeAssignment; import org.apache.flink.runtime.state.internal.InternalKvState; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ListStateChangeApplier.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ListStateChangeApplier.java index aaac5341f3e4d..7174afdc064f7 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ListStateChangeApplier.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ListStateChangeApplier.java @@ -18,7 +18,7 @@ package org.apache.flink.state.changelog.restore; import org.apache.flink.api.common.typeutils.base.ListSerializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.internal.InternalKvState; import org.apache.flink.runtime.state.internal.InternalListState; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/MapStateChangeApplier.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/MapStateChangeApplier.java index 6eb64213488d0..211473ca0333f 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/MapStateChangeApplier.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/MapStateChangeApplier.java @@ -18,7 +18,7 @@ package org.apache.flink.state.changelog.restore; import org.apache.flink.api.common.typeutils.base.MapSerializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.internal.InternalKvState; import org.apache.flink.runtime.state.internal.InternalMapState; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/PriorityQueueStateChangeApplier.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/PriorityQueueStateChangeApplier.java index 08d60a2f8803e..ab7ffd3597f30 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/PriorityQueueStateChangeApplier.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/PriorityQueueStateChangeApplier.java @@ -17,8 +17,8 @@ package org.apache.flink.state.changelog.restore; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue; import org.apache.flink.state.changelog.StateChangeOperation; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ReducingStateChangeApplier.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ReducingStateChangeApplier.java index 9bd94238e65ea..7bb2a8d72be52 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ReducingStateChangeApplier.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ReducingStateChangeApplier.java @@ -17,7 +17,7 @@ package org.apache.flink.state.changelog.restore; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.internal.InternalKvState; import org.apache.flink.runtime.state.internal.InternalReducingState; diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/StateChangeApplier.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/StateChangeApplier.java index 3b120baa64410..3ad2140a4782e 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/StateChangeApplier.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/StateChangeApplier.java @@ -18,7 +18,7 @@ package org.apache.flink.state.changelog.restore; import org.apache.flink.annotation.Internal; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.state.changelog.StateChangeOperation; /** Applies state data change to some state. */ diff --git a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ValueStateChangeApplier.java b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ValueStateChangeApplier.java index 8525451b1bfe5..57314ee5e0785 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ValueStateChangeApplier.java +++ b/flink-state-backends/flink-statebackend-changelog/src/main/java/org/apache/flink/state/changelog/restore/ValueStateChangeApplier.java @@ -17,7 +17,7 @@ package org.apache.flink.state.changelog.restore; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.runtime.state.InternalKeyContext; import org.apache.flink.runtime.state.internal.InternalKvState; import org.apache.flink.runtime.state.internal.InternalValueState; diff --git a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogDelegateEmbeddedRocksDBStateBackendTest.java b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogDelegateEmbeddedRocksDBStateBackendTest.java index 91ce7ae6b06b4..7518777517c80 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogDelegateEmbeddedRocksDBStateBackendTest.java +++ b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogDelegateEmbeddedRocksDBStateBackendTest.java @@ -19,7 +19,7 @@ package org.apache.flink.state.changelog; import org.apache.flink.api.common.state.StateTtlConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.StateLatencyTrackOptions; import org.apache.flink.runtime.execution.Environment; diff --git a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogDelegateHashMapTest.java b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogDelegateHashMapTest.java index e4235ad171cd2..999cca5858df3 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogDelegateHashMapTest.java +++ b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogDelegateHashMapTest.java @@ -19,7 +19,7 @@ package org.apache.flink.state.changelog; import org.apache.flink.api.common.state.StateTtlConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.StateLatencyTrackOptions; import org.apache.flink.runtime.execution.Environment; diff --git a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogListStateTest.java b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogListStateTest.java index fb09247435d7f..381f81df9b7f5 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogListStateTest.java +++ b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogListStateTest.java @@ -19,7 +19,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.runtime.state.InternalKeyContextImpl; import org.apache.flink.runtime.state.KeyGroupRange; diff --git a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogMapStateTest.java b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogMapStateTest.java index d17bd3df19367..da735e1109af4 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogMapStateTest.java +++ b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogMapStateTest.java @@ -19,7 +19,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.runtime.state.InternalKeyContextImpl; import org.apache.flink.runtime.state.KeyGroupRange; diff --git a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogPqStateTest.java b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogPqStateTest.java index 96203e1891574..babca26da8969 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogPqStateTest.java +++ b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogPqStateTest.java @@ -18,7 +18,7 @@ package org.apache.flink.state.changelog; import org.apache.flink.api.common.typeutils.base.StringSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.KeyGroupedInternalPriorityQueue; import org.apache.flink.util.CloseableIterator; import org.apache.flink.util.function.FunctionWithException; diff --git a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogStateBackendTestUtils.java b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogStateBackendTestUtils.java index 15b53ef3d9c68..d6084e9b419fd 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogStateBackendTestUtils.java +++ b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/ChangelogStateBackendTestUtils.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.typeutils.GenericTypeInfo; import org.apache.flink.changelog.fs.ChangelogStorageMetricGroup; diff --git a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/TestChangeLoggerKv.java b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/TestChangeLoggerKv.java index 338dc5cca1f4c..9d0eb91cb35e5 100644 --- a/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/TestChangeLoggerKv.java +++ b/flink-state-backends/flink-statebackend-changelog/src/test/java/org/apache/flink/state/changelog/TestChangeLoggerKv.java @@ -17,7 +17,7 @@ package org.apache.flink.state.changelog; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.function.ThrowingConsumer; import java.io.IOException; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStAggregatingState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStAggregatingState.java index abec5d6c83ccf..b508fce86d853 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStAggregatingState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStAggregatingState.java @@ -19,7 +19,7 @@ package org.apache.flink.state.forst; import org.apache.flink.api.common.state.v2.AggregatingState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.core.state.InternalStateFuture; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBBunchPutRequest.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBBunchPutRequest.java index 4a89fde78d30b..d934664b2b74a 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBBunchPutRequest.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBBunchPutRequest.java @@ -19,7 +19,7 @@ package org.apache.flink.state.forst; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.core.state.InternalStateFuture; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBTtlCompactFiltersManager.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBTtlCompactFiltersManager.java index a1bc9ef2f92fd..bfb13ee7dc0d5 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBTtlCompactFiltersManager.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStDBTtlCompactFiltersManager.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.state.StateTtlConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackend.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackend.java index 6e0c7613ab18b..de80fa33ec669 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackend.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackend.java @@ -19,8 +19,8 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.state.v2.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.core.fs.Path; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackendBuilder.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackendBuilder.java index 6abc97dcc9064..edd89218a57d4 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackendBuilder.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStKeyedStateBackendBuilder.java @@ -18,7 +18,7 @@ package org.apache.flink.state.forst; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.core.fs.Path; import org.apache.flink.core.memory.DataInputDeserializer; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStListState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStListState.java index 8bca44b4a671a..fb0b966dbd0f2 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStListState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStListState.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.v2.ListState; import org.apache.flink.api.common.state.v2.StateIterator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.core.state.InternalStateFuture; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMapState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMapState.java index 05a25921c776b..1e860f613f42f 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMapState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStMapState.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.v2.MapState; import org.apache.flink.api.common.state.v2.State; import org.apache.flink.api.common.state.v2.StateIterator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStReducingState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStReducingState.java index da6e1dfbb7c71..6a33a85ee7599 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStReducingState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStReducingState.java @@ -18,7 +18,7 @@ package org.apache.flink.state.forst; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.core.state.InternalStateFuture; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStSerializerUtils.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStSerializerUtils.java index d600b9b324d54..72af7b438e1f7 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStSerializerUtils.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStSerializerUtils.java @@ -18,7 +18,7 @@ package org.apache.flink.state.forst; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.SerializedCompositeKeyBuilder; import java.io.IOException; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStValueState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStValueState.java index a3d2c41d0b10f..0e43145dcb705 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStValueState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ForStValueState.java @@ -19,7 +19,7 @@ package org.apache.flink.state.forst; import org.apache.flink.api.common.state.v2.ValueState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.core.state.InternalStateFuture; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ListDelimitedSerializer.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ListDelimitedSerializer.java index ab114258870be..db611d49a4e03 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ListDelimitedSerializer.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/ListDelimitedSerializer.java @@ -18,7 +18,7 @@ package org.apache.flink.state.forst; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.util.Preconditions; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStIncrementalRestoreOperation.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStIncrementalRestoreOperation.java index 620385856941d..c5103b168f6c7 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStIncrementalRestoreOperation.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/restore/ForStIncrementalRestoreOperation.java @@ -18,12 +18,12 @@ package org.apache.flink.state.forst.restore; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.core.fs.FileSystem; import org.apache.flink.core.fs.Path; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.metrics.MetricGroup; import org.apache.flink.runtime.state.IncrementalKeyedStateHandle; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStIncrementalSnapshotStrategy.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStIncrementalSnapshotStrategy.java index 5217e46556803..76e5a3aa6eca2 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStIncrementalSnapshotStrategy.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStIncrementalSnapshotStrategy.java @@ -18,7 +18,7 @@ package org.apache.flink.state.forst.snapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple4; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.core.fs.Path; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStNativeFullSnapshotStrategy.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStNativeFullSnapshotStrategy.java index e9f3330e76b11..21d14f86a17fd 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStNativeFullSnapshotStrategy.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStNativeFullSnapshotStrategy.java @@ -18,7 +18,7 @@ package org.apache.flink.state.forst.snapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.core.fs.Path; import org.apache.flink.runtime.checkpoint.CheckpointOptions; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStSnapshotStrategyBase.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStSnapshotStrategyBase.java index c72b4065ab4c7..8d98d36f6da93 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStSnapshotStrategyBase.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/snapshot/ForStSnapshotStrategyBase.java @@ -19,10 +19,10 @@ package org.apache.flink.state.forst.snapshot; import org.apache.flink.api.common.state.CheckpointListener; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.core.fs.Path; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.checkpoint.filemerging.FileMergingSnapshotManager; import org.apache.flink.runtime.state.CheckpointStreamFactory; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStStateKeysIterator.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStStateKeysIterator.java index f59d1880ae165..33fd318aed8d8 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStStateKeysIterator.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStStateKeysIterator.java @@ -19,7 +19,7 @@ package org.apache.flink.state.forst.sync; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.runtime.state.CompositeKeySerializationUtils; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncAppendingState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncAppendingState.java index 5c80543306666..e59791b3045df 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncAppendingState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncAppendingState.java @@ -18,7 +18,7 @@ package org.apache.flink.state.forst.sync; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalAppendingState; import org.forstdb.ColumnFamilyHandle; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncState.java index f526d8facbad0..dd486340a7a3c 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/AbstractForStSyncState.java @@ -18,7 +18,7 @@ package org.apache.flink.state.forst.sync; import org.apache.flink.api.common.state.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBCachingPriorityQueueSet.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBCachingPriorityQueueSet.java index 0585104a2f3d7..b15bc6e9a5a0f 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBCachingPriorityQueueSet.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBCachingPriorityQueueSet.java @@ -18,7 +18,7 @@ package org.apache.flink.state.forst.sync; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.runtime.state.CompositeKeySerializationUtils; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBPriorityQueueSetFactory.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBPriorityQueueSetFactory.java index fbf0b1b48fa07..331e07815a33e 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBPriorityQueueSetFactory.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStDBPriorityQueueSetFactory.java @@ -18,8 +18,8 @@ package org.apache.flink.state.forst.sync; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.core.fs.ICloseableRegistry; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStStateKeysAndNamespaceIterator.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStStateKeysAndNamespaceIterator.java index bc4b53e6aa907..0ecdc0b152d2d 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStStateKeysAndNamespaceIterator.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStStateKeysAndNamespaceIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.state.forst.sync; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.CompositeKeySerializationUtils; import org.apache.flink.util.FlinkRuntimeException; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStStateKeysIterator.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStStateKeysIterator.java index 7f4d57854f60c..bc571b9e794ad 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStStateKeysIterator.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStStateKeysIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.state.forst.sync; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.FlinkRuntimeException; import javax.annotation.Nonnull; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncAggregatingState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncAggregatingState.java index 79f069b0a197f..f122f9022455a 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncAggregatingState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncAggregatingState.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.AggregatingStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; import org.apache.flink.runtime.state.internal.InternalAggregatingState; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackend.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackend.java index 3159dfb45765c..a5ddfc1d20f1c 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackend.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackend.java @@ -22,9 +22,9 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializerSnapshot; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackendBuilder.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackendBuilder.java index 16dea8a9548a9..c3507c548b718 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackendBuilder.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncKeyedStateBackendBuilder.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.core.fs.Path; import org.apache.flink.metrics.MetricGroup; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncListState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncListState.java index 2fbd1e222563c..205e3ba684626 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncListState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncListState.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.DataInputDeserializer; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncMapState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncMapState.java index 8eaf1df09a252..2b013c1bdbcfe 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncMapState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncMapState.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.MapState; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.DataInputDeserializer; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncReducingState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncReducingState.java index fe8bea670c59f..6a8c6f19124e5 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncReducingState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncReducingState.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.ReducingStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; import org.apache.flink.runtime.state.internal.InternalReducingState; diff --git a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncValueState.java b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncValueState.java index 5e00f5a9d9463..e961f857bfa43 100644 --- a/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncValueState.java +++ b/flink-state-backends/flink-statebackend-forst/src/main/java/org/apache/flink/state/forst/sync/ForStSyncValueState.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.state.ValueState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; import org.apache.flink.runtime.state.internal.InternalValueState; diff --git a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStTestUtils.java b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStTestUtils.java index 42940c570e2ef..65d502e9b8fbf 100644 --- a/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStTestUtils.java +++ b/flink-state-backends/flink-statebackend-forst/src/test/java/org/apache/flink/state/forst/ForStTestUtils.java @@ -18,7 +18,7 @@ package org.apache.flink.state.forst; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.metrics.groups.UnregisteredMetricsGroup; import org.apache.flink.runtime.execution.Environment; diff --git a/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMap.java b/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMap.java index 318d205a50f72..366b377d4c63b 100644 --- a/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMap.java +++ b/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMap.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.state.heap; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; diff --git a/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMapSnapshot.java b/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMapSnapshot.java index 35fc52cf27b34..9d7cba4e159a7 100644 --- a/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMapSnapshot.java +++ b/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMapSnapshot.java @@ -18,10 +18,10 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.StateEntry; import org.apache.flink.runtime.state.StateSnapshotTransformer; import org.apache.flink.util.ResourceGuard; diff --git a/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/SkipListKeySerializer.java b/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/SkipListKeySerializer.java index 7dbeb65f49da1..af58e2fdc7ce5 100644 --- a/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/SkipListKeySerializer.java +++ b/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/SkipListKeySerializer.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos; import org.apache.flink.core.memory.DataInputViewStreamWrapper; diff --git a/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/SkipListValueSerializer.java b/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/SkipListValueSerializer.java index 6bf9975b9ae5c..2295853838e94 100644 --- a/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/SkipListValueSerializer.java +++ b/flink-state-backends/flink-statebackend-heap-spillable/src/main/java/org/apache/flink/runtime/state/heap/SkipListValueSerializer.java @@ -18,7 +18,7 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.core.memory.MemorySegment; diff --git a/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMapComplexOpTest.java b/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMapComplexOpTest.java index a9e5e5406cab1..7c47b28938306 100644 --- a/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMapComplexOpTest.java +++ b/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMapComplexOpTest.java @@ -20,7 +20,7 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMapTestUtils.java b/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMapTestUtils.java index f599b77efd17e..8065c44c78830 100644 --- a/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMapTestUtils.java +++ b/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/CopyOnWriteSkipListStateMapTestUtils.java @@ -20,15 +20,15 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.core.memory.ByteArrayInputStreamWithPos; import org.apache.flink.core.memory.ByteArrayOutputStreamWithPos; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.state.StateEntry; import org.apache.flink.runtime.state.StateSnapshotTransformer; diff --git a/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/SkipListKeyComparatorTest.java b/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/SkipListKeyComparatorTest.java index 9736c587e45a5..e161c5a15e5a2 100644 --- a/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/SkipListKeyComparatorTest.java +++ b/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/SkipListKeyComparatorTest.java @@ -20,12 +20,12 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; diff --git a/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/SkipListSerializerTest.java b/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/SkipListSerializerTest.java index 3e9fc9c78abbc..7cf20a1e8891f 100644 --- a/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/SkipListSerializerTest.java +++ b/flink-state-backends/flink-statebackend-heap-spillable/src/test/java/org/apache/flink/runtime/state/heap/SkipListSerializerTest.java @@ -20,7 +20,7 @@ package org.apache.flink.runtime.state.heap; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.ByteArrayInputStreamWithPos; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/AbstractRocksDBAppendingState.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/AbstractRocksDBAppendingState.java index b86ed92b7e08b..ea3d1745d282c 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/AbstractRocksDBAppendingState.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/AbstractRocksDBAppendingState.java @@ -18,7 +18,7 @@ package org.apache.flink.state.rocksdb; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalAppendingState; import org.rocksdb.ColumnFamilyHandle; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/AbstractRocksDBState.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/AbstractRocksDBState.java index d5f15d902dbcf..2121a6ff361bd 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/AbstractRocksDBState.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/AbstractRocksDBState.java @@ -18,7 +18,7 @@ package org.apache.flink.state.rocksdb; import org.apache.flink.api.common.state.State; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBAggregatingState.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBAggregatingState.java index 0e91800fcebd1..b2b34294839fe 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBAggregatingState.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBAggregatingState.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.AggregatingStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; import org.apache.flink.runtime.state.internal.InternalAggregatingState; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBCachingPriorityQueueSet.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBCachingPriorityQueueSet.java index 6dc904e0099a5..d4476b5c0ae4f 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBCachingPriorityQueueSet.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBCachingPriorityQueueSet.java @@ -18,7 +18,7 @@ package org.apache.flink.state.rocksdb; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.runtime.state.CompositeKeySerializationUtils; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBKeyedStateBackend.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBKeyedStateBackend.java index edae8e5f39129..ae9d972a77c86 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBKeyedStateBackend.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBKeyedStateBackend.java @@ -21,9 +21,9 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializerSnapshot; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBKeyedStateBackendBuilder.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBKeyedStateBackendBuilder.java index 8dd72d1db0987..887644fcf2da1 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBKeyedStateBackendBuilder.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBKeyedStateBackendBuilder.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.metrics.MetricGroup; import org.apache.flink.runtime.query.TaskKvStateRegistry; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBListState.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBListState.java index be426a95db541..45890aada73c4 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBListState.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBListState.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.DataInputDeserializer; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBMapState.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBMapState.java index 20470c3a3dd71..208d8f5491c5a 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBMapState.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBMapState.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.MapState; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.DataInputDeserializer; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBPriorityQueueSetFactory.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBPriorityQueueSetFactory.java index 9b379d4520968..afe2a23011597 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBPriorityQueueSetFactory.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBPriorityQueueSetFactory.java @@ -18,8 +18,8 @@ package org.apache.flink.state.rocksdb; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.core.fs.ICloseableRegistry; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBReducingState.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBReducingState.java index 3bcf21df9c803..ddd7c344467e3 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBReducingState.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBReducingState.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.ReducingStateDescriptor; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; import org.apache.flink.runtime.state.internal.InternalReducingState; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBSnapshotTransformFactoryAdaptor.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBSnapshotTransformFactoryAdaptor.java index b4f77896bad66..b12ccd2a59438 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBSnapshotTransformFactoryAdaptor.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBSnapshotTransformFactoryAdaptor.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.runtime.state.StateSnapshotTransformer; import org.apache.flink.runtime.state.StateSnapshotTransformer.StateSnapshotTransformFactory; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBValueState.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBValueState.java index dfe27bf2eeda6..86064aef726aa 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBValueState.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/RocksDBValueState.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.state.ValueState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; import org.apache.flink.runtime.state.internal.InternalValueState; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/AbstractRocksStateKeysIterator.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/AbstractRocksStateKeysIterator.java index 2513aa942dcaa..295cba0aeed19 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/AbstractRocksStateKeysIterator.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/AbstractRocksStateKeysIterator.java @@ -19,7 +19,7 @@ package org.apache.flink.state.rocksdb.iterator; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.runtime.state.CompositeKeySerializationUtils; import org.apache.flink.state.rocksdb.RocksIteratorWrapper; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/RocksQueueIterator.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/RocksQueueIterator.java index dfafe6b30cbb7..279ccfe8031b8 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/RocksQueueIterator.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/RocksQueueIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.state.rocksdb.iterator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.runtime.state.CompositeKeySerializationUtils; import org.apache.flink.runtime.state.KeyGroupRange; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/RocksStateKeysAndNamespaceIterator.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/RocksStateKeysAndNamespaceIterator.java index 9c806cd14d884..bcf30024dbfa9 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/RocksStateKeysAndNamespaceIterator.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/RocksStateKeysAndNamespaceIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.state.rocksdb.iterator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.state.CompositeKeySerializationUtils; import org.apache.flink.state.rocksdb.RocksIteratorWrapper; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/RocksStateKeysIterator.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/RocksStateKeysIterator.java index 0a58bba5d7bdb..603786edcfdde 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/RocksStateKeysIterator.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/iterator/RocksStateKeysIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.state.rocksdb.iterator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.state.rocksdb.RocksIteratorWrapper; import org.apache.flink.util.FlinkRuntimeException; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/restore/RocksDBIncrementalRestoreOperation.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/restore/RocksDBIncrementalRestoreOperation.java index 79bc7bba2019a..a7a1bc4520bdd 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/restore/RocksDBIncrementalRestoreOperation.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/restore/RocksDBIncrementalRestoreOperation.java @@ -18,10 +18,10 @@ package org.apache.flink.state.rocksdb.restore; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.core.fs.CloseableRegistry; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.metrics.MetricGroup; import org.apache.flink.runtime.state.BackendBuildingException; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksDBFullSnapshotResources.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksDBFullSnapshotResources.java index 630605cd5d608..744553942f3da 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksDBFullSnapshotResources.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksDBFullSnapshotResources.java @@ -18,7 +18,7 @@ package org.apache.flink.state.rocksdb.snapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.runtime.state.FullSnapshotResources; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksDBSnapshotStrategyBase.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksDBSnapshotStrategyBase.java index 7ace1cd817b0a..03028b4949297 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksDBSnapshotStrategyBase.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksDBSnapshotStrategyBase.java @@ -19,9 +19,9 @@ package org.apache.flink.state.rocksdb.snapshot; import org.apache.flink.api.common.state.CheckpointListener; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.checkpoint.filemerging.FileMergingSnapshotManager; import org.apache.flink.runtime.state.CheckpointStreamFactory; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksIncrementalSnapshotStrategy.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksIncrementalSnapshotStrategy.java index 5ae5cdd904f6f..74b3c87d36690 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksIncrementalSnapshotStrategy.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksIncrementalSnapshotStrategy.java @@ -18,7 +18,7 @@ package org.apache.flink.state.rocksdb.snapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.runtime.checkpoint.CheckpointOptions; import org.apache.flink.runtime.checkpoint.CheckpointType; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksNativeFullSnapshotStrategy.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksNativeFullSnapshotStrategy.java index 956cac018e7fc..4c6bf1eadf307 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksNativeFullSnapshotStrategy.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/snapshot/RocksNativeFullSnapshotStrategy.java @@ -18,7 +18,7 @@ package org.apache.flink.state.rocksdb.snapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.runtime.checkpoint.CheckpointOptions; import org.apache.flink.runtime.state.CheckpointStreamFactory; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/ttl/RocksDbTtlCompactFiltersManager.java b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/ttl/RocksDbTtlCompactFiltersManager.java index c393a06c00fc3..e27e1eb5cd6ff 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/ttl/RocksDbTtlCompactFiltersManager.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/main/java/org/apache/flink/state/rocksdb/ttl/RocksDbTtlCompactFiltersManager.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.state.StateTtlConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.runtime.state.RegisteredKeyValueStateBackendMetaInfo; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/EmbeddedRocksDBStateBackendTest.java b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/EmbeddedRocksDBStateBackendTest.java index b188f9afae5ce..80ba937e5ead8 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/EmbeddedRocksDBStateBackendTest.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/EmbeddedRocksDBStateBackendTest.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.configuration.ConfigOption; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBKeyedStateBackendTestFactory.java b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBKeyedStateBackendTestFactory.java index a069253935d79..ec0db119893a8 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBKeyedStateBackendTestFactory.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBKeyedStateBackendTestFactory.java @@ -19,7 +19,7 @@ package org.apache.flink.state.rocksdb; import org.apache.flink.api.common.JobID; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.metrics.groups.UnregisteredMetricsGroup; import org.apache.flink.runtime.operators.testutils.MockEnvironment; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBRocksStateKeysAndNamespacesIteratorTest.java b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBRocksStateKeysAndNamespacesIteratorTest.java index e2aa5593e550f..cc72387c0705c 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBRocksStateKeysAndNamespacesIteratorTest.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBRocksStateKeysAndNamespacesIteratorTest.java @@ -19,7 +19,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBRocksStateKeysIteratorTest.java b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBRocksStateKeysIteratorTest.java index 4755a7a882cdb..5b27962f05a65 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBRocksStateKeysIteratorTest.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBRocksStateKeysIteratorTest.java @@ -19,7 +19,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.core.memory.DataOutputSerializer; diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBTestUtils.java b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBTestUtils.java index 5495ad00547c7..1292d58f41eca 100644 --- a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBTestUtils.java +++ b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/RocksDBTestUtils.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.JobID; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.CloseableRegistry; import org.apache.flink.metrics.groups.UnregisteredMetricsGroup; import org.apache.flink.runtime.execution.Environment; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java index 5f9b33fe7e5f6..ce7e73bbe23da 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java @@ -46,7 +46,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.metrics.groups.OperatorMetricGroup; import org.apache.flink.types.Value; import org.apache.flink.util.Preconditions; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/filesystem/BucketStateSerializer.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/filesystem/BucketStateSerializer.java index e914b88fd8de0..86a5e56b06541 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/filesystem/BucketStateSerializer.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/filesystem/BucketStateSerializer.java @@ -24,9 +24,9 @@ import org.apache.flink.core.io.SimpleVersionedSerialization; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataOutputSerializer; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.CollectionUtil; import org.apache.flink.util.Preconditions; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/legacy/TwoPhaseCommitSinkFunction.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/legacy/TwoPhaseCommitSinkFunction.java index 27a6bd12cf383..3304cd744098e 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/legacy/TwoPhaseCommitSinkFunction.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/legacy/TwoPhaseCommitSinkFunction.java @@ -25,10 +25,10 @@ import org.apache.flink.api.common.typeinfo.TypeHint; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.state.FunctionInitializationContext; import org.apache.flink.runtime.state.FunctionSnapshotContext; import org.apache.flink.streaming.api.checkpoint.CheckpointedFunction; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/SerializedCheckpointData.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/SerializedCheckpointData.java index 704b964b597eb..8c66c1f304e88 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/SerializedCheckpointData.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/source/SerializedCheckpointData.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.functions.source; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/legacy/io/CollectionInputFormat.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/legacy/io/CollectionInputFormat.java index 801b94c4e9423..e6419cc55bfe2 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/legacy/io/CollectionInputFormat.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/legacy/io/CollectionInputFormat.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.io.GenericInputFormat; import org.apache.flink.api.common.io.NonParallelInput; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperator.java index 2f147190a0a4f..a27a19dce9a34 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperator.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperator.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.operators.MailboxExecutor; import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.StateInitializationContext; import org.apache.flink.runtime.state.StateSnapshotContext; import org.apache.flink.streaming.api.datastream.AsyncDataStream; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicEventTimeSessionWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicEventTimeSessionWindows.java index c11d19117544e..3eb53eef0c9d3 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicEventTimeSessionWindows.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicEventTimeSessionWindows.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.windowing.triggers.EventTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicProcessingTimeSessionWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicProcessingTimeSessionWindows.java index 72bbfb9580cc1..273ee6176d4ac 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicProcessingTimeSessionWindows.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicProcessingTimeSessionWindows.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.windowing.triggers.ProcessingTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/EventTimeSessionWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/EventTimeSessionWindows.java index c03f5b589fbd9..c6258f48dcd3d 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/EventTimeSessionWindows.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/EventTimeSessionWindows.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.windowing.triggers.EventTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/ProcessingTimeSessionWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/ProcessingTimeSessionWindows.java index 57588b44ecdc5..ea9e93b13d6d9 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/ProcessingTimeSessionWindows.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/ProcessingTimeSessionWindows.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.windowing.triggers.ProcessingTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/DeltaTrigger.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/DeltaTrigger.java index b73f93dedc126..bfd76ed332294 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/DeltaTrigger.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/DeltaTrigger.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.functions.windowing.delta.DeltaFunction; import org.apache.flink.streaming.api.windowing.windows.Window; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/experimental/CollectSink.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/experimental/CollectSink.java index 28af753e255cc..5be076f11a5b1 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/experimental/CollectSink.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/experimental/CollectSink.java @@ -19,7 +19,7 @@ import org.apache.flink.annotation.Experimental; import org.apache.flink.api.common.functions.OpenContext; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.streaming.api.functions.sink.legacy.RichSinkFunction; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/experimental/SocketStreamIterator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/experimental/SocketStreamIterator.java index 69a72c3186028..3c573f6ee9a3b 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/experimental/SocketStreamIterator.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/experimental/SocketStreamIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.experimental; import org.apache.flink.annotation.Experimental; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.util.NetUtils; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/GenericWriteAheadSink.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/GenericWriteAheadSink.java index 352c7977211b8..2f39e7871ea5b 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/GenericWriteAheadSink.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/GenericWriteAheadSink.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.fs.FSDataInputStream; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/StreamTestSingleInputGate.java b/flink-streaming-java/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/StreamTestSingleInputGate.java index cf7418d8780a9..f2a6aad98456b 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/StreamTestSingleInputGate.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/StreamTestSingleInputGate.java @@ -20,7 +20,7 @@ package org.apache.flink.runtime.io.network.partition.consumer; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.runtime.event.AbstractEvent; import org.apache.flink.runtime.io.network.api.EndOfData; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/PrintSinkTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/PrintSinkTest.java index c64f727e67268..ec79e2c76c59c 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/PrintSinkTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/PrintSinkTest.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.operators.MailboxExecutor; import org.apache.flink.api.common.operators.ProcessingTimeService; import org.apache.flink.api.common.serialization.SerializationSchema; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.sink2.SinkWriter; import org.apache.flink.api.connector.sink2.WriterInitContext; import org.apache.flink.metrics.MetricGroup; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperatorTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperatorTest.java index 2f1cc06d77af1..0c6d50aa9d94f 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperatorTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/async/AsyncWaitOperatorTest.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.functions.OpenContext; import org.apache.flink.api.common.functions.RichMapFunction; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple1; import org.apache.flink.api.java.typeutils.runtime.TupleSerializer; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunctionRandomITCase.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunctionRandomITCase.java index dfc0ed986d713..d0c31e4ede6cd 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunctionRandomITCase.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunctionRandomITCase.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.api.operators.collect; import org.apache.flink.api.common.JobID; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.streaming.api.operators.collect.utils.CollectSinkFunctionTestWrapper; import org.apache.flink.streaming.api.operators.collect.utils.TestJobClient; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunctionTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunctionTest.java index 34efd510a6dfc..a96c564787269 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunctionTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/CollectSinkFunctionTest.java @@ -17,7 +17,7 @@ package org.apache.flink.streaming.api.operators.collect; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.configuration.TaskManagerOptions; import org.apache.flink.streaming.api.operators.collect.utils.CollectSinkFunctionTestWrapper; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/CollectSinkFunctionTestWrapper.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/CollectSinkFunctionTestWrapper.java index e76f3dcac67fd..f5e364359abe0 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/CollectSinkFunctionTestWrapper.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/collect/utils/CollectSinkFunctionTestWrapper.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.accumulators.Accumulator; import org.apache.flink.api.common.accumulators.SerializedListAccumulator; import org.apache.flink.api.common.functions.DefaultOpenContext; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArraySerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.runtime.io.disk.iomanager.IOManager; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/experimental/SocketStreamIteratorTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/experimental/SocketStreamIteratorTest.java index 63a0321851775..b24d0da3f4c43 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/experimental/SocketStreamIteratorTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/experimental/SocketStreamIteratorTest.java @@ -18,7 +18,7 @@ package org.apache.flink.streaming.experimental; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.core.testutils.CheckedThread; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperatorTestBase.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperatorTestBase.java index 6bde86216b9f9..1735d81fb8556 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperatorTestBase.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkWriterOperatorTestBase.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArraySerializer; import org.apache.flink.api.connector.sink2.Sink; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorTest.java index cd43d6bdf3581..5d9e3e8949890 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperatorTest.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeHint; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.streaming.api.functions.windowing.PassThroughWindowFunction; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java index af4310bea72eb..7187c5d88e653 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.state.ListState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.streaming.api.windowing.assigners.EventTimeSessionWindows; import org.apache.flink.streaming.api.windowing.assigners.MergingWindowAssigner; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorMigrationTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorMigrationTest.java index 6ad8e9ee34c3b..07dfd4f985cd3 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorMigrationTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorMigrationTest.java @@ -27,7 +27,7 @@ import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeHint; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.tuple.Tuple3; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/MultipleInputStreamTaskTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/MultipleInputStreamTaskTest.java index 479cf3d7b6b1b..2d00c7a672da9 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/MultipleInputStreamTaskTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/MultipleInputStreamTaskTest.java @@ -26,8 +26,8 @@ import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.connector.source.Boundedness; @@ -38,8 +38,8 @@ import org.apache.flink.api.connector.source.mocks.MockSourceSplit; import org.apache.flink.api.connector.source.mocks.MockSourceSplitSerializer; import org.apache.flink.core.execution.SavepointFormatType; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.metrics.Counter; import org.apache.flink.metrics.Gauge; import org.apache.flink.metrics.Metric; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTaskTestHarness.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTaskTestHarness.java index 788fe11e327c3..344599c2f09b4 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTaskTestHarness.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTaskTestHarness.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.ClosureCleaner; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.runtime.event.AbstractEvent; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTaskTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTaskTest.java index 822947e71e412..5e947dcba7f77 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTaskTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTaskTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.OpenContext; import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskMailboxTestHarnessBuilder.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskMailboxTestHarnessBuilder.java index f5098c5b97133..ec4332b06952d 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskMailboxTestHarnessBuilder.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskMailboxTestHarnessBuilder.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.checkpoint.TaskStateSnapshot; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTest.java index d155f58dc6498..b1ab4af713e4f 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTest.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.operators.ProcessingTimeService.ProcessingTimeCallback; import org.apache.flink.api.common.state.CheckpointListener; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.ReadableConfig; import org.apache.flink.core.execution.SavepointFormatType; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTestHarness.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTestHarness.java index d4e072cfe8e08..f38869c37cc28 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTestHarness.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTestHarness.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.operators.MailboxExecutor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.memory.ManagedMemoryUseCase; import org.apache.flink.metrics.Metric; diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TwoInputStreamTaskTestHarness.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TwoInputStreamTaskTestHarness.java index 228b6e2fd91d8..3dfe216259caa 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TwoInputStreamTaskTestHarness.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/tasks/TwoInputStreamTaskTestHarness.java @@ -19,7 +19,7 @@ package org.apache.flink.streaming.runtime.tasks; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.execution.Environment; import org.apache.flink.runtime.io.network.partition.consumer.StreamTestSingleInputGate; import org.apache.flink.streaming.api.graph.StreamEdge; diff --git a/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/api/bridge/java/StreamTableEnvironment.java b/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/api/bridge/java/StreamTableEnvironment.java index 86610a431fb1a..3622a7962d815 100644 --- a/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/api/bridge/java/StreamTableEnvironment.java +++ b/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/api/bridge/java/StreamTableEnvironment.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; import org.apache.flink.api.common.typeutils.CompositeType; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/DataTypeFactoryImpl.java b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/DataTypeFactoryImpl.java index b623ea16df2c6..6bf35c7f34ad0 100644 --- a/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/DataTypeFactoryImpl.java +++ b/flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/DataTypeFactoryImpl.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; import org.apache.flink.configuration.ReadableConfig; import org.apache.flink.table.api.DataTypes; diff --git a/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializerSnapshot.java b/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializerSnapshot.java index bbc8f0081dd4d..3f04ef1ab68a2 100644 --- a/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializerSnapshot.java +++ b/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializerSnapshot.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; import java.io.IOException; diff --git a/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaEitherSerializerSnapshot.java b/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaEitherSerializerSnapshot.java index 3e5f01791638a..1d0c2756d840e 100644 --- a/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaEitherSerializerSnapshot.java +++ b/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaEitherSerializerSnapshot.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import scala.util.Either; diff --git a/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaOptionSerializerSnapshot.java b/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaOptionSerializerSnapshot.java index 7fa8dba8e46f9..2c3bb5cd7d5e1 100644 --- a/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaOptionSerializerSnapshot.java +++ b/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaOptionSerializerSnapshot.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import scala.Option; diff --git a/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaTrySerializerSnapshot.java b/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaTrySerializerSnapshot.java index 2253cf79c0a8c..6cf38cd02efa0 100644 --- a/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaTrySerializerSnapshot.java +++ b/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/ScalaTrySerializerSnapshot.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import scala.util.Try; diff --git a/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/TraversableSerializerSnapshot.java b/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/TraversableSerializerSnapshot.java index 3d55422aae1ef..16876049b40d5 100644 --- a/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/TraversableSerializerSnapshot.java +++ b/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/TraversableSerializerSnapshot.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/Tuple2CaseClassSerializerSnapshot.java b/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/Tuple2CaseClassSerializerSnapshot.java index a4e2fc4c47069..c9751f4ce4376 100644 --- a/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/Tuple2CaseClassSerializerSnapshot.java +++ b/flink-table/flink-table-api-scala/src/main/java/org/apache/flink/table/api/typeutils/Tuple2CaseClassSerializerSnapshot.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; import java.io.IOException; diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/ImplicitTypeConversions.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/ImplicitTypeConversions.scala index 267ec7acf5427..1e33056861926 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/ImplicitTypeConversions.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/ImplicitTypeConversions.scala @@ -20,7 +20,7 @@ package org.apache.flink.table.api import org.apache.flink.annotation.PublicEvolving import org.apache.flink.api.common.serialization.SerializerConfig import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.common.typeutils.TypeSerializer +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import org.apache.flink.table.api.typeutils._ import org.apache.flink.table.expressions.Expression diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/codegen/TypeInformationGen.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/codegen/TypeInformationGen.scala index ac19e60c8073b..d3bd9a045ee39 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/codegen/TypeInformationGen.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/codegen/TypeInformationGen.scala @@ -20,13 +20,13 @@ package org.apache.flink.table.api.codegen import org.apache.flink.annotation.Internal import org.apache.flink.api.common.serialization.SerializerConfig import org.apache.flink.api.common.typeinfo._ +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import org.apache.flink.api.common.typeutils._ import org.apache.flink.api.java.typeutils._ import org.apache.flink.table.api.typeutils.{CaseClassTypeInfo, ScalaCaseClassSerializer, ScalaNothingTypeInfo, UnitTypeInfo} import org.apache.flink.types.Value import java.lang.reflect.{Field, Modifier} - import scala.collection.JavaConverters._ import scala.collection.mutable import scala.language.postfixOps diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/CaseClassComparator.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/CaseClassComparator.scala index 7065feaa3e69a..81386f93b162f 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/CaseClassComparator.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/CaseClassComparator.scala @@ -18,7 +18,8 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal -import org.apache.flink.api.common.typeutils.{TypeComparator, TypeSerializer} +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer +import org.apache.flink.api.common.typeutils.TypeComparator import org.apache.flink.api.java.typeutils.runtime.TupleComparatorBase import org.apache.flink.core.memory.MemorySegment import org.apache.flink.types.{KeyFieldOutOfBoundsException, NullKeyFieldException} diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/CaseClassSerializer.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/CaseClassSerializer.scala index 8248be626cfc9..608968f6250d3 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/CaseClassSerializer.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/CaseClassSerializer.scala @@ -18,9 +18,9 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal -import org.apache.flink.api.common.typeutils.TypeSerializer +import org.apache.flink.api.common.memory.{DataInputView, DataOutputView} +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import org.apache.flink.api.java.typeutils.runtime.TupleSerializerBase -import org.apache.flink.core.memory.{DataInputView, DataOutputView} import org.apache.flink.types.NullFieldException /** diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EitherSerializer.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EitherSerializer.scala index 80ef530899798..2da2d55abbbba 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EitherSerializer.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EitherSerializer.scala @@ -18,8 +18,9 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal +import org.apache.flink.api.common.memory.{DataInputView, DataOutputView} +import org.apache.flink.api.common.typeinfo.utils.{TypeSerializer, TypeSerializerSnapshot} import org.apache.flink.api.common.typeutils._ -import org.apache.flink.core.memory.{DataInputView, DataOutputView} /** Serializer for [[Either]]. */ @Internal diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EitherTypeInfo.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EitherTypeInfo.scala index d1743577e9790..59ef478389ec1 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EitherTypeInfo.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EitherTypeInfo.scala @@ -20,7 +20,7 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.{Public, PublicEvolving} import org.apache.flink.api.common.serialization.SerializerConfig import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.common.typeutils.TypeSerializer +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import scala.collection.JavaConverters._ diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EnumValueComparator.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EnumValueComparator.scala index 77c19e70937a2..16478c3364b8c 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EnumValueComparator.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EnumValueComparator.scala @@ -18,9 +18,10 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal +import org.apache.flink.api.common.memory.{DataInputView, DataOutputView} import org.apache.flink.api.common.typeutils.TypeComparator import org.apache.flink.api.common.typeutils.base.IntComparator -import org.apache.flink.core.memory.{DataInputView, DataOutputView, MemorySegment} +import org.apache.flink.core.memory.MemorySegment /** Comparator for [[Enumeration]] values. */ @Internal diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EnumValueSerializer.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EnumValueSerializer.scala index f45b2f3854f23..0c5cfb044d064 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EnumValueSerializer.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EnumValueSerializer.scala @@ -18,8 +18,8 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal -import org.apache.flink.api.common.typeutils.TypeSerializer -import org.apache.flink.core.memory.{DataInputView, DataOutputView} +import org.apache.flink.api.common.memory.{DataInputView, DataOutputView} +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer /** Serializer for [[Enumeration]] values. */ @Internal diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EnumValueTypeInfo.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EnumValueTypeInfo.scala index 037d7f3895851..a3dd90ac535cd 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EnumValueTypeInfo.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/EnumValueTypeInfo.scala @@ -20,8 +20,9 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.{Public, PublicEvolving} import org.apache.flink.api.common.ExecutionConfig import org.apache.flink.api.common.serialization.SerializerConfig +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import org.apache.flink.api.common.typeinfo.{AtomicType, TypeInformation} -import org.apache.flink.api.common.typeutils.{TypeComparator, TypeSerializer} +import org.apache.flink.api.common.typeutils.TypeComparator import scala.collection.JavaConverters._ diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/NothingSerializer.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/NothingSerializer.scala index 892ec9a7ecfa5..fbf94527d06c5 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/NothingSerializer.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/NothingSerializer.scala @@ -18,8 +18,9 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal -import org.apache.flink.api.common.typeutils.{SimpleTypeSerializerSnapshot, TypeSerializer, TypeSerializerSnapshot} -import org.apache.flink.core.memory.{DataInputView, DataOutputView} +import org.apache.flink.api.common.memory.{DataInputView, DataOutputView} +import org.apache.flink.api.common.typeinfo.utils.{TypeSerializer, TypeSerializerSnapshot} +import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot import java.util.function.Supplier diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/OptionSerializer.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/OptionSerializer.scala index 169e8cc484b67..7dc68769676fc 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/OptionSerializer.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/OptionSerializer.scala @@ -18,8 +18,9 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal +import org.apache.flink.api.common.memory.{DataInputView, DataOutputView} +import org.apache.flink.api.common.typeinfo.utils.{TypeSerializer, TypeSerializerSnapshot} import org.apache.flink.api.common.typeutils._ -import org.apache.flink.core.memory.{DataInputView, DataOutputView} /** Serializer for [[Option]]. */ @Internal diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/OptionTypeComparator.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/OptionTypeComparator.scala index 7f3de29dd650f..5fd3d3d13cbfe 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/OptionTypeComparator.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/OptionTypeComparator.scala @@ -18,8 +18,9 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal +import org.apache.flink.api.common.memory.{DataInputView, DataOutputView} import org.apache.flink.api.common.typeutils.TypeComparator -import org.apache.flink.core.memory.{DataInputView, DataOutputView, MemorySegment} +import org.apache.flink.core.memory.MemorySegment /** Comparator for [[Option]] values. Note that [[None]] is lesser than any [[Some]] values. */ @Internal diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/OptionTypeInfo.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/OptionTypeInfo.scala index 08bdad816be32..69f12dca91aaa 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/OptionTypeInfo.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/OptionTypeInfo.scala @@ -20,8 +20,9 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.{Public, PublicEvolving, VisibleForTesting} import org.apache.flink.api.common.ExecutionConfig import org.apache.flink.api.common.serialization.SerializerConfig +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import org.apache.flink.api.common.typeinfo.{AtomicType, TypeInformation} -import org.apache.flink.api.common.typeutils.{TypeComparator, TypeSerializer} +import org.apache.flink.api.common.typeutils.TypeComparator import scala.collection.JavaConverters._ diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializer.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializer.scala index 978acf992fc43..1d25576861f70 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializer.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializer.scala @@ -18,7 +18,7 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal -import org.apache.flink.api.common.typeutils.{TypeSerializer, TypeSerializerSnapshot} +import org.apache.flink.api.common.typeinfo.utils.{TypeSerializer, TypeSerializerSnapshot} import org.apache.flink.table.api.typeutils.ScalaCaseClassSerializer.lookupConstructor import java.io.ObjectInputStream diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/ScalaEnumSerializerSnapshot.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/ScalaEnumSerializerSnapshot.scala index 624a4aa927de1..6df1e3ce949bf 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/ScalaEnumSerializerSnapshot.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/ScalaEnumSerializerSnapshot.scala @@ -18,8 +18,8 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal -import org.apache.flink.api.common.typeutils.{TypeSerializer, TypeSerializerSchemaCompatibility, TypeSerializerSnapshot} -import org.apache.flink.core.memory.{DataInputView, DataOutputView} +import org.apache.flink.api.common.memory.{DataInputView, DataOutputView} +import org.apache.flink.api.common.typeinfo.utils.{TypeSerializer, TypeSerializerSchemaCompatibility, TypeSerializerSnapshot} import org.apache.flink.util.{InstantiationUtil, Preconditions} import scala.collection.mutable.ListBuffer diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/ScalaNothingTypeInfo.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/ScalaNothingTypeInfo.scala index 522d93b733a6e..e7a821eb2179b 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/ScalaNothingTypeInfo.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/ScalaNothingTypeInfo.scala @@ -20,7 +20,7 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.{Public, PublicEvolving} import org.apache.flink.api.common.serialization.SerializerConfig import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.common.typeutils.TypeSerializer +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer /** * @deprecated diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TraversableSerializer.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TraversableSerializer.scala index b57a05eb3ab22..729f7c17ae61c 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TraversableSerializer.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TraversableSerializer.scala @@ -18,13 +18,13 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal +import org.apache.flink.api.common.memory.{DataInputView, DataOutputView} +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import org.apache.flink.api.common.typeutils._ -import org.apache.flink.core.memory.{DataInputView, DataOutputView} import org.apache.flink.shaded.guava32.com.google.common.cache.{Cache, CacheBuilder} import java.io.ObjectInputStream import java.util.concurrent.Callable - import scala.collection.generic.CanBuildFrom import scala.ref.WeakReference diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TraversableTypeInfo.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TraversableTypeInfo.scala index b78e73e5b5b5f..beef4ebc75018 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TraversableTypeInfo.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TraversableTypeInfo.scala @@ -20,7 +20,7 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.{Public, PublicEvolving} import org.apache.flink.api.common.serialization.SerializerConfig import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.common.typeutils.TypeSerializer +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import scala.collection.JavaConverters._ diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TrySerializer.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TrySerializer.scala index c1c6ac228ca2d..6f0e7d6cba566 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TrySerializer.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TrySerializer.scala @@ -18,10 +18,11 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal +import org.apache.flink.api.common.memory.{DataInputView, DataOutputView} import org.apache.flink.api.common.serialization.SerializerConfig +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import org.apache.flink.api.common.typeutils._ import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer -import org.apache.flink.core.memory.{DataInputView, DataOutputView} import scala.util.{Failure, Success, Try} diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TryTypeInfo.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TryTypeInfo.scala index 86bd67e4ef363..88f6e1810133a 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TryTypeInfo.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/TryTypeInfo.scala @@ -20,7 +20,7 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.{Public, PublicEvolving} import org.apache.flink.api.common.serialization.SerializerConfig import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.common.typeutils.TypeSerializer +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import scala.collection.JavaConverters._ import scala.util.Try diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/Tuple2CaseClassSerializer.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/Tuple2CaseClassSerializer.scala index 131fac6c4a78a..1c48aa539637d 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/Tuple2CaseClassSerializer.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/Tuple2CaseClassSerializer.scala @@ -18,7 +18,7 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal -import org.apache.flink.api.common.typeutils.{TypeSerializer, TypeSerializerSnapshot} +import org.apache.flink.api.common.typeinfo.utils.{TypeSerializer, TypeSerializerSnapshot} /** Serializer for [[Tuple2]]. */ @Internal diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/UnitSerializer.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/UnitSerializer.scala index 8f223157515a6..1f1b50dff8ba0 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/UnitSerializer.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/UnitSerializer.scala @@ -18,9 +18,10 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.Internal -import org.apache.flink.api.common.typeutils.{SimpleTypeSerializerSnapshot, TypeSerializer, TypeSerializerSnapshot} +import org.apache.flink.api.common.memory.{DataInputView, DataOutputView} +import org.apache.flink.api.common.typeinfo.utils.{TypeSerializer, TypeSerializerSnapshot} +import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton -import org.apache.flink.core.memory.{DataInputView, DataOutputView} import org.apache.flink.table.api.typeutils.UnitSerializer.UnitSerializerSnapshot import java.util.function.Supplier diff --git a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/UnitTypeInfo.scala b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/UnitTypeInfo.scala index e8f68686dc6a0..06332043b4a68 100644 --- a/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/UnitTypeInfo.scala +++ b/flink-table/flink-table-api-scala/src/main/scala/org/apache/flink/table/api/typeutils/UnitTypeInfo.scala @@ -20,7 +20,7 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.annotation.{Public, PublicEvolving} import org.apache.flink.api.common.serialization.SerializerConfig import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.common.typeutils.TypeSerializer +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer /** * @deprecated diff --git a/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/OptionSerializerUpgradeTest.java b/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/OptionSerializerUpgradeTest.java index 1933cb026a916..8a12128ed91fa 100644 --- a/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/OptionSerializerUpgradeTest.java +++ b/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/OptionSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.table.api.typeutils; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.test.util.MigrationTest; diff --git a/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaEitherSerializerUpgradeTest.java b/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaEitherSerializerUpgradeTest.java index 118502f377847..2c50a04ea85c0 100644 --- a/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaEitherSerializerUpgradeTest.java +++ b/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaEitherSerializerUpgradeTest.java @@ -19,9 +19,9 @@ package org.apache.flink.table.api.typeutils; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaTrySerializerUpgradeTest.java b/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaTrySerializerUpgradeTest.java index 378df473faaa5..26367f51e0bbb 100644 --- a/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaTrySerializerUpgradeTest.java +++ b/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaTrySerializerUpgradeTest.java @@ -20,9 +20,9 @@ import org.apache.flink.FlinkVersion; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.test.util.MigrationTest; diff --git a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/CaseClassTypeInfoTest.scala b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/CaseClassTypeInfoTest.scala index 94afae3674f74..430176fa47d10 100644 --- a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/CaseClassTypeInfoTest.scala +++ b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/CaseClassTypeInfoTest.scala @@ -19,7 +19,8 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.api.common.serialization.SerializerConfig import org.apache.flink.api.common.typeinfo.BasicTypeInfo -import org.apache.flink.api.common.typeutils.{TypeInformationTestBase, TypeSerializer} +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer +import org.apache.flink.api.common.typeutils.TypeInformationTestBase /** Test for [[CaseClassTypeInfo]]. */ class CaseClassTypeInfoTest extends TypeInformationTestBase[CaseClassTypeInfo[_]] { diff --git a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/EnumValueSerializerCompatibilityTest.scala b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/EnumValueSerializerCompatibilityTest.scala index a8bb3e0550a13..d53e312e1b4e7 100644 --- a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/EnumValueSerializerCompatibilityTest.scala +++ b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/EnumValueSerializerCompatibilityTest.scala @@ -17,7 +17,8 @@ */ package org.apache.flink.table.api.typeutils -import org.apache.flink.api.common.typeutils.{TypeSerializerSchemaCompatibility, TypeSerializerSnapshotSerializationUtil} +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility +import org.apache.flink.api.common.typeutils.TypeSerializerSnapshotSerializationUtil import org.apache.flink.core.memory.{DataInputViewStreamWrapper, DataOutputViewStreamWrapper} import org.assertj.core.api.Assertions.{assertThat, fail} diff --git a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/EnumValueSerializerUpgradeTest.scala b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/EnumValueSerializerUpgradeTest.scala index aad403472a5a4..27342987b5a07 100644 --- a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/EnumValueSerializerUpgradeTest.scala +++ b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/EnumValueSerializerUpgradeTest.scala @@ -18,7 +18,8 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.FlinkVersion -import org.apache.flink.api.common.typeutils.{TypeSerializer, TypeSerializerConditions, TypeSerializerSchemaCompatibility, TypeSerializerUpgradeTestBase} +import org.apache.flink.api.common.typeinfo.utils.{TypeSerializer, TypeSerializerSchemaCompatibility} +import org.apache.flink.api.common.typeutils.{TypeSerializerConditions, TypeSerializerUpgradeTestBase} import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase.TestSpecification import org.apache.flink.table.api.typeutils.EnumValueSerializerUpgradeTest.{EnumValueSerializerSetup, EnumValueSerializerVerifier} import org.apache.flink.test.util.MigrationTest diff --git a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializerUpgradeTest.scala b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializerUpgradeTest.scala index 832fe7226f932..2205ba2c31911 100644 --- a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializerUpgradeTest.scala +++ b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializerUpgradeTest.scala @@ -19,7 +19,8 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.FlinkVersion import org.apache.flink.api.common.serialization.SerializerConfigImpl -import org.apache.flink.api.common.typeutils.{TypeSerializer, TypeSerializerConditions, TypeSerializerSchemaCompatibility, TypeSerializerUpgradeTestBase} +import org.apache.flink.api.common.typeinfo.utils.{TypeSerializer, TypeSerializerSchemaCompatibility} +import org.apache.flink.api.common.typeutils.{TypeSerializerConditions, TypeSerializerUpgradeTestBase} import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase.TestSpecification import org.apache.flink.table.api.createTypeInformation import org.apache.flink.table.api.typeutils.ScalaCaseClassSerializerUpgradeTest.{ScalaCaseClassSerializerSetup, ScalaCaseClassSerializerVerifier} diff --git a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableSerializerUpgradeTest.scala b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableSerializerUpgradeTest.scala index 02bed7a8cc889..a235187a1f230 100644 --- a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableSerializerUpgradeTest.scala +++ b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableSerializerUpgradeTest.scala @@ -20,7 +20,8 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.FlinkVersion import org.apache.flink.api.common.serialization.SerializerConfigImpl import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.common.typeutils.{TypeSerializer, TypeSerializerConditions, TypeSerializerSchemaCompatibility, TypeSerializerUpgradeTestBase} +import org.apache.flink.api.common.typeinfo.utils.{TypeSerializer, TypeSerializerSchemaCompatibility} +import org.apache.flink.api.common.typeutils.{TypeSerializerConditions, TypeSerializerUpgradeTestBase} import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase.TestSpecification import org.apache.flink.table.api._ import org.apache.flink.table.api.typeutils.TraversableSerializerUpgradeTest._ diff --git a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableTypeInfoTest.scala b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableTypeInfoTest.scala index 315a1de836920..c537acec1089b 100644 --- a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableTypeInfoTest.scala +++ b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableTypeInfoTest.scala @@ -18,8 +18,9 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.api.common.serialization.SerializerConfig +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} -import org.apache.flink.api.common.typeutils.{TypeInformationTestBase, TypeSerializer} +import org.apache.flink.api.common.typeutils.TypeInformationTestBase /** Test for [[TraversableTypeInfo]]. */ class TraversableTypeInfoTest extends TypeInformationTestBase[TraversableTypeInfo[_, _]] { diff --git a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TypeInfoFactoryTest.scala b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TypeInfoFactoryTest.scala index f3175ea0c81c4..e93a5f94c5aa6 100644 --- a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TypeInfoFactoryTest.scala +++ b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TypeInfoFactoryTest.scala @@ -20,7 +20,7 @@ package org.apache.flink.table.api.typeutils import org.apache.flink.api.common.serialization.SerializerConfig import org.apache.flink.api.common.typeinfo.{TypeInfo, TypeInfoFactory, TypeInformation} import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ -import org.apache.flink.api.common.typeutils.TypeSerializer +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import org.apache.flink.api.java.typeutils.{EitherTypeInfo => JavaEitherTypeInfo} import org.apache.flink.api.java.typeutils.TypeInfoFactoryTest._ import org.apache.flink.table.api._ diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/annotation/DataTypeHint.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/annotation/DataTypeHint.java index df97fd8d25c30..2496439669b26 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/annotation/DataTypeHint.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/annotation/DataTypeHint.java @@ -19,7 +19,7 @@ package org.apache.flink.table.annotation; import org.apache.flink.annotation.PublicEvolving; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.inference.TypeInference; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/annotation/UnknownSerializer.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/annotation/UnknownSerializer.java index 2c7bbcb6cf504..e183a149e5ae8 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/annotation/UnknownSerializer.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/annotation/UnknownSerializer.java @@ -18,7 +18,7 @@ package org.apache.flink.table.annotation; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** * Helper class for {@link DataTypeHint} for representing an unknown serializer that should be diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/DataTypes.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/DataTypes.java index 72c3bfd37ee8b..80e87c062129a 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/DataTypes.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/DataTypes.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.annotation.DataTypeHint; import org.apache.flink.table.catalog.DataTypeFactory; import org.apache.flink.table.catalog.ObjectIdentifier; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/catalog/DataTypeFactory.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/catalog/DataTypeFactory.java index 5b364531cb541..17c0861c39483 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/catalog/DataTypeFactory.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/catalog/DataTypeFactory.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.annotation.DataTypeHint; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.api.ValidationException; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/connector/source/DynamicFilteringData.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/connector/source/DynamicFilteringData.java index 0526dbee5e2d5..2bd5361cb4969 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/connector/source/DynamicFilteringData.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/connector/source/DynamicFilteringData.java @@ -22,7 +22,7 @@ import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArrayComparator; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.table.api.TableException; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/RawValueData.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/RawValueData.java index cd45e37e90a9a..d19361844c76b 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/RawValueData.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/RawValueData.java @@ -19,7 +19,7 @@ package org.apache.flink.table.data; import org.apache.flink.annotation.PublicEvolving; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.binary.BinaryRawValueData; import org.apache.flink.table.types.logical.RawType; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/BinaryRawValueData.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/BinaryRawValueData.java index 5446797603e81..e09e02cb84109 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/BinaryRawValueData.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/BinaryRawValueData.java @@ -19,7 +19,7 @@ package org.apache.flink.table.data.binary; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.table.data.RawValueData; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/BinarySegmentUtils.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/BinarySegmentUtils.java index e87aaa7b659fe..66bb28833d677 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/BinarySegmentUtils.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/BinarySegmentUtils.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.table.data.ArrayData; import org.apache.flink.table.data.DecimalData; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/BinaryStringData.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/BinaryStringData.java index 3962587073e12..078fdb1695e95 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/BinaryStringData.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/BinaryStringData.java @@ -19,7 +19,7 @@ package org.apache.flink.table.data.binary; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.table.data.StringData; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/LazyBinaryFormat.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/LazyBinaryFormat.java index 4c499e2f50ce9..030cfa56c17e7 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/LazyBinaryFormat.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/data/binary/LazyBinaryFormat.java @@ -18,7 +18,7 @@ package org.apache.flink.table.data.binary; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.table.data.RawValueData; import org.apache.flink.util.WrappingRuntimeException; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/ListViewSerializer.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/ListViewSerializer.java index cd921c85cd402..0a670cf0f89c3 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/ListViewSerializer.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/ListViewSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.LegacySerializerSnapshotTransformer; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.table.api.dataview.ListView; import java.io.IOException; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/ListViewSerializerSnapshot.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/ListViewSerializerSnapshot.java index 539e6197f1414..b2d3bf3d25035 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/ListViewSerializerSnapshot.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/ListViewSerializerSnapshot.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.table.api.dataview.ListView; import java.util.List; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/ListViewTypeInfo.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/ListViewTypeInfo.java index dbfebe4448008..a3ee546f39dfc 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/ListViewTypeInfo.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/ListViewTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.table.api.dataview.ListView; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/MapViewSerializer.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/MapViewSerializer.java index 764ab24e21d02..a2109188765aa 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/MapViewSerializer.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/MapViewSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.LegacySerializerSnapshotTransformer; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.table.api.dataview.MapView; import java.io.IOException; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/MapViewSerializerSnapshot.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/MapViewSerializerSnapshot.java index a2b5bc3031dd6..6f965b3fc6400 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/MapViewSerializerSnapshot.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/MapViewSerializerSnapshot.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.table.api.dataview.MapView; import java.util.Map; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/MapViewTypeInfo.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/MapViewTypeInfo.java index 4a226fe38f5ae..59f6a3b981824 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/MapViewTypeInfo.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/MapViewTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.MapSerializer; import org.apache.flink.table.api.dataview.MapView; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/NullAwareMapSerializer.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/NullAwareMapSerializer.java index 890e269a747de..ce050e7002a42 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/NullAwareMapSerializer.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/NullAwareMapSerializer.java @@ -19,10 +19,10 @@ package org.apache.flink.table.dataview; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.CollectionUtil; import java.io.IOException; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/NullAwareMapSerializerSnapshot.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/NullAwareMapSerializerSnapshot.java index 7780f750007bd..b298dd036033d 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/NullAwareMapSerializerSnapshot.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/NullAwareMapSerializerSnapshot.java @@ -20,8 +20,8 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import java.util.Map; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/NullSerializer.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/NullSerializer.java index 4d4bd8b275f11..8c99f5cd3ddde 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/NullSerializer.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/dataview/NullSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/legacy/types/logical/TypeInformationRawType.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/legacy/types/logical/TypeInformationRawType.java index 408e497af4bfa..7fcaedccce89a 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/legacy/types/logical/TypeInformationRawType.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/legacy/types/logical/TypeInformationRawType.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.api.TableException; import org.apache.flink.table.data.RawValueData; import org.apache.flink.table.types.logical.LogicalType; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/extraction/DataTypeTemplate.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/extraction/DataTypeTemplate.java index 08426874ec215..09399fd7884d0 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/extraction/DataTypeTemplate.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/extraction/DataTypeTemplate.java @@ -19,7 +19,7 @@ package org.apache.flink.table.types.extraction; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.annotation.ArgumentHint; import org.apache.flink.table.annotation.DataTypeHint; import org.apache.flink.table.annotation.ExtractionVersion; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/extraction/ExtractionUtils.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/extraction/ExtractionUtils.java index 0d01e04a08ffc..64c8041f1f248 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/extraction/ExtractionUtils.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/extraction/ExtractionUtils.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.annotation.ArgumentHint; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.api.ValidationException; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/RawType.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/RawType.java index 16c603a76f1ee..7b9accbf65bcd 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/RawType.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/types/logical/RawType.java @@ -19,8 +19,9 @@ package org.apache.flink.table.types.logical; import org.apache.flink.annotation.PublicEvolving; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeutils.TypeSerializerUtils; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.table.api.TableException; @@ -150,7 +151,7 @@ public static RawType restore( final byte[] bytes = EncodingUtils.decodeBase64ToBytes(serializerString); final DataInputDeserializer inputDeserializer = new DataInputDeserializer(bytes); final TypeSerializerSnapshot snapshot = - TypeSerializerSnapshot.readVersionedSnapshot(inputDeserializer, classLoader); + TypeSerializerUtils.readVersionedSnapshot(inputDeserializer, classLoader); return (RawType) new RawType(clazz, snapshot.restoreSerializer()); } catch (Throwable t) { throw new ValidationException( @@ -168,7 +169,7 @@ public String getSerializerString() { if (serializerString == null) { final DataOutputSerializer outputSerializer = new DataOutputSerializer(128); try { - TypeSerializerSnapshot.writeVersionedSnapshot( + TypeSerializerUtils.writeVersionedSnapshot( outputSerializer, serializer.snapshotConfiguration()); serializerString = EncodingUtils.encodeBytesToBase64(outputSerializer.getCopyOfBuffer()); diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/typeutils/TimeIndicatorTypeInfo.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/typeutils/TimeIndicatorTypeInfo.java index efeab97fa0a0a..d5bb6aa5cc122 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/typeutils/TimeIndicatorTypeInfo.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/typeutils/TimeIndicatorTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.SqlTimeTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.SqlTimestampComparator; import org.apache.flink.api.common.typeutils.base.SqlTimestampSerializer; diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/typeutils/TimeIntervalTypeInfo.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/typeutils/TimeIntervalTypeInfo.java index deaa519ea5cbd..04dfd7e98e7cc 100644 --- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/typeutils/TimeIntervalTypeInfo.java +++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/typeutils/TimeIntervalTypeInfo.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.typeinfo.AtomicType; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.LongComparator; diff --git a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/dataview/NullAwareMapSerializerTest.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/dataview/NullAwareMapSerializerTest.java index b0a19b0f3c7ea..dfb9395e0032e 100644 --- a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/dataview/NullAwareMapSerializerTest.java +++ b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/dataview/NullAwareMapSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.dataview; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/TypeInfoDataTypeConverterTest.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/TypeInfoDataTypeConverterTest.java index 7bf4cac0eb545..b4f6b56529ffe 100644 --- a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/TypeInfoDataTypeConverterTest.java +++ b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/TypeInfoDataTypeConverterTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.table.api.DataTypes; diff --git a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/extraction/DataTypeExtractorTest.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/extraction/DataTypeExtractorTest.java index eb3888ea1a3cd..2b63a188833c3 100644 --- a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/extraction/DataTypeExtractorTest.java +++ b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/extraction/DataTypeExtractorTest.java @@ -18,7 +18,7 @@ package org.apache.flink.table.types.extraction; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple12; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/extraction/utils/DataTypeHintMock.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/extraction/utils/DataTypeHintMock.java index 827155442e650..997e09e79b8c3 100644 --- a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/extraction/utils/DataTypeHintMock.java +++ b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/extraction/utils/DataTypeHintMock.java @@ -18,7 +18,7 @@ package org.apache.flink.table.types.extraction.utils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.annotation.DataTypeHint; import org.apache.flink.table.annotation.ExtractionVersion; import org.apache.flink.table.annotation.HintFlag; diff --git a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/inference/ComparableInputTypeStrategyTest.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/inference/ComparableInputTypeStrategyTest.java index 3c4b9696f1294..adaba827083a0 100644 --- a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/inference/ComparableInputTypeStrategyTest.java +++ b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/inference/ComparableInputTypeStrategyTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.types.inference; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.PojoSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; import org.apache.flink.table.api.DataTypes; diff --git a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/utils/DataTypeFactoryMock.java b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/utils/DataTypeFactoryMock.java index 7decdaff47ef2..a3cd58814f33e 100644 --- a/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/utils/DataTypeFactoryMock.java +++ b/flink-table/flink-table-common/src/test/java/org/apache/flink/table/types/utils/DataTypeFactoryMock.java @@ -19,7 +19,7 @@ package org.apache.flink.table.types.utils; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.VoidSerializer; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.api.ValidationException; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/connectors/CollectDynamicSink.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/connectors/CollectDynamicSink.java index 672dc7dfd7b19..3cfae5ab2a821 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/connectors/CollectDynamicSink.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/connectors/CollectDynamicSink.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.MemorySize; import org.apache.flink.configuration.ReadableConfig; import org.apache.flink.configuration.RpcOptions; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/casting/AbstractCodeGeneratorCastRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/casting/AbstractCodeGeneratorCastRule.java index 71cdaa335637a..f40416686e0a4 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/casting/AbstractCodeGeneratorCastRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/functions/casting/AbstractCodeGeneratorCastRule.java @@ -18,7 +18,7 @@ package org.apache.flink.table.planner.functions.casting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.api.TableRuntimeException; import org.apache.flink.table.data.utils.CastExecutor; import org.apache.flink.table.planner.codegen.CodeGenUtils; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecMatch.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecMatch.java index 8da68878070a6..e102af8a1bb24 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecMatch.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/common/CommonExecMatch.java @@ -19,7 +19,7 @@ package org.apache.flink.table.planner.plan.nodes.exec.common; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.dag.Transformation; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.cep.EventComparator; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/serde/LogicalTypeJsonDeserializer.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/serde/LogicalTypeJsonDeserializer.java index 99ee1e925077b..5bf28c2763e94 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/serde/LogicalTypeJsonDeserializer.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/serde/LogicalTypeJsonDeserializer.java @@ -19,7 +19,7 @@ package org.apache.flink.table.planner.plan.nodes.exec.serde; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.api.TableException; import org.apache.flink.table.api.config.TableConfigOptions; import org.apache.flink.table.api.config.TableConfigOptions.CatalogPlanRestore; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/serde/LogicalTypeJsonSerializer.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/serde/LogicalTypeJsonSerializer.java index 93f9e6174dcb6..f74ea485e0110 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/serde/LogicalTypeJsonSerializer.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/serde/LogicalTypeJsonSerializer.java @@ -19,7 +19,7 @@ package org.apache.flink.table.planner.plan.nodes.exec.serde; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.configuration.ReadableConfig; import org.apache.flink.table.api.TableException; import org.apache.flink.table.api.ValidationException; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecChangelogNormalize.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecChangelogNormalize.java index 29171195e850f..c9668b5a0c62e 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecChangelogNormalize.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecChangelogNormalize.java @@ -19,7 +19,7 @@ package org.apache.flink.table.planner.plan.nodes.exec.stream; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.dag.Transformation; import org.apache.flink.configuration.ReadableConfig; import org.apache.flink.streaming.api.operators.KeyedProcessOperator; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecDeduplicate.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecDeduplicate.java index 812ab1b5cbfd3..c204981d6973b 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecDeduplicate.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecDeduplicate.java @@ -19,7 +19,7 @@ package org.apache.flink.table.planner.plan.nodes.exec.stream; import org.apache.flink.FlinkVersion; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.dag.Transformation; import org.apache.flink.configuration.ReadableConfig; import org.apache.flink.streaming.api.operators.KeyedProcessOperator; diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/typeutils/DataViewUtils.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/typeutils/DataViewUtils.java index db8d29abc48d7..6eba732f3e03b 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/typeutils/DataViewUtils.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/typeutils/DataViewUtils.java @@ -19,7 +19,7 @@ package org.apache.flink.table.planner.typeutils; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.api.TableException; import org.apache.flink.table.api.dataview.DataView; diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/CodeGeneratorContext.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/CodeGeneratorContext.scala index 7cbdb50b134c2..dfb89a37cb6df 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/CodeGeneratorContext.scala +++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/CodeGeneratorContext.scala @@ -18,7 +18,7 @@ package org.apache.flink.table.planner.codegen import org.apache.flink.api.common.functions.Function -import org.apache.flink.api.common.typeutils.TypeSerializer +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import org.apache.flink.configuration.ReadableConfig import org.apache.flink.table.data.GenericRowData import org.apache.flink.table.data.conversion.{DataStructureConverter, DataStructureConverters} diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/agg/AggsHandlerCodeGenerator.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/agg/AggsHandlerCodeGenerator.scala index c9c7ee5d50032..3a1efa5c03517 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/agg/AggsHandlerCodeGenerator.scala +++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/codegen/agg/AggsHandlerCodeGenerator.scala @@ -17,7 +17,6 @@ */ package org.apache.flink.table.planner.codegen.agg -import org.apache.flink.api.common.typeutils.TypeSerializer import org.apache.flink.table.api.{DataTypes, TableException} import org.apache.flink.table.data.GenericRowData import org.apache.flink.table.expressions._ @@ -44,6 +43,7 @@ import org.apache.flink.util.Collector import org.apache.calcite.rex.RexLiteral import org.apache.calcite.tools.RelBuilder +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import java.time.ZoneId import java.util.Optional diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/sinks/CollectTableSink.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/sinks/CollectTableSink.scala index 26045c3f35906..98be2442a727f 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/sinks/CollectTableSink.scala +++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/sinks/CollectTableSink.scala @@ -20,7 +20,7 @@ package org.apache.flink.table.planner.sinks import org.apache.flink.api.common.accumulators.SerializedListAccumulator import org.apache.flink.api.common.io.{OutputFormat, RichOutputFormat} import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.common.typeutils.TypeSerializer +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import org.apache.flink.api.java.typeutils.RowTypeInfo import org.apache.flink.configuration.Configuration import org.apache.flink.legacy.table.sinks.StreamTableSink diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/DynamicFilteringValuesSource.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/DynamicFilteringValuesSource.java index 303bf92f546a5..ed5a25ff693e6 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/DynamicFilteringValuesSource.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/DynamicFilteringValuesSource.java @@ -18,7 +18,7 @@ package org.apache.flink.connector.source; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.source.Boundedness; import org.apache.flink.api.connector.source.Source; import org.apache.flink.api.connector.source.SourceReader; diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/DynamicFilteringValuesSourceReader.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/DynamicFilteringValuesSourceReader.java index 29ffa8a70a0c5..b08973f0b2fb3 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/DynamicFilteringValuesSourceReader.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/DynamicFilteringValuesSourceReader.java @@ -18,13 +18,13 @@ package org.apache.flink.connector.source; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.source.ReaderOutput; import org.apache.flink.api.connector.source.SourceReader; import org.apache.flink.api.connector.source.SourceReaderContext; import org.apache.flink.connector.source.split.ValuesSourcePartitionSplit; import org.apache.flink.core.io.InputStatus; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.table.api.TableException; import org.apache.flink.table.data.RowData; diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/ValuesSource.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/ValuesSource.java index 69ebba90bd778..b10e43f383815 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/ValuesSource.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/ValuesSource.java @@ -18,7 +18,7 @@ package org.apache.flink.connector.source; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.source.Boundedness; import org.apache.flink.api.connector.source.Source; import org.apache.flink.api.connector.source.SourceReader; diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/ValuesSourceReader.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/ValuesSourceReader.java index dcaca67fd1ea6..701feab880264 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/ValuesSourceReader.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/connector/source/ValuesSourceReader.java @@ -18,13 +18,13 @@ package org.apache.flink.connector.source; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.source.ReaderOutput; import org.apache.flink.api.connector.source.SourceReader; import org.apache.flink.api.connector.source.SourceReaderContext; import org.apache.flink.connector.source.split.ValuesSourceSplit; import org.apache.flink.core.io.InputStatus; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.table.api.TableException; import org.apache.flink.table.data.RowData; diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesRuntimeFunctions.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesRuntimeFunctions.java index c7dcdf98a67fd..108d27388499b 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesRuntimeFunctions.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesRuntimeFunctions.java @@ -26,10 +26,10 @@ import org.apache.flink.api.common.io.RichOutputFormat; import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.source.Boundedness; import org.apache.flink.configuration.Configuration; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.metrics.MetricGroup; diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesTableFactory.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesTableFactory.java index c6763c8521aca..a385839662e4e 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesTableFactory.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/factories/TestValuesTableFactory.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.io.OutputFormat; import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.source.Boundedness; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/utils/FailingCollectionSource.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/utils/FailingCollectionSource.java index 78fbbb0a58d53..fc4c631d59206 100644 --- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/utils/FailingCollectionSource.java +++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/utils/FailingCollectionSource.java @@ -21,9 +21,9 @@ import org.apache.flink.api.common.state.CheckpointListener; import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.state.FunctionInitializationContext; diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-over-aggregate_1/over-aggregate-lag/1.18/savepoint/OverWindowRestoreTest b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-over-aggregate_1/over-aggregate-lag/1.18/savepoint/OverWindowRestoreTest index 08e2541de987a..d4fa7a53eb3d6 100644 --- a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-over-aggregate_1/over-aggregate-lag/1.18/savepoint/OverWindowRestoreTest +++ b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-over-aggregate_1/over-aggregate-lag/1.18/savepoint/OverWindowRestoreTest @@ -21,7 +21,7 @@ package org.apache.flink.table.planner.plan.nodes.exec.stream; import org.apache.commons.collections.CollectionUtils; import org.apache.flink.api.common.JobStatus; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.source.Boundedness; import org.apache.flink.api.connector.source.Source; import org.apache.flink.api.connector.source.SourceReader; diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/factories/utils/TestCollectionTableFactory.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/factories/utils/TestCollectionTableFactory.scala index b49474a9591f4..ee15094c46437 100644 --- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/factories/utils/TestCollectionTableFactory.scala +++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/factories/utils/TestCollectionTableFactory.scala @@ -20,7 +20,7 @@ package org.apache.flink.table.planner.factories.utils import org.apache.flink.api.common.functions.OpenContext import org.apache.flink.api.common.serialization.SerializerConfigImpl import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.common.typeutils.TypeSerializer +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import org.apache.flink.legacy.table.sinks.{AppendStreamTableSink, StreamTableSink} import org.apache.flink.legacy.table.sources.StreamTableSource import org.apache.flink.streaming.api.datastream.{DataStream, DataStreamSink, DataStreamSource} diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/testTableSourceSinks.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/testTableSourceSinks.scala index 14d314463b165..772a74c0fc10f 100644 --- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/testTableSourceSinks.scala +++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/planner/utils/testTableSourceSinks.scala @@ -19,8 +19,8 @@ package org.apache.flink.table.planner.utils import org.apache.flink.api.common.io.InputFormat import org.apache.flink.api.common.serialization.SerializerConfigImpl +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} -import org.apache.flink.api.common.typeutils.TypeSerializer import org.apache.flink.api.java.typeutils.RowTypeInfo import org.apache.flink.core.io.InputSplit import org.apache.flink.legacy.table.factories.StreamTableSourceFactory diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/formats/raw/RawFormatSerializationSchema.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/formats/raw/RawFormatSerializationSchema.java index 839cc66abf13a..2a0f96a8f3d2a 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/formats/raw/RawFormatSerializationSchema.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/formats/raw/RawFormatSerializationSchema.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializationSchema; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.table.data.RowData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/conversion/RawByteArrayConverter.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/conversion/RawByteArrayConverter.java index b2388740c440b..accdc4668bb8d 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/conversion/RawByteArrayConverter.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/conversion/RawByteArrayConverter.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RawValueData; import org.apache.flink.table.legacy.types.logical.TypeInformationRawType; import org.apache.flink.table.types.DataType; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/conversion/RawObjectConverter.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/conversion/RawObjectConverter.java index 06faa99dad4fd..2f79971264873 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/conversion/RawObjectConverter.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/conversion/RawObjectConverter.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RawValueData; import org.apache.flink.table.legacy.types.logical.TypeInformationRawType; import org.apache.flink.table.types.DataType; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/util/DataFormatConverters.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/util/DataFormatConverters.java index 345d2bd166d78..5cef225411bc1 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/util/DataFormatConverters.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/util/DataFormatConverters.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.typeinfo.BasicArrayTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.CompositeType; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.PojoField; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/writer/AbstractBinaryWriter.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/writer/AbstractBinaryWriter.java index 51f5c5728f92a..4da98bb3dd4f8 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/writer/AbstractBinaryWriter.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/writer/AbstractBinaryWriter.java @@ -18,7 +18,7 @@ package org.apache.flink.table.data.writer; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/writer/BinaryWriter.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/writer/BinaryWriter.java index ce706a1f7c603..3dea4d139035e 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/writer/BinaryWriter.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/data/writer/BinaryWriter.java @@ -18,7 +18,7 @@ package org.apache.flink.table.data.writer; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.ArrayData; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.MapData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/ListViewSpec.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/ListViewSpec.java index 178c59a661822..963256eb3626f 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/ListViewSpec.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/ListViewSpec.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.dataview; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.api.dataview.ListView; import org.apache.flink.table.types.CollectionDataType; import org.apache.flink.table.types.DataType; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/MapViewSpec.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/MapViewSpec.java index 4112c70015678..eb4373cf98eec 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/MapViewSpec.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/MapViewSpec.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.dataview; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.api.dataview.MapView; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.KeyValueDataType; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/PerKeyStateDataViewStore.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/PerKeyStateDataViewStore.java index a2989e5845eec..ad3b71dcc05be 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/PerKeyStateDataViewStore.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/PerKeyStateDataViewStore.java @@ -27,7 +27,7 @@ import org.apache.flink.api.common.state.StateTtlConfig; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** * Default implementation of {@link StateDataViewStore} that currently forwards state registration diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/PerWindowStateDataViewStore.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/PerWindowStateDataViewStore.java index 9b88b29510840..44314ffa4af00 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/PerWindowStateDataViewStore.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/PerWindowStateDataViewStore.java @@ -26,7 +26,7 @@ import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.KeyedStateBackend; import org.apache.flink.runtime.state.internal.InternalListState; import org.apache.flink.runtime.state.internal.InternalMapState; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/StateDataViewStore.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/StateDataViewStore.java index 8d4561a164866..4613dbfc6a086 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/StateDataViewStore.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/StateDataViewStore.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.functions.RuntimeContext; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** This interface contains methods for registering {@link StateDataView} with a managed store. */ @Internal diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/UnsupportedStateDataViewStore.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/UnsupportedStateDataViewStore.java index 4e612f0186cac..3e43a5e6d1938 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/UnsupportedStateDataViewStore.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/dataview/UnsupportedStateDataViewStore.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.dataview; import org.apache.flink.api.common.functions.RuntimeContext; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; /** * A {@link StateDataViewStore} to throw {@link UnsupportedOperationException} when creating {@link diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/aggregate/ArrayAggFunction.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/aggregate/ArrayAggFunction.java index 126b483ea11ee..14674208d8de1 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/aggregate/ArrayAggFunction.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/aggregate/ArrayAggFunction.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.functions.aggregate; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.data.ArrayData; import org.apache.flink.table.data.GenericArrayData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/aggregate/LagAggFunction.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/aggregate/LagAggFunction.java index 7da9f5d397c00..38c82fea25926 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/aggregate/LagAggFunction.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/functions/aggregate/LagAggFunction.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.functions.aggregate; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.api.TableException; import org.apache.flink.table.functions.AggregateFunction; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/io/CompressedHeaderlessChannelReaderInputView.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/io/CompressedHeaderlessChannelReaderInputView.java index 6666e9cee3dfe..e9d5397bad54f 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/io/CompressedHeaderlessChannelReaderInputView.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/io/CompressedHeaderlessChannelReaderInputView.java @@ -18,6 +18,7 @@ package org.apache.flink.table.runtime.io; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.runtime.io.compression.BlockCompressionFactory; @@ -41,7 +42,7 @@ import java.util.concurrent.atomic.AtomicReference; /** - * A {@link org.apache.flink.core.memory.DataInputView} that is backed by a {@link + * A {@link DataInputView} that is backed by a {@link * BufferFileReader}, making it effectively a data input stream. The view reads it data in blocks * from the underlying channel and decompress it before returning to caller. The view can only read * data that has been written by {@link CompressedHeaderlessChannelWriterOutputView}, due to block diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/io/CompressedHeaderlessChannelWriterOutputView.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/io/CompressedHeaderlessChannelWriterOutputView.java index 61d476600d7b8..e74d0e01296b6 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/io/CompressedHeaderlessChannelWriterOutputView.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/io/CompressedHeaderlessChannelWriterOutputView.java @@ -18,6 +18,7 @@ package org.apache.flink.table.runtime.io; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.runtime.io.compression.BlockCompressionFactory; @@ -32,7 +33,7 @@ import java.util.concurrent.LinkedBlockingQueue; /** - * A {@link org.apache.flink.core.memory.DataOutputView} that is backed by a {@link FileIOChannel}, + * A {@link DataOutputView} that is backed by a {@link FileIOChannel}, * making it effectively a data output stream. The view will compress its data before writing it in * blocks to the underlying channel. */ diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/io/HeaderlessChannelWriterOutputView.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/io/HeaderlessChannelWriterOutputView.java index 5d00950528b4b..66486d1d1caca 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/io/HeaderlessChannelWriterOutputView.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/io/HeaderlessChannelWriterOutputView.java @@ -18,6 +18,7 @@ package org.apache.flink.table.runtime.io; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.AbstractChannelWriterOutputView; import org.apache.flink.runtime.io.disk.iomanager.BlockChannelWriter; @@ -29,7 +30,7 @@ import java.util.concurrent.LinkedBlockingQueue; /** - * A {@link org.apache.flink.core.memory.DataOutputView} that is backed by a {@link + * A {@link DataOutputView} that is backed by a {@link * BlockChannelWriter}, making it effectively a data output stream. The view writes its data in * blocks to the underlying channel, but does not expect header for each block. */ diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/MiniBatchGroupAggFunction.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/MiniBatchGroupAggFunction.java index df3f5248a92e5..e7f62f4799e31 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/MiniBatchGroupAggFunction.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/MiniBatchGroupAggFunction.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.StateTtlConfig; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.utils.JoinedRowData; import org.apache.flink.table.runtime.context.ExecutionContext; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/AbstractSliceWindowAggProcessor.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/AbstractSliceWindowAggProcessor.java index 19c727a5525fc..d422cd4bdd5a6 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/AbstractSliceWindowAggProcessor.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/AbstractSliceWindowAggProcessor.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.aggregate.window.processors; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.generated.GeneratedNamespaceAggsHandleFunction; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/AbstractWindowAggProcessor.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/AbstractWindowAggProcessor.java index e0a59d158b671..c0a7475c5fb01 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/AbstractWindowAggProcessor.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/AbstractWindowAggProcessor.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.internal.InternalValueState; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.utils.JoinedRowData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/SliceSharedWindowAggProcessor.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/SliceSharedWindowAggProcessor.java index 6dd076bf54084..685f8f884dc7c 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/SliceSharedWindowAggProcessor.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/SliceSharedWindowAggProcessor.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.aggregate.window.processors; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.generated.GeneratedNamespaceAggsHandleFunction; import org.apache.flink.table.runtime.operators.aggregate.window.buffers.WindowBuffer; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/SliceUnsharedWindowAggProcessor.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/SliceUnsharedWindowAggProcessor.java index 20126e24e0169..6eb4888ba66ad 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/SliceUnsharedWindowAggProcessor.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/SliceUnsharedWindowAggProcessor.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.aggregate.window.processors; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.generated.GeneratedNamespaceAggsHandleFunction; import org.apache.flink.table.runtime.operators.aggregate.window.buffers.WindowBuffer; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/UnsliceWindowAggProcessor.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/UnsliceWindowAggProcessor.java index 00eda35222e19..b848faf5f9e29 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/UnsliceWindowAggProcessor.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/aggregate/window/processors/UnsliceWindowAggProcessor.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.MergingState; import org.apache.flink.api.common.state.State; import org.apache.flink.api.common.state.StateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.metrics.MetricGroup; import org.apache.flink.runtime.state.VoidNamespace; import org.apache.flink.runtime.state.VoidNamespaceSerializer; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/DeduplicateFunctionBase.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/DeduplicateFunctionBase.java index b87a02e7d9c48..70be7377c1591 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/DeduplicateFunctionBase.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/DeduplicateFunctionBase.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.functions.KeyedProcessFunction; import static org.apache.flink.table.runtime.util.StateConfigUtil.createTtlConfig; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepFirstRowFunction.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepFirstRowFunction.java index 70630ed9f0400..cfe4cbc436d25 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepFirstRowFunction.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepFirstRowFunction.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.deduplicate; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.util.Collector; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepLastRowFunction.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepLastRowFunction.java index eb51008e08e5d..2703be89b8441 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepLastRowFunction.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepLastRowFunction.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.deduplicate; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.context.ExecutionContext; import org.apache.flink.table.runtime.generated.GeneratedRecordEqualiser; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/RowTimeMiniBatchDeduplicateFunction.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/RowTimeMiniBatchDeduplicateFunction.java index 73d8f28335ae3..9604e325d91c6 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/RowTimeMiniBatchDeduplicateFunction.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/RowTimeMiniBatchDeduplicateFunction.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.deduplicate; import org.apache.flink.api.common.state.ValueState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.util.Collector; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/RowTimeMiniBatchLatestChangeDeduplicateFunction.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/RowTimeMiniBatchLatestChangeDeduplicateFunction.java index a46aed4f66afc..d9ee14c8fcf76 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/RowTimeMiniBatchLatestChangeDeduplicateFunction.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/RowTimeMiniBatchLatestChangeDeduplicateFunction.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.deduplicate; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.util.Collector; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/window/combines/RowTimeDeduplicateRecordsCombiner.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/window/combines/RowTimeDeduplicateRecordsCombiner.java index ebb916887913b..f4d0c398e4a66 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/window/combines/RowTimeDeduplicateRecordsCombiner.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/window/combines/RowTimeDeduplicateRecordsCombiner.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.deduplicate.window.combines; import org.apache.flink.api.common.functions.RuntimeContext; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.KeyedStateBackend; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.operators.window.tvf.combines.RecordsCombiner; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/window/processors/RowTimeWindowDeduplicateProcessor.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/window/processors/RowTimeWindowDeduplicateProcessor.java index 2898f28e56f58..1fc8ed7ab5f1d 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/window/processors/RowTimeWindowDeduplicateProcessor.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/deduplicate/window/processors/RowTimeWindowDeduplicateProcessor.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.runtime.state.internal.InternalValueState; import org.apache.flink.table.data.RowData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/dynamicfiltering/DynamicFilteringDataCollectorOperator.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/dynamicfiltering/DynamicFilteringDataCollectorOperator.java index 52288e11b86b4..49635dcc7187b 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/dynamicfiltering/DynamicFilteringDataCollectorOperator.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/dynamicfiltering/DynamicFilteringDataCollectorOperator.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArrayComparator; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.operators.coordination.OperatorEventGateway; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/lookup/KeyedLookupJoinWrapper.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/lookup/KeyedLookupJoinWrapper.java index 8c71865811666..f4b64f9ca3829 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/lookup/KeyedLookupJoinWrapper.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/lookup/KeyedLookupJoinWrapper.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.StateTtlConfig; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.streaming.api.functions.KeyedProcessFunction; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/stream/MiniBatchStreamingJoinOperator.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/stream/MiniBatchStreamingJoinOperator.java index a31cd7da57662..1c88ffaaa6903 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/stream/MiniBatchStreamingJoinOperator.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/stream/MiniBatchStreamingJoinOperator.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.join.stream; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.watermark.Watermark; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.table.data.RowData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/window/WindowJoinOperator.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/window/WindowJoinOperator.java index 710feb54a54b4..6f0fc446ff1c0 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/window/WindowJoinOperator.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/window/WindowJoinOperator.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.DefaultOpenContext; import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.state.ListStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.metrics.Counter; import org.apache.flink.metrics.Gauge; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/window/WindowJoinOperatorBuilder.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/window/WindowJoinOperatorBuilder.java index c0e566555e714..7300ba7f5b63f 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/window/WindowJoinOperatorBuilder.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/join/window/WindowJoinOperatorBuilder.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.join.window; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.generated.GeneratedJoinCondition; import org.apache.flink.table.runtime.operators.join.FlinkJoinType; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/MultipleInputStreamOperatorBase.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/MultipleInputStreamOperatorBase.java index 003381ca30f62..ec7c6caa3722f 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/MultipleInputStreamOperatorBase.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/MultipleInputStreamOperatorBase.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.multipleinput; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.graph.StreamConfig; import org.apache.flink.streaming.api.operators.AbstractStreamOperatorV2; import org.apache.flink.streaming.api.operators.Input; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/output/CopyingFirstInputOfTwoInputStreamOperatorOutput.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/output/CopyingFirstInputOfTwoInputStreamOperatorOutput.java index 19b11b94e0fd9..088101ec3eb77 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/output/CopyingFirstInputOfTwoInputStreamOperatorOutput.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/output/CopyingFirstInputOfTwoInputStreamOperatorOutput.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.multipleinput.output; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.operators.Output; import org.apache.flink.streaming.api.operators.TwoInputStreamOperator; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/output/CopyingOneInputStreamOperatorOutput.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/output/CopyingOneInputStreamOperatorOutput.java index 662e1f5276d5a..13b950db1e290 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/output/CopyingOneInputStreamOperatorOutput.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/output/CopyingOneInputStreamOperatorOutput.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.multipleinput.output; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.operators.OneInputStreamOperator; import org.apache.flink.streaming.api.operators.Output; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/output/CopyingSecondInputOfTwoInputStreamOperatorOutput.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/output/CopyingSecondInputOfTwoInputStreamOperatorOutput.java index d3703cb1567c9..5b21ccb4c1028 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/output/CopyingSecondInputOfTwoInputStreamOperatorOutput.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/multipleinput/output/CopyingSecondInputOfTwoInputStreamOperatorOutput.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.multipleinput.output; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.event.WatermarkEvent; import org.apache.flink.streaming.api.operators.Output; import org.apache.flink.streaming.api.operators.TwoInputStreamOperator; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/AppendOnlyTopNFunction.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/AppendOnlyTopNFunction.java index 14f359380608f..3d5c485b2857d 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/AppendOnlyTopNFunction.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/AppendOnlyTopNFunction.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.MapState; import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.StateTtlConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.ListTypeInfo; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.generated.GeneratedRecordComparator; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/FastTop1Function.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/FastTop1Function.java index 4c701e144a54e..425011fc299f4 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/FastTop1Function.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/FastTop1Function.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.StateTtlConfig; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.state.FunctionInitializationContext; import org.apache.flink.runtime.state.FunctionSnapshotContext; import org.apache.flink.streaming.api.checkpoint.CheckpointedFunction; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/RetractableTopNFunction.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/RetractableTopNFunction.java index 1965b95411117..b53a790e1ee4f 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/RetractableTopNFunction.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/RetractableTopNFunction.java @@ -26,7 +26,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.ListTypeInfo; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.util.RowDataUtil; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/UpdatableTopNFunction.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/UpdatableTopNFunction.java index 07d256ca6b523..0c72addb5785c 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/UpdatableTopNFunction.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/UpdatableTopNFunction.java @@ -24,7 +24,7 @@ import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.StateTtlConfig; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.TupleTypeInfo; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/window/combines/TopNRecordsCombiner.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/window/combines/TopNRecordsCombiner.java index 4dfc73219cbec..696155fb13ecb 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/window/combines/TopNRecordsCombiner.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/window/combines/TopNRecordsCombiner.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.rank.window.combines; import org.apache.flink.api.common.functions.RuntimeContext; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.runtime.state.KeyedStateBackend; import org.apache.flink.table.data.RowData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/window/processors/WindowRankProcessor.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/window/processors/WindowRankProcessor.java index 11ac6d524f0a3..096adf5a96082 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/window/processors/WindowRankProcessor.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/rank/window/processors/WindowRankProcessor.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.MapState; import org.apache.flink.api.common.state.MapStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.runtime.state.internal.InternalMapState; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/sink/SinkUpsertMaterializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/sink/SinkUpsertMaterializer.java index 8ba4b792e2b05..645eda36f61ba 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/sink/SinkUpsertMaterializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/sink/SinkUpsertMaterializer.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.state.StateTtlConfig; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.ListSerializer; import org.apache.flink.streaming.api.operators.OneInputStreamOperator; import org.apache.flink.streaming.api.operators.TimestampedCollector; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/sort/ChannelReaderKVInputViewIterator.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/sort/ChannelReaderKVInputViewIterator.java index d7c2c4707e731..7820f75c2c83a 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/sort/ChannelReaderKVInputViewIterator.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/sort/ChannelReaderKVInputViewIterator.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.sort; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.AbstractChannelReaderInputView; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/CountWindow.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/CountWindow.java index 2413c67a2d9fa..a7d155eddafa2 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/CountWindow.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/CountWindow.java @@ -19,10 +19,10 @@ package org.apache.flink.table.runtime.operators.window; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.MathUtils; import java.io.IOException; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/TimeWindow.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/TimeWindow.java index 11e2ed3fd1887..7817f6ab23e6a 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/TimeWindow.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/TimeWindow.java @@ -19,10 +19,10 @@ package org.apache.flink.table.runtime.operators.window; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/CountSlidingWindowAssigner.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/CountSlidingWindowAssigner.java index 2236c284243cb..920bd7708ea59 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/CountSlidingWindowAssigner.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/CountSlidingWindowAssigner.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.operators.window.CountWindow; import org.apache.flink.table.runtime.operators.window.groupwindow.internal.InternalWindowProcessFunction; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/CountTumblingWindowAssigner.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/CountTumblingWindowAssigner.java index 1a05a3987aa1c..1eba02da0f02b 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/CountTumblingWindowAssigner.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/CountTumblingWindowAssigner.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeinfo.Types; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.operators.window.CountWindow; import org.apache.flink.table.runtime.operators.window.groupwindow.internal.InternalWindowProcessFunction; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/CumulativeWindowAssigner.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/CumulativeWindowAssigner.java index 6ce48f9eb4255..0df2870a110a7 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/CumulativeWindowAssigner.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/CumulativeWindowAssigner.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.window.groupwindow.assigners; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.operators.window.TimeWindow; import org.apache.flink.util.IterableIterator; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/GroupWindowAssigner.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/GroupWindowAssigner.java index cad4ff9d77734..8dba949e61104 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/GroupWindowAssigner.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/GroupWindowAssigner.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.window.groupwindow.assigners; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.operators.window.Window; import org.apache.flink.table.runtime.operators.window.groupwindow.internal.InternalWindowProcessFunction; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/SessionWindowAssigner.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/SessionWindowAssigner.java index afc697e70f886..18d38e755a259 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/SessionWindowAssigner.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/SessionWindowAssigner.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.window.groupwindow.assigners; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.operators.window.MergeCallback; import org.apache.flink.table.runtime.operators.window.TimeWindow; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/SlidingWindowAssigner.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/SlidingWindowAssigner.java index 2485187045891..d927b990a38eb 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/SlidingWindowAssigner.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/SlidingWindowAssigner.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.window.groupwindow.assigners; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.operators.window.TimeWindow; import org.apache.flink.util.IterableIterator; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/TumblingWindowAssigner.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/TumblingWindowAssigner.java index 99809aa966358..91d643a1a9dcd 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/TumblingWindowAssigner.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/TumblingWindowAssigner.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.window.groupwindow.assigners; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.operators.window.TimeWindow; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/internal/MergingWindowProcessFunction.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/internal/MergingWindowProcessFunction.java index b89041d38e586..2567a117e93fe 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/internal/MergingWindowProcessFunction.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/internal/MergingWindowProcessFunction.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.state.MapState; import org.apache.flink.api.common.state.MapStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.generated.NamespaceAggsHandleFunctionBase; import org.apache.flink.table.runtime.operators.window.Window; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/AggregateWindowOperator.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/AggregateWindowOperator.java index 05b117e51b2d7..90fb2c2f3d215 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/AggregateWindowOperator.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/AggregateWindowOperator.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.window.groupwindow.operator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.utils.JoinedRowData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/TableAggregateWindowOperator.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/TableAggregateWindowOperator.java index 118163d895070..d9dc1ad1daa20 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/TableAggregateWindowOperator.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/TableAggregateWindowOperator.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.window.groupwindow.operator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.generated.GeneratedNamespaceTableAggsHandleFunction; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/WindowOperator.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/WindowOperator.java index 8a2c04bf36bc3..45d56cae6aeab 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/WindowOperator.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/WindowOperator.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.metrics.Counter; import org.apache.flink.metrics.Gauge; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/common/WindowProcessor.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/common/WindowProcessor.java index 6f221a47fc149..6d043daa77ccd 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/common/WindowProcessor.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/common/WindowProcessor.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.functions.RuntimeContext; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.runtime.state.KeyedStateBackend; import org.apache.flink.streaming.api.operators.InternalTimerService; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/operator/UnalignedWindowTableFunctionOperator.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/operator/UnalignedWindowTableFunctionOperator.java index 02b30e8f603c9..adb6c39db133c 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/operator/UnalignedWindowTableFunctionOperator.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/operator/UnalignedWindowTableFunctionOperator.java @@ -25,7 +25,7 @@ import org.apache.flink.api.common.state.StateDescriptor; import org.apache.flink.api.common.state.ValueState; import org.apache.flink.api.common.state.ValueStateDescriptor; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.metrics.Counter; import org.apache.flink.metrics.Gauge; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/unslicing/UnsliceAssigners.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/unslicing/UnsliceAssigners.java index a7030220ea2b1..04d5b254d6844 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/unslicing/UnsliceAssigners.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/operators/window/tvf/unslicing/UnsliceAssigners.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.TimestampData; import org.apache.flink.table.runtime.operators.window.MergeCallback; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/AbstractMapSerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/AbstractMapSerializer.java index ebb3c3f09844b..2aca55e94e108 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/AbstractMapSerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/AbstractMapSerializer.java @@ -18,9 +18,9 @@ package org.apache.flink.table.runtime.typeutils; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.Preconditions; import java.io.IOException; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/ArrayDataSerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/ArrayDataSerializer.java index bf9783789fe28..1d2a93d67b7b2 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/ArrayDataSerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/ArrayDataSerializer.java @@ -20,13 +20,13 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.typeutils.runtime.DataInputViewStream; import org.apache.flink.api.java.typeutils.runtime.DataOutputViewStream; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.table.data.ArrayData; import org.apache.flink.table.data.GenericArrayData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/BinaryRowDataSerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/BinaryRowDataSerializer.java index 324482b8da5f1..f38a375e9f44e 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/BinaryRowDataSerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/BinaryRowDataSerializer.java @@ -19,11 +19,11 @@ package org.apache.flink.table.runtime.typeutils; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.core.memory.MemorySegmentWritable; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/DecimalDataSerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/DecimalDataSerializer.java index 05f2757008b10..9044456301a38 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/DecimalDataSerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/DecimalDataSerializer.java @@ -19,11 +19,11 @@ package org.apache.flink.table.runtime.typeutils; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.table.data.DecimalData; import java.io.IOException; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/DecimalDataTypeInfo.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/DecimalDataTypeInfo.java index 587d082213e1b..79d8cd489a36c 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/DecimalDataTypeInfo.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/DecimalDataTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.types.DataType; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/ExternalSerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/ExternalSerializer.java index 4c712c25414d1..b257e364d42c9 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/ExternalSerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/ExternalSerializer.java @@ -20,12 +20,12 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.typeutils.runtime.DataInputViewStream; import org.apache.flink.api.java.typeutils.runtime.DataOutputViewStream; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.table.data.ArrayData; import org.apache.flink.table.data.MapData; import org.apache.flink.table.data.RawValueData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/ExternalTypeInfo.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/ExternalTypeInfo.java index e3b98f2777369..5258c6f23afbf 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/ExternalTypeInfo.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/ExternalTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.DataTypeQueryable; import org.apache.flink.table.types.logical.LogicalType; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/InternalSerializers.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/InternalSerializers.java index 3198b9b6f92ac..59cd06fe482bc 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/InternalSerializers.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/InternalSerializers.java @@ -20,7 +20,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.BooleanSerializer; import org.apache.flink.api.common.typeutils.base.ByteSerializer; import org.apache.flink.api.common.typeutils.base.DoubleSerializer; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/InternalTypeInfo.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/InternalTypeInfo.java index 63fb8e23d22a7..fbda90f37e2de 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/InternalTypeInfo.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/InternalTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.DataTypeQueryable; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/LinkedListSerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/LinkedListSerializer.java index 0720e20c8fa50..54a6aaae671fc 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/LinkedListSerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/LinkedListSerializer.java @@ -20,11 +20,11 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.typeutils.runtime.MaskUtils; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import java.io.IOException; import java.util.LinkedList; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/MapDataSerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/MapDataSerializer.java index cd58a4bc0a3f2..9d6258939b302 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/MapDataSerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/MapDataSerializer.java @@ -20,13 +20,13 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.typeutils.runtime.DataInputViewStream; import org.apache.flink.api.java.typeutils.runtime.DataOutputViewStream; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.table.data.ArrayData; import org.apache.flink.table.data.MapData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/PagedTypeSerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/PagedTypeSerializer.java index 8227a862e2bc3..487913e96a1cb 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/PagedTypeSerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/PagedTypeSerializer.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.memory.AbstractPagedInputView; import org.apache.flink.runtime.memory.AbstractPagedOutputView; import org.apache.flink.table.data.binary.BinaryRowData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/RawValueDataSerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/RawValueDataSerializer.java index 6fda57c741162..f27c7f0d2a3e8 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/RawValueDataSerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/RawValueDataSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.table.data.RawValueData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/RowDataSerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/RowDataSerializer.java index 3106d9e65d5c3..61849a2e36bab 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/RowDataSerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/RowDataSerializer.java @@ -21,13 +21,13 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerUtil; import org.apache.flink.api.common.typeutils.NestedSerializersSnapshotDelegate; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.typeutils.runtime.DataInputViewStream; import org.apache.flink.api.java.typeutils.runtime.DataOutputViewStream; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.memory.AbstractPagedInputView; import org.apache.flink.runtime.memory.AbstractPagedOutputView; import org.apache.flink.table.data.GenericRowData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/SortedMapSerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/SortedMapSerializer.java index 35dd4adaf2ea3..f546e833faed8 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/SortedMapSerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/SortedMapSerializer.java @@ -18,8 +18,8 @@ package org.apache.flink.table.runtime.typeutils; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import java.util.Comparator; import java.util.SortedMap; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/SortedMapSerializerSnapshot.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/SortedMapSerializerSnapshot.java index 4ebf48e4ce79a..f563795561030 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/SortedMapSerializerSnapshot.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/SortedMapSerializerSnapshot.java @@ -19,13 +19,13 @@ package org.apache.flink.table.runtime.typeutils; import org.apache.flink.api.common.typeutils.NestedSerializersSnapshotDelegate; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.java.typeutils.runtime.DataInputViewStream; import org.apache.flink.api.java.typeutils.runtime.DataOutputViewStream; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; import java.io.IOException; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/SortedMapTypeInfo.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/SortedMapTypeInfo.java index da062c68d3da9..52d56783b511b 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/SortedMapTypeInfo.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/SortedMapTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.util.Preconditions; import java.io.Serializable; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/StringDataSerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/StringDataSerializer.java index 89f105128d194..5e3aa37b4b869 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/StringDataSerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/StringDataSerializer.java @@ -20,10 +20,10 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.table.data.StringData; import org.apache.flink.table.data.binary.BinarySegmentUtils; import org.apache.flink.table.data.binary.BinaryStringData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/StringDataTypeInfo.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/StringDataTypeInfo.java index d4103dabd1667..2528b4b230b3d 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/StringDataTypeInfo.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/StringDataTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.StringData; /** TypeInformation for {@link StringData}. */ diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/TimestampDataSerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/TimestampDataSerializer.java index 56ca2d7e8a9b2..890fec3d7aca8 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/TimestampDataSerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/TimestampDataSerializer.java @@ -19,11 +19,11 @@ package org.apache.flink.table.runtime.typeutils; import org.apache.flink.annotation.Internal; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.table.data.TimestampData; import java.io.IOException; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/TimestampDataTypeInfo.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/TimestampDataTypeInfo.java index 7eb0f56c75530..bbd45f1a06354 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/TimestampDataTypeInfo.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/TimestampDataTypeInfo.java @@ -21,7 +21,7 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.TimestampData; import java.util.Objects; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/WindowKeySerializer.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/WindowKeySerializer.java index b4175cc71579b..180491417626f 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/WindowKeySerializer.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/typeutils/WindowKeySerializer.java @@ -19,10 +19,10 @@ package org.apache.flink.table.runtime.typeutils; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.memory.AbstractPagedInputView; import org.apache.flink.runtime.memory.AbstractPagedOutputView; import org.apache.flink.table.data.RowData; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/util/SegmentsUtil.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/util/SegmentsUtil.java index 55e970abcb8c6..d1142cfca6293 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/util/SegmentsUtil.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/util/SegmentsUtil.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.util; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import java.io.IOException; diff --git a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/util/collections/binary/BytesMap.java b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/util/collections/binary/BytesMap.java index 5cef1e693e408..c10cf1b100c44 100644 --- a/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/util/collections/binary/BytesMap.java +++ b/flink-table/flink-table-runtime/src/main/java/org/apache/flink/table/runtime/util/collections/binary/BytesMap.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.util.collections.binary; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.table.data.binary.BinaryRowData; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/data/BinaryRowDataTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/data/BinaryRowDataTest.java index 3a204e3fabaa3..50582fa0777fb 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/data/BinaryRowDataTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/data/BinaryRowDataTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.data; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LocalDateSerializer; import org.apache.flink.api.common.typeutils.base.LocalDateTimeSerializer; import org.apache.flink.api.common.typeutils.base.LocalTimeSerializer; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/data/NestedRowDataTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/data/NestedRowDataTest.java index 34a98ccd84350..650e1253be27e 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/data/NestedRowDataTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/data/NestedRowDataTest.java @@ -18,7 +18,7 @@ package org.apache.flink.table.data; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.StringSerializer; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/aggregate/window/WindowAggOperatorTestBase.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/aggregate/window/WindowAggOperatorTestBase.java index 95fbec138c10f..363521671a1cd 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/aggregate/window/WindowAggOperatorTestBase.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/aggregate/window/WindowAggOperatorTestBase.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.aggregate.window; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness; import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness; import org.apache.flink.table.data.GenericRowData; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepFirstRowFunctionTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepFirstRowFunctionTest.java index 6d4b870d60780..d2b5e7031852d 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepFirstRowFunctionTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepFirstRowFunctionTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.deduplicate; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness; import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepLastRowFunctionTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepLastRowFunctionTest.java index 7eeeb75edae2e..0f1de8dbfbda1 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepLastRowFunctionTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/ProcTimeMiniBatchDeduplicateKeepLastRowFunctionTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.deduplicate; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness; import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/RowTimeDeduplicateFunctionTestBase.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/RowTimeDeduplicateFunctionTestBase.java index 777c426952105..585f6dd014496 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/RowTimeDeduplicateFunctionTestBase.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/RowTimeDeduplicateFunctionTestBase.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.deduplicate; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.operators.KeyedProcessOperator; import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness; import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/window/RowTimeWindowDeduplicateOperatorTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/window/RowTimeWindowDeduplicateOperatorTest.java index 85b9a2d9d6b53..a7c4b7bc04bdc 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/window/RowTimeWindowDeduplicateOperatorTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/deduplicate/window/RowTimeWindowDeduplicateOperatorTest.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.deduplicate.window; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.checkpoint.OperatorSubtaskState; import org.apache.flink.streaming.api.watermark.Watermark; import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/AsyncLookupJoinHarnessTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/AsyncLookupJoinHarnessTest.java index 89647d4193ab7..90c1905d24928 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/AsyncLookupJoinHarnessTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/AsyncLookupJoinHarnessTest.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.functions.DefaultOpenContext; import org.apache.flink.api.common.functions.FlatMapFunction; import org.apache.flink.api.common.functions.OpenContext; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.datastream.AsyncDataStream; import org.apache.flink.streaming.api.functions.async.AsyncFunction; import org.apache.flink.streaming.api.functions.async.ResultFuture; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/KeyedLookupJoinHarnessTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/KeyedLookupJoinHarnessTest.java index 2cab5e20562bb..7f2ea3c0e2628 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/KeyedLookupJoinHarnessTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/KeyedLookupJoinHarnessTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.OpenContext; import org.apache.flink.api.common.functions.RichFlatMapFunction; import org.apache.flink.api.common.state.StateTtlConfig; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.operators.KeyedProcessOperator; import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness; import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/LookupJoinHarnessTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/LookupJoinHarnessTest.java index 2851a100cd3c7..1ea0849b03b38 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/LookupJoinHarnessTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/LookupJoinHarnessTest.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.functions.AbstractRichFunction; import org.apache.flink.api.common.functions.FlatMapFunction; import org.apache.flink.api.common.functions.OpenContext; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.api.functions.ProcessFunction; import org.apache.flink.streaming.api.operators.ProcessOperator; import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/RandomSortMergeInnerJoinTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/RandomSortMergeInnerJoinTest.java index 7541c7f224caa..1c4f06e916954 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/RandomSortMergeInnerJoinTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/RandomSortMergeInnerJoinTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/RandomSortMergeOuterJoinTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/RandomSortMergeOuterJoinTest.java index 86477ac91d52b..660318f6d1684 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/RandomSortMergeOuterJoinTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/join/RandomSortMergeOuterJoinTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.join; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.IntComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/multipleinput/output/OutputTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/multipleinput/output/OutputTest.java index 019e128690fb3..c46acb0707856 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/multipleinput/output/OutputTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/multipleinput/output/OutputTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.operators.multipleinput.output; import org.apache.flink.api.common.serialization.SerializerConfigImpl; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.streaming.api.operators.Output; import org.apache.flink.streaming.api.watermark.Watermark; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/rank/window/WindowRankOperatorTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/rank/window/WindowRankOperatorTest.java index 43e605582b807..20bb9bf230dd4 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/rank/window/WindowRankOperatorTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/rank/window/WindowRankOperatorTest.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.rank.window; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.runtime.checkpoint.OperatorSubtaskState; import org.apache.flink.streaming.api.watermark.Watermark; import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/groupwindow/internal/MergingWindowSetTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/groupwindow/internal/MergingWindowSetTest.java index a4ecbdcb45880..d1d1900fb9e60 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/groupwindow/internal/MergingWindowSetTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/groupwindow/internal/MergingWindowSetTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.state.MapState; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.operators.window.MergeCallback; import org.apache.flink.table.runtime.operators.window.TimeWindow; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/tvf/operator/WindowTableFunctionOperatorTestBase.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/tvf/operator/WindowTableFunctionOperatorTestBase.java index 06ede388ca9fc..e4f6a8052f7c9 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/tvf/operator/WindowTableFunctionOperatorTestBase.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/tvf/operator/WindowTableFunctionOperatorTestBase.java @@ -18,7 +18,7 @@ package org.apache.flink.table.runtime.operators.window.tvf.operator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.TimestampData; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/ExternalSerializerTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/ExternalSerializerTest.java index e1d88f1322e50..0d261c3bbdcf9 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/ExternalSerializerTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/ExternalSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils; import org.apache.flink.api.common.typeutils.SerializerTestInstance; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; import org.apache.flink.types.Row; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/LinkedListSerializerTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/LinkedListSerializerTest.java index 6c52908da93c2..629d6e50342f3 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/LinkedListSerializerTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/LinkedListSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongSerializer; import java.util.LinkedList; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/LinkedListSerializerUpgradeTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/LinkedListSerializerUpgradeTest.java index 59149615cfc14..cf349c44bd958 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/LinkedListSerializerUpgradeTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/LinkedListSerializerUpgradeTest.java @@ -20,9 +20,9 @@ import org.apache.flink.FlinkVersion; import org.apache.flink.annotation.VisibleForTesting; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerConditions; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.test.util.MigrationTest; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/RowDataSerializerTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/RowDataSerializerTest.java index b70c5497cefd9..36e7539565a33 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/RowDataSerializerTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/RowDataSerializerTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeutils.SerializerTestInstance; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.runtime.kryo.KryoSerializer; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.data.GenericRowData; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/SerializerTestUtil.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/SerializerTestUtil.java index 00d48528c87e4..9422158e50f12 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/SerializerTestUtil.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/SerializerTestUtil.java @@ -18,9 +18,9 @@ package org.apache.flink.table.runtime.typeutils; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSchemaCompatibility; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshotSerializationUtil; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/TimestampDataSerializerTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/TimestampDataSerializerTest.java index c9883aed81464..1e02651b68299 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/TimestampDataSerializerTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/TimestampDataSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.TimestampData; /** Test for {@link TimestampDataSerializer}. */ diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/WindowKeySerializerTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/WindowKeySerializerTest.java index ba9ece24e7659..b303e2414b432 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/WindowKeySerializerTest.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/typeutils/WindowKeySerializerTest.java @@ -19,7 +19,7 @@ package org.apache.flink.table.runtime.typeutils; import org.apache.flink.api.common.typeutils.SerializerTestBase; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.StringData; import org.apache.flink.table.data.binary.BinaryRowData; import org.apache.flink.table.data.writer.BinaryRowWriter; diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/utils/HandwrittenSelectorUtil.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/utils/HandwrittenSelectorUtil.java index 3191cc8937499..2a914fc13eee5 100644 --- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/utils/HandwrittenSelectorUtil.java +++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/utils/HandwrittenSelectorUtil.java @@ -18,7 +18,7 @@ package org.apache.flink.table.utils; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.binary.BinaryRowData; import org.apache.flink.table.data.writer.BinaryRowWriter; diff --git a/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/testsuites/SinkTestSuiteBase.java b/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/testsuites/SinkTestSuiteBase.java index 74aacbb17a89b..5ae243abd78b9 100644 --- a/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/testsuites/SinkTestSuiteBase.java +++ b/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/testsuites/SinkTestSuiteBase.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.JobStatus; import org.apache.flink.api.common.eventtime.WatermarkStrategy; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.sink2.Sink; import org.apache.flink.api.connector.source.Boundedness; import org.apache.flink.configuration.Configuration; diff --git a/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/testsuites/SourceTestSuiteBase.java b/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/testsuites/SourceTestSuiteBase.java index 8d54d38a07417..4b48e2f95f185 100644 --- a/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/testsuites/SourceTestSuiteBase.java +++ b/flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/testsuites/SourceTestSuiteBase.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.JobStatus; import org.apache.flink.api.common.eventtime.WatermarkStrategy; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.connector.source.Boundedness; import org.apache.flink.api.connector.source.Source; import org.apache.flink.configuration.Configuration; diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/types/PojoTestUtils.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/types/PojoTestUtils.java index c31ec1de4bb35..99b2214b53902 100644 --- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/types/PojoTestUtils.java +++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/types/PojoTestUtils.java @@ -21,7 +21,7 @@ import org.apache.flink.api.common.serialization.SerializerConfig; import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.typeutils.TypeExtractor; import org.apache.flink.api.java.typeutils.runtime.PojoSerializer; diff --git a/flink-tests/src/test/java/org/apache/flink/test/classloading/jar/CheckpointingCustomKvStateProgram.java b/flink-tests/src/test/java/org/apache/flink/test/classloading/jar/CheckpointingCustomKvStateProgram.java index 721f7078d8eae..c16e0530feac4 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/classloading/jar/CheckpointingCustomKvStateProgram.java +++ b/flink-tests/src/test/java/org/apache/flink/test/classloading/jar/CheckpointingCustomKvStateProgram.java @@ -27,15 +27,15 @@ import org.apache.flink.api.common.state.ReducingState; import org.apache.flink.api.common.state.ReducingStateDescriptor; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.base.TypeSerializerSingleton; import org.apache.flink.api.java.functions.KeySelector; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.connector.file.sink.FileSink; import org.apache.flink.core.fs.Path; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.streaming.api.checkpoint.ListCheckpointed; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flink-tests/src/test/java/org/apache/flink/test/completeness/TypeSerializerTestCoverageTest.java b/flink-tests/src/test/java/org/apache/flink/test/completeness/TypeSerializerTestCoverageTest.java index 494ee2e827e40..8369116ed0f61 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/completeness/TypeSerializerTestCoverageTest.java +++ b/flink-tests/src/test/java/org/apache/flink/test/completeness/TypeSerializerTestCoverageTest.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.SerializerTestBase; import org.apache.flink.api.common.typeutils.SingleThreadAccessCheckingTypeSerializer; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase; import org.apache.flink.api.common.typeutils.UnloadableDummyTypeSerializer; import org.apache.flink.api.common.typeutils.base.EnumSerializer; diff --git a/flink-tests/src/test/java/org/apache/flink/test/manual/HashTableRecordWidthCombinations.java b/flink-tests/src/test/java/org/apache/flink/test/manual/HashTableRecordWidthCombinations.java index b02ca93b0fb39..7d653488fd7f6 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/manual/HashTableRecordWidthCombinations.java +++ b/flink-tests/src/test/java/org/apache/flink/test/manual/HashTableRecordWidthCombinations.java @@ -20,7 +20,7 @@ import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.LongComparator; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArraySerializer; diff --git a/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringSorting.java b/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringSorting.java index baa3e78d2fc80..6e975852a83a3 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringSorting.java +++ b/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringSorting.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeHint; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.common.typeutils.base.StringComparator; import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringValueSorting.java b/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringValueSorting.java index 82efa36aa5e91..9a064f166dc0f 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringValueSorting.java +++ b/flink-tests/src/test/java/org/apache/flink/test/manual/MassiveStringValueSorting.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.serialization.SerializerConfigImpl; import org.apache.flink.api.common.typeinfo.TypeHint; import org.apache.flink.api.common.typeutils.TypeComparator; -import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeinfo.utils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.TupleTypeInfo; import org.apache.flink.api.java.typeutils.runtime.CopyableValueComparator; diff --git a/flink-tests/src/test/java/org/apache/flink/test/misc/CustomSerializationITCase.java b/flink-tests/src/test/java/org/apache/flink/test/misc/CustomSerializationITCase.java index 720b99cb5cd57..6469271f169bd 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/misc/CustomSerializationITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/misc/CustomSerializationITCase.java @@ -23,8 +23,8 @@ import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.MemorySize; import org.apache.flink.configuration.TaskManagerOptions; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.client.JobExecutionException; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughputITCase.java b/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughputITCase.java index 545f6e048d28f..59840a9e5506e 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughputITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/runtime/NetworkStackThroughputITCase.java @@ -20,8 +20,8 @@ import org.apache.flink.client.program.ClusterClient; import org.apache.flink.core.io.IOReadableWritable; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.runtime.execution.Environment; import org.apache.flink.runtime.io.network.api.reader.RecordReader; import org.apache.flink.runtime.io.network.api.writer.RecordWriter; diff --git a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/StreamOperatorSnapshotRestoreTest.java b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/StreamOperatorSnapshotRestoreTest.java index ae8c12b2819ed..e5c1d8fc9b08c 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/StreamOperatorSnapshotRestoreTest.java +++ b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/StreamOperatorSnapshotRestoreTest.java @@ -26,9 +26,9 @@ import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.base.IntSerializer; import org.apache.flink.api.java.functions.KeySelector; -import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.api.common.memory.DataInputView; import org.apache.flink.core.memory.DataInputViewStreamWrapper; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.checkpoint.OperatorSubtaskState; import org.apache.flink.runtime.jobgraph.JobVertexID; diff --git a/flink-tests/src/test/java/org/apache/flink/test/util/CoordVector.java b/flink-tests/src/test/java/org/apache/flink/test/util/CoordVector.java index 81604ea361dcb..dcd568757a426 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/util/CoordVector.java +++ b/flink-tests/src/test/java/org/apache/flink/test/util/CoordVector.java @@ -18,8 +18,8 @@ package org.apache.flink.test.util; -import org.apache.flink.core.memory.DataInputView; -import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.api.common.memory.DataInputView; +import org.apache.flink.api.common.memory.DataOutputView; import org.apache.flink.types.Value; import java.io.IOException;