You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by re...@apache.org on 2024/09/30 15:04:39 UTC

(flink) branch master updated (ec6695778e4 -> f2d6b5753db)

This is an automated email from the ASF dual-hosted git repository.

renqs pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


    from ec6695778e4 [FLINK-36355][runtime] Remove deprecated metrics (#25417)
     add f2d6b5753db [FLINK-36245] Relocate deprecated SourceFunction / SinkFunction and remove deprecated Sink V1 in 2.0 (#25331)

No new revisions were added by this update.

Summary of changes:
 .../5b9eed8a-5fb6-4373-98ac-3be2a71941b8           |   8 -
 .../7602816f-5c01-4b7a-9e3e-235dfedec245           |   3 -
 .../f7a4e6fa-e7de-48c9-a61e-c13e83f0c72e           |  70 ++-
 .../flink/connector/base/sink/AsyncSinkBase.java   |   5 +-
 .../base/sink/writer/AsyncSinkWriter.java          | 144 +-----
 .../base/sink/writer/ElementConverter.java         |   4 +-
 .../SingleThreadMultiplexSourceReaderBase.java     |  69 ---
 .../base/source/reader/SourceReaderBase.java       |  39 --
 .../reader/fetcher/SingleThreadFetcherManager.java |  63 ---
 .../source/reader/fetcher/SplitFetcherManager.java |  64 ---
 .../connector/base/sink/ArrayListAsyncSink.java    |  20 +-
 .../base/sink/writer/AsyncSinkWriterTest.java      |  26 +-
 .../sink/writer/AsyncSinkWriterThrottlingTest.java |  38 +-
 .../base/sink/writer/TestElementConverter.java     |   4 +-
 .../base/sink/writer/TestSinkInitContext.java      |   2 +-
 .../TestSinkInitContextAnyThreadMailbox.java       |   2 +-
 .../source/reader/CoordinatedSourceITCase.java     |   2 +-
 .../reader/CoordinatedSourceRescaleITCase.java     |   2 +-
 .../apache/flink/connector/file/sink/FileSink.java |  15 -
 .../flink/connector/file/src/FileSource.java       |  17 -
 .../flink/connector/file/src/FileSourceSplit.java  |  31 --
 .../file/src/impl/FileRecordFormatAdapter.java     | 192 --------
 .../file/src/reader/FileRecordFormat.java          | 200 ---------
 .../connector/file/src/reader/TextLineFormat.java  |  23 -
 .../connector/file/table/FileSystemTableSink.java  |   4 +-
 .../connector/file/table/batch/BatchSink.java      |   2 +-
 .../batch/compact/BatchPartitionCommitterSink.java |   2 +-
 .../file/table/stream/AbstractStreamingWriter.java |   2 +-
 .../file/table/stream/StreamingFileWriter.java     |   2 +-
 .../connector/file/table/stream/StreamingSink.java |   2 +-
 .../table/stream/compact/CompactFileWriter.java    |   2 +-
 .../file/sink/BatchExecutionFileSinkITCase.java    |   2 +-
 .../file/sink/FileSinkCompactionSwitchITCase.java  |   2 +-
 .../file/sink/FileSinkSpeculativeITCase.java       |   2 +-
 .../sink/StreamingExecutionFileSinkITCase.java     |   2 +-
 .../file/sink/writer/FileSinkMigrationITCase.java  |   4 +-
 ...leWriterBucketStateSerializerMigrationTest.java |   2 +-
 .../file/src/impl/FileRecordFormatAdapterTest.java | 196 ---------
 .../connector/file/src/impl/TestIntReader.java     |  11 +-
 .../file/table/FileSystemOutputFormatTest.java     |   2 +-
 .../file/table/LimitableBulkFormatTest.java        |   2 +-
 .../compact/BatchPartitionCommitterSinkTest.java   |   2 +-
 .../file/table/stream/StreamingFileWriterTest.java |   2 +-
 .../stream/compact/CompactFileWriterTest.java      |   2 +-
 .../flink/connectors/hive/HiveTableSink.java       |   4 +-
 .../table/catalog/hive/HiveCatalogUdfITCase.java   |   2 +-
 .../hive/factories/TestLockTableSinkFactory.java   |   6 +-
 .../{ => legacy}/WikipediaEditEventIrcStream.java  |   4 +-
 .../{ => legacy}/WikipediaEditsSource.java         |  14 +-
 .../wikiedits/WikipediaEditsSourceTest.java        |   3 +-
 .../apache/flink/api/connector/sink/Committer.java |  47 --
 .../flink/api/connector/sink/GlobalCommitter.java  |  80 ----
 .../org/apache/flink/api/connector/sink/Sink.java  | 226 ----------
 .../flink/api/connector/sink/SinkWriter.java       | 113 -----
 .../org/apache/flink/api/connector/sink2/Sink.java | 162 +------
 .../flink/api/connector/sink2/StatefulSink.java    |  85 ----
 .../connector/sink2/TwoPhaseCommittingSink.java    |  75 ----
 .../streaming/tests/PeriodicStreamingJob.java      |  13 +-
 .../flink-confluent-schema-registry/pom.xml        |  10 +
 .../registry/test/TestAvroConsumerConfluent.java   |   5 +-
 .../tests/DataStreamAllroundTestJobFactory.java    |   8 +-
 .../tests/DataStreamAllroundTestProgram.java       |   2 +-
 .../streaming/tests/SequenceGeneratorSource.java   |  11 +-
 .../flink/connector/file/sink/FileSinkProgram.java |  15 +-
 .../HeavyDeploymentStressTestProgram.java          |  10 +-
 .../StickyAllocationAndLocalRecoveryTestJob.java   |  13 +-
 .../NettyShuffleMemoryControlTestProgram.java      |  10 +-
 .../tests/queryablestate/QsStateProducer.java      |   6 +-
 .../flink/table/toolbox/TestSourceFunction.java    |   2 +-
 .../src/test/java/SqlClientITCase.java             |   2 +
 .../apache/flink/test/StatefulStreamingJob.java    |  11 +-
 .../flink/sql/tests/StreamSQLTestProgram.java      |  13 +-
 .../tests/DataStreamStateTTLTestProgram.java       |   2 +-
 .../streaming/tests/TtlStateUpdateSource.java      |   7 +-
 .../tests/StatefulStreamJobUpgradeTestProgram.java |   2 +-
 flink-examples/flink-examples-streaming/pom.xml    |   8 +-
 .../statemachine/KafkaEventsGeneratorJob.java      |  20 +-
 .../flink/fs/s3/common/S5CmdOnMinioITCase.java     |   2 +-
 .../flink/formats/avro/AvroBulkFormatTest.java     |  13 +-
 .../formats/avro/AvroStreamingFileSinkITCase.java  |   2 +-
 .../compress/CompressWriterFactoryTest.java        |   2 +-
 .../formats/compress/CompressionFactoryITCase.java |   2 +-
 .../HadoopPathBasedBulkFormatBuilder.java          |   1 +
 .../filesystem/TestStreamingFileSinkFactory.java   |   2 +
 .../org/apache/flink/orc/OrcFileSystemITCase.java  |   2 +-
 .../flink/orc/writer/OrcBulkRowDataWriterTest.java |   2 +-
 .../flink/orc/writer/OrcBulkWriterITCase.java      |   2 +-
 .../apache/flink/orc/writer/OrcBulkWriterTest.java |   2 +-
 .../avro/AvroParquetStreamingFileSinkITCase.java   |   2 +-
 .../ParquetProtoStreamingFileSinkITCase.java       |   2 +-
 .../protobuf/table/TestProtobufSinkFunction.java   |   2 +-
 .../protobuf/table/TestProtobufSourceFunction.java |   2 +-
 .../protobuf/table/TestProtobufTableSink.java      |   2 +-
 .../SequenceStreamingFileSinkITCase.java           |   2 +-
 .../hdfstests/ContinuousFileProcessingITCase.java  |   4 +-
 .../ContinuousFileProcessingMigrationTest.java     |   4 +-
 .../hdfstests/ContinuousFileProcessingTest.java    |   4 +-
 ...HighAvailabilityRecoverFromSavepointITCase.java |   2 +-
 .../apache/flink/state/api/SavepointWriter.java    |   2 +-
 .../flink/state/api/input/SourceBuilder.java       |   2 +-
 .../flink/state/api/SavepointReaderITTestBase.java |   2 +-
 .../flink/state/api/input/WindowReaderTest.java    |   2 +-
 .../flink/state/api/utils/MaxWatermarkSource.java  |   2 +-
 .../flink/state/api/utils/SavepointTestBase.java   |   4 +-
 .../flink/state/api/utils/WaitingSource.java       |   4 +-
 .../pyflink/datastream/connectors/file_system.py   |   6 +-
 .../connectors/tests/test_elasticsearch.py         |   3 +
 .../datastream/connectors/tests/test_jdbc.py       |   3 +
 .../datastream/connectors/tests/test_kafka.py      |   4 +
 .../datastream/connectors/tests/test_kinesis.py    |   3 +
 .../datastream/stream_execution_environment.py     |   4 +-
 .../tests/test_stream_execution_environment.py     |   3 +
 .../runtime/arrow/sources/ArrowSourceFunction.java |   9 +-
 .../python/util/DataStreamTestCollectSink.java     |   2 +-
 .../flink/python/util/MyCustomSourceFunction.java  |   2 +-
 .../arrow/sources/ArrowSourceFunctionTestBase.java |   2 +-
 .../table/utils/TestCollectionTableFactory.java    |   2 +-
 .../org/apache/flink/table/utils/TestingSinks.java |   2 +-
 .../itcases/AbstractQueryableStateTestBase.java    |   2 +-
 .../AbstractAsyncStateUdfStreamOperator.java       |   2 +-
 .../api/checkpoint/ExternallyInducedSource.java    |  10 +-
 .../connector/sink2/GlobalCommitterOperator.java   |  19 -
 .../flink/streaming/api/datastream/DataStream.java |  78 +---
 .../streaming/api/datastream/DataStreamSink.java   |  11 +-
 .../streaming/api/datastream/KeyedStream.java      |   2 +-
 .../environment/StreamExecutionEnvironment.java    |  83 ++--
 .../{ => legacy}/OutputFormatSinkFunction.java     |  11 +-
 .../sink/{ => legacy}/PrintSinkFunction.java       |   7 +-
 .../sink/{ => legacy}/RichSinkFunction.java        |   7 +-
 .../functions/sink/{ => legacy}/SinkFunction.java  |   6 +-
 .../sink/{ => legacy}/SocketClientSink.java        |  11 +-
 .../source/ContinuousFileReaderOperator.java       |   2 +
 .../api/functions/source/FileProcessingMode.java   |   1 +
 .../functions/source/TimestampedInputSplit.java    |   1 +
 .../ContinuousFileMonitoringFunction.java          |  11 +-
 .../{ => legacy}/FileMonitoringFunction.java       |   9 +-
 .../source/{ => legacy}/FileReadFunction.java      |  11 +-
 .../source/{ => legacy}/FromElementsFunction.java  |  12 +-
 .../source/{ => legacy}/FromIteratorFunction.java  |  12 +-
 .../FromSplittableIteratorFunction.java            |  12 +-
 .../{ => legacy}/InputFormatSourceFunction.java    |   8 +-
 .../{ => legacy}/ParallelSourceFunction.java       |  10 +-
 .../{ => legacy}/RichParallelSourceFunction.java   |  12 +-
 .../source/{ => legacy}/RichSourceFunction.java    |  12 +-
 .../{ => legacy}/SocketTextStreamFunction.java     |  12 +-
 .../source/{ => legacy}/SourceFunction.java        |   6 +-
 .../{ => legacy}/StatefulSequenceSource.java       |  12 +-
 .../api/operators/AbstractUdfStreamOperator.java   |   2 +-
 .../SimpleInputFormatOperatorFactory.java          |   2 +-
 .../api/operators/SimpleOperatorFactory.java       |   4 +-
 .../flink/streaming/api/operators/StreamSink.java  |   2 +-
 .../streaming/api/operators/StreamSource.java      |   7 +-
 .../api/operators/StreamSourceContexts.java        |   9 +-
 .../api/operators/collect/CollectSinkFunction.java |   2 +-
 .../transformations/LegacySinkTransformation.java  |   2 +-
 .../LegacySourceTransformation.java                |   2 +-
 .../api/transformations/SinkV1Adapter.java         | 487 ---------------------
 .../runtime/operators/sink/CommitterOperator.java  |   2 +-
 .../InitContextInitializationContextAdapter.java   |   4 +-
 .../runtime/operators/sink/SinkWriterOperator.java |   5 +-
 .../operators/sink/SinkWriterStateHandler.java     |   6 +-
 .../sink/StatefulSinkWriterStateHandler.java       |   8 +-
 .../streaming/runtime/tasks/SourceStreamTask.java  |   7 +-
 .../runtime/watermarkstatus/WatermarkStatus.java   |   4 +-
 .../flink/streaming/api/SourceFunctionTest.java    |   4 +-
 .../apache/flink/streaming/api/TypeFillTest.java   |   2 +-
 .../api/functions/FromElementsFunctionTest.java    |   6 +-
 .../streaming/api/functions/ListSourceContext.java |   2 +-
 .../api/functions/StatefulSequenceSourceTest.java  |   2 +-
 .../sink/OutputFormatSinkFunctionTest.java         |   1 +
 .../source/FileMonitoringFunctionTest.java         |   4 +-
 .../source/InputFormatSourceFunctionTest.java      |   2 +
 .../source/SocketTextStreamFunctionTest.java       |   6 +-
 .../api/operators/StreamSinkOperatorTest.java      |   2 +-
 .../StreamSourceContextIdleDetectionTests.java     |   2 +-
 .../api/transformations/SinkV1AdapterTest.java     | 187 --------
 .../flink/streaming/graph/TranslationTest.java     |   2 +-
 .../operators/StreamOperatorChainingTest.java      |   2 +-
 .../StreamSourceOperatorLatencyMetricsTest.java    |   2 +-
 .../CommittableCollectorSerializerTest.java        |   6 +-
 .../partitioner/RescalePartitionerTest.java        |   2 +-
 .../tasks/InterruptSensitiveRestoreTest.java       |   2 +-
 .../streaming/util/BlockingSourceContext.java      |   2 +-
 .../streaming/util/CollectingSourceContext.java    |   2 +-
 .../flink/streaming/util/SourceFunctionUtil.java   |   2 +-
 .../ChangelogStateBackendLoadingTest.java          |   2 +-
 .../connector/sink2/WithPostCommitTopology.java    |  38 --
 .../api/connector/sink2/WithPreCommitTopology.java |  46 --
 .../api/connector/sink2/WithPreWriteTopology.java  |  33 --
 .../streaming/api/functions/sink/PrintSink.java    |   3 +-
 .../api/functions/sink/SinkContextUtil.java        |   1 +
 .../api/functions/sink/filesystem/Bucket.java      |   1 +
 .../functions/sink/filesystem/BucketFactory.java   |   1 +
 .../api/functions/sink/filesystem/Buckets.java     |   3 +-
 .../sink/filesystem/StreamingFileSinkHelper.java   |   3 +-
 .../filesystem/{ => legacy}/StreamingFileSink.java |  35 +-
 .../sink/{ => legacy}/DiscardingSink.java          |   7 +-
 .../{ => legacy}/TwoPhaseCommitSinkFunction.java   |   9 +-
 .../api/functions/sink/v2/DiscardingSink.java      |   3 +-
 .../source/datagen/DataGeneratorSource.java        |   7 +-
 .../flink/streaming/experimental/CollectSink.java  |   2 +-
 .../apache/flink/streaming/api/DataStreamTest.java |   2 +-
 .../datastream/DataStreamSinkDeprecatedTest.java   |  60 ---
 ...ecutionEnvironmentComplexConfigurationTest.java |   2 +-
 .../StreamExecutionEnvironmentTest.java            |   4 +-
 .../api/functions/PrintSinkFunctionTest.java       |   2 +-
 .../streaming/api/functions/PrintSinkTest.java     |   4 +-
 .../api/functions/sink/SocketClientSinkTest.java   |   3 +-
 .../api/functions/sink/TransactionHolderTest.java  |   2 +-
 ...oPhaseCommitSinkStateSerializerUpgradeTest.java | 132 ------
 .../functions/sink/filesystem/BulkWriterTest.java  |   1 +
 .../filesystem/LocalStreamingFileSinkTest.java     |   1 +
 .../api/functions/sink/filesystem/TestUtils.java   |   3 +-
 .../TwoPhaseCommitSinkFunctionTest.java            |   7 +-
 .../source/datagen/DataGeneratorSourceTest.java    |   2 +-
 .../SinkV1TransformationTranslatorITCase.java      | 208 ---------
 ...V2TransformationTranslatorDeprecatedITCase.java |  98 -----
 .../api/graph/StreamGraphGeneratorTest.java        |  29 +-
 .../api/graph/StreamingJobGraphGeneratorTest.java  | 145 +-----
 .../api/lineage/LineageGraphUtilsTest.java         |   4 +-
 .../AbstractUdfStreamOperatorLifecycleTest.java    |   4 +-
 .../StreamingJobGraphGeneratorNodeHashTest.java    |  54 ++-
 .../graph/WithMasterCheckpointHookConfigTest.java  |   2 +-
 .../StreamSourceOperatorWatermarksTest.java        |   4 +-
 .../SinkV2CommitterOperatorDeprecatedTest.java     |  77 ----
 .../SinkV2SinkWriterOperatorDeprecatedTest.java    | 133 ------
 .../sink/SinkV2SinkWriterOperatorTest.java         |   4 +-
 .../operators/sink/SinkWriterOperatorTestBase.java |  83 +---
 .../streaming/runtime/operators/sink/TestSink.java | 396 -----------------
 .../runtime/operators/sink/TestSinkV2.java         |  11 +-
 .../sink/WithAdapterCommitterOperatorTest.java     |  28 +-
 .../sink/WithAdapterSinkWriterOperatorTest.java    |  75 ++--
 .../operators/sink/deprecated/TestSinkV2.java      | 423 ------------------
 ...ToStreamOperatorRecipientExactlyOnceITCase.java |   2 +-
 .../tasks/SourceExternalCheckpointTriggerTest.java |   2 +-
 .../runtime/tasks/SourceStreamTaskTest.java        |   8 +-
 .../runtime/tasks/SourceTaskTerminationTest.java   |   2 +-
 .../tasks/StreamTaskFinalCheckpointsTest.java      |   2 +-
 .../runtime/tasks/StreamTaskSystemExitTest.java    |   2 +-
 .../streaming/runtime/tasks/StreamTaskTest.java    |   4 +-
 .../flink/streaming/util/TestExpandingSink.java    |   5 -
 .../util/TestExpandingSinkDeprecated.java          |  78 ----
 .../print/table/PrintTableSinkFactory.java         |   6 +-
 .../connector/source/SourceFunctionProvider.java   |   7 +-
 .../connector/sink/DataStreamSinkProvider.java     |   8 +-
 .../sink/{ => legacy}/SinkFunctionProvider.java    |  12 +-
 .../factories/DataGenTableSourceFactoryTest.java   |   2 +-
 flink-table/flink-table-common/pom.xml             |   8 +-
 .../table/connector/sink/DynamicTableSink.java     |  13 +-
 .../table/legacy/connector/sink/SinkProvider.java  |  68 ---
 .../table/connector/sink/TestManagedSink.java      |  54 +--
 .../connector/sink/TestManagedSinkCommitter.java   |  54 +--
 .../connector/sink/TestManagedSinkWriter.java      |  12 +-
 .../table/connector/sink/TestManagedTableSink.java |   3 +-
 .../connectors/TransformationSinkProvider.java     |   5 +-
 .../exec/batch/BatchExecLegacyTableSourceScan.java |   2 +-
 .../nodes/exec/batch/BatchExecTableSourceScan.java |   2 +-
 .../plan/nodes/exec/common/CommonExecSink.java     |  23 +-
 .../exec/common/CommonExecTableSourceScan.java     |   8 +-
 .../planner/factories/TableFactoryHarness.java     |   6 +-
 .../factories/TestSupportsStagingTableFactory.java |   2 +-
 .../factories/TestUpdateDeleteTableFactory.java    |   6 +-
 .../factories/TestValuesRuntimeFunctions.java      |   4 +-
 .../planner/factories/TestValuesTableFactory.java  |   8 +-
 .../BuiltInAggregateFunctionTestBase.java          |   2 +-
 .../functions/HashcodeDeprecatedITCase.java        | 212 ---------
 .../table/planner/functions/HashcodeITCase.java    |   2 +-
 .../nodes/exec/common/CommonExecSinkITCase.java    |  63 +--
 .../MultipleInputNodeCreationProcessorTest.java    |   2 +-
 .../runtime/stream/sql/join/JoinReorderITCase.java |   2 +-
 .../stream/table/TimeAttributesITCase.scala        |   2 +-
 .../runtime/utils/FailingCollectionSource.java     |   2 +-
 .../utils/TestCollectionTableFactory.scala         |   2 +-
 .../planner/plan/stream/sql/TableSinkTest.scala    |   2 +-
 .../batch/sql/PartitionableSinkITCase.scala        |   2 +-
 .../runtime/stream/FsStreamingSinkITCaseBase.scala |   2 +-
 .../stream/sql/StreamFileSystemITCaseBase.scala    |   2 +-
 .../stream/table/TableToDataStreamITCase.scala     |   2 +-
 .../planner/runtime/utils/StreamTestSink.scala     |   2 +-
 .../runtime/utils/StreamingWithStateTestBase.scala |   2 +-
 .../table/planner/runtime/utils/TimeTestUtil.scala |   5 +-
 .../planner/utils/MemoryTableSourceSinkUtil.scala  |   2 +-
 .../table/runtime/operators/sink/SinkOperator.java |   2 +-
 .../runtime/operators/sink/SinkOperatorTest.java   |   2 +-
 .../testframe/external/ExternalContext.java        |   2 +-
 .../sink/DataStreamSinkV1ExternalContext.java      |  39 --
 .../testframe/testsuites/SinkTestSuiteBase.java    |  11 +-
 .../connector/upserttest/sink/UpsertTestSink.java  |   3 +-
 .../flink/streaming/util/FiniteTestSource.java     |   7 +-
 .../streaming/runtime/util/TestListResultSink.java |   2 +-
 .../runtime/metrics/JobManagerMetricsITCase.java   |   4 +-
 .../operators/lifecycle/graph/TestEventSource.java |   6 +-
 .../flink/test/cancelling/JobCancelingITCase.java  |   4 +-
 .../ApproximateLocalRecoveryDownstreamITCase.java  |   4 +-
 .../test/checkpointing/AutoRescalingITCase.java    |   6 +-
 .../checkpointing/ChangelogRecoveryITCaseBase.java |   4 +-
 .../CheckpointAfterAllTasksFinishedITCase.java     |   4 +-
 .../CheckpointFailureManagerITCase.java            |   2 +-
 .../CheckpointRestoreWithUidHashITCase.java        |   4 +-
 .../test/checkpointing/CheckpointStoreITCase.java  |   2 +-
 .../checkpointing/CoStreamCheckpointingITCase.java |   4 +-
 .../ContinuousFileProcessingCheckpointITCase.java  |   4 +-
 .../EventTimeWindowCheckpointingITCase.java        |   2 +-
 .../checkpointing/IgnoreInFlightDataITCase.java    |   4 +-
 .../KeyedStateCheckpointingITCase.java             |   4 +-
 .../NotifyCheckpointAbortedITCase.java             |   4 +-
 .../ProcessingTimeWindowCheckpointingITCase.java   |   2 +-
 .../test/checkpointing/RegionFailoverITCase.java   |   4 +-
 .../RescaleCheckpointManuallyITCase.java           |   4 +-
 .../flink/test/checkpointing/RescalingITCase.java  |   6 +-
 .../checkpointing/RestoreUpgradedJobITCase.java    |   4 +-
 .../flink/test/checkpointing/SavepointITCase.java  |   8 +-
 .../checkpointing/StateCheckpointedITCase.java     |   4 +-
 .../StatefulJobSnapshotMigrationITCase.java        |   2 +-
 .../StatefulJobWBroadcastStateMigrationITCase.java |   2 +-
 .../StreamCheckpointNotifierITCase.java            |   4 +-
 .../checkpointing/StreamCheckpointingITCase.java   |   6 +-
 .../test/checkpointing/TimersSavepointITCase.java  |   2 +-
 .../UdfStreamOperatorCheckpointingITCase.java      |   4 +-
 .../UnalignedCheckpointRescaleITCase.java          |   2 +-
 .../UnalignedCheckpointStressITCase.java           |   2 +-
 .../checkpointing/UnalignedCheckpointTestBase.java |   2 +-
 .../utils/AccumulatingIntegerSink.java             |   2 +-
 .../utils/CancellingIntegerSource.java             |   2 +-
 .../test/checkpointing/utils/FailingSource.java    |   2 +-
 .../checkpointing/utils/MigrationTestUtils.java    |   8 +-
 .../test/checkpointing/utils/ValidatingSink.java   |   2 +-
 .../jar/CheckpointedStreamingProgram.java          |   2 +-
 .../jar/CheckpointingCustomKvStateProgram.java     |   2 +-
 .../TypeSerializerTestCoverageTest.java            |   2 +-
 .../execution/JobStatusChangedListenerITCase.java  |   4 +-
 .../manual/StreamingScalabilityAndLatency.java     |   4 +-
 .../apache/flink/test/misc/JobIDLoggingITCase.java |   2 +-
 .../flink/test/recovery/FastFailuresITCase.java    |   4 +-
 .../flink/test/recovery/LocalRecoveryITCase.java   |   2 +-
 ...nagerProcessFailureStreamingRecoveryITCase.java |   4 +-
 .../flink/test/runtime/BatchShuffleITCaseBase.java |   4 +-
 .../test/runtime/entrypoint/StreamingNoop.java     |   2 +-
 .../test/scheduling/AdaptiveSchedulerITCase.java   |   4 +-
 .../flink/test/scheduling/ReactiveModeITCase.java  |   4 +-
 .../test/scheduling/RestartStrategyITCase.java     |   4 +-
 .../scheduling/SpeculativeExecutionITCase.java     |  31 +-
 .../flink/test/state/ManualWindowSpeedITCase.java  |   2 +-
 .../state/operator/restore/keyed/KeyedJob.java     |   2 +-
 .../operator/restore/unkeyed/NonKeyedJob.java      |   2 +-
 .../streaming/api/FileReadingWatermarkITCase.java  |   4 +-
 .../streaming/api/StreamingOperatorsITCase.java    |   4 +-
 .../DataStreamWithSharedPartitionNodeITCase.java   |   2 +-
 .../datastream/FinishedSourcesWatermarkITCase.java |   4 +-
 .../ReinterpretDataStreamAsKeyedStreamITCase.java  |   6 +-
 .../runtime/BigUserProgramJobSubmitITCase.java     |   2 +-
 .../streaming/runtime/BroadcastStateITCase.java    |   2 +-
 .../streaming/runtime/BufferTimeoutITCase.java     |   4 +-
 .../runtime/ChainedRuntimeContextITCase.java       |   2 +-
 .../test/streaming/runtime/CoGroupJoinITCase.java  |   4 +-
 .../streaming/runtime/GlobalAggregateITCase.java   |   2 +-
 .../test/streaming/runtime/IntervalJoinITCase.java |   4 +-
 .../runtime/RecordAttributesPropagationITCase.java |   2 +-
 .../test/streaming/runtime/SideOutputITCase.java   |   2 +-
 .../flink/test/streaming/runtime/SinkITCase.java   | 371 ----------------
 .../test/streaming/runtime/SinkMetricsITCase.java  |  15 +-
 .../streaming/runtime/SinkV2DeprecatedITCase.java  | 142 ------
 .../flink/test/streaming/runtime/SinkV2ITCase.java |   2 +-
 .../runtime/SinkV2MetricsDeprecatedITCase.java     | 347 ---------------
 .../streaming/runtime/SinkV2MetricsITCase.java     |   3 +-
 .../runtime/StreamTaskSelectiveReadingITCase.java  |   2 +-
 .../streaming/runtime/StreamTaskTimerITCase.java   |   2 +-
 .../test/streaming/runtime/TimestampITCase.java    |   2 +-
 .../runtime/UnifiedSinkMigrationITCase.java        | 395 -----------------
 .../runtime/util/ReceiveCheckNoOpSink.java         |   2 +-
 .../flink/test/util/InfiniteIntegerSource.java     |   2 +-
 .../sessionwindows/SessionWindowITCase.java        |   2 +-
 .../flink/walkthrough/common/sink/AlertSink.java   |   3 +-
 .../common/source/TransactionSource.java           |   9 +-
 .../java/org/apache/flink/yarn/NoDataSource.java   |   2 +-
 .../flink/yarn/testjob/YarnTestArchiveJob.java     |   2 +-
 .../flink/yarn/testjob/YarnTestCacheJob.java       |   2 +-
 .../org/apache/flink/yarn/testjob/YarnTestJob.java |   2 +-
 pom.xml                                            |   4 +
 379 files changed, 995 insertions(+), 7161 deletions(-)
 delete mode 100644 flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/src/impl/FileRecordFormatAdapter.java
 delete mode 100644 flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/src/reader/FileRecordFormat.java
 delete mode 100644 flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/src/reader/TextLineFormat.java
 delete mode 100644 flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/src/impl/FileRecordFormatAdapterTest.java
 rename flink-contrib/flink-connector-wikiedits/src/main/java/org/apache/flink/streaming/connectors/wikiedits/{ => legacy}/WikipediaEditEventIrcStream.java (97%)
 rename flink-contrib/flink-connector-wikiedits/src/main/java/org/apache/flink/streaming/connectors/wikiedits/{ => legacy}/WikipediaEditsSource.java (86%)
 delete mode 100644 flink-core/src/main/java/org/apache/flink/api/connector/sink/Committer.java
 delete mode 100644 flink-core/src/main/java/org/apache/flink/api/connector/sink/GlobalCommitter.java
 delete mode 100644 flink-core/src/main/java/org/apache/flink/api/connector/sink/Sink.java
 delete mode 100644 flink-core/src/main/java/org/apache/flink/api/connector/sink/SinkWriter.java
 delete mode 100644 flink-core/src/main/java/org/apache/flink/api/connector/sink2/StatefulSink.java
 delete mode 100644 flink-core/src/main/java/org/apache/flink/api/connector/sink2/TwoPhaseCommittingSink.java
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/{ => legacy}/OutputFormatSinkFunction.java (95%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/{ => legacy}/PrintSinkFunction.java (96%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/{ => legacy}/RichSinkFunction.java (91%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/{ => legacy}/SinkFunction.java (97%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/sink/{ => legacy}/SocketClientSink.java (97%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/{ => legacy}/ContinuousFileMonitoringFunction.java (97%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/{ => legacy}/FileMonitoringFunction.java (94%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/{ => legacy}/FileReadFunction.java (83%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/{ => legacy}/FromElementsFunction.java (97%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/{ => legacy}/FromIteratorFunction.java (80%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/{ => legacy}/FromSplittableIteratorFunction.java (84%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/{ => legacy}/InputFormatSourceFunction.java (95%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/{ => legacy}/ParallelSourceFunction.java (85%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/{ => legacy}/RichParallelSourceFunction.java (82%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/{ => legacy}/RichSourceFunction.java (86%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/{ => legacy}/SocketTextStreamFunction.java (94%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/{ => legacy}/SourceFunction.java (98%)
 rename flink-runtime/src/main/java/org/apache/flink/streaming/api/functions/source/{ => legacy}/StatefulSequenceSource.java (93%)
 delete mode 100644 flink-runtime/src/main/java/org/apache/flink/streaming/api/transformations/SinkV1Adapter.java
 delete mode 100644 flink-runtime/src/test/java/org/apache/flink/streaming/api/transformations/SinkV1AdapterTest.java
 delete mode 100644 flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPostCommitTopology.java
 delete mode 100644 flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPreCommitTopology.java
 delete mode 100644 flink-streaming-java/src/main/java/org/apache/flink/streaming/api/connector/sink2/WithPreWriteTopology.java
 rename flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/filesystem/{ => legacy}/StreamingFileSink.java (94%)
 rename flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/{ => legacy}/DiscardingSink.java (92%)
 rename flink-streaming-java/src/main/java/org/apache/flink/streaming/api/functions/sink/{ => legacy}/TwoPhaseCommitSinkFunction.java (99%)
 delete mode 100644 flink-streaming-java/src/test/java/org/apache/flink/streaming/api/datastream/DataStreamSinkDeprecatedTest.java
 delete mode 100644 flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/TwoPhaseCommitSinkStateSerializerUpgradeTest.java
 rename flink-streaming-java/src/test/java/org/apache/flink/streaming/api/functions/sink/{ => legacy}/TwoPhaseCommitSinkFunctionTest.java (98%)
 delete mode 100644 flink-streaming-java/src/test/java/org/apache/flink/streaming/api/graph/SinkV1TransformationTranslatorITCase.java
 delete mode 100644 flink-streaming-java/src/test/java/org/apache/flink/streaming/api/graph/SinkV2TransformationTranslatorDeprecatedITCase.java
 delete mode 100644 flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkV2CommitterOperatorDeprecatedTest.java
 delete mode 100644 flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/SinkV2SinkWriterOperatorDeprecatedTest.java
 delete mode 100644 flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/TestSink.java
 delete mode 100644 flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/sink/deprecated/TestSinkV2.java
 delete mode 100644 flink-streaming-java/src/test/java/org/apache/flink/streaming/util/TestExpandingSinkDeprecated.java
 rename flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/connector/sink/{ => legacy}/SinkFunctionProvider.java (82%)
 delete mode 100644 flink-table/flink-table-common/src/main/java/org/apache/flink/table/legacy/connector/sink/SinkProvider.java
 delete mode 100644 flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/functions/HashcodeDeprecatedITCase.java
 delete mode 100644 flink-test-utils-parent/flink-connector-test-utils/src/main/java/org/apache/flink/connector/testframe/external/sink/DataStreamSinkV1ExternalContext.java
 delete mode 100644 flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SinkITCase.java
 delete mode 100644 flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SinkV2DeprecatedITCase.java
 delete mode 100644 flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/SinkV2MetricsDeprecatedITCase.java
 delete mode 100644 flink-tests/src/test/java/org/apache/flink/test/streaming/runtime/UnifiedSinkMigrationITCase.java