From e10c8691add2cfedfe859a5e51115a08212d7cf0 Mon Sep 17 00:00:00 2001 From: Hang Ruan Date: Wed, 6 Mar 2024 16:02:22 +0800 Subject: [PATCH] [FLINK-34584][cdc][build] Rename package from com.ververica to org.apache.flink This closes #3089. --- README.md | 4 +- docs/content/connectors/db2-cdc.md | 2 +- docs/content/connectors/mongodb-cdc(ZH).md | 8 +- docs/content/connectors/mongodb-cdc.md | 8 +- docs/content/connectors/mysql-cdc(ZH).md | 4 +- docs/content/connectors/mysql-cdc.md | 4 +- docs/content/connectors/oceanbase-cdc(ZH).md | 8 +- docs/content/connectors/oceanbase-cdc.md | 8 +- docs/content/connectors/oracle-cdc.md | 12 +- docs/content/connectors/postgres-cdc.md | 12 +- docs/content/connectors/sqlserver-cdc.md | 12 +- docs/content/connectors/tidb-cdc.md | 8 +- docs/content/connectors/vitess-cdc.md | 4 +- docs/content/overview/cdc-connectors.md | 4 +- .../datastream-api-package-guidance.md | 16 +- .../datastream-api-package-guidance-zh.md | 16 +- .../apache/flink}/cdc/cli/CliExecutor.java | 20 +- .../apache/flink}/cdc/cli/CliFrontend.java | 13 +- .../flink}/cdc/cli/CliFrontendOptions.java | 2 +- .../cli/parser/PipelineDefinitionParser.java | 6 +- .../parser/YamlPipelineDefinitionParser.java | 16 +- .../cdc/cli/utils/ConfigurationUtils.java | 6 +- .../cdc/cli/utils/FlinkEnvironmentUtils.java | 6 +- .../flink}/cdc/cli/CliFrontendTest.java | 9 +- .../YamlPipelineDefinitionParserTest.java | 17 +- .../cdc/common/annotation/Experimental.java | 2 +- .../cdc/common/annotation/Internal.java | 2 +- .../flink}/cdc/common/annotation/Public.java | 2 +- .../cdc/common/annotation/PublicEvolving.java | 2 +- .../common/annotation/VisibleForTesting.java | 2 +- .../common/configuration/ConfigOption.java | 13 +- .../common/configuration/ConfigOptions.java | 11 +- .../common/configuration/Configuration.java | 10 +- .../configuration/ConfigurationUtils.java | 19 +- .../cdc/common/configuration/FallbackKey.java | 2 +- .../StructuredOptionsSplitter.java | 9 +- .../description/BlockElement.java | 4 +- .../description/Description.java | 10 +- .../description/DescriptionElement.java | 4 +- .../configuration/description/Formatter.java | 4 +- .../description/HtmlFormatter.java | 2 +- .../description/InlineElement.java | 4 +- .../description/LineBreakElement.java | 4 +- .../description/LinkElement.java | 4 +- .../description/ListElement.java | 4 +- .../description/TextElement.java | 6 +- .../flink}/cdc/common/data/ArrayData.java | 14 +- .../flink}/cdc/common/data/DecimalData.java | 8 +- .../cdc/common/data/GenericArrayData.java | 7 +- .../cdc/common/data/GenericMapData.java | 6 +- .../common/data/LocalZonedTimestampData.java | 8 +- .../flink}/cdc/common/data/MapData.java | 6 +- .../flink}/cdc/common/data/RecordData.java | 12 +- .../flink}/cdc/common/data/StringData.java | 8 +- .../flink}/cdc/common/data/TimestampData.java | 8 +- .../cdc/common/data/ZonedTimestampData.java | 8 +- .../cdc/common/data/binary/BinaryFormat.java | 5 +- .../common/data/binary/BinaryRecordData.java | 42 ++-- .../cdc/common/data/binary/BinarySection.java | 7 +- .../data/binary/BinarySegmentUtils.java | 21 +- .../common/data/binary/BinaryStringData.java | 18 +- .../common/data/binary/LazyBinaryFormat.java | 5 +- .../common/data/binary/MurmurHashUtils.java | 5 +- .../common/data/binary/NullAwareGetters.java | 4 +- .../cdc/common/event/AddColumnEvent.java | 6 +- .../common/event/AlterColumnTypeEvent.java | 4 +- .../flink}/cdc/common/event/ChangeEvent.java | 4 +- .../cdc/common/event/CreateTableEvent.java | 8 +- .../cdc/common/event/DataChangeEvent.java | 6 +- .../cdc/common/event/DropColumnEvent.java | 4 +- .../apache/flink}/cdc/common/event/Event.java | 4 +- .../cdc/common/event/EventDeserializer.java | 4 +- .../flink}/cdc/common/event/FlushEvent.java | 2 +- .../cdc/common/event/OperationType.java | 4 +- .../cdc/common/event/RenameColumnEvent.java | 2 +- .../cdc/common/event/SchemaChangeEvent.java | 4 +- .../flink}/cdc/common/event/TableId.java | 4 +- .../cdc/common/factories/DataSinkFactory.java | 6 +- .../common/factories/DataSourceFactory.java | 6 +- .../flink}/cdc/common/factories/Factory.java | 12 +- .../cdc/common/factories/FactoryHelper.java | 6 +- .../cdc/common/pipeline/PipelineOptions.java | 14 +- .../common/pipeline/SchemaChangeBehavior.java | 4 +- .../flink}/cdc/common/schema/Column.java | 10 +- .../cdc/common/schema/MetadataColumn.java | 6 +- .../cdc/common/schema/PhysicalColumn.java | 6 +- .../flink}/cdc/common/schema/Schema.java | 18 +- .../flink}/cdc/common/schema/Selectors.java | 6 +- .../flink}/cdc/common/schema/TableFilter.java | 4 +- .../flink}/cdc/common/sink/DataSink.java | 4 +- .../cdc/common/sink/EventSinkProvider.java | 5 +- .../sink/FlinkSinkFunctionProvider.java | 7 +- .../cdc/common/sink/FlinkSinkProvider.java | 7 +- .../cdc/common/sink/MetadataApplier.java | 6 +- .../flink}/cdc/common/source/DataSource.java | 4 +- .../common/source/EventSourceProvider.java | 5 +- .../source/FlinkSourceFunctionProvider.java | 7 +- .../common/source/FlinkSourceProvider.java | 7 +- .../cdc/common/source/MetadataAccessor.java | 8 +- .../cdc/common/text/ParsingException.java | 2 +- .../flink}/cdc/common/text/Position.java | 2 +- .../flink}/cdc/common/text/TokenStream.java | 2 +- .../flink}/cdc/common/types/ArrayType.java | 6 +- .../flink}/cdc/common/types/BigIntType.java | 4 +- .../flink}/cdc/common/types/BinaryType.java | 4 +- .../flink}/cdc/common/types/BooleanType.java | 4 +- .../flink}/cdc/common/types/CharType.java | 4 +- .../flink}/cdc/common/types/DataField.java | 10 +- .../flink}/cdc/common/types/DataType.java | 4 +- .../cdc/common/types/DataTypeChecks.java | 2 +- .../common/types/DataTypeDefaultVisitor.java | 4 +- .../cdc/common/types/DataTypeFamily.java | 4 +- .../flink}/cdc/common/types/DataTypeRoot.java | 4 +- .../cdc/common/types/DataTypeVisitor.java | 4 +- .../flink}/cdc/common/types/DataTypes.java | 4 +- .../flink}/cdc/common/types/DateType.java | 4 +- .../flink}/cdc/common/types/DecimalType.java | 4 +- .../flink}/cdc/common/types/DoubleType.java | 4 +- .../flink}/cdc/common/types/FloatType.java | 4 +- .../flink}/cdc/common/types/IntType.java | 4 +- .../common/types/LocalZonedTimestampType.java | 4 +- .../flink}/cdc/common/types/MapType.java | 6 +- .../flink}/cdc/common/types/RowType.java | 8 +- .../flink}/cdc/common/types/SmallIntType.java | 4 +- .../flink}/cdc/common/types/TimeType.java | 4 +- .../cdc/common/types/TimestampType.java | 4 +- .../flink}/cdc/common/types/TinyIntType.java | 4 +- .../cdc/common/types/VarBinaryType.java | 4 +- .../flink}/cdc/common/types/VarCharType.java | 4 +- .../cdc/common/types/ZonedTimestampType.java | 4 +- .../cdc/common/types/utils/DataTypeUtils.java | 23 +- .../utils/runtime/DataInputViewStream.java | 2 +- .../utils/runtime/DataOutputViewStream.java | 2 +- .../cdc/common/utils/EncodingUtils.java | 2 +- .../cdc/common/utils/InstantiationUtil.java | 2 +- .../cdc/common/utils/Preconditions.java | 2 +- .../flink}/cdc/common/utils/Predicates.java | 6 +- .../flink}/cdc/common/utils/SchemaUtils.java | 20 +- .../cdc/common/utils/StringUtf8Utils.java | 4 +- .../flink}/cdc/common/utils/StringUtils.java | 2 +- .../flink}/cdc/common/utils/TimeUtils.java | 10 +- .../cdc/common/utils/TypeCheckUtils.java | 30 +-- .../cdc/common/schema/SelectorsTest.java | 7 +- .../assertions/AddColumnEventAssert.java | 5 +- .../AlterColumnTypeEventAssert.java | 7 +- .../assertions/ChangeEventAssert.java | 7 +- .../assertions/CreateTableEventAssert.java | 6 +- .../assertions/DataChangeEventAssert.java | 6 +- .../assertions/DropColumnEventAssert.java | 5 +- .../testutils/assertions/EventAssert.java | 9 +- .../testutils/assertions/EventAssertions.java | 21 +- .../assertions/RecordDataAssert.java | 7 +- .../RecordDataWithSchemaAssert.java | 9 +- .../assertions/RenameColumnEventAssert.java | 5 +- .../assertions/SchemaChangeEventAssert.java | 14 +- .../cdc/common/utils/SchemaUtilsTest.java | 23 +- .../flink}/cdc/composer/PipelineComposer.java | 4 +- .../cdc/composer/PipelineExecution.java | 2 +- .../cdc/composer/definition/PipelineDef.java | 17 +- .../cdc/composer/definition/RouteDef.java | 2 +- .../cdc/composer/definition/SinkDef.java | 4 +- .../cdc/composer/definition/SourceDef.java | 4 +- .../cdc/composer/definition/TransformDef.java | 2 +- .../composer/flink/FlinkEnvironmentUtils.java | 5 +- .../composer/flink/FlinkPipelineComposer.java | 43 ++-- .../flink/FlinkPipelineExecution.java | 5 +- .../coordination/OperatorIDGenerator.java | 5 +- .../flink/translator/DataSinkTranslator.java | 17 +- .../translator/DataSourceTranslator.java | 31 ++- .../translator/PartitioningTranslator.java | 19 +- .../flink/translator/RouteTranslator.java | 13 +- .../translator/SchemaOperatorTranslator.java | 23 +- .../composer/utils/FactoryDiscoveryUtils.java | 7 +- .../flink/FlinkPipelineComposerITCase.java | 32 +-- .../flink/FlinkPipelineComposerTest.java | 17 +- .../translator/DataSourceTranslatorTest.java | 17 +- .../utils/FactoryDiscoveryUtilsTest.java | 9 +- .../utils/factory/DataSinkFactory1.java | 12 +- .../utils/factory/DataSinkFactory2.java | 12 +- .../utils/factory/DataSourceFactory1.java | 12 +- .../utils/factory/DataSourceFactory2.java | 12 +- .../composer/utils/factory/TestOptions.java | 10 +- ...apache.flink.cdc.common.factories.Factory} | 8 +- .../doris/factory/DorisDataSinkFactory.java | 61 ++--- .../connectors/doris/sink/DorisDataSink.java | 13 +- .../doris/sink/DorisDataSinkOptions.java | 9 +- .../doris/sink/DorisEventSerializer.java | 25 +- .../doris/sink/DorisMetadataApplier.java | 38 +-- .../doris/sink/DorisRowConverter.java | 36 ++- ...apache.flink.cdc.common.factories.Factory} | 2 +- .../doris/sink/DorisRowConverterTest.java | 21 +- .../mysql/factory/MySqlDataSourceFactory.java | 94 ++++---- .../mysql/source/MySqlDataSource.java | 24 +- .../mysql/source/MySqlDataSourceOptions.java | 10 +- .../mysql/source/MySqlEventDeserializer.java | 19 +- .../mysql/source/MySqlMetadataAccessor.java | 15 +- .../source/MySqlSchemaDataTypeInference.java | 11 +- .../CustomAlterTableParserListener.java | 27 ++- .../CustomColumnDefinitionParserListener.java | 2 +- .../parser/CustomMySqlAntlrDdlParser.java | 5 +- .../CustomMySqlAntlrDdlParserListener.java | 5 +- .../reader/MySqlPipelineRecordEmitter.java | 36 +-- .../mysql/utils/MySqlSchemaUtils.java | 17 +- .../mysql/utils/MySqlTypeUtils.java | 7 +- ...apache.flink.cdc.common.factories.Factory} | 2 +- .../source/MySqlDataSourceFactoryTest.java | 25 +- .../mysql/source/MySqlFullTypesITCase.java | 74 +++--- .../source/MySqlMetadataAccessorITCase.java | 38 +-- .../mysql/source/MySqlPipelineITCase.java | 58 ++--- .../mysql/testutils/MySqSourceTestUtils.java | 2 +- .../mysql/testutils/RecordDataTestUtils.java | 8 +- .../sink/EventRecordSerializationSchema.java | 27 +-- .../starrocks/sink/SchemaChangeConfig.java | 14 +- .../starrocks/sink/StarRocksDataSink.java | 13 +- .../sink/StarRocksDataSinkFactory.java | 92 ++++--- .../sink/StarRocksDataSinkOptions.java | 7 +- .../sink/StarRocksMetadataApplier.java | 25 +- .../starrocks/sink/StarRocksUtils.java | 45 ++-- .../starrocks/sink/TableCreateConfig.java | 19 +- ...apache.flink.cdc.common.factories.Factory} | 2 +- .../sink/CdcDataTypeTransformerTest.java | 13 +- .../EventRecordSerializationSchemaTest.java | 53 +++-- .../starrocks/sink/MockStarRocksCatalog.java | 2 +- .../sink/StarRocksDataSinkFactoryTest.java | 17 +- .../sink/StarRocksMetadataApplierTest.java | 34 ++- .../cdc/connectors/values/ValuesDatabase.java | 39 +-- .../values/factory/ValuesDataFactory.java | 26 +- .../values/sink/ValuesDataSink.java | 33 ++- .../values/sink/ValuesDataSinkHelper.java | 10 +- .../values/sink/ValuesDataSinkOptions.java | 6 +- .../values/source/ValuesDataSource.java | 19 +- .../values/source/ValuesDataSourceHelper.java | 32 +-- .../source/ValuesDataSourceOptions.java | 12 +- ...apache.flink.cdc.common.factories.Factory} | 2 +- .../connectors/values/ValuesDatabaseTest.java | 39 +-- .../values/sink/ValuesDataSinkHelperTest.java | 25 +- .../values/source/ValuesDataSourceITCase.java | 40 ++-- .../base/config/BaseSourceConfig.java | 7 +- .../base/config/JdbcSourceConfig.java | 7 +- .../base/config/JdbcSourceConfigFactory.java | 12 +- .../connectors/base/config/SourceConfig.java | 6 +- .../base/dialect/DataSourceDialect.java | 15 +- .../base/dialect/JdbcDataSourceDialect.java | 17 +- .../base/options/JdbcSourceOptions.java | 5 +- .../base/options/SourceOptions.java | 7 +- .../connectors/base/options/StartupMode.java | 2 +- .../base/options/StartupOptions.java | 2 +- .../relational/JdbcSourceEventDispatcher.java | 13 +- .../connection/ConnectionPoolId.java | 2 +- .../connection/ConnectionPools.java | 6 +- .../connection/JdbcConnectionFactory.java | 4 +- .../connection/JdbcConnectionPoolFactory.java | 5 +- .../connection/JdbcConnectionPools.java | 6 +- .../handler/SchemaChangeEventHandler.java | 5 +- .../source}/EmbeddedFlinkDatabaseHistory.java | 5 +- .../base/source/IncrementalSource.java | 50 ++-- .../base/source/assigner/AssignerStatus.java | 2 +- .../source/assigner/HybridSplitAssigner.java | 31 +-- .../assigner/SnapshotSplitAssigner.java | 34 +-- .../base/source/assigner/SplitAssigner.java | 13 +- .../source/assigner/StreamSplitAssigner.java | 25 +- .../source/assigner/splitter/ChunkRange.java | 2 +- .../assigner/splitter/ChunkSplitter.java | 7 +- .../splitter/JdbcSourceChunkSplitter.java | 6 +- .../state/HybridPendingSplitsState.java | 2 +- .../assigner/state/PendingSplitsState.java | 2 +- .../state/PendingSplitsStateSerializer.java | 22 +- .../state/SnapshotPendingSplitsState.java | 13 +- .../state/StreamPendingSplitsState.java | 2 +- .../IncrementalSourceEnumerator.java | 42 ++-- .../source/jdbc/JdbcIncrementalSource.java | 14 +- .../FinishedSnapshotSplitsAckEvent.java | 7 +- .../FinishedSnapshotSplitsReportEvent.java | 9 +- .../FinishedSnapshotSplitsRequestEvent.java | 7 +- .../LatestFinishedSplitsNumberEvent.java | 10 +- ...atestFinishedSplitsNumberRequestEvent.java | 10 +- .../meta/events/StreamSplitAssignedEvent.java | 11 +- .../meta/events/StreamSplitMetaEvent.java | 9 +- .../events/StreamSplitMetaRequestEvent.java | 7 +- .../events/StreamSplitUpdateAckEvent.java | 10 +- .../events/StreamSplitUpdateRequestEvent.java | 11 +- .../base/source/meta/offset/Offset.java | 5 +- .../offset/OffsetDeserializerSerializer.java | 8 +- .../source/meta/offset/OffsetFactory.java | 2 +- .../source/meta/split/ChangeEventRecords.java | 2 +- .../meta/split/FinishedSnapshotSplitInfo.java | 10 +- .../meta/split/SchemalessSnapshotSplit.java | 4 +- .../base/source/meta/split/SnapshotSplit.java | 4 +- .../source/meta/split/SnapshotSplitState.java | 4 +- .../base/source/meta/split/SourceRecords.java | 2 +- .../source/meta/split/SourceSplitBase.java | 4 +- .../meta/split/SourceSplitSerializer.java | 12 +- .../source/meta/split/SourceSplitState.java | 2 +- .../base/source/meta/split/StreamSplit.java | 5 +- .../source/meta/split/StreamSplitState.java | 5 +- .../meta/wartermark/WatermarkEvent.java | 5 +- .../source/meta/wartermark/WatermarkKind.java | 2 +- .../source/metrics/SourceReaderMetrics.java | 5 +- .../reader/IncrementalSourceReader.java | 56 ++--- .../IncrementalSourceReaderContext.java | 2 +- .../IncrementalSourceReaderWithCommit.java | 16 +- .../IncrementalSourceRecordEmitter.java | 32 +-- .../reader/IncrementalSourceSplitReader.java | 38 +-- .../external/AbstractScanFetchTask.java | 23 +- .../source/reader/external/FetchTask.java | 13 +- .../base/source/reader/external/Fetcher.java | 8 +- .../IncrementalSourceScanFetcher.java | 16 +- .../IncrementalSourceStreamFetcher.java | 12 +- .../external/JdbcSourceFetchTaskContext.java | 12 +- .../source/utils/hooks/SnapshotPhaseHook.java | 5 +- .../utils/hooks/SnapshotPhaseHooks.java | 2 +- .../base/utils/EnvironmentUtils.java | 2 +- .../connectors/base/utils/ObjectUtils.java | 2 +- .../connectors/base}/utils/OptionUtils.java | 2 +- .../base/utils/SerializerUtils.java | 2 +- .../base/utils/SourceRecordUtils.java | 4 +- .../base/utils/VersionComparable.java | 2 +- .../base/JdbcConnectionPoolTest.java | 16 +- .../MySqlChangeEventSourceExampleTest.java | 18 +- .../EmbeddedFlinkDatabaseHistory.java | 5 +- .../base/experimental/MySqlChunkSplitter.java | 22 +- .../base/experimental/MySqlDialect.java | 51 ++-- .../base/experimental/MySqlSourceBuilder.java | 16 +- .../MysqlPooledDataSourceFactory.java | 8 +- .../config/MySqlSourceConfig.java | 7 +- .../config/MySqlSourceConfigFactory.java | 9 +- .../experimental/config/ServerIdRange.java | 4 +- .../fetch/MySqlScanFetchTask.java | 22 +- .../fetch/MySqlSourceFetchTaskContext.java | 31 ++- .../fetch/MySqlStreamFetchTask.java | 19 +- .../MySqlSchemaChangeEventHandler.java | 11 +- .../experimental/offset/BinlogOffset.java | 5 +- .../offset/BinlogOffsetFactory.java | 7 +- .../utils/MySqlConnectionUtils.java | 4 +- .../base/experimental/utils/MySqlSchema.java | 6 +- .../experimental/utils/MySqlTypeUtils.java | 2 +- .../base/experimental/utils/MySqlUtils.java | 6 +- .../utils/TableDiscoveryUtils.java | 8 +- .../PendingSplitsStateSerializerTest.java | 20 +- .../HybridPendingSplitsStateVersion5.java | 4 +- .../PendingSplitsStateSerializerVersion5.java | 18 +- .../SnapshotPendingSplitsStateVersion5.java | 13 +- .../meta/split/SourceSplitSerializerTest.java | 10 +- .../LegacySourceSplitSerializierVersion4.java | 16 +- .../split/version4/StreamSplitVersion4.java | 9 +- .../base/testutils/MySqlContainer.java | 2 +- .../base/testutils/MySqlVersion.java | 2 +- .../base/testutils/UniqueDatabase.java | 2 +- .../flink}/cdc/connectors/db2/Db2Source.java | 11 +- .../db2/table/Db2ReadableMetaData.java | 4 +- .../connectors/db2/table/Db2TableSource.java | 13 +- .../db2/table/Db2TableSourceFactory.java | 9 +- .../cdc/connectors/db2/table/StartupMode.java | 2 +- .../connectors/db2/table/StartupOptions.java | 2 +- .../connectors/db2}/utils/OptionUtils.java | 2 +- .../org.apache.flink.table.factories.Factory | 2 +- .../cdc/connectors/db2/Db2SourceTest.java | 16 +- .../cdc/connectors/db2/Db2TestBase.java | 2 +- .../db2/table/Db2ConnectorITCase.java | 4 +- .../db2/table/Db2TableSourceFactoryTest.java | 8 +- .../embedded/EmbeddedEngineChangeEvent.java | 3 +- .../DebeziumDeserializationSchema.java | 4 +- .../cdc/debezium/DebeziumSourceFunction.java | 30 +-- .../JsonDebeziumDeserializationSchema.java | 2 +- .../StringDebeziumDeserializationSchema.java | 2 +- .../apache/flink}/cdc/debezium/Validator.java | 2 +- .../DebeziumEventDeserializationSchema.java | 40 ++-- .../DebeziumSchemaDataTypeInference.java | 13 +- .../event/SchemaDataTypeInference.java | 7 +- .../event/SourceRecordEventDeserializer.java | 17 +- .../FlinkJsonTableChangeSerializer.java | 2 +- .../internal/DebeziumChangeConsumer.java | 5 +- .../internal/DebeziumChangeFetcher.java | 6 +- .../cdc/debezium/internal/DebeziumOffset.java | 4 +- .../internal/DebeziumOffsetSerializer.java | 6 +- .../internal/FlinkDatabaseHistory.java | 8 +- .../internal/FlinkDatabaseSchemaHistory.java | 11 +- .../internal/FlinkOffsetBackingStore.java | 5 +- .../cdc/debezium/internal/Handover.java | 6 +- .../cdc/debezium/internal/SchemaRecord.java | 2 +- .../table/AppendMetadataCollector.java | 4 +- .../debezium/table/DebeziumChangelogMode.java | 2 +- .../cdc/debezium/table/DebeziumOptions.java | 2 +- .../DeserializationRuntimeConverter.java | 2 +- ...eserializationRuntimeConverterFactory.java | 2 +- .../cdc/debezium/table/MetadataConverter.java | 5 +- .../RowDataDebeziumDeserializeSchema.java | 6 +- .../table/RowDataMetadataConverter.java | 5 +- .../debezium/utils/DatabaseHistoryUtil.java | 7 +- .../cdc/debezium/utils/JdbcUrlUtils.java | 2 +- .../debezium/utils/ResolvedSchemaUtils.java | 5 +- .../debezium/utils/TemporalConversions.java | 2 +- .../cdc/connectors/mongodb/MongoDBSource.java | 45 ++-- .../MongoDBConnectorSourceConnector.java | 2 +- .../internal/MongoDBConnectorSourceTask.java | 32 +-- .../mongodb/internal/MongoDBEnvelope.java | 2 +- .../mongodb/source/MongoDBSource.java | 31 ++- .../mongodb/source/MongoDBSourceBuilder.java | 17 +- .../splitters/MongoDBChunkSplitter.java | 11 +- .../splitters/SampleBucketSplitStrategy.java | 34 ++- .../splitters/ShardedSplitStrategy.java | 24 +- .../splitters/SingleSplitStrategy.java | 20 +- .../assigners/splitters/SplitContext.java | 11 +- .../assigners/splitters/SplitStrategy.java | 6 +- .../splitters/SplitVectorSplitStrategy.java | 31 ++- .../source/config/MongoDBSourceConfig.java | 10 +- .../config/MongoDBSourceConfigFactory.java | 41 ++-- .../source/config/MongoDBSourceOptions.java | 10 +- .../source/connection/MongoClientPool.java | 5 +- .../source/dialect/MongoDBDialect.java | 47 ++-- .../source/offset/ChangeStreamDescriptor.java | 2 +- .../source/offset/ChangeStreamOffset.java | 9 +- .../offset/ChangeStreamOffsetFactory.java | 15 +- .../source/reader/MongoDBRecordEmitter.java | 34 +-- .../reader/fetch/MongoDBFetchTaskContext.java | 29 ++- .../reader/fetch/MongoDBScanFetchTask.java | 63 +++-- .../reader/fetch/MongoDBStreamFetchTask.java | 95 ++++---- .../mongodb/source/utils/BsonUtils.java | 2 +- .../mongodb/source/utils/ChunkUtils.java | 10 +- .../utils/CollectionDiscoveryUtils.java | 2 +- .../source/utils/MongoRecordUtils.java | 23 +- .../mongodb/source/utils/MongoUtils.java | 54 +++-- .../source/utils/ResumeTokenUtils.java | 4 +- ...MongoDBConnectorDeserializationSchema.java | 12 +- ...torFullChangelogDeserializationSchema.java | 8 +- .../table/MongoDBReadableMetadata.java | 6 +- .../mongodb/table/MongoDBTableSource.java | 18 +- .../table/MongoDBTableSourceFactory.java | 55 +++-- .../org.apache.flink.table.factories.Factory | 2 +- .../mongodb/LegacyMongoDBContainer.java | 2 +- .../LegacyMongoDBSourceExampleTest.java | 10 +- .../mongodb/LegacyMongoDBSourceTest.java | 24 +- .../mongodb/LegacyMongoDBSourceTestBase.java | 6 +- .../mongodb/LegacyMongoDBTestBase.java | 6 +- .../source/MongoDBFullChangelogITCase.java | 30 +-- .../MongoDBParallelSourceExampleTest.java | 8 +- .../source/MongoDBParallelSourceITCase.java | 30 +-- .../mongodb/source/MongoDBSourceTestBase.java | 4 +- .../mongodb/source/NewlyAddedTableITCase.java | 61 ++--- .../MongoDBSnapshotSplitReaderTest.java | 44 ++-- .../reader/MongoDBStreamSplitReaderTest.java | 50 ++-- .../mongodb/source/utils/BsonUtilsTest.java | 2 +- .../source/utils/ResumeTokenUtilsTest.java | 2 +- .../mongodb/table/MongoDBConnectorITCase.java | 12 +- .../table/MongoDBRegexFilterITCase.java | 12 +- .../table/MongoDBTableFactoryTest.java | 40 ++-- .../mongodb/table/MongoDBTimeZoneITCase.java | 8 +- .../mongodb/utils/MongoDBAssertUtils.java | 2 +- .../mongodb/utils/MongoDBContainer.java | 2 +- .../mongodb/utils/MongoDBTestUtils.java | 2 +- .../mongodb/utils/RecordsFormatter.java | 8 +- .../connectors/mongodb/utils/TestTable.java | 8 +- .../cdc/connectors/mysql/MySqlSource.java | 21 +- .../cdc/connectors/mysql/MySqlValidator.java | 14 +- .../mysql/SeekBinlogToTimestampFilter.java | 4 +- .../mysql/debezium/DebeziumUtils.java | 13 +- .../EmbeddedFlinkDatabaseHistory.java | 5 +- .../dispatcher/EventDispatcherImpl.java | 15 +- .../dispatcher/SignalEventDispatcher.java | 7 +- .../debezium/reader/BinlogSplitReader.java | 48 ++-- .../mysql/debezium/reader/DebeziumReader.java | 2 +- .../debezium/reader/SnapshotSplitReader.java | 45 ++-- .../StoppableChangeEventSourceContext.java | 2 +- .../task/MySqlBinlogSplitReadTask.java | 20 +- .../task/MySqlSnapshotSplitReadTask.java | 28 +-- .../task/context/MySqlErrorHandler.java | 7 +- .../task/context/MySqlTaskContextImpl.java | 2 +- .../task/context/StatefulTaskContext.java | 21 +- .../exception/SchemaOutOfSyncException.java | 2 +- .../mysql/schema/MySqlFieldDefinition.java | 12 +- .../connectors/mysql/schema/MySqlSchema.java | 18 +- .../mysql/schema/MySqlTableDefinition.java | 8 +- .../mysql/schema/MySqlTypeUtils.java | 2 +- .../connectors/mysql/source/MySqlSource.java | 58 +++-- .../mysql/source/MySqlSourceBuilder.java | 11 +- .../source/assigners/AssignerStatus.java | 2 +- .../mysql/source/assigners/ChunkRange.java | 2 +- .../mysql/source/assigners/ChunkSplitter.java | 6 +- .../assigners/MySqlBinlogSplitAssigner.java | 19 +- .../source/assigners/MySqlChunkSplitter.java | 45 ++-- .../assigners/MySqlHybridSplitAssigner.java | 33 ++- .../assigners/MySqlSnapshotSplitAssigner.java | 72 +++--- .../source/assigners/MySqlSplitAssigner.java | 13 +- .../state/BinlogPendingSplitsState.java | 2 +- .../assigners/state/ChunkSplitterState.java | 5 +- .../state/HybridPendingSplitsState.java | 2 +- .../assigners/state/PendingSplitsState.java | 2 +- .../state/PendingSplitsStateSerializer.java | 40 ++-- .../state/SnapshotPendingSplitsState.java | 17 +- .../source/config/MySqlSourceConfig.java | 6 +- .../config/MySqlSourceConfigFactory.java | 40 ++-- .../source/config/MySqlSourceOptions.java | 7 +- .../mysql/source/config/ServerIdRange.java | 2 +- .../source/connection/ConnectionPoolId.java | 2 +- .../source/connection/ConnectionPools.java | 7 +- .../connection/JdbcConnectionFactory.java | 4 +- .../connection/JdbcConnectionPools.java | 9 +- .../connection/PooledDataSourceFactory.java | 5 +- .../enumerator/MySqlSourceEnumerator.java | 42 ++-- .../events/BinlogSplitAssignedEvent.java | 9 +- .../source/events/BinlogSplitMetaEvent.java | 9 +- .../events/BinlogSplitMetaRequestEvent.java | 7 +- .../events/BinlogSplitUpdateAckEvent.java | 7 +- .../events/BinlogSplitUpdateRequestEvent.java | 7 +- .../FinishedSnapshotSplitsAckEvent.java | 7 +- .../FinishedSnapshotSplitsReportEvent.java | 9 +- .../FinishedSnapshotSplitsRequestEvent.java | 7 +- .../LatestFinishedSplitsNumberEvent.java | 7 +- ...atestFinishedSplitsNumberRequestEvent.java | 7 +- .../metrics/MySqlSourceReaderMetrics.java | 5 +- .../mysql/source/offset/BinlogOffset.java | 32 +-- .../source/offset/BinlogOffsetBuilder.java | 6 +- .../mysql/source/offset/BinlogOffsetKind.java | 2 +- .../source/offset/BinlogOffsetSerializer.java | 6 +- .../source/offset/BinlogOffsetUtils.java | 7 +- .../source/reader/MySqlRecordEmitter.java | 48 ++-- .../source/reader/MySqlSourceReader.java | 69 +++--- .../reader/MySqlSourceReaderContext.java | 2 +- .../mysql/source/reader/MySqlSplitReader.java | 41 ++-- .../split/FinishedSnapshotSplitInfo.java | 12 +- .../mysql/source/split/MySqlBinlogSplit.java | 5 +- .../source/split/MySqlBinlogSplitState.java | 5 +- .../mysql/source/split/MySqlRecords.java | 2 +- .../split/MySqlSchemalessSnapshotSplit.java | 4 +- .../source/split/MySqlSnapshotSplit.java | 4 +- .../source/split/MySqlSnapshotSplitState.java | 4 +- .../mysql/source/split/MySqlSplit.java | 2 +- .../source/split/MySqlSplitSerializer.java | 16 +- .../mysql/source/split/MySqlSplitState.java | 2 +- .../mysql/source/split/SourceRecords.java | 2 +- .../mysql/source/utils/ChunkUtils.java | 6 +- .../mysql/source/utils/EnvironmentUtils.java | 2 +- .../mysql/source/utils/ObjectUtils.java | 2 +- .../mysql/source/utils/RecordUtils.java | 24 +- .../mysql/source/utils/SerializerUtils.java | 8 +- .../mysql/source/utils/StatementUtils.java | 4 +- .../source/utils/TableDiscoveryUtils.java | 12 +- .../mysql/source/utils/VersionComparable.java | 2 +- .../source/utils/hooks/SnapshotPhaseHook.java | 2 +- .../utils/hooks/SnapshotPhaseHooks.java | 2 +- .../MySqlDeserializationConverterFactory.java | 6 +- .../mysql/table/MySqlReadableMetadata.java | 6 +- .../mysql/table/MySqlTableSource.java | 17 +- .../mysql/table/MySqlTableSourceFactory.java | 225 ++++++++---------- .../connectors/mysql/table/StartupMode.java | 2 +- .../mysql/table/StartupOptions.java | 4 +- .../connectors/mysql/utils/OptionUtils.java | 2 +- .../org.apache.flink.table.factories.Factory | 2 +- .../mysql/LegacyMySqlSourceExampleTest.java | 6 +- .../mysql/LegacyMySqlSourceITCase.java | 6 +- .../mysql/LegacyMySqlSourceTest.java | 34 +-- .../connectors/mysql/LegacyMySqlTestBase.java | 4 +- .../cdc/connectors/mysql/MySqlTestUtils.java | 10 +- .../connectors/mysql/MySqlValidatorTest.java | 26 +- .../mysql/debezium/DebeziumUtilsTest.java | 11 +- .../reader/BinlogSplitReaderTest.java | 58 ++--- .../reader/SnapshotSplitReaderTest.java | 28 +-- .../mysql/source/MySqlSourceExampleTest.java | 6 +- .../mysql/source/MySqlSourceITCase.java | 24 +- .../mysql/source/MySqlSourceTestBase.java | 6 +- .../mysql/source/NewlyAddedTableITCase.java | 12 +- .../source/SpecificStartingOffsetITCase.java | 16 +- .../MySqlBinlogSplitAssignerTest.java | 20 +- .../assigners/MySqlChunkSplitterTest.java | 4 +- .../MySqlHybridSplitAssignerTest.java | 32 +-- .../MySqlSnapshotSplitAssignerTest.java | 32 +-- .../PendingSplitsStateSerializerTest.java | 15 +- .../source/reader/MySqlRecordEmitterTest.java | 16 +- .../source/reader/MySqlSourceReaderTest.java | 62 ++--- .../split/MySqlSplitSerializerTest.java | 10 +- .../source/split/MySqlSplitStateTest.java | 7 +- .../mysql/source/utils/ObjectUtilsTest.java | 4 +- .../mysql/source/utils/RecordUtilsTest.java | 6 +- .../source/utils/SerializerUtilsTest.java | 8 +- .../mysql/table/MySqlCompatibilityITCase.java | 14 +- .../mysql/table/MySqlConnectorITCase.java | 22 +- .../table/MySqlTableSourceFactoryTest.java | 26 +- .../mysql/table/MySqlTimezoneITCase.java | 12 +- .../table/MysqlConnectorCharsetITCase.java | 6 +- .../mysql/testutils/MySqlContainer.java | 2 +- .../mysql/testutils/MySqlVersion.java | 2 +- .../mysql/testutils/RecordsFormatter.java | 8 +- .../connectors/mysql/testutils/TestTable.java | 6 +- .../mysql/testutils/TestTableSchemas.java | 2 +- .../mysql/testutils/UniqueDatabase.java | 2 +- .../polardbx/PolardbxCharsetITCase.java | 2 +- .../polardbx/PolardbxSourceITCase.java | 6 +- .../polardbx/PolardbxSourceTestBase.java | 2 +- .../connectors/oceanbase/OceanBaseSource.java | 10 +- .../oceanbase/source/OceanBaseConnection.java | 2 +- ...anBaseDeserializationRuntimeConverter.java | 2 +- .../source/OceanBaseRichSourceFunction.java | 6 +- ...RowDataOceanBaseDeserializationSchema.java | 12 +- .../OceanBaseAppendMetadataCollector.java | 5 +- .../table/OceanBaseDeserializationSchema.java | 5 +- .../table/OceanBaseMetadataConverter.java | 4 +- .../table/OceanBaseReadableMetadata.java | 2 +- .../oceanbase/table/OceanBaseRecord.java | 2 +- .../oceanbase/table/OceanBaseTableSource.java | 7 +- .../table/OceanBaseTableSourceFactory.java | 7 +- .../oceanbase/table/StartupMode.java | 2 +- .../oceanbase/utils/OptionUtils.java | 42 ++++ .../org.apache.flink.table.factories.Factory | 2 +- .../oceanbase/OceanBaseTestBase.java | 2 +- .../table/OceanBaseConnectorITCase.java | 4 +- .../table/OceanBaseTableFactoryTest.java | 2 +- .../cdc/connectors/oracle/OracleSource.java | 9 +- .../connectors/oracle/OracleValidator.java | 7 +- .../oracle/source/OracleDialect.java | 38 +-- .../source/OraclePooledDataSourceFactory.java | 9 +- .../oracle/source/OracleSourceBuilder.java | 16 +- .../splitter/OracleChunkSplitter.java | 24 +- .../source/config/OracleSourceConfig.java | 7 +- .../config/OracleSourceConfigFactory.java | 9 +- .../source/config/OracleSourceOptions.java | 7 +- .../OracleSchemaChangeEventHandler.java | 5 +- .../source/meta/offset/RedoLogOffset.java | 5 +- .../meta/offset/RedoLogOffsetFactory.java | 6 +- .../reader/fetch/EventProcessorFactory.java | 17 +- .../reader/fetch/OracleScanFetchTask.java | 17 +- .../fetch/OracleSourceFetchTaskContext.java | 34 +-- .../reader/fetch/OracleStreamFetchTask.java | 13 +- .../StoppableChangeEventSourceContext.java | 2 +- .../source/utils/OracleConnectionUtils.java | 4 +- .../oracle/source/utils/OracleSchema.java | 2 +- .../oracle/source/utils/OracleTypeUtils.java | 2 +- .../oracle/source/utils/OracleUtils.java | 6 +- ...OracleDeserializationConverterFactory.java | 6 +- .../oracle/table/OracleReadableMetaData.java | 4 +- .../oracle/table/OracleTableSource.java | 19 +- .../table/OracleTableSourceFactory.java | 55 +++-- .../connectors/oracle/util/ChunkUtils.java | 4 +- .../oracle/util/OracleJdbcUrlUtils.java | 2 +- .../org.apache.flink.table.factories.Factory | 2 +- .../OracleChangeEventSourceExampleTest.java | 12 +- .../connectors/oracle/OracleSourceTest.java | 18 +- .../oracle/source/OracleSourceITCase.java | 14 +- .../oracle/source/OracleSourceTestBase.java | 2 +- .../oracle/table/OracleConnectorITCase.java | 16 +- .../table/OracleTableSourceFactoryTest.java | 13 +- .../oracle/testutils/RecordsFormatter.java | 8 +- .../oracle/testutils/TestTable.java | 6 +- .../postgres/utils/OptionUtils.java | 42 ---- .../debezium/connector/postgresql/Utils.java | 2 +- .../connectors/postgres/PostgreSQLSource.java | 9 +- .../source/PostgresChunkSplitter.java | 22 +- .../source/PostgresConnectionPoolFactory.java | 9 +- .../postgres/source/PostgresDialect.java | 34 +-- .../source/PostgresSourceBuilder.java | 44 ++-- .../source/config/PostgresSourceConfig.java | 7 +- .../config/PostgresSourceConfigFactory.java | 12 +- .../source/config/PostgresSourceOptions.java | 9 +- .../enumerator/PostgresSourceEnumerator.java | 24 +- .../source/events/OffsetCommitAckEvent.java | 12 +- .../source/events/OffsetCommitEvent.java | 12 +- .../source/fetch/PostgresScanFetchTask.java | 20 +- .../fetch/PostgresSourceFetchTaskContext.java | 32 +-- .../source/fetch/PostgresStreamFetchTask.java | 22 +- .../StoppableChangeEventSourceContext.java | 2 +- .../PostgresSchemaChangeEventHandler.java | 5 +- .../source/offset/PostgresOffset.java | 5 +- .../source/offset/PostgresOffsetFactory.java | 7 +- .../source/offset/PostgresOffsetUtils.java | 5 +- .../source/reader/PostgresSourceReader.java | 26 +- .../postgres/source/utils/ChunkUtils.java | 2 +- .../source/utils/CustomPostgresSchema.java | 4 +- .../source/utils/PostgresQueryUtils.java | 4 +- .../source/utils/PostgresTypeUtils.java | 2 +- .../source/utils/TableDiscoveryUtils.java | 2 +- ...greSQLDeserializationConverterFactory.java | 6 +- .../table/PostgreSQLReadableMetadata.java | 4 +- .../table/PostgreSQLTableFactory.java | 71 +++--- .../postgres/table/PostgreSQLTableSource.java | 21 +- .../table/PostgresValueValidator.java | 5 +- .../postgres}/utils/OptionUtils.java | 2 +- .../org.apache.flink.table.factories.Factory | 2 +- .../postgres/PostgreSQLSourceTest.java | 16 +- .../connectors/postgres/PostgresTestBase.java | 8 +- .../postgres/source/MockPostgresDialect.java | 7 +- .../source/NewlyAddedTableITCase.java | 25 +- .../postgres/source/PostgresDialectTest.java | 9 +- .../source/PostgresSourceExampleTest.java | 14 +- .../postgres/source/PostgresSourceITCase.java | 24 +- .../fetch/PostgresScanFetchTaskTest.java | 36 +-- .../PostgresSourceFetchTaskContextTest.java | 5 +- .../table/MockPostgreSQLTableFactory.java | 2 +- .../table/MockPostgreSQLTableSource.java | 15 +- .../table/PostgreSQLConnectorITCase.java | 4 +- .../table/PostgreSQLSavepointITCase.java | 4 +- .../table/PostgreSQLTableFactoryTest.java | 36 +-- .../postgres/testutils/PostgresTestUtils.java | 2 +- .../postgres/testutils/RecordsFormatter.java | 8 +- .../postgres/testutils/TestHelper.java | 2 +- .../postgres/testutils/TestTable.java | 6 +- .../postgres/testutils/UniqueDatabase.java | 5 +- .../org.apache.flink.table.factories.Factory | 2 +- .../connectors/sqlserver/SqlServerSource.java | 9 +- .../sqlserver/SqlServerValidator.java | 4 +- .../source/SqlServerSourceBuilder.java | 16 +- .../source/config/SqlServerSourceConfig.java | 7 +- .../config/SqlServerSourceConfigFactory.java | 9 +- .../dialect/SqlServerChunkSplitter.java | 22 +- .../source/dialect/SqlServerDialect.java | 34 +-- .../SqlServerPooledDataSourceFactory.java | 6 +- .../source/dialect/SqlServerSchema.java | 2 +- .../SqlServerSchemaChangeEventHandler.java | 5 +- .../sqlserver/source/offset/LsnFactory.java | 7 +- .../sqlserver/source/offset/LsnOffset.java | 5 +- .../reader/fetch/SqlServerScanFetchTask.java | 22 +- .../SqlServerSourceFetchTaskContext.java | 26 +- .../fetch/SqlServerStreamFetchTask.java | 21 +- .../utils/SqlServerConnectionUtils.java | 2 +- .../source/utils/SqlServerTypeUtils.java | 2 +- .../source/utils/SqlServerUtils.java | 8 +- ...ServerDeserializationConverterFactory.java | 6 +- .../table/SqlServerReadableMetadata.java | 4 +- .../table/SqlServerTableFactory.java | 39 ++- .../sqlserver/table/SqlServerTableSource.java | 19 +- .../org.apache.flink.table.factories.Factory | 2 +- .../SqlServerParallelSourceExampleTest.java | 12 +- .../sqlserver/SqlServerTestBase.java | 2 +- .../source/SqlServerSourceITCase.java | 14 +- .../source/SqlServerSourceTestBase.java | 6 +- .../fetch/SqlServerScanFetchTaskTest.java | 38 +-- .../table/SqlServerConnectorITCase.java | 4 +- .../table/SqlServerTableFactoryTest.java | 10 +- .../table/SqlServerTimezoneITCase.java | 4 +- .../sqlserver/testutils/RecordsFormatter.java | 8 +- .../sqlserver/testutils/TestTable.java | 6 +- .../cdc/connectors/utils/AssertUtils.java | 4 +- .../connectors/utils/TestSourceContext.java | 2 +- .../tidb/table/utils/OptionUtils.java | 42 ---- .../cdc/connectors/tidb/TDBSourceOptions.java | 2 +- .../cdc/connectors/tidb/TiDBSource.java | 4 +- .../TiKVChangeEventDeserializationSchema.java | 4 +- .../tidb/TiKVRichParallelSourceFunction.java | 6 +- ...iKVSnapshotEventDeserializationSchema.java | 4 +- ...aTiKVChangeEventDeserializationSchema.java | 4 +- ...ataTiKVEventDeserializationSchemaBase.java | 4 +- ...iKVSnapshotEventDeserializationSchema.java | 4 +- .../connectors/tidb/table/StartupMode.java | 2 +- .../connectors/tidb/table/StartupOptions.java | 2 +- .../tidb/table/TiDBTableSource.java | 6 +- .../tidb/table/TiDBTableSourceFactory.java | 23 +- .../table/TiKVAppendMetadataCollector.java | 2 +- .../TiKVDeserializationRuntimeConverter.java | 2 +- .../tidb/table/TiKVMetadataConverter.java | 5 +- .../tidb/table/TiKVReadableMetadata.java | 2 +- .../tidb/table/utils/OptionUtils.java | 42 ++++ .../tidb/table/utils/TableKeyRangeUtils.java | 2 +- .../org.apache.flink.table.factories.Factory | 2 +- .../flink/cdc/connectors}/TiDBTestBase.java | 2 +- .../table/TiDBConnectorITCase.java | 4 +- .../table/TiDBConnectorRegionITCase.java | 4 +- .../table/TiDBTableSourceFactoryTest.java | 4 +- .../cdc/connectors/vitess/VitessSource.java | 11 +- .../connectors/vitess/VitessValidator.java | 5 +- .../vitess/config/SchemaAdjustmentMode.java | 2 +- .../connectors/vitess/config/TabletType.java | 2 +- .../vitess/table/VitessTableFactory.java | 11 +- .../vitess/table/VitessTableSource.java | 15 +- .../org.apache.flink.table.factories.Factory | 2 +- .../connectors/vitess/VitessSourceTest.java | 16 +- .../cdc/connectors/vitess/VitessTestBase.java | 4 +- .../vitess/container/VitessContainer.java | 2 +- .../vitess/table/VitessConnectorITCase.java | 4 +- .../vitess/table/VitessTableFactoryTest.java | 6 +- .../flink/cdc/connectors/db2}/DummyDocs.java | 2 +- .../cdc/connectors/mongodb/DummyDocs.java | 21 ++ .../cdc/connectors/mysql/DummyDocs.java | 2 +- .../cdc/connectors/oceanbase/DummyDocs.java | 21 ++ .../cdc/connectors/oracle}/DummyDocs.java | 2 +- .../cdc/connectors/postgres/DummyDocs.java | 21 -- .../cdc/connectors/postgres/DummyDocs.java | 21 ++ .../cdc/connectors/sqlserver/DummyDocs.java | 21 -- .../cdc/connectors/sqlserver/DummyDocs.java | 21 ++ .../src/main/java/DummyDocs.java | 19 -- .../flink/cdc/connectors/tidb}/DummyDocs.java | 2 +- .../cdc/connectors/vitess/DummyDocs.java | 21 -- .../cdc/connectors/vitess}/DummyDocs.java | 2 +- .../cdc/connectors/tests/Db2E2eITCase.java | 9 +- .../cdc/connectors/tests/MongoE2eITCase.java | 19 +- .../cdc/connectors/tests/MySqlE2eITCase.java | 11 +- .../connectors/tests/OceanBaseE2eITCase.java | 9 +- .../cdc/connectors/tests/OracleE2eITCase.java | 19 +- .../connectors/tests/PostgresE2eITCase.java | 9 +- .../connectors/tests/SqlServerE2eITCase.java | 9 +- .../cdc/connectors/tests/TiDBE2eITCase.java | 9 +- .../cdc/connectors/tests/VitessE2eITCase.java | 17 +- .../utils/FlinkContainerTestEnvironment.java | 8 +- .../cdc/connectors/tests/utils/JdbcProxy.java | 2 +- .../tests/utils/ParameterProperty.java | 2 +- .../tests/utils/SQLJobSubmission.java | 2 +- .../cdc/connectors/tests/utils/TestUtils.java | 2 +- .../operators/route/RouteFunction.java | 27 +-- .../operators/schema/SchemaOperator.java | 26 +- .../schema/SchemaOperatorFactory.java | 11 +- .../schema/coordinator/SchemaManager.java | 22 +- .../schema/coordinator/SchemaRegistry.java | 24 +- .../coordinator/SchemaRegistryProvider.java | 7 +- .../SchemaRegistryRequestHandler.java | 26 +- .../event/CoordinationResponseUtils.java | 7 +- .../schema/event/FlushSuccessEvent.java | 7 +- .../schema/event/GetSchemaRequest.java | 13 +- .../schema/event/GetSchemaResponse.java | 14 +- .../schema/event/ReleaseUpstreamRequest.java | 9 +- .../schema/event/ReleaseUpstreamResponse.java | 7 +- .../schema/event/SchemaChangeRequest.java | 11 +- .../schema/event/SchemaChangeResponse.java | 7 +- .../schema/event/SinkWriterRegisterEvent.java | 5 +- .../sink/DataSinkWriterOperator.java | 17 +- .../sink/DataSinkWriterOperatorFactory.java | 7 +- .../operators/sink/SchemaEvolutionClient.java | 21 +- .../partitioning/EventPartitioner.java | 5 +- .../partitioning/PartitioningEvent.java | 6 +- .../PartitioningEventKeySelector.java | 5 +- .../partitioning/PostPartitionProcessor.java | 7 +- .../partitioning/PrePartitionOperator.java | 33 ++- .../runtime/serializer/BooleanSerializer.java | 2 +- .../BytePrimitiveArraySerializer.java | 2 +- .../runtime/serializer/ByteSerializer.java | 2 +- .../runtime/serializer/DoubleSerializer.java | 2 +- .../runtime/serializer/EnumSerializer.java | 11 +- .../runtime/serializer/FloatSerializer.java | 2 +- .../cdc/runtime/serializer/IntSerializer.java | 2 +- .../serializer/InternalSerializers.java | 25 +- .../serializer/LinkedListSerializer.java | 7 +- .../runtime/serializer/ListSerializer.java | 4 +- .../runtime/serializer/LongSerializer.java | 2 +- .../cdc/runtime/serializer/MapSerializer.java | 4 +- .../NestedSerializersSnapshotDelegate.java | 6 +- .../serializer/NullableSerializerWrapper.java | 9 +- .../runtime/serializer/ShortSerializer.java | 2 +- .../runtime/serializer/StringSerializer.java | 2 +- .../runtime/serializer/TableIdSerializer.java | 5 +- .../serializer/TypeSerializerSingleton.java | 2 +- .../serializer/data/ArrayDataSerializer.java | 19 +- .../data/DecimalDataSerializer.java | 5 +- .../LocalZonedTimestampDataSerializer.java | 7 +- .../serializer/data/RecordDataSerializer.java | 11 +- .../serializer/data/StringDataSerializer.java | 11 +- .../data/TimestampDataSerializer.java | 5 +- .../data/ZonedTimestampDataSerializer.java | 9 +- .../binary/BinaryRecordDataSerializer.java | 13 +- .../data/writer/AbstractBinaryWriter.java | 33 ++- .../data/writer/BinaryRecordDataWriter.java | 9 +- .../serializer/data/writer/BinaryWriter.java | 33 ++- .../event/AddColumnEventSerializer.java | 15 +- .../event/AlterColumnTypeEventSerializer.java | 19 +- .../event/CreateTableEventSerializer.java | 15 +- .../event/DataChangeEventSerializer.java | 23 +- .../event/DropColumnEventSerializer.java | 15 +- .../serializer/event/EventSerializer.java | 17 +- .../event/PartitioningEventSerializer.java | 11 +- .../event/RenameColumnEventSerializer.java | 15 +- .../event/SchemaChangeEventSerializer.java | 21 +- .../serializer/schema/ColumnSerializer.java | 15 +- .../schema/ColumnWithPositionSerializer.java | 17 +- .../schema/DataFieldSerializer.java | 13 +- .../serializer/schema/DataTypeSerializer.java | 47 ++-- .../schema/MetadataColumnSerializer.java | 15 +- .../schema/PhysicalColumnSerializer.java | 15 +- .../serializer/schema/RowTypeSerializer.java | 11 +- .../serializer/schema/SchemaSerializer.java | 15 +- .../typeutils/BinaryRecordDataGenerator.java | 23 +- .../cdc/runtime/typeutils/EventTypeInfo.java | 7 +- .../typeutils/PartitioningEventTypeInfo.java | 9 +- .../operators/route/RouteFunctionTest.java | 38 +-- .../operators/schema/SchemaOperatorTest.java | 18 +- .../schema/coordinator/SchemaManagerTest.java | 23 +- .../PrePartitionOperatorTest.java | 24 +- .../serializer/BooleanSerializerTest.java | 2 +- .../BytePrimitiveArraySerializerTest.java | 2 +- .../serializer/ByteSerializerTest.java | 2 +- .../serializer/DoubleSerializerTest.java | 2 +- .../serializer/EnumSerializerTest.java | 4 +- .../serializer/FloatSerializerTest.java | 2 +- .../runtime/serializer/IntSerializerTest.java | 2 +- .../serializer/LinkedListSerializerTest.java | 2 +- .../serializer/ListSerializerTest.java | 2 +- .../serializer/LongSerializerTest.java | 2 +- .../runtime/serializer/MapSerializerTest.java | 2 +- .../NullableSerializerWrapperTest.java | 2 +- .../serializer/SerializerTestBase.java | 2 +- .../serializer/ShortSerializerTest.java | 2 +- .../serializer/StringSerializerTest.java | 2 +- .../serializer/TableIdSerializerTest.java | 5 +- .../data/ArrayDataSerializerTest.java | 15 +- .../data/DecimalDataSerializerTest.java | 6 +- ...LocalZonedTimestampDataSerializerTest.java | 7 +- .../data/RecordDataSerializerTest.java | 14 +- .../data/StringDataSerializerTest.java | 8 +- .../data/TimestampDataSerializerTest.java | 7 +- .../ZonedTimestampDataSerializerTest.java | 7 +- .../event/AddColumnEventSerializerTest.java | 13 +- .../AlterColumnTypeEventSerializerTest.java | 13 +- .../event/CreateTableEventSerializerTest.java | 13 +- .../event/DataChangeEventSerializerTest.java | 19 +- .../event/DropColumnEventSerializerTest.java | 9 +- .../serializer/event/EventSerializerTest.java | 11 +- .../PartitioningEventSerializerTest.java | 13 +- .../RenameColumnEventSerializerTest.java | 9 +- .../SchemaChangeEventSerializerTest.java | 27 +-- .../schema/ColumnSerializerTest.java | 9 +- .../ColumnWithPositionSerializerTest.java | 11 +- .../schema/DataFieldSerializerTest.java | 9 +- .../schema/DataTypeSerializerTest.java | 9 +- .../schema/MetadataColumnSerializerTest.java | 11 +- .../schema/PhysicalColumnSerializerTest.java | 11 +- .../schema/RowTypeSerializerTest.java | 11 +- .../schema/SchemaSerializerTest.java | 9 +- .../operators/EventOperatorTestHarness.java | 27 +-- .../schema/CollectingMetadataApplier.java | 6 +- .../schema/TestingSchemaRegistryGateway.java | 5 +- .../BinaryRecordDataGeneratorTest.java | 25 +- 915 files changed, 5486 insertions(+), 5570 deletions(-) rename flink-cdc-cli/src/main/java/{com/ververica => org/apache/flink}/cdc/cli/CliExecutor.java (85%) rename flink-cdc-cli/src/main/java/{com/ververica => org/apache/flink}/cdc/cli/CliFrontend.java (95%) rename flink-cdc-cli/src/main/java/{com/ververica => org/apache/flink}/cdc/cli/CliFrontendOptions.java (98%) rename flink-cdc-cli/src/main/java/{com/ververica => org/apache/flink}/cdc/cli/parser/PipelineDefinitionParser.java (87%) rename flink-cdc-cli/src/main/java/{com/ververica => org/apache/flink}/cdc/cli/parser/YamlPipelineDefinitionParser.java (93%) rename flink-cdc-cli/src/main/java/{com/ververica => org/apache/flink}/cdc/cli/utils/ConfigurationUtils.java (95%) rename flink-cdc-cli/src/main/java/{com/ververica => org/apache/flink}/cdc/cli/utils/FlinkEnvironmentUtils.java (91%) rename flink-cdc-cli/src/test/java/{com/ververica => org/apache/flink}/cdc/cli/CliFrontendTest.java (96%) rename flink-cdc-cli/src/test/java/{com/ververica => org/apache/flink}/cdc/cli/parser/YamlPipelineDefinitionParserTest.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/annotation/Experimental.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/annotation/Internal.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/annotation/Public.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/annotation/PublicEvolving.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/annotation/VisibleForTesting.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/ConfigOption.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/ConfigOptions.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/Configuration.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/ConfigurationUtils.java (93%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/FallbackKey.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/StructuredOptionsSplitter.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/description/BlockElement.java (88%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/description/Description.java (92%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/description/DescriptionElement.java (89%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/description/Formatter.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/description/HtmlFormatter.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/description/InlineElement.java (88%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/description/LineBreakElement.java (90%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/description/LinkElement.java (94%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/description/ListElement.java (93%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/configuration/description/TextElement.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/ArrayData.java (95%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/DecimalData.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/GenericArrayData.java (98%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/GenericMapData.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/LocalZonedTimestampData.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/MapData.java (91%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/RecordData.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/StringData.java (85%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/TimestampData.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/ZonedTimestampData.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/binary/BinaryFormat.java (95%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/binary/BinaryRecordData.java (91%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/binary/BinarySection.java (94%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/binary/BinarySegmentUtils.java (98%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/binary/BinaryStringData.java (98%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/binary/LazyBinaryFormat.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/binary/MurmurHashUtils.java (98%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/data/binary/NullAwareGetters.java (91%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/event/AddColumnEvent.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/event/AlterColumnTypeEvent.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/event/ChangeEvent.java (91%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/event/CreateTableEvent.java (90%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/event/DataChangeEvent.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/event/DropColumnEvent.java (95%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/event/Event.java (90%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/event/EventDeserializer.java (91%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/event/FlushEvent.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/event/OperationType.java (90%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/event/RenameColumnEvent.java (98%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/event/SchemaChangeEvent.java (91%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/event/TableId.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/factories/DataSinkFactory.java (87%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/factories/DataSourceFactory.java (86%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/factories/Factory.java (88%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/factories/FactoryHelper.java (91%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/pipeline/PipelineOptions.java (90%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/pipeline/SchemaChangeBehavior.java (89%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/schema/Column.java (93%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/schema/MetadataColumn.java (93%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/schema/PhysicalColumn.java (90%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/schema/Schema.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/schema/Selectors.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/schema/TableFilter.java (93%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/sink/DataSink.java (92%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/sink/EventSinkProvider.java (92%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/sink/FlinkSinkFunctionProvider.java (90%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/sink/FlinkSinkProvider.java (89%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/sink/MetadataApplier.java (87%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/source/DataSource.java (92%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/source/EventSourceProvider.java (92%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/source/FlinkSourceFunctionProvider.java (90%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/source/FlinkSourceProvider.java (89%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/source/MetadataAccessor.java (91%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/text/ParsingException.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/text/Position.java (98%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/text/TokenStream.java (99%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/ArrayType.java (94%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/BigIntType.java (94%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/BinaryType.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/BooleanType.java (94%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/CharType.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/DataField.java (91%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/DataType.java (98%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/DataTypeChecks.java (99%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/DataTypeDefaultVisitor.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/DataTypeFamily.java (92%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/DataTypeRoot.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/DataTypeVisitor.java (94%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/DataTypes.java (99%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/DateType.java (94%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/DecimalType.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/DoubleType.java (94%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/FloatType.java (94%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/IntType.java (94%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/LocalZonedTimestampType.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/MapType.java (95%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/RowType.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/SmallIntType.java (94%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/TimeType.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/TimestampType.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/TinyIntType.java (94%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/VarBinaryType.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/VarCharType.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/ZonedTimestampType.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/utils/DataTypeUtils.java (90%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/utils/runtime/DataInputViewStream.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/types/utils/runtime/DataOutputViewStream.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/utils/EncodingUtils.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/utils/InstantiationUtil.java (99%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/utils/Preconditions.java (99%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/utils/Predicates.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/utils/SchemaUtils.java (93%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/utils/StringUtf8Utils.java (99%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/utils/StringUtils.java (97%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/utils/TimeUtils.java (96%) rename flink-cdc-common/src/main/java/{com/ververica => org/apache/flink}/cdc/common/utils/TypeCheckUtils.java (81%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/schema/SelectorsTest.java (97%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/testutils/assertions/AddColumnEventAssert.java (93%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/testutils/assertions/AlterColumnTypeEventAssert.java (90%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/testutils/assertions/ChangeEventAssert.java (91%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/testutils/assertions/CreateTableEventAssert.java (90%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/testutils/assertions/DataChangeEventAssert.java (92%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/testutils/assertions/DropColumnEventAssert.java (93%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/testutils/assertions/EventAssert.java (87%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/testutils/assertions/EventAssertions.java (81%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/testutils/assertions/RecordDataAssert.java (91%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/testutils/assertions/RecordDataWithSchemaAssert.java (89%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/testutils/assertions/RenameColumnEventAssert.java (93%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/testutils/assertions/SchemaChangeEventAssert.java (84%) rename flink-cdc-common/src/test/java/{com/ververica => org/apache/flink}/cdc/common/utils/SchemaUtilsTest.java (92%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/PipelineComposer.java (91%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/PipelineExecution.java (97%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/definition/PipelineDef.java (89%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/definition/RouteDef.java (98%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/definition/SinkDef.java (95%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/definition/SourceDef.java (95%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/definition/TransformDef.java (95%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/flink/FlinkEnvironmentUtils.java (95%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/flink/FlinkPipelineComposer.java (85%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/flink/FlinkPipelineExecution.java (94%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/flink/coordination/OperatorIDGenerator.java (94%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/flink/translator/DataSinkTranslator.java (91%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/flink/translator/DataSourceTranslator.java (81%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/flink/translator/PartitioningTranslator.java (74%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/flink/translator/RouteTranslator.java (81%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/flink/translator/SchemaOperatorTranslator.java (84%) rename flink-cdc-composer/src/main/java/{com/ververica => org/apache/flink}/cdc/composer/utils/FactoryDiscoveryUtils.java (96%) rename flink-cdc-composer/src/test/java/{com/ververica => org/apache/flink}/cdc/composer/flink/FlinkPipelineComposerITCase.java (92%) rename flink-cdc-composer/src/test/java/{com/ververica => org/apache/flink}/cdc/composer/flink/FlinkPipelineComposerTest.java (81%) rename flink-cdc-composer/src/test/java/{com/ververica => org/apache/flink}/cdc/composer/flink/translator/DataSourceTranslatorTest.java (81%) rename flink-cdc-composer/src/test/java/{com/ververica => org/apache/flink}/cdc/composer/utils/FactoryDiscoveryUtilsTest.java (89%) rename flink-cdc-composer/src/test/java/{com/ververica => org/apache/flink}/cdc/composer/utils/factory/DataSinkFactory1.java (85%) rename flink-cdc-composer/src/test/java/{com/ververica => org/apache/flink}/cdc/composer/utils/factory/DataSinkFactory2.java (82%) rename flink-cdc-composer/src/test/java/{com/ververica => org/apache/flink}/cdc/composer/utils/factory/DataSourceFactory1.java (85%) rename flink-cdc-composer/src/test/java/{com/ververica => org/apache/flink}/cdc/composer/utils/factory/DataSourceFactory2.java (82%) rename flink-cdc-composer/src/test/java/{com/ververica => org/apache/flink}/cdc/composer/utils/factory/TestOptions.java (79%) rename flink-cdc-composer/src/test/resources/META-INF/services/{com.ververica.cdc.common.factories.Factory => org.apache.flink.cdc.common.factories.Factory} (75%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/doris/factory/DorisDataSinkFactory.java (68%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/doris/sink/DorisDataSink.java (88%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/doris/sink/DorisDataSinkOptions.java (96%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/doris/sink/DorisEventSerializer.java (88%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/doris/sink/DorisMetadataApplier.java (87%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/doris/sink/DorisRowConverter.java (87%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/resources/META-INF/services/{com.ververica.cdc.common.factories.Factory => org.apache.flink.cdc.common.factories.Factory} (92%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/doris/sink/DorisRowConverterTest.java (85%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/factory/MySqlDataSourceFactory.java (77%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlDataSource.java (73%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlDataSourceOptions.java (97%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlEventDeserializer.java (90%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlMetadataAccessor.java (86%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlSchemaDataTypeInference.java (84%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/parser/CustomAlterTableParserListener.java (92%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/parser/CustomColumnDefinitionParserListener.java (99%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParser.java (99%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParserListener.java (97%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/reader/MySqlPipelineRecordEmitter.java (87%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/utils/MySqlSchemaUtils.java (92%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/utils/MySqlTypeUtils.java (98%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/resources/META-INF/services/{com.ververica.cdc.common.factories.Factory => org.apache.flink.cdc.common.factories.Factory} (91%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlDataSourceFactoryTest.java (79%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlFullTypesITCase.java (87%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlMetadataAccessorITCase.java (93%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlPipelineITCase.java (92%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/testutils/MySqSourceTestUtils.java (96%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/testutils/RecordDataTestUtils.java (88%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/starrocks/sink/EventRecordSerializationSchema.java (87%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/starrocks/sink/SchemaChangeConfig.java (79%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/starrocks/sink/StarRocksDataSink.java (89%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/starrocks/sink/StarRocksDataSinkFactory.java (61%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/starrocks/sink/StarRocksDataSinkOptions.java (97%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/starrocks/sink/StarRocksMetadataApplier.java (94%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/starrocks/sink/StarRocksUtils.java (92%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/starrocks/sink/TableCreateConfig.java (79%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/resources/META-INF/services/{com.ververica.cdc.common.factories.Factory => org.apache.flink.cdc.common.factories.Factory} (91%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/test/java/{com/ververical => org/apache/flink}/cdc/connectors/starrocks/sink/CdcDataTypeTransformerTest.java (94%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/test/java/{com/ververical => org/apache/flink}/cdc/connectors/starrocks/sink/EventRecordSerializationSchemaTest.java (90%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/test/java/{com/ververical => org/apache/flink}/cdc/connectors/starrocks/sink/MockStarRocksCatalog.java (99%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/test/java/{com/ververical => org/apache/flink}/cdc/connectors/starrocks/sink/StarRocksDataSinkFactoryTest.java (78%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/test/java/{com/ververical => org/apache/flink}/cdc/connectors/starrocks/sink/StarRocksMetadataApplierTest.java (89%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/values/ValuesDatabase.java (94%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/values/factory/ValuesDataFactory.java (74%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/values/sink/ValuesDataSink.java (86%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/values/sink/ValuesDataSinkHelper.java (90%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/values/sink/ValuesDataSinkOptions.java (89%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/values/source/ValuesDataSource.java (96%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/values/source/ValuesDataSourceHelper.java (95%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/values/source/ValuesDataSourceOptions.java (87%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/src/main/resources/META-INF/services/{com.ververica.cdc.common.factories.Factory => org.apache.flink.cdc.common.factories.Factory} (92%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/values/ValuesDatabaseTest.java (92%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/values/sink/ValuesDataSinkHelperTest.java (84%) rename flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-values/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/values/source/ValuesDataSourceITCase.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/config/BaseSourceConfig.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/config/JdbcSourceConfig.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/config/JdbcSourceConfigFactory.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/config/SourceConfig.java (88%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/dialect/DataSourceDialect.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/dialect/JdbcDataSourceDialect.java (80%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/options/JdbcSourceOptions.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/options/SourceOptions.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/options/StartupMode.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/options/StartupOptions.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/relational/JdbcSourceEventDispatcher.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/relational/connection/ConnectionPoolId.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/relational/connection/ConnectionPools.java (85%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/relational/connection/JdbcConnectionFactory.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/relational/connection/JdbcConnectionPoolFactory.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/relational/connection/JdbcConnectionPools.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/relational/handler/SchemaChangeEventHandler.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/{test/java/com/ververica/cdc/connectors/base/experimental => main/java/org/apache/flink/cdc/connectors/base/source}/EmbeddedFlinkDatabaseHistory.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/IncrementalSource.java (82%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/AssignerStatus.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/HybridSplitAssigner.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/SnapshotSplitAssigner.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/SplitAssigner.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/StreamSplitAssigner.java (86%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/splitter/ChunkRange.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/splitter/ChunkSplitter.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/splitter/JdbcSourceChunkSplitter.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/state/HybridPendingSplitsState.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/state/PendingSplitsState.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializer.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/state/SnapshotPendingSplitsState.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/state/StreamPendingSplitsState.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/enumerator/IncrementalSourceEnumerator.java (88%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/jdbc/JdbcIncrementalSource.java (75%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/events/FinishedSnapshotSplitsAckEvent.java (87%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/events/FinishedSnapshotSplitsReportEvent.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/events/FinishedSnapshotSplitsRequestEvent.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/events/LatestFinishedSplitsNumberEvent.java (79%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/events/LatestFinishedSplitsNumberRequestEvent.java (72%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/events/StreamSplitAssignedEvent.java (68%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/events/StreamSplitMetaEvent.java (85%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/events/StreamSplitMetaRequestEvent.java (86%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/events/StreamSplitUpdateAckEvent.java (71%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/events/StreamSplitUpdateRequestEvent.java (68%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/offset/Offset.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/offset/OffsetDeserializerSerializer.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/offset/OffsetFactory.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/ChangeEventRecords.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/FinishedSnapshotSplitInfo.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/SchemalessSnapshotSplit.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/SnapshotSplit.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/SnapshotSplitState.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/SourceRecords.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/SourceSplitBase.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/SourceSplitSerializer.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/SourceSplitState.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/StreamSplit.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/StreamSplitState.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/wartermark/WatermarkEvent.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/wartermark/WatermarkKind.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/metrics/SourceReaderMetrics.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/reader/IncrementalSourceReader.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/reader/IncrementalSourceReaderContext.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/reader/IncrementalSourceReaderWithCommit.java (87%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/reader/IncrementalSourceRecordEmitter.java (83%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/reader/IncrementalSourceSplitReader.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/reader/external/AbstractScanFetchTask.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/reader/external/FetchTask.java (85%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/reader/external/Fetcher.java (85%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/reader/external/IncrementalSourceScanFetcher.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/reader/external/IncrementalSourceStreamFetcher.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/reader/external/JdbcSourceFetchTaskContext.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/utils/hooks/SnapshotPhaseHook.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/utils/hooks/SnapshotPhaseHooks.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/utils/EnvironmentUtils.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/utils/ObjectUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/{flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2 => flink-cdc-base/src/main/java/org/apache/flink/cdc/connectors/base}/utils/OptionUtils.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/utils/SerializerUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/utils/SourceRecordUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/base/utils/VersionComparable.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/JdbcConnectionPoolTest.java (88%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/MySqlChangeEventSourceExampleTest.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/{main/java/com/ververica/cdc/connectors/base/source => test/java/org/apache/flink/cdc/connectors/base/experimental}/EmbeddedFlinkDatabaseHistory.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/MySqlChunkSplitter.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/MySqlDialect.java (75%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/MySqlSourceBuilder.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/MysqlPooledDataSourceFactory.java (83%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/config/MySqlSourceConfig.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/config/MySqlSourceConfigFactory.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/config/ServerIdRange.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/fetch/MySqlScanFetchTask.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/fetch/MySqlSourceFetchTaskContext.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/fetch/MySqlStreamFetchTask.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/handler/MySqlSchemaChangeEventHandler.java (78%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/offset/BinlogOffset.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/offset/BinlogOffsetFactory.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/utils/MySqlConnectionUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/utils/MySqlSchema.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/utils/MySqlTypeUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/utils/MySqlUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/experimental/utils/TableDiscoveryUtils.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializerTest.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/state/version5/HybridPendingSplitsStateVersion5.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/state/version5/PendingSplitsStateSerializerVersion5.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/assigner/state/version5/SnapshotPendingSplitsStateVersion5.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/SourceSplitSerializerTest.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/version4/LegacySourceSplitSerializierVersion4.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/source/meta/split/version4/StreamSplitVersion4.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/testutils/MySqlContainer.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/testutils/MySqlVersion.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/base/testutils/UniqueDatabase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/db2/Db2Source.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/db2/table/Db2ReadableMetaData.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/db2/table/Db2TableSource.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/db2/table/Db2TableSourceFactory.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/db2/table/StartupMode.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/db2/table/StartupOptions.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/{flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base => flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2}/utils/OptionUtils.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/db2/Db2SourceTest.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/db2/Db2TestBase.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/db2/table/Db2ConnectorITCase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/db2/table/Db2TableSourceFactoryTest.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/DebeziumDeserializationSchema.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/DebeziumSourceFunction.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/JsonDebeziumDeserializationSchema.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/StringDebeziumDeserializationSchema.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/Validator.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/event/DebeziumEventDeserializationSchema.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/event/DebeziumSchemaDataTypeInference.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/event/SchemaDataTypeInference.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/event/SourceRecordEventDeserializer.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/history/FlinkJsonTableChangeSerializer.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/internal/DebeziumChangeConsumer.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/internal/DebeziumChangeFetcher.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/internal/DebeziumOffset.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/internal/DebeziumOffsetSerializer.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/internal/FlinkDatabaseHistory.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/internal/FlinkDatabaseSchemaHistory.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/internal/FlinkOffsetBackingStore.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/internal/Handover.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/internal/SchemaRecord.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/table/AppendMetadataCollector.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/table/DebeziumChangelogMode.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/table/DebeziumOptions.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/table/DeserializationRuntimeConverter.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/table/DeserializationRuntimeConverterFactory.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/table/MetadataConverter.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/table/RowDataDebeziumDeserializeSchema.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/table/RowDataMetadataConverter.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/utils/DatabaseHistoryUtil.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/utils/JdbcUrlUtils.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/utils/ResolvedSchemaUtils.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/{com/ververica => org/apache/flink}/cdc/debezium/utils/TemporalConversions.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/MongoDBSource.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/internal/MongoDBConnectorSourceConnector.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/internal/MongoDBConnectorSourceTask.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/internal/MongoDBEnvelope.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/MongoDBSource.java (71%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/MongoDBSourceBuilder.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/assigners/splitters/MongoDBChunkSplitter.java (80%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/assigners/splitters/SampleBucketSplitStrategy.java (81%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/assigners/splitters/ShardedSplitStrategy.java (83%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/assigners/splitters/SingleSplitStrategy.java (72%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/assigners/splitters/SplitContext.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/assigners/splitters/SplitStrategy.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/assigners/splitters/SplitVectorSplitStrategy.java (79%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/config/MongoDBSourceConfig.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/config/MongoDBSourceConfigFactory.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/config/MongoDBSourceOptions.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/connection/MongoClientPool.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/dialect/MongoDBDialect.java (78%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/offset/ChangeStreamDescriptor.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/offset/ChangeStreamOffset.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/offset/ChangeStreamOffsetFactory.java (76%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/reader/MongoDBRecordEmitter.java (71%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/reader/fetch/MongoDBFetchTaskContext.java (86%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/reader/fetch/MongoDBScanFetchTask.java (75%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/reader/fetch/MongoDBStreamFetchTask.java (77%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/utils/BsonUtils.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/utils/ChunkUtils.java (75%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/utils/CollectionDiscoveryUtils.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/utils/MongoRecordUtils.java (88%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/utils/MongoUtils.java (88%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/utils/ResumeTokenUtils.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/table/MongoDBConnectorDeserializationSchema.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/table/MongoDBConnectorFullChangelogDeserializationSchema.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/table/MongoDBReadableMetadata.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/table/MongoDBTableSource.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/table/MongoDBTableSourceFactory.java (76%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/LegacyMongoDBContainer.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/LegacyMongoDBSourceExampleTest.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/LegacyMongoDBSourceTest.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/LegacyMongoDBSourceTestBase.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/LegacyMongoDBTestBase.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/MongoDBFullChangelogITCase.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/MongoDBParallelSourceExampleTest.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/MongoDBParallelSourceITCase.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/MongoDBSourceTestBase.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/NewlyAddedTableITCase.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/reader/MongoDBSnapshotSplitReaderTest.java (78%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/reader/MongoDBStreamSplitReaderTest.java (78%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/utils/BsonUtilsTest.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/source/utils/ResumeTokenUtilsTest.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/table/MongoDBConnectorITCase.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/table/MongoDBRegexFilterITCase.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/table/MongoDBTableFactoryTest.java (87%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/table/MongoDBTimeZoneITCase.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/utils/MongoDBAssertUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/utils/MongoDBContainer.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/utils/MongoDBTestUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/utils/RecordsFormatter.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mongodb/utils/TestTable.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/MySqlSource.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/MySqlValidator.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/SeekBinlogToTimestampFilter.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/DebeziumUtils.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/EmbeddedFlinkDatabaseHistory.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/dispatcher/EventDispatcherImpl.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/dispatcher/SignalEventDispatcher.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/reader/BinlogSplitReader.java (87%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/reader/DebeziumReader.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/reader/SnapshotSplitReader.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/{flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/fetch => flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/reader}/StoppableChangeEventSourceContext.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/task/MySqlBinlogSplitReadTask.java (85%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/task/MySqlSnapshotSplitReadTask.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/task/context/MySqlErrorHandler.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/task/context/MySqlTaskContextImpl.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/task/context/StatefulTaskContext.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/task/context/exception/SchemaOutOfSyncException.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/schema/MySqlFieldDefinition.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/schema/MySqlSchema.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/schema/MySqlTableDefinition.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/schema/MySqlTypeUtils.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlSource.java (82%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlSourceBuilder.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/AssignerStatus.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/ChunkRange.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/ChunkSplitter.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssigner.java (86%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/MySqlChunkSplitter.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssigner.java (87%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssigner.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/MySqlSplitAssigner.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/state/BinlogPendingSplitsState.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/state/ChunkSplitterState.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/state/HybridPendingSplitsState.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/state/PendingSplitsState.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializer.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/state/SnapshotPendingSplitsState.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/config/MySqlSourceConfig.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/config/MySqlSourceConfigFactory.java (87%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/config/MySqlSourceOptions.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/config/ServerIdRange.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/connection/ConnectionPoolId.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/connection/ConnectionPools.java (85%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/connection/JdbcConnectionFactory.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/connection/JdbcConnectionPools.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/connection/PooledDataSourceFactory.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/enumerator/MySqlSourceEnumerator.java (87%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/events/BinlogSplitAssignedEvent.java (79%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/events/BinlogSplitMetaEvent.java (86%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/events/BinlogSplitMetaRequestEvent.java (87%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/events/BinlogSplitUpdateAckEvent.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/events/BinlogSplitUpdateRequestEvent.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsAckEvent.java (87%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsReportEvent.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsRequestEvent.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberEvent.java (88%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberRequestEvent.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/metrics/MySqlSourceReaderMetrics.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/offset/BinlogOffset.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/offset/BinlogOffsetBuilder.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/offset/BinlogOffsetKind.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/offset/BinlogOffsetSerializer.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/offset/BinlogOffsetUtils.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/reader/MySqlRecordEmitter.java (71%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/reader/MySqlSourceReader.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/reader/MySqlSourceReaderContext.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/reader/MySqlSplitReader.java (87%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/split/FinishedSnapshotSplitInfo.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/split/MySqlBinlogSplit.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/split/MySqlBinlogSplitState.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/split/MySqlRecords.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/split/MySqlSchemalessSnapshotSplit.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/split/MySqlSnapshotSplit.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/split/MySqlSnapshotSplitState.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/split/MySqlSplit.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/split/MySqlSplitSerializer.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/split/MySqlSplitState.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/split/SourceRecords.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/utils/ChunkUtils.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/utils/EnvironmentUtils.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/utils/ObjectUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/utils/RecordUtils.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/utils/SerializerUtils.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/utils/StatementUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/utils/TableDiscoveryUtils.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/utils/VersionComparable.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHook.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHooks.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/table/MySqlDeserializationConverterFactory.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/table/MySqlReadableMetadata.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/table/MySqlTableSource.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/table/MySqlTableSourceFactory.java (55%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/table/StartupMode.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/table/StartupOptions.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/utils/OptionUtils.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/LegacyMySqlSourceExampleTest.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/LegacyMySqlSourceITCase.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/LegacyMySqlSourceTest.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/LegacyMySqlTestBase.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/MySqlTestUtils.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/MySqlValidatorTest.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/DebeziumUtilsTest.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/reader/BinlogSplitReaderTest.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/debezium/reader/SnapshotSplitReaderTest.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlSourceExampleTest.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlSourceITCase.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/MySqlSourceTestBase.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/NewlyAddedTableITCase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/SpecificStartingOffsetITCase.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssignerTest.java (83%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/MySqlChunkSplitterTest.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssignerTest.java (88%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssignerTest.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializerTest.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/reader/MySqlRecordEmitterTest.java (88%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/reader/MySqlSourceReaderTest.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/split/MySqlSplitSerializerTest.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/split/MySqlSplitStateTest.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/utils/ObjectUtilsTest.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/utils/RecordUtilsTest.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/source/utils/SerializerUtilsTest.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/table/MySqlCompatibilityITCase.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/table/MySqlConnectorITCase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/table/MySqlTableSourceFactoryTest.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/table/MySqlTimezoneITCase.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/table/MysqlConnectorCharsetITCase.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/testutils/MySqlContainer.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/testutils/MySqlVersion.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/testutils/RecordsFormatter.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/testutils/TestTable.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/testutils/TestTableSchemas.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/testutils/UniqueDatabase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/polardbx/PolardbxCharsetITCase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/polardbx/PolardbxSourceITCase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/polardbx/PolardbxSourceTestBase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/OceanBaseSource.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/source/OceanBaseConnection.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/source/OceanBaseDeserializationRuntimeConverter.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/source/OceanBaseRichSourceFunction.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/source/RowDataOceanBaseDeserializationSchema.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/table/OceanBaseAppendMetadataCollector.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/table/OceanBaseDeserializationSchema.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/table/OceanBaseMetadataConverter.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/table/OceanBaseReadableMetadata.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/table/OceanBaseRecord.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/table/OceanBaseTableSource.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/table/OceanBaseTableSourceFactory.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/table/StartupMode.java (97%) create mode 100644 flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/utils/OptionUtils.java rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/OceanBaseTestBase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/table/OceanBaseConnectorITCase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/oceanbase/table/OceanBaseTableFactoryTest.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/OracleSource.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/OracleValidator.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/OracleDialect.java (78%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/OraclePooledDataSourceFactory.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/OracleSourceBuilder.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/assigner/splitter/OracleChunkSplitter.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/config/OracleSourceConfig.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/config/OracleSourceConfigFactory.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/config/OracleSourceOptions.java (88%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/handler/OracleSchemaChangeEventHandler.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/meta/offset/RedoLogOffset.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/meta/offset/RedoLogOffsetFactory.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/reader/fetch/EventProcessorFactory.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/reader/fetch/OracleScanFetchTask.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/reader/fetch/OracleSourceFetchTaskContext.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/reader/fetch/OracleStreamFetchTask.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/reader/fetch/StoppableChangeEventSourceContext.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/utils/OracleConnectionUtils.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/utils/OracleSchema.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/utils/OracleTypeUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/utils/OracleUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/table/OracleDeserializationConverterFactory.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/table/OracleReadableMetaData.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/table/OracleTableSource.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/table/OracleTableSourceFactory.java (79%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/util/ChunkUtils.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/util/OracleJdbcUrlUtils.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/OracleChangeEventSourceExampleTest.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/OracleSourceTest.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/OracleSourceITCase.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/source/OracleSourceTestBase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/table/OracleConnectorITCase.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/testutils/RecordsFormatter.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/oracle/testutils/TestTable.java (93%) delete mode 100644 flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/utils/OptionUtils.java rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/PostgreSQLSource.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/PostgresChunkSplitter.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/PostgresConnectionPoolFactory.java (86%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/PostgresDialect.java (87%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/PostgresSourceBuilder.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/config/PostgresSourceConfig.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/config/PostgresSourceConfigFactory.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/config/PostgresSourceOptions.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/enumerator/PostgresSourceEnumerator.java (84%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/events/OffsetCommitAckEvent.java (67%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/events/OffsetCommitEvent.java (71%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/fetch/PostgresScanFetchTask.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContext.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/fetch/PostgresStreamFetchTask.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/{flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader => flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/fetch}/StoppableChangeEventSourceContext.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/handler/PostgresSchemaChangeEventHandler.java (88%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/offset/PostgresOffset.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/offset/PostgresOffsetFactory.java (89%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/offset/PostgresOffsetUtils.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/reader/PostgresSourceReader.java (80%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/utils/ChunkUtils.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/utils/CustomPostgresSchema.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/utils/PostgresQueryUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/utils/PostgresTypeUtils.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/utils/TableDiscoveryUtils.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/table/PostgreSQLDeserializationConverterFactory.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/table/PostgreSQLReadableMetadata.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/table/PostgreSQLTableFactory.java (75%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/table/PostgreSQLTableSource.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/table/PostgresValueValidator.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/{flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase => flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres}/utils/OptionUtils.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/PostgreSQLSourceTest.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/PostgresTestBase.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/MockPostgresDialect.java (88%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/NewlyAddedTableITCase.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/PostgresDialectTest.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/PostgresSourceExampleTest.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/PostgresSourceITCase.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/fetch/PostgresScanFetchTaskTest.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContextTest.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/table/MockPostgreSQLTableFactory.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/table/MockPostgreSQLTableSource.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/table/PostgreSQLConnectorITCase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/table/PostgreSQLSavepointITCase.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/table/PostgreSQLTableFactoryTest.java (91%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/testutils/PostgresTestUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/testutils/RecordsFormatter.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/testutils/TestHelper.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/testutils/TestTable.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/postgres/testutils/UniqueDatabase.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/SqlServerSource.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/SqlServerValidator.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/SqlServerSourceBuilder.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/config/SqlServerSourceConfig.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/config/SqlServerSourceConfigFactory.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/dialect/SqlServerChunkSplitter.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/dialect/SqlServerDialect.java (81%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/dialect/SqlServerPooledDataSourceFactory.java (85%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/dialect/SqlServerSchema.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/handler/SqlServerSchemaChangeEventHandler.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/offset/LsnFactory.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/offset/LsnOffset.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/reader/fetch/SqlServerScanFetchTask.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/reader/fetch/SqlServerSourceFetchTaskContext.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/reader/fetch/SqlServerStreamFetchTask.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/utils/SqlServerConnectionUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/utils/SqlServerTypeUtils.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/utils/SqlServerUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/table/SqlServerDeserializationConverterFactory.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/table/SqlServerReadableMetadata.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/table/SqlServerTableFactory.java (86%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/table/SqlServerTableSource.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/SqlServerParallelSourceExampleTest.java (85%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/SqlServerTestBase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/SqlServerSourceITCase.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/SqlServerSourceTestBase.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/source/read/fetch/SqlServerScanFetchTaskTest.java (90%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/table/SqlServerConnectorITCase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/table/SqlServerTableFactoryTest.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/table/SqlServerTimezoneITCase.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/testutils/RecordsFormatter.java (92%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/sqlserver/testutils/TestTable.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/utils/AssertUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/utils/TestSourceContext.java (97%) delete mode 100644 flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/utils/OptionUtils.java rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/TDBSourceOptions.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/TiDBSource.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/TiKVChangeEventDeserializationSchema.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/TiKVSnapshotEventDeserializationSchema.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/table/RowDataTiKVChangeEventDeserializationSchema.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/table/RowDataTiKVEventDeserializationSchemaBase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/table/RowDataTiKVSnapshotEventDeserializationSchema.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/table/StartupMode.java (94%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/table/StartupOptions.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/table/TiDBTableSource.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/table/TiDBTableSourceFactory.java (85%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/table/TiKVAppendMetadataCollector.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/table/TiKVDeserializationRuntimeConverter.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/table/TiKVMetadataConverter.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/table/TiKVReadableMetadata.java (98%) create mode 100644 flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/utils/OptionUtils.java rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/tidb/table/utils/TableKeyRangeUtils.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/{com/ververica/cdc/connectors/tidb => org/apache/flink/cdc/connectors}/TiDBTestBase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/{com/ververica/cdc/connectors/tidb => org/apache/flink/cdc/connectors}/table/TiDBConnectorITCase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/{com/ververica/cdc/connectors/tidb => org/apache/flink/cdc/connectors}/table/TiDBConnectorRegionITCase.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/{com/ververica/cdc/connectors/tidb => org/apache/flink/cdc/connectors}/table/TiDBTableSourceFactoryTest.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/vitess/VitessSource.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/vitess/VitessValidator.java (93%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/vitess/config/SchemaAdjustmentMode.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/vitess/config/TabletType.java (96%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/vitess/table/VitessTableFactory.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/vitess/table/VitessTableSource.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/vitess/VitessSourceTest.java (95%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/vitess/VitessTestBase.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/vitess/container/VitessContainer.java (98%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/vitess/table/VitessConnectorITCase.java (99%) rename flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/vitess/table/VitessTableFactoryTest.java (97%) rename flink-cdc-connect/flink-cdc-source-connectors/{flink-sql-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle => flink-sql-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2}/DummyDocs.java (95%) create mode 100644 flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/DummyDocs.java rename flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mysql-cdc/src/main/java/{com/ververica => org/apache/flink}/cdc/connectors/mysql/DummyDocs.java (95%) create mode 100644 flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/DummyDocs.java rename flink-cdc-connect/flink-cdc-source-connectors/{flink-sql-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase => flink-sql-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle}/DummyDocs.java (95%) delete mode 100644 flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/DummyDocs.java create mode 100644 flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/DummyDocs.java delete mode 100644 flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/DummyDocs.java create mode 100644 flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/DummyDocs.java delete mode 100644 flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-tidb-cdc/src/main/java/DummyDocs.java rename flink-cdc-connect/flink-cdc-source-connectors/{flink-sql-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2 => flink-sql-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb}/DummyDocs.java (95%) delete mode 100644 flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/DummyDocs.java rename flink-cdc-connect/flink-cdc-source-connectors/{flink-sql-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb => flink-sql-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess}/DummyDocs.java (95%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/Db2E2eITCase.java (97%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/MongoE2eITCase.java (93%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/MySqlE2eITCase.java (95%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/OceanBaseE2eITCase.java (97%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/OracleE2eITCase.java (92%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/PostgresE2eITCase.java (98%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/SqlServerE2eITCase.java (97%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/TiDBE2eITCase.java (98%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/VitessE2eITCase.java (95%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java (98%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/utils/JdbcProxy.java (98%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/utils/ParameterProperty.java (96%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/utils/SQLJobSubmission.java (97%) rename flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/{com/ververica => org/apache/flink}/cdc/connectors/tests/utils/TestUtils.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/route/RouteFunction.java (90%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/SchemaOperator.java (86%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/SchemaOperatorFactory.java (86%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/coordinator/SchemaManager.java (93%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/coordinator/SchemaRegistry.java (91%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/coordinator/SchemaRegistryProvider.java (90%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/coordinator/SchemaRegistryRequestHandler.java (90%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/event/CoordinationResponseUtils.java (97%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/event/FlushSuccessEvent.java (91%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/event/GetSchemaRequest.java (84%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/event/GetSchemaResponse.java (78%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/event/ReleaseUpstreamRequest.java (81%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/event/ReleaseUpstreamResponse.java (84%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/event/SchemaChangeRequest.java (86%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/event/SchemaChangeResponse.java (90%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/event/SinkWriterRegisterEvent.java (92%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/sink/DataSinkWriterOperator.java (95%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/sink/DataSinkWriterOperatorFactory.java (94%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/sink/SchemaEvolutionClient.java (79%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/partitioning/EventPartitioner.java (92%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/partitioning/PartitioningEvent.java (93%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/partitioning/PartitioningEventKeySelector.java (91%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/partitioning/PostPartitionProcessor.java (88%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/partitioning/PrePartitionOperator.java (90%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/BooleanSerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/BytePrimitiveArraySerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/ByteSerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/DoubleSerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/EnumSerializer.java (96%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/FloatSerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/IntSerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/InternalSerializers.java (79%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/LinkedListSerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/ListSerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/LongSerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/MapSerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/NestedSerializersSnapshotDelegate.java (97%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/NullableSerializerWrapper.java (95%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/ShortSerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/StringSerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/TableIdSerializer.java (97%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/TypeSerializerSingleton.java (96%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/ArrayDataSerializer.java (94%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/DecimalDataSerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializer.java (97%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/RecordDataSerializer.java (91%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/StringDataSerializer.java (92%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/TimestampDataSerializer.java (98%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/ZonedTimestampDataSerializer.java (96%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/binary/BinaryRecordDataSerializer.java (93%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/writer/AbstractBinaryWriter.java (93%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/writer/BinaryRecordDataWriter.java (93%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/writer/BinaryWriter.java (84%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/AddColumnEventSerializer.java (89%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/AlterColumnTypeEventSerializer.java (87%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/CreateTableEventSerializer.java (89%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/DataChangeEventSerializer.java (90%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/DropColumnEventSerializer.java (89%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/EventSerializer.java (91%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/PartitioningEventSerializer.java (92%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/RenameColumnEventSerializer.java (89%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/SchemaChangeEventSerializer.java (91%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/ColumnSerializer.java (91%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/ColumnWithPositionSerializer.java (90%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/DataFieldSerializer.java (91%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/DataTypeSerializer.java (89%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/MetadataColumnSerializer.java (90%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/PhysicalColumnSerializer.java (90%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/RowTypeSerializer.java (91%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/SchemaSerializer.java (91%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/typeutils/BinaryRecordDataGenerator.java (82%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/typeutils/EventTypeInfo.java (92%) rename flink-cdc-runtime/src/main/java/{com/ververica => org/apache/flink}/cdc/runtime/typeutils/PartitioningEventTypeInfo.java (89%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/route/RouteFunctionTest.java (88%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/SchemaOperatorTest.java (89%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/operators/schema/coordinator/SchemaManagerTest.java (94%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/partitioning/PrePartitionOperatorTest.java (89%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/BooleanSerializerTest.java (96%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/BytePrimitiveArraySerializerTest.java (97%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/ByteSerializerTest.java (97%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/DoubleSerializerTest.java (97%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/EnumSerializerTest.java (99%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/FloatSerializerTest.java (97%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/IntSerializerTest.java (96%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/LinkedListSerializerTest.java (98%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/ListSerializerTest.java (98%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/LongSerializerTest.java (96%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/MapSerializerTest.java (98%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/NullableSerializerWrapperTest.java (96%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/SerializerTestBase.java (99%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/ShortSerializerTest.java (97%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/StringSerializerTest.java (96%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/TableIdSerializerTest.java (93%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/ArrayDataSerializerTest.java (88%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/DecimalDataSerializerTest.java (89%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializerTest.java (94%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/RecordDataSerializerTest.java (80%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/StringDataSerializerTest.java (87%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/TimestampDataSerializerTest.java (94%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/data/ZonedTimestampDataSerializerTest.java (94%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/AddColumnEventSerializerTest.java (91%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/AlterColumnTypeEventSerializerTest.java (85%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/CreateTableEventSerializerTest.java (87%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/DataChangeEventSerializerTest.java (85%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/DropColumnEventSerializerTest.java (88%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/EventSerializerTest.java (88%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/PartitioningEventSerializerTest.java (89%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/RenameColumnEventSerializerTest.java (88%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/event/SchemaChangeEventSerializerTest.java (82%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/ColumnSerializerTest.java (88%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/ColumnWithPositionSerializerTest.java (89%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/DataFieldSerializerTest.java (87%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/DataTypeSerializerTest.java (93%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/MetadataColumnSerializerTest.java (85%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/PhysicalColumnSerializerTest.java (84%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/RowTypeSerializerTest.java (85%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/serializer/schema/SchemaSerializerTest.java (91%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/testutils/operators/EventOperatorTestHarness.java (88%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/testutils/schema/CollectingMetadataApplier.java (88%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/testutils/schema/TestingSchemaRegistryGateway.java (95%) rename flink-cdc-runtime/src/test/java/{com/ververica => org/apache/flink}/cdc/runtime/typeutils/BinaryRecordDataGeneratorTest.java (89%) diff --git a/README.md b/README.md index 78bb2183d..ba7a61638 100644 --- a/README.md +++ b/README.md @@ -117,8 +117,8 @@ Include following Maven dependency (available through Maven Central): ```java import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; -import com.ververica.cdc.connectors.mysql.source.MySqlSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSource; public class MySqlSourceExample { public static void main(String[] args) throws Exception { diff --git a/docs/content/connectors/db2-cdc.md b/docs/content/connectors/db2-cdc.md index 32b6e1d6f..fbb3ae365 100644 --- a/docs/content/connectors/db2-cdc.md +++ b/docs/content/connectors/db2-cdc.md @@ -225,7 +225,7 @@ _Note: the mechanism of `scan.startup.mode` option relying on Debezium's `snapsh import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.source.SourceFunction; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; public class Db2SourceExample { public static void main(String[] args) throws Exception { diff --git a/docs/content/connectors/mongodb-cdc(ZH).md b/docs/content/connectors/mongodb-cdc(ZH).md index 2d1543742..b341e62cd 100644 --- a/docs/content/connectors/mongodb-cdc(ZH).md +++ b/docs/content/connectors/mongodb-cdc(ZH).md @@ -438,8 +438,8 @@ MongoDB CDC 连接器也可以是一个数据流源。 你可以创建 SourceFun ```java import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.source.SourceFunction; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; -import com.ververica.cdc.connectors.mongodb.MongoDBSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.mongodb.MongoDBSource; public class MongoDBSourceExample { public static void main(String[] args) throws Exception { @@ -466,8 +466,8 @@ MongoDB CDC 增量连接器（2.3.0 之后）可以使用，如下所示： ```java import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.connectors.mongodb.source.MongoDBSource; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.mongodb.source.MongoDBSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; public class MongoDBIncrementalSourceExample { public static void main(String[] args) throws Exception { diff --git a/docs/content/connectors/mongodb-cdc.md b/docs/content/connectors/mongodb-cdc.md index 86f1c95d4..1158b6cc4 100644 --- a/docs/content/connectors/mongodb-cdc.md +++ b/docs/content/connectors/mongodb-cdc.md @@ -448,8 +448,8 @@ The MongoDB CDC connector can also be a DataStream source. You can create a Sour ```java import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.source.SourceFunction; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; -import com.ververica.cdc.connectors.mongodb.MongoDBSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.mongodb.MongoDBSource; public class MongoDBSourceExample { public static void main(String[] args) throws Exception { @@ -476,8 +476,8 @@ The MongoDB CDC incremental connector (after 2.3.0) can be used as the following ```java import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.connectors.mongodb.source.MongoDBSource; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.mongodb.source.MongoDBSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; public class MongoDBIncrementalSourceExample { public static void main(String[] args) throws Exception { diff --git a/docs/content/connectors/mysql-cdc(ZH).md b/docs/content/connectors/mysql-cdc(ZH).md index fdbd8d98a..778cd4b78 100644 --- a/docs/content/connectors/mysql-cdc(ZH).md +++ b/docs/content/connectors/mysql-cdc(ZH).md @@ -652,8 +652,8 @@ CREATE TABLE mysql_source (...) WITH ( ```java import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; -import com.ververica.cdc.connectors.mysql.source.MySqlSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSource; public class MySqlSourceExample { public static void main(String[] args) throws Exception { diff --git a/docs/content/connectors/mysql-cdc.md b/docs/content/connectors/mysql-cdc.md index d3566a25e..a2b95a8af 100644 --- a/docs/content/connectors/mysql-cdc.md +++ b/docs/content/connectors/mysql-cdc.md @@ -666,8 +666,8 @@ could fail as the Debezium reader keeps the current latest table schema internal ```java import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; -import com.ververica.cdc.connectors.mysql.source.MySqlSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSource; public class MySqlSourceExample { public static void main(String[] args) throws Exception { diff --git a/docs/content/connectors/oceanbase-cdc(ZH).md b/docs/content/connectors/oceanbase-cdc(ZH).md index 42937cc20..c8269b485 100644 --- a/docs/content/connectors/oceanbase-cdc(ZH).md +++ b/docs/content/connectors/oceanbase-cdc(ZH).md @@ -443,10 +443,10 @@ import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.oceanbase.OceanBaseSource; -import com.ververica.cdc.connectors.oceanbase.source.RowDataOceanBaseDeserializationSchema; -import com.ververica.cdc.connectors.oceanbase.table.OceanBaseDeserializationSchema; -import com.ververica.cdc.connectors.oceanbase.table.StartupMode; +import org.apache.flink.cdc.connectors.oceanbase.OceanBaseSource; +import org.apache.flink.cdc.connectors.oceanbase.source.RowDataOceanBaseDeserializationSchema; +import org.apache.flink.cdc.connectors.oceanbase.table.OceanBaseDeserializationSchema; +import org.apache.flink.cdc.connectors.oceanbase.table.StartupMode; import java.time.ZoneId; import java.util.Arrays; diff --git a/docs/content/connectors/oceanbase-cdc.md b/docs/content/connectors/oceanbase-cdc.md index 480338a9d..864f5f44c 100644 --- a/docs/content/connectors/oceanbase-cdc.md +++ b/docs/content/connectors/oceanbase-cdc.md @@ -451,10 +451,10 @@ import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.oceanbase.OceanBaseSource; -import com.ververica.cdc.connectors.oceanbase.source.RowDataOceanBaseDeserializationSchema; -import com.ververica.cdc.connectors.oceanbase.table.OceanBaseDeserializationSchema; -import com.ververica.cdc.connectors.oceanbase.table.StartupMode; +import org.apache.flink.cdc.connectors.oceanbase.OceanBaseSource; +import org.apache.flink.cdc.connectors.oceanbase.source.RowDataOceanBaseDeserializationSchema; +import org.apache.flink.cdc.connectors.oceanbase.table.OceanBaseDeserializationSchema; +import org.apache.flink.cdc.connectors.oceanbase.table.StartupMode; import java.time.ZoneId; import java.util.Arrays; diff --git a/docs/content/connectors/oracle-cdc.md b/docs/content/connectors/oracle-cdc.md index 0f7c64e10..ddd4881df 100644 --- a/docs/content/connectors/oracle-cdc.md +++ b/docs/content/connectors/oracle-cdc.md @@ -509,10 +509,10 @@ The Oracle CDC connector can also be a DataStream source. There are two modes fo #### Incremental Snapshot based DataStream (Experimental) ```java -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; -import com.ververica.cdc.connectors.oracle.source.OracleSourceBuilder; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; +import org.apache.flink.cdc.connectors.oracle.source.OracleSourceBuilder; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -561,8 +561,8 @@ public class OracleParallelSourceExample { ```java import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.source.SourceFunction; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; -import com.ververica.cdc.connectors.oracle.OracleSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.oracle.OracleSource; public class OracleSourceExample { public static void main(String[] args) throws Exception { diff --git a/docs/content/connectors/postgres-cdc.md b/docs/content/connectors/postgres-cdc.md index cd7e96ef7..76bdb1073 100644 --- a/docs/content/connectors/postgres-cdc.md +++ b/docs/content/connectors/postgres-cdc.md @@ -444,10 +444,10 @@ The Postgres CDC connector can also be a DataStream source. There are two modes #### Incremental Snapshot based DataStream (Experimental) ```java -import com.ververica.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; -import com.ververica.cdc.connectors.postgres.source.PostgresSourceBuilder; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; +import org.apache.flink.cdc.connectors.postgres.source.PostgresSourceBuilder; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -495,8 +495,8 @@ public class PostgresParallelSourceExample { ```java import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.source.SourceFunction; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; -import com.ververica.cdc.connectors.postgres.PostgreSQLSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.postgres.PostgreSQLSource; public class PostgreSQLSourceExample { public static void main(String[] args) throws Exception { diff --git a/docs/content/connectors/sqlserver-cdc.md b/docs/content/connectors/sqlserver-cdc.md index 1618c8386..c07b6c68d 100644 --- a/docs/content/connectors/sqlserver-cdc.md +++ b/docs/content/connectors/sqlserver-cdc.md @@ -342,8 +342,8 @@ The SQLServer CDC connector can also be a DataStream source. You can create a So ```java import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.source.SourceFunction; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; -import com.ververica.cdc.connectors.sqlserver.SqlServerSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.sqlserver.SqlServerSource; public class SqlServerSourceExample { public static void main(String[] args) throws Exception { @@ -373,10 +373,10 @@ The SQLServer CDC incremental connector (after 2.4.0) can be used as the followi import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.sqlserver.source.SqlServerSourceBuilder; -import com.ververica.cdc.connectors.sqlserver.source.SqlServerSourceBuilder.SqlServerIncrementalSource; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.sqlserver.source.SqlServerSourceBuilder; +import org.apache.flink.cdc.connectors.sqlserver.source.SqlServerSourceBuilder.SqlServerIncrementalSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; public class SqlServerIncrementalSourceExample { public static void main(String[] args) throws Exception { diff --git a/docs/content/connectors/tidb-cdc.md b/docs/content/connectors/tidb-cdc.md index 06fbeec91..6f51b6b54 100644 --- a/docs/content/connectors/tidb-cdc.md +++ b/docs/content/connectors/tidb-cdc.md @@ -241,10 +241,10 @@ import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.source.SourceFunction; import org.apache.flink.util.Collector; -import com.ververica.cdc.connectors.tidb.TDBSourceOptions; -import com.ververica.cdc.connectors.tidb.TiDBSource; -import com.ververica.cdc.connectors.tidb.TiKVChangeEventDeserializationSchema; -import com.ververica.cdc.connectors.tidb.TiKVSnapshotEventDeserializationSchema; +import org.apache.flink.cdc.connectors.tidb.TDBSourceOptions; +import org.apache.flink.cdc.connectors.tidb.TiDBSource; +import org.apache.flink.cdc.connectors.tidb.TiKVChangeEventDeserializationSchema; +import org.apache.flink.cdc.connectors.tidb.TiKVSnapshotEventDeserializationSchema; import org.tikv.kvproto.Cdcpb; import org.tikv.kvproto.Kvrpcpb; diff --git a/docs/content/connectors/vitess-cdc.md b/docs/content/connectors/vitess-cdc.md index a6959b7d3..eb0019593 100644 --- a/docs/content/connectors/vitess-cdc.md +++ b/docs/content/connectors/vitess-cdc.md @@ -224,8 +224,8 @@ The Incremental Reading feature of Vitess CDC Source only exposes in SQL current ```java import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.source.SourceFunction; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; -import com.ververica.cdc.connectors.vitess.VitessSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.vitess.VitessSource; public class VitessSourceExample { public static void main(String[] args) throws Exception { diff --git a/docs/content/overview/cdc-connectors.md b/docs/content/overview/cdc-connectors.md index b95f03c26..b209d5afd 100644 --- a/docs/content/overview/cdc-connectors.md +++ b/docs/content/overview/cdc-connectors.md @@ -124,8 +124,8 @@ Include following Maven dependency (available through Maven Central): ```java import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; -import com.ververica.cdc.connectors.mysql.source.MySqlSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSource; public class MySqlBinlogSourceExample { public static void main(String[] args) throws Exception { diff --git a/docs/content/quickstart/datastream-api-package-guidance.md b/docs/content/quickstart/datastream-api-package-guidance.md index cf5a60191..f9ecaa538 100644 --- a/docs/content/quickstart/datastream-api-package-guidance.md +++ b/docs/content/quickstart/datastream-api-package-guidance.md @@ -182,35 +182,35 @@ flink 1.17.2 flink mysql cdc 2.4.2 org.apache.kafka - com.ververica.cdc.connectors.shaded.org.apache.kafka + org.apache.flink.cdc.connectors.shaded.org.apache.kafka org.antlr - com.ververica.cdc.connectors.shaded.org.antlr + org.apache.flink.cdc.connectors.shaded.org.antlr com.fasterxml - com.ververica.cdc.connectors.shaded.com.fasterxml + org.apache.flink.cdc.connectors.shaded.com.fasterxml com.google - com.ververica.cdc.connectors.shaded.com.google + org.apache.flink.cdc.connectors.shaded.com.google com.esri.geometry - com.ververica.cdc.connectors.shaded.com.esri.geometry + org.apache.flink.cdc.connectors.shaded.com.esri.geometry com.zaxxer - com.ververica.cdc.connectors.shaded.com.zaxxer + org.apache.flink.cdc.connectors.shaded.com.zaxxer @@ -233,8 +233,8 @@ package com.ververica.flink.cdc; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.connectors.mysql.source.MySqlSource; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; public class CdcTest { public static void main(String[] args) throws Exception { diff --git a/docs/content/快速上手/datastream-api-package-guidance-zh.md b/docs/content/快速上手/datastream-api-package-guidance-zh.md index 9f9c806c7..400474b3d 100644 --- a/docs/content/快速上手/datastream-api-package-guidance-zh.md +++ b/docs/content/快速上手/datastream-api-package-guidance-zh.md @@ -182,35 +182,35 @@ flink 1.17.2 flink mysql cdc 2.4.2 org.apache.kafka - com.ververica.cdc.connectors.shaded.org.apache.kafka + org.apache.flink.cdc.connectors.shaded.org.apache.kafka org.antlr - com.ververica.cdc.connectors.shaded.org.antlr + org.apache.flink.cdc.connectors.shaded.org.antlr com.fasterxml - com.ververica.cdc.connectors.shaded.com.fasterxml + org.apache.flink.cdc.connectors.shaded.com.fasterxml com.google - com.ververica.cdc.connectors.shaded.com.google + org.apache.flink.cdc.connectors.shaded.com.google com.esri.geometry - com.ververica.cdc.connectors.shaded.com.esri.geometry + org.apache.flink.cdc.connectors.shaded.com.esri.geometry com.zaxxer - com.ververica.cdc.connectors.shaded.com.zaxxer + org.apache.flink.cdc.connectors.shaded.com.zaxxer @@ -233,8 +233,8 @@ package com.ververica.flink.cdc; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.connectors.mysql.source.MySqlSource; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSource; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; public class CdcTest { public static void main(String[] args) throws Exception { diff --git a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/CliExecutor.java b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/CliExecutor.java similarity index 85% rename from flink-cdc-cli/src/main/java/com/ververica/cdc/cli/CliExecutor.java rename to flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/CliExecutor.java index f5735b286..febe8b331 100644 --- a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/CliExecutor.java +++ b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/CliExecutor.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.cli; - -import com.ververica.cdc.cli.parser.PipelineDefinitionParser; -import com.ververica.cdc.cli.parser.YamlPipelineDefinitionParser; -import com.ververica.cdc.cli.utils.FlinkEnvironmentUtils; -import com.ververica.cdc.common.annotation.VisibleForTesting; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.composer.PipelineComposer; -import com.ververica.cdc.composer.PipelineExecution; -import com.ververica.cdc.composer.definition.PipelineDef; +package org.apache.flink.cdc.cli; + +import org.apache.flink.cdc.cli.parser.PipelineDefinitionParser; +import org.apache.flink.cdc.cli.parser.YamlPipelineDefinitionParser; +import org.apache.flink.cdc.cli.utils.FlinkEnvironmentUtils; +import org.apache.flink.cdc.common.annotation.VisibleForTesting; +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.composer.PipelineComposer; +import org.apache.flink.cdc.composer.PipelineExecution; +import org.apache.flink.cdc.composer.definition.PipelineDef; import java.nio.file.Path; import java.util.List; diff --git a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/CliFrontend.java b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/CliFrontend.java similarity index 95% rename from flink-cdc-cli/src/main/java/com/ververica/cdc/cli/CliFrontend.java rename to flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/CliFrontend.java index bc2f5862c..cd54333d5 100644 --- a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/CliFrontend.java +++ b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/CliFrontend.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.cli; +package org.apache.flink.cdc.cli; + +import org.apache.flink.cdc.cli.utils.ConfigurationUtils; +import org.apache.flink.cdc.cli.utils.FlinkEnvironmentUtils; +import org.apache.flink.cdc.common.annotation.VisibleForTesting; +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.composer.PipelineExecution; -import com.ververica.cdc.cli.utils.ConfigurationUtils; -import com.ververica.cdc.cli.utils.FlinkEnvironmentUtils; -import com.ververica.cdc.common.annotation.VisibleForTesting; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.composer.PipelineExecution; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.DefaultParser; diff --git a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/CliFrontendOptions.java b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/CliFrontendOptions.java similarity index 98% rename from flink-cdc-cli/src/main/java/com/ververica/cdc/cli/CliFrontendOptions.java rename to flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/CliFrontendOptions.java index 20ff8036c..fd3507d52 100644 --- a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/CliFrontendOptions.java +++ b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/CliFrontendOptions.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.cli; +package org.apache.flink.cdc.cli; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; diff --git a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/parser/PipelineDefinitionParser.java b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/parser/PipelineDefinitionParser.java similarity index 87% rename from flink-cdc-cli/src/main/java/com/ververica/cdc/cli/parser/PipelineDefinitionParser.java rename to flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/parser/PipelineDefinitionParser.java index a5c9cb59f..c7eef56c1 100644 --- a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/parser/PipelineDefinitionParser.java +++ b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/parser/PipelineDefinitionParser.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.cli.parser; +package org.apache.flink.cdc.cli.parser; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.composer.definition.PipelineDef; +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.composer.definition.PipelineDef; import java.nio.file.Path; diff --git a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParser.java b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/parser/YamlPipelineDefinitionParser.java similarity index 93% rename from flink-cdc-cli/src/main/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParser.java rename to flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/parser/YamlPipelineDefinitionParser.java index 8ef210c1a..67db2b821 100644 --- a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParser.java +++ b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/parser/YamlPipelineDefinitionParser.java @@ -15,26 +15,26 @@ * limitations under the License. */ -package com.ververica.cdc.cli.parser; +package org.apache.flink.cdc.cli.parser; + +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.composer.definition.PipelineDef; +import org.apache.flink.cdc.composer.definition.RouteDef; +import org.apache.flink.cdc.composer.definition.SinkDef; +import org.apache.flink.cdc.composer.definition.SourceDef; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.type.TypeReference; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.composer.definition.PipelineDef; -import com.ververica.cdc.composer.definition.RouteDef; -import com.ververica.cdc.composer.definition.SinkDef; -import com.ververica.cdc.composer.definition.SourceDef; - import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; -import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; +import static org.apache.flink.cdc.common.utils.Preconditions.checkNotNull; /** Parser for converting YAML formatted pipeline definition to {@link PipelineDef}. */ public class YamlPipelineDefinitionParser implements PipelineDefinitionParser { diff --git a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/utils/ConfigurationUtils.java b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/utils/ConfigurationUtils.java similarity index 95% rename from flink-cdc-cli/src/main/java/com/ververica/cdc/cli/utils/ConfigurationUtils.java rename to flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/utils/ConfigurationUtils.java index be6d3911e..efe0a5143 100644 --- a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/utils/ConfigurationUtils.java +++ b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/utils/ConfigurationUtils.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.cli.utils; +package org.apache.flink.cdc.cli.utils; + +import org.apache.flink.cdc.common.configuration.Configuration; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.type.TypeReference; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import com.ververica.cdc.common.configuration.Configuration; - import java.io.FileNotFoundException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/utils/FlinkEnvironmentUtils.java b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/utils/FlinkEnvironmentUtils.java similarity index 91% rename from flink-cdc-cli/src/main/java/com/ververica/cdc/cli/utils/FlinkEnvironmentUtils.java rename to flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/utils/FlinkEnvironmentUtils.java index c6ce8e1c1..15226a18f 100644 --- a/flink-cdc-cli/src/main/java/com/ververica/cdc/cli/utils/FlinkEnvironmentUtils.java +++ b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/utils/FlinkEnvironmentUtils.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.cli.utils; +package org.apache.flink.cdc.cli.utils; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.composer.flink.FlinkPipelineComposer; +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.composer.flink.FlinkPipelineComposer; import java.nio.file.Path; import java.util.List; diff --git a/flink-cdc-cli/src/test/java/com/ververica/cdc/cli/CliFrontendTest.java b/flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/CliFrontendTest.java similarity index 96% rename from flink-cdc-cli/src/test/java/com/ververica/cdc/cli/CliFrontendTest.java rename to flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/CliFrontendTest.java index 806180769..1f8a37236 100644 --- a/flink-cdc-cli/src/test/java/com/ververica/cdc/cli/CliFrontendTest.java +++ b/flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/CliFrontendTest.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.cli; +package org.apache.flink.cdc.cli; + +import org.apache.flink.cdc.composer.PipelineComposer; +import org.apache.flink.cdc.composer.PipelineExecution; +import org.apache.flink.cdc.composer.definition.PipelineDef; import org.apache.flink.shaded.guava31.com.google.common.io.Resources; -import com.ververica.cdc.composer.PipelineComposer; -import com.ververica.cdc.composer.PipelineExecution; -import com.ververica.cdc.composer.definition.PipelineDef; import org.apache.commons.cli.CommandLineParser; import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.Options; diff --git a/flink-cdc-cli/src/test/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParserTest.java b/flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/parser/YamlPipelineDefinitionParserTest.java similarity index 96% rename from flink-cdc-cli/src/test/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParserTest.java rename to flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/parser/YamlPipelineDefinitionParserTest.java index 16defd2d7..6a1c9c688 100644 --- a/flink-cdc-cli/src/test/java/com/ververica/cdc/cli/parser/YamlPipelineDefinitionParserTest.java +++ b/flink-cdc-cli/src/test/java/org/apache/flink/cdc/cli/parser/YamlPipelineDefinitionParserTest.java @@ -15,16 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.cli.parser; +package org.apache.flink.cdc.cli.parser; + +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.composer.definition.PipelineDef; +import org.apache.flink.cdc.composer.definition.RouteDef; +import org.apache.flink.cdc.composer.definition.SinkDef; +import org.apache.flink.cdc.composer.definition.SourceDef; import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; import org.apache.flink.shaded.guava31.com.google.common.io.Resources; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.composer.definition.PipelineDef; -import com.ververica.cdc.composer.definition.RouteDef; -import com.ververica.cdc.composer.definition.SinkDef; -import com.ververica.cdc.composer.definition.SourceDef; import org.junit.jupiter.api.Test; import java.net.URL; @@ -32,11 +33,11 @@ import java.nio.file.Paths; import java.util.Arrays; import java.util.Collections; -import static com.ververica.cdc.common.pipeline.PipelineOptions.PIPELINE_LOCAL_TIME_ZONE; +import static org.apache.flink.cdc.common.pipeline.PipelineOptions.PIPELINE_LOCAL_TIME_ZONE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; -/** Unit test for {@link YamlPipelineDefinitionParser}. */ +/** Unit test for {@link org.apache.flink.cdc.cli.parser.YamlPipelineDefinitionParser}. */ class YamlPipelineDefinitionParserTest { @Test diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/Experimental.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/Experimental.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/Experimental.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/Experimental.java index 5017d054f..704e77319 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/Experimental.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/Experimental.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.annotation; +package org.apache.flink.cdc.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/Internal.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/Internal.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/Internal.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/Internal.java index 9b9a1138b..5e6f8fded 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/Internal.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/Internal.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.annotation; +package org.apache.flink.cdc.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/Public.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/Public.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/Public.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/Public.java index 891680f4a..fe3c55745 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/Public.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/Public.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.annotation; +package org.apache.flink.cdc.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/PublicEvolving.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/PublicEvolving.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/PublicEvolving.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/PublicEvolving.java index 41c75a2bb..ddac2c62a 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/PublicEvolving.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/PublicEvolving.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.annotation; +package org.apache.flink.cdc.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/VisibleForTesting.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/VisibleForTesting.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/VisibleForTesting.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/VisibleForTesting.java index 188f52148..7a14433a9 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/annotation/VisibleForTesting.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/annotation/VisibleForTesting.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.annotation; +package org.apache.flink.cdc.common.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/ConfigOption.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/ConfigOption.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/ConfigOption.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/ConfigOption.java index 6f662f3e1..a0db41a35 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/ConfigOption.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/ConfigOption.java @@ -15,17 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration; +package org.apache.flink.cdc.common.configuration; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.configuration.description.Description; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.configuration.description.Description; +import org.apache.flink.cdc.common.utils.Preconditions; import java.util.Arrays; import java.util.Collections; import java.util.stream.Stream; -import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; - /** * A {@code ConfigOption} describes a configuration parameter. It encapsulates the configuration * key, deprecated older versions of the key, and an optional default value for the configuration @@ -98,11 +97,11 @@ public class ConfigOption { T defaultValue, boolean isList, FallbackKey... fallbackKeys) { - this.key = checkNotNull(key); + this.key = Preconditions.checkNotNull(key); this.description = description; this.defaultValue = defaultValue; this.fallbackKeys = fallbackKeys == null || fallbackKeys.length == 0 ? EMPTY : fallbackKeys; - this.clazz = checkNotNull(clazz); + this.clazz = Preconditions.checkNotNull(clazz); this.isList = isList; } diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/ConfigOptions.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/ConfigOptions.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/ConfigOptions.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/ConfigOptions.java index ea9725cbc..4d9d3c701 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/ConfigOptions.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/ConfigOptions.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration; +package org.apache.flink.cdc.common.configuration; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.configuration.description.Description; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.configuration.description.Description; +import org.apache.flink.cdc.common.utils.Preconditions; import java.time.Duration; import java.util.Arrays; import java.util.List; import java.util.Map; -import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; - /** * {@code ConfigOptions} are used to build a {@link ConfigOption}. The option is typically built in * one of the following pattern: @@ -75,7 +74,7 @@ public class ConfigOptions { * @return The builder for the config option with the given key. */ public static OptionBuilder key(String key) { - checkNotNull(key); + Preconditions.checkNotNull(key); return new OptionBuilder(key); } diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/Configuration.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/Configuration.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/Configuration.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/Configuration.java index b02ec8184..e5ce2f2d5 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/Configuration.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/Configuration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration; +package org.apache.flink.cdc.common.configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,10 +26,10 @@ import java.util.Map; import java.util.Optional; import java.util.function.BiFunction; -import static com.ververica.cdc.common.configuration.ConfigurationUtils.canBePrefixMap; -import static com.ververica.cdc.common.configuration.ConfigurationUtils.containsPrefixMap; -import static com.ververica.cdc.common.configuration.ConfigurationUtils.convertToPropertiesPrefixed; -import static com.ververica.cdc.common.configuration.ConfigurationUtils.removePrefixMap; +import static org.apache.flink.cdc.common.configuration.ConfigurationUtils.canBePrefixMap; +import static org.apache.flink.cdc.common.configuration.ConfigurationUtils.containsPrefixMap; +import static org.apache.flink.cdc.common.configuration.ConfigurationUtils.convertToPropertiesPrefixed; +import static org.apache.flink.cdc.common.configuration.ConfigurationUtils.removePrefixMap; /** Lightweight configuration object which stores key/value pairs. */ public class Configuration implements java.io.Serializable, Cloneable { diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/ConfigurationUtils.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/ConfigurationUtils.java similarity index 93% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/ConfigurationUtils.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/ConfigurationUtils.java index caa2e55e9..7fea3960e 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/ConfigurationUtils.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/ConfigurationUtils.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration; +package org.apache.flink.cdc.common.configuration; -import com.ververica.cdc.common.utils.TimeUtils; +import org.apache.flink.cdc.common.utils.TimeUtils; import java.time.Duration; import java.util.Arrays; @@ -26,8 +26,6 @@ import java.util.Locale; import java.util.Map; import java.util.stream.Collectors; -import static com.ververica.cdc.common.configuration.StructuredOptionsSplitter.escapeWithSingleQuote; - /** Utility class for {@link Configuration} related helper functions. */ public class ConfigurationUtils { @@ -140,7 +138,10 @@ public class ConfigurationUtils { } else if (o instanceof List) { return ((List) o) .stream() - .map(e -> escapeWithSingleQuote(convertToString(e), ";")) + .map( + e -> + StructuredOptionsSplitter.escapeWithSingleQuote( + convertToString(e), ";")) .collect(Collectors.joining(";")); } else if (o instanceof Map) { return ((Map) o) @@ -148,11 +149,13 @@ public class ConfigurationUtils { .map( e -> { String escapedKey = - escapeWithSingleQuote(e.getKey().toString(), ":"); + StructuredOptionsSplitter.escapeWithSingleQuote( + e.getKey().toString(), ":"); String escapedValue = - escapeWithSingleQuote(e.getValue().toString(), ":"); + StructuredOptionsSplitter.escapeWithSingleQuote( + e.getValue().toString(), ":"); - return escapeWithSingleQuote( + return StructuredOptionsSplitter.escapeWithSingleQuote( escapedKey + ":" + escapedValue, ","); }) .collect(Collectors.joining(",")); diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/FallbackKey.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/FallbackKey.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/FallbackKey.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/FallbackKey.java index 21b20d643..77b0b8a01 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/FallbackKey.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/FallbackKey.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration; +package org.apache.flink.cdc.common.configuration; /** A key with FallbackKeys will fall back to the FallbackKeys if it itself is not configured. */ public class FallbackKey { diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/StructuredOptionsSplitter.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/StructuredOptionsSplitter.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/StructuredOptionsSplitter.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/StructuredOptionsSplitter.java index 0ecb32885..f86ecb2bb 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/StructuredOptionsSplitter.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/StructuredOptionsSplitter.java @@ -15,16 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration; +package org.apache.flink.cdc.common.configuration; -import com.ververica.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.utils.Preconditions; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; - /** Helper class for splitting a string on a given delimiter with quoting logic. */ @Internal class StructuredOptionsSplitter { @@ -48,7 +47,7 @@ class StructuredOptionsSplitter { * @return a list of splits */ static List splitEscaped(String string, char delimiter) { - List tokens = tokenize(checkNotNull(string), delimiter); + List tokens = tokenize(Preconditions.checkNotNull(string), delimiter); return processTokens(tokens); } diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/BlockElement.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/BlockElement.java similarity index 88% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/BlockElement.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/BlockElement.java index 1bb2dbf5b..85ea1176a 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/BlockElement.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/BlockElement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration.description; +package org.apache.flink.cdc.common.configuration.description; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** Part of description that represents a block e.g. some text, linebreak or a list. */ @PublicEvolving diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/Description.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/Description.java similarity index 92% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/Description.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/Description.java index da194eed3..c1ba3ca8f 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/Description.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/Description.java @@ -15,17 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration.description; +package org.apache.flink.cdc.common.configuration.description; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.configuration.ConfigOption; import java.util.ArrayList; import java.util.List; -/** - * Description for {@link com.ververica.cdc.common.configuration.ConfigOption}. Allows providing - * multiple rich formats. - */ +/** Description for {@link ConfigOption}. Allows providing multiple rich formats. */ @PublicEvolving public class Description { diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/DescriptionElement.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/DescriptionElement.java similarity index 89% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/DescriptionElement.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/DescriptionElement.java index 131d2cf89..a95a33afd 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/DescriptionElement.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/DescriptionElement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration.description; +package org.apache.flink.cdc.common.configuration.description; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** Part of a {@link Description} that can be converted into String representation. */ @PublicEvolving diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/Formatter.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/Formatter.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/Formatter.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/Formatter.java index b0cdf5fad..3a979fdeb 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/Formatter.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/Formatter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration.description; +package org.apache.flink.cdc.common.configuration.description; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.EnumSet; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/HtmlFormatter.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/HtmlFormatter.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/HtmlFormatter.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/HtmlFormatter.java index afc06dfbc..cceecb3af 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/HtmlFormatter.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/HtmlFormatter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration.description; +package org.apache.flink.cdc.common.configuration.description; import java.util.EnumSet; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/InlineElement.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/InlineElement.java similarity index 88% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/InlineElement.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/InlineElement.java index bad3919f0..481e10e68 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/InlineElement.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/InlineElement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration.description; +package org.apache.flink.cdc.common.configuration.description; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** Part of description that represents an element inside a block e.g. a link. */ @PublicEvolving diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/LineBreakElement.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/LineBreakElement.java similarity index 90% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/LineBreakElement.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/LineBreakElement.java index 52fe7096b..036dc2163 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/LineBreakElement.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/LineBreakElement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration.description; +package org.apache.flink.cdc.common.configuration.description; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** Represents a line break in the {@link Description}. */ @PublicEvolving diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/LinkElement.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/LinkElement.java similarity index 94% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/LinkElement.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/LinkElement.java index 1062d9049..5ff5e33eb 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/LinkElement.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/LinkElement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration.description; +package org.apache.flink.cdc.common.configuration.description; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** Element that represents a link in the {@link Description}. */ @PublicEvolving diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/ListElement.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/ListElement.java similarity index 93% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/ListElement.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/ListElement.java index 682be20a1..2a3ad1872 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/ListElement.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/ListElement.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration.description; +package org.apache.flink.cdc.common.configuration.description; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Arrays; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/TextElement.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/TextElement.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/TextElement.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/TextElement.java index 3329348fd..95f107f76 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/configuration/description/TextElement.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/configuration/description/TextElement.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.configuration.description; +package org.apache.flink.cdc.common.configuration.description; -import org.apache.flink.shaded.guava31.com.google.common.base.Strings; +import org.apache.flink.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.shaded.guava31.com.google.common.base.Strings; import java.util.Arrays; import java.util.Collections; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/ArrayData.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/ArrayData.java similarity index 95% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/ArrayData.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/ArrayData.java index 057cce751..8b25b4586 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/ArrayData.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/ArrayData.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.common.data; +package org.apache.flink.cdc.common.data; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.ArrayType; -import com.ververica.cdc.common.types.DataType; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.ArrayType; +import org.apache.flink.cdc.common.types.DataType; import javax.annotation.Nullable; import java.io.Serializable; -import static com.ververica.cdc.common.types.DataTypeChecks.getFieldCount; -import static com.ververica.cdc.common.types.DataTypeChecks.getPrecision; -import static com.ververica.cdc.common.types.DataTypeChecks.getScale; +import static org.apache.flink.cdc.common.types.DataTypeChecks.getFieldCount; +import static org.apache.flink.cdc.common.types.DataTypeChecks.getPrecision; +import static org.apache.flink.cdc.common.types.DataTypeChecks.getScale; /** * Base interface of an internal data structure representing data of {@link ArrayType}. diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/DecimalData.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/DecimalData.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/DecimalData.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/DecimalData.java index fb171f6e5..da83cc7cf 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/DecimalData.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/DecimalData.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.data; +package org.apache.flink.cdc.common.data; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.DecimalType; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.DecimalType; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -27,7 +27,7 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.math.RoundingMode; -import static com.ververica.cdc.common.utils.Preconditions.checkArgument; +import static org.apache.flink.cdc.common.utils.Preconditions.checkArgument; /** * An internal data structure representing data of {@link DecimalType}. diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/GenericArrayData.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/GenericArrayData.java similarity index 98% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/GenericArrayData.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/GenericArrayData.java index 733334e4f..f87905c43 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/GenericArrayData.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/GenericArrayData.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.data; +package org.apache.flink.cdc.common.data; + +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.ArrayType; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.ArrayType; import org.apache.commons.lang3.ArrayUtils; import java.util.Arrays; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/GenericMapData.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/GenericMapData.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/GenericMapData.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/GenericMapData.java index 0bb399795..e38a83509 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/GenericMapData.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/GenericMapData.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.data; +package org.apache.flink.cdc.common.data; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.MapType; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.MapType; import java.util.Map; import java.util.Objects; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/LocalZonedTimestampData.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/LocalZonedTimestampData.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/LocalZonedTimestampData.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/LocalZonedTimestampData.java index 071846796..9f4a40c9d 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/LocalZonedTimestampData.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/LocalZonedTimestampData.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.data; +package org.apache.flink.cdc.common.data; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.LocalZonedTimestampType; -import com.ververica.cdc.common.utils.Preconditions; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.LocalZonedTimestampType; +import org.apache.flink.cdc.common.utils.Preconditions; import java.time.Instant; import java.time.LocalDate; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/MapData.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/MapData.java similarity index 91% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/MapData.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/MapData.java index beb2e1857..7bff8da55 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/MapData.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/MapData.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.data; +package org.apache.flink.cdc.common.data; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.MapType; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.MapType; /** * Base interface of an internal data structure representing data of {@link MapType}. diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/RecordData.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/RecordData.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/RecordData.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/RecordData.java index b5befccd2..c3aa97b65 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/RecordData.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/RecordData.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.common.data; +package org.apache.flink.cdc.common.data; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.DataType; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.DataType; import javax.annotation.Nullable; import java.io.Serializable; -import static com.ververica.cdc.common.types.DataTypeChecks.getFieldCount; -import static com.ververica.cdc.common.types.DataTypeChecks.getPrecision; -import static com.ververica.cdc.common.types.DataTypeChecks.getScale; +import static org.apache.flink.cdc.common.types.DataTypeChecks.getFieldCount; +import static org.apache.flink.cdc.common.types.DataTypeChecks.getPrecision; +import static org.apache.flink.cdc.common.types.DataTypeChecks.getScale; /** * Class {@code RecordData} describes the data of changed record (i.e. row) in the external system. diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/StringData.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/StringData.java similarity index 85% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/StringData.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/StringData.java index 7b0687f9f..4b21b3e5c 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/StringData.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/StringData.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.data; +package org.apache.flink.cdc.common.data; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.CharType; -import com.ververica.cdc.common.types.VarCharType; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.CharType; +import org.apache.flink.cdc.common.types.VarCharType; /** An internal data structure representing data of {@link CharType} and {@link VarCharType}. */ @PublicEvolving diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/TimestampData.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/TimestampData.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/TimestampData.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/TimestampData.java index dff8770f0..aca9580f9 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/TimestampData.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/TimestampData.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.data; +package org.apache.flink.cdc.common.data; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.TimestampType; -import com.ververica.cdc.common.utils.Preconditions; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.TimestampType; +import org.apache.flink.cdc.common.utils.Preconditions; import java.sql.Timestamp; import java.time.LocalDate; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/ZonedTimestampData.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/ZonedTimestampData.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/ZonedTimestampData.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/ZonedTimestampData.java index 241b2768a..e6c7def33 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/ZonedTimestampData.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/ZonedTimestampData.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.data; +package org.apache.flink.cdc.common.data; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.ZonedTimestampType; -import com.ververica.cdc.common.utils.Preconditions; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.ZonedTimestampType; +import org.apache.flink.cdc.common.utils.Preconditions; import java.sql.Timestamp; import java.time.Instant; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryFormat.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinaryFormat.java similarity index 95% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryFormat.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinaryFormat.java index 5953e50c8..ff52f4a2c 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryFormat.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinaryFormat.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.data.binary; +package org.apache.flink.cdc.common.data.binary; +import org.apache.flink.cdc.common.annotation.Internal; import org.apache.flink.core.memory.MemorySegment; -import com.ververica.cdc.common.annotation.Internal; - /** Binary format spanning {@link MemorySegment}s. */ @Internal public interface BinaryFormat { diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryRecordData.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinaryRecordData.java similarity index 91% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryRecordData.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinaryRecordData.java index 9e07a4c37..a2d91bbd8 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryRecordData.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinaryRecordData.java @@ -15,31 +15,29 @@ * limitations under the License. */ -package com.ververica.cdc.common.data.binary; - +package org.apache.flink.cdc.common.data.binary; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.data.ArrayData; +import org.apache.flink.cdc.common.data.DecimalData; +import org.apache.flink.cdc.common.data.LocalZonedTimestampData; +import org.apache.flink.cdc.common.data.MapData; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.data.StringData; +import org.apache.flink.cdc.common.data.TimestampData; +import org.apache.flink.cdc.common.data.ZonedTimestampData; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypeRoot; +import org.apache.flink.cdc.common.types.DecimalType; +import org.apache.flink.cdc.common.types.LocalZonedTimestampType; +import org.apache.flink.cdc.common.types.TimestampType; +import org.apache.flink.cdc.common.types.ZonedTimestampType; +import org.apache.flink.cdc.common.utils.Preconditions; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.data.ArrayData; -import com.ververica.cdc.common.data.DecimalData; -import com.ververica.cdc.common.data.LocalZonedTimestampData; -import com.ververica.cdc.common.data.MapData; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.data.StringData; -import com.ververica.cdc.common.data.TimestampData; -import com.ververica.cdc.common.data.ZonedTimestampData; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DecimalType; -import com.ververica.cdc.common.types.LocalZonedTimestampType; -import com.ververica.cdc.common.types.TimestampType; -import com.ververica.cdc.common.types.ZonedTimestampType; - import java.nio.ByteOrder; -import static com.ververica.cdc.common.types.DataTypeRoot.DECIMAL; -import static com.ververica.cdc.common.utils.Preconditions.checkArgument; - /** * An implementation of {@link RecordData} which is backed by {@link MemorySegment} instead of * Object. It can significantly reduce the serialization/deserialization of Java objects. @@ -110,14 +108,14 @@ public final class BinaryRecordData extends BinarySection implements RecordData, } public static boolean isMutable(DataType type) { - return isInFixedLengthPart(type) || type.getTypeRoot() == DECIMAL; + return isInFixedLengthPart(type) || type.getTypeRoot() == DataTypeRoot.DECIMAL; } private final int arity; private final int nullBitsSizeInBytes; public BinaryRecordData(int arity) { - checkArgument(arity >= 0); + Preconditions.checkArgument(arity >= 0); this.arity = arity; this.nullBitsSizeInBytes = calculateBitSetWidthInBytes(arity); } diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinarySection.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinarySection.java similarity index 94% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinarySection.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinarySection.java index 0d73ef5e2..799c91a4f 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinarySection.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinarySection.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.common.data.binary; +package org.apache.flink.cdc.common.data.binary; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.utils.Preconditions; import org.apache.flink.core.memory.MemorySegment; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.utils.Preconditions; - /** A basic implementation of {@link BinaryFormat} which describe a section of memory. */ @Internal public class BinarySection implements BinaryFormat { diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinarySegmentUtils.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinarySegmentUtils.java similarity index 98% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinarySegmentUtils.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinarySegmentUtils.java index 7101ea6c0..079527f32 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinarySegmentUtils.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinarySegmentUtils.java @@ -15,23 +15,22 @@ * limitations under the License. */ -package com.ververica.cdc.common.data.binary; - +package org.apache.flink.cdc.common.data.binary; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.data.DecimalData; +import org.apache.flink.cdc.common.data.LocalZonedTimestampData; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.data.StringData; +import org.apache.flink.cdc.common.data.TimestampData; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.data.DecimalData; -import com.ververica.cdc.common.data.LocalZonedTimestampData; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.data.StringData; -import com.ververica.cdc.common.data.TimestampData; - import java.io.IOException; import java.nio.ByteOrder; -import static com.ververica.cdc.common.data.binary.BinaryFormat.HIGHEST_FIRST_BIT; -import static com.ververica.cdc.common.data.binary.BinaryFormat.HIGHEST_SECOND_TO_EIGHTH_BIT; +import static org.apache.flink.cdc.common.data.binary.BinaryFormat.HIGHEST_FIRST_BIT; +import static org.apache.flink.cdc.common.data.binary.BinaryFormat.HIGHEST_SECOND_TO_EIGHTH_BIT; import static org.apache.flink.core.memory.MemoryUtils.UNSAFE; /** Utilities for binary data segments which heavily uses {@link MemorySegment}. */ diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryStringData.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinaryStringData.java similarity index 98% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryStringData.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinaryStringData.java index 058ec88d5..52af6a25c 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/BinaryStringData.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/BinaryStringData.java @@ -15,23 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.common.data.binary; +package org.apache.flink.cdc.common.data.binary; import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.data.StringData; +import org.apache.flink.cdc.common.utils.Preconditions; +import org.apache.flink.cdc.common.utils.StringUtf8Utils; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.data.StringData; -import com.ververica.cdc.common.utils.StringUtf8Utils; - import javax.annotation.Nonnull; import java.util.Arrays; -import static com.ververica.cdc.common.data.binary.BinarySegmentUtils.getBytes; -import static com.ververica.cdc.common.utils.Preconditions.checkArgument; - /** * A lazily binary implementation of {@link StringData} which is backed by {@link MemorySegment}s * and {@link String}. @@ -111,7 +108,8 @@ public final class BinaryStringData extends LazyBinaryFormat implements @Override public byte[] toBytes() { ensureMaterialized(); - return getBytes(binarySection.segments, binarySection.offset, binarySection.sizeInBytes); + return BinarySegmentUtils.getBytes( + binarySection.segments, binarySection.offset, binarySection.sizeInBytes); } @Override @@ -261,7 +259,7 @@ public final class BinaryStringData extends LazyBinaryFormat implements needCompare = Math.min(Math.min(sizeOfFirst1, sizeOfFirst2), len); } - checkArgument(needCompare == len); + Preconditions.checkArgument(needCompare == len); return binarySection.sizeInBytes - other.binarySection.sizeInBytes; } diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/LazyBinaryFormat.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/LazyBinaryFormat.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/LazyBinaryFormat.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/LazyBinaryFormat.java index a50e1b100..fe05b0424 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/LazyBinaryFormat.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/LazyBinaryFormat.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.common.data.binary; +package org.apache.flink.cdc.common.data.binary; import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.cdc.common.annotation.Internal; import org.apache.flink.core.memory.MemorySegment; -import com.ververica.cdc.common.annotation.Internal; - import java.io.IOException; /** diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/MurmurHashUtils.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/MurmurHashUtils.java similarity index 98% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/MurmurHashUtils.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/MurmurHashUtils.java index 8fc03770e..9caa30dfc 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/MurmurHashUtils.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/MurmurHashUtils.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.data.binary; +package org.apache.flink.cdc.common.data.binary; +import org.apache.flink.cdc.common.annotation.Internal; import org.apache.flink.core.memory.MemorySegment; -import com.ververica.cdc.common.annotation.Internal; - import static org.apache.flink.core.memory.MemoryUtils.UNSAFE; /** Murmur Hash. This is inspired by Guava's Murmur3_32HashFunction. */ diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/NullAwareGetters.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/NullAwareGetters.java similarity index 91% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/NullAwareGetters.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/NullAwareGetters.java index e17569842..2fc8d11c1 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/data/binary/NullAwareGetters.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/data/binary/NullAwareGetters.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.data.binary; +package org.apache.flink.cdc.common.data.binary; -import com.ververica.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.annotation.Internal; /** Provides null related getters. */ @Internal diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/AddColumnEvent.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/AddColumnEvent.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/event/AddColumnEvent.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/AddColumnEvent.java index f6a25785c..9a1802373 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/AddColumnEvent.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/AddColumnEvent.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.event; +package org.apache.flink.cdc.common.event; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.schema.Column; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.schema.Column; import javax.annotation.Nullable; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/AlterColumnTypeEvent.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/AlterColumnTypeEvent.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/event/AlterColumnTypeEvent.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/AlterColumnTypeEvent.java index ff34e1481..5eb5da0d1 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/AlterColumnTypeEvent.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/AlterColumnTypeEvent.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.event; +package org.apache.flink.cdc.common.event; -import com.ververica.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataType; import java.util.Map; import java.util.Objects; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/ChangeEvent.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/ChangeEvent.java similarity index 91% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/event/ChangeEvent.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/ChangeEvent.java index 8cd5a4895..b44fa61ae 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/ChangeEvent.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/ChangeEvent.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.event; +package org.apache.flink.cdc.common.event; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** * Class {@code ChangeEvent} represents the change events of external systems, including {@link diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/CreateTableEvent.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/CreateTableEvent.java similarity index 90% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/event/CreateTableEvent.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/CreateTableEvent.java index d8b62e019..712ad8c58 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/CreateTableEvent.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/CreateTableEvent.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.event; +package org.apache.flink.cdc.common.event; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.source.DataSource; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.source.DataSource; import java.util.Objects; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/DataChangeEvent.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/DataChangeEvent.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/event/DataChangeEvent.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/DataChangeEvent.java index 498a5b2bd..1f0289056 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/DataChangeEvent.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/DataChangeEvent.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.event; +package org.apache.flink.cdc.common.event; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.data.RecordData; import java.io.Serializable; import java.util.Collections; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/DropColumnEvent.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/DropColumnEvent.java similarity index 95% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/event/DropColumnEvent.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/DropColumnEvent.java index 3b64b17ae..301bf3d75 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/DropColumnEvent.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/DropColumnEvent.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.event; +package org.apache.flink.cdc.common.event; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.List; import java.util.Objects; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/Event.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/Event.java similarity index 90% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/event/Event.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/Event.java index b6d5214bf..ed50f9015 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/Event.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/Event.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.event; +package org.apache.flink.cdc.common.event; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** * Class {@code Event} is the super interface defines the events of external systems flowing into diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/EventDeserializer.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/EventDeserializer.java similarity index 91% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/event/EventDeserializer.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/EventDeserializer.java index b938aaab4..f220cba0c 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/EventDeserializer.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/EventDeserializer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.event; +package org.apache.flink.cdc.common.event; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.io.Serializable; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/FlushEvent.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/FlushEvent.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/event/FlushEvent.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/FlushEvent.java index 969d01a62..468faa8b5 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/FlushEvent.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/FlushEvent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.event; +package org.apache.flink.cdc.common.event; import java.util.Objects; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/OperationType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/OperationType.java similarity index 90% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/event/OperationType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/OperationType.java index 7414b4e35..f4a74182f 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/OperationType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/OperationType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.event; +package org.apache.flink.cdc.common.event; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** * Enum {@code OperationType} describes the type of operation that the data change event reports. diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/RenameColumnEvent.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/RenameColumnEvent.java similarity index 98% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/event/RenameColumnEvent.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/RenameColumnEvent.java index 20fa42a6a..63dd72381 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/RenameColumnEvent.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/RenameColumnEvent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.event; +package org.apache.flink.cdc.common.event; import java.util.Map; import java.util.Objects; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/SchemaChangeEvent.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/SchemaChangeEvent.java similarity index 91% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/event/SchemaChangeEvent.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/SchemaChangeEvent.java index 414f04514..1d37860fb 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/SchemaChangeEvent.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/SchemaChangeEvent.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.event; +package org.apache.flink.cdc.common.event; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.io.Serializable; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/TableId.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/TableId.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/event/TableId.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/TableId.java index a2b124ac5..1c7aff251 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/event/TableId.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/event/TableId.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.event; +package org.apache.flink.cdc.common.event; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import javax.annotation.Nullable; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/DataSinkFactory.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/factories/DataSinkFactory.java similarity index 87% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/DataSinkFactory.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/factories/DataSinkFactory.java index 47409e196..95ab8657c 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/DataSinkFactory.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/factories/DataSinkFactory.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.factories; +package org.apache.flink.cdc.common.factories; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.sink.DataSink; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.sink.DataSink; /** * A factory to create {@link DataSink} instances. See also {@link Factory} for more information. diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/DataSourceFactory.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/factories/DataSourceFactory.java similarity index 86% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/DataSourceFactory.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/factories/DataSourceFactory.java index 5691549b1..f72c045db 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/DataSourceFactory.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/factories/DataSourceFactory.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.factories; +package org.apache.flink.cdc.common.factories; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.source.DataSource; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.source.DataSource; /** * A factory to create {@link DataSource} instances. See also {@link Factory} for more information. diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/Factory.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/factories/Factory.java similarity index 88% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/Factory.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/factories/Factory.java index 4b0e244b2..07675d02e 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/Factory.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/factories/Factory.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.factories; +package org.apache.flink.cdc.common.factories; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.configuration.ConfigOption; -import com.ververica.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.configuration.ConfigOption; +import org.apache.flink.cdc.common.configuration.Configuration; import java.util.Set; @@ -30,8 +30,8 @@ import java.util.Set; *

A factory is uniquely identified by {@link Class} and {@link #identifier()}. * *

The list of available factories is discovered using Java's Service Provider Interfaces (SPI). - * Classes that implement this interface can be added to {@code - * META_INF/services/com.ververica.cdc.common.factories.Factory} in JAR files. + * Classes that implement this interface can be added to {@code META_INF/services/Factory} in JAR + * files. * *

Every factory declares a set of required and optional options. This information will not be * used during discovery but is helpful when generating documentation and performing validation. A diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/FactoryHelper.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/factories/FactoryHelper.java similarity index 91% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/FactoryHelper.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/factories/FactoryHelper.java index 937658fe4..a3a9ae1ac 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/factories/FactoryHelper.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/factories/FactoryHelper.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.factories; +package org.apache.flink.cdc.common.factories; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.configuration.Configuration; /** A helper for working with {@link Factory}. */ @PublicEvolving diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/pipeline/PipelineOptions.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/pipeline/PipelineOptions.java similarity index 90% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/pipeline/PipelineOptions.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/pipeline/PipelineOptions.java index f35f7b450..9ffabbfe2 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/pipeline/PipelineOptions.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/pipeline/PipelineOptions.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.common.pipeline; +package org.apache.flink.cdc.common.pipeline; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.configuration.ConfigOption; -import com.ververica.cdc.common.configuration.ConfigOptions; -import com.ververica.cdc.common.configuration.description.Description; -import com.ververica.cdc.common.configuration.description.ListElement; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.configuration.ConfigOption; +import org.apache.flink.cdc.common.configuration.ConfigOptions; +import org.apache.flink.cdc.common.configuration.description.Description; +import org.apache.flink.cdc.common.configuration.description.ListElement; -import static com.ververica.cdc.common.configuration.description.TextElement.text; +import static org.apache.flink.cdc.common.configuration.description.TextElement.text; /** Predefined pipeline configuration options. */ @PublicEvolving diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/pipeline/SchemaChangeBehavior.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/pipeline/SchemaChangeBehavior.java similarity index 89% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/pipeline/SchemaChangeBehavior.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/pipeline/SchemaChangeBehavior.java index 8d2b3d572..1ac5ddbb7 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/pipeline/SchemaChangeBehavior.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/pipeline/SchemaChangeBehavior.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.pipeline; +package org.apache.flink.cdc.common.pipeline; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** Behavior for handling schema changes. */ @PublicEvolving diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/Column.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/Column.java similarity index 93% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/Column.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/Column.java index 6c25ed4fa..5c1c59d5e 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/Column.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/Column.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.common.schema; +package org.apache.flink.cdc.common.schema; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.DataType; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.DataType; import javax.annotation.Nullable; import java.io.Serializable; import java.util.Objects; -import static com.ververica.cdc.common.utils.EncodingUtils.escapeIdentifier; -import static com.ververica.cdc.common.utils.EncodingUtils.escapeSingleQuotes; +import static org.apache.flink.cdc.common.utils.EncodingUtils.escapeIdentifier; +import static org.apache.flink.cdc.common.utils.EncodingUtils.escapeSingleQuotes; /** * Representation of a column in a {@link Schema}. diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/MetadataColumn.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/MetadataColumn.java similarity index 93% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/MetadataColumn.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/MetadataColumn.java index faa35b1cb..89eecf46f 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/MetadataColumn.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/MetadataColumn.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.schema; +package org.apache.flink.cdc.common.schema; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.DataType; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.DataType; import javax.annotation.Nullable; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/PhysicalColumn.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/PhysicalColumn.java similarity index 90% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/PhysicalColumn.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/PhysicalColumn.java index d89ee2196..1f3e26427 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/PhysicalColumn.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/PhysicalColumn.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.schema; +package org.apache.flink.cdc.common.schema; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.DataType; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.DataType; import javax.annotation.Nullable; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/Schema.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/Schema.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/Schema.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/Schema.java index c4404d7df..31110cfd5 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/Schema.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/Schema.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.common.schema; - -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.types.DataField; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypeRoot; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.common.utils.Preconditions; +package org.apache.flink.cdc.common.schema; + +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.types.DataField; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypeRoot; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.common.utils.Preconditions; import javax.annotation.Nullable; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/Selectors.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/Selectors.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/Selectors.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/Selectors.java index 2359e18ee..3b53333c0 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/Selectors.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/Selectors.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.schema; +package org.apache.flink.cdc.common.schema; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.utils.Predicates; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.utils.Predicates; import java.util.ArrayList; import java.util.Iterator; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/TableFilter.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/TableFilter.java similarity index 93% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/TableFilter.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/TableFilter.java index d9c97ef6f..b8c278d01 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/schema/TableFilter.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/schema/TableFilter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.schema; +package org.apache.flink.cdc.common.schema; -import com.ververica.cdc.common.event.TableId; +import org.apache.flink.cdc.common.event.TableId; import java.util.function.Predicate; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/DataSink.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/DataSink.java similarity index 92% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/DataSink.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/DataSink.java index 53dbf1cac..a6f92e44a 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/DataSink.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/DataSink.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.sink; +package org.apache.flink.cdc.common.sink; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** * {@code DataSink} is used to write change data to external system and apply metadata changes to diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/EventSinkProvider.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/EventSinkProvider.java similarity index 92% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/EventSinkProvider.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/EventSinkProvider.java index 3723d55a3..ec1d34b67 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/EventSinkProvider.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/EventSinkProvider.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.common.sink; +package org.apache.flink.cdc.common.sink; import org.apache.flink.api.connector.sink2.Sink; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import org.apache.flink.streaming.api.functions.sink.SinkFunction; -import com.ververica.cdc.common.annotation.PublicEvolving; - /** * A marker interface used to provide an event sink for writing change events to external systems. * We can reuse exiting Flink {@link Sink} and Flink {@link SinkFunction} implementation, and we can diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/FlinkSinkFunctionProvider.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/FlinkSinkFunctionProvider.java similarity index 90% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/FlinkSinkFunctionProvider.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/FlinkSinkFunctionProvider.java index 5798b38de..5e907bef6 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/FlinkSinkFunctionProvider.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/FlinkSinkFunctionProvider.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.common.sink; +package org.apache.flink.cdc.common.sink; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.event.Event; import org.apache.flink.streaming.api.functions.sink.SinkFunction; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.event.Event; - /** * {@code FlinkSinkFunctionProvider} is used to provide a Flink {@link SinkFunction} for writing * events to external systems. diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/FlinkSinkProvider.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/FlinkSinkProvider.java similarity index 89% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/FlinkSinkProvider.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/FlinkSinkProvider.java index b45c8daca..9daac630a 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/FlinkSinkProvider.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/FlinkSinkProvider.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.sink; +package org.apache.flink.cdc.common.sink; import org.apache.flink.api.connector.sink2.Sink; - -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.event.Event; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.event.Event; /** * {@code FlinkSinkProvider} is used to provide a Flink {@link Sink} for writing events to external diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/MetadataApplier.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/MetadataApplier.java similarity index 87% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/MetadataApplier.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/MetadataApplier.java index f064bff45..219f833cf 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/sink/MetadataApplier.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/sink/MetadataApplier.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.sink; +package org.apache.flink.cdc.common.sink; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; import java.io.Serializable; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/source/DataSource.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/DataSource.java similarity index 92% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/source/DataSource.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/DataSource.java index be0bebb16..1027207a4 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/source/DataSource.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/DataSource.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.source; +package org.apache.flink.cdc.common.source; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** * {@code DataSource} is used to access metadata and read change data from external systems. It can diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/source/EventSourceProvider.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/EventSourceProvider.java similarity index 92% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/source/EventSourceProvider.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/EventSourceProvider.java index b45aa1ef4..bf33f839e 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/source/EventSourceProvider.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/EventSourceProvider.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.common.source; +package org.apache.flink.cdc.common.source; import org.apache.flink.api.connector.source.Source; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import org.apache.flink.streaming.api.functions.source.SourceFunction; -import com.ververica.cdc.common.annotation.PublicEvolving; - /** * A marker interface used to provide an event source for reading events from external systems. We * can reuse exiting Flink {@link Source} and Flink {@link SourceFunction} implementation, and we diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/source/FlinkSourceFunctionProvider.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/FlinkSourceFunctionProvider.java similarity index 90% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/source/FlinkSourceFunctionProvider.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/FlinkSourceFunctionProvider.java index 6dc439c4d..5713aac21 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/source/FlinkSourceFunctionProvider.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/FlinkSourceFunctionProvider.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.common.source; +package org.apache.flink.cdc.common.source; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.event.Event; import org.apache.flink.streaming.api.functions.source.SourceFunction; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.event.Event; - /** * {@code FlinkSourceFunctionProvider} is used to provide a Flink {@link SourceFunction} for reading * events from external systems. diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/source/FlinkSourceProvider.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/FlinkSourceProvider.java similarity index 89% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/source/FlinkSourceProvider.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/FlinkSourceProvider.java index 54536923b..6a3e35f0b 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/source/FlinkSourceProvider.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/FlinkSourceProvider.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.source; +package org.apache.flink.cdc.common.source; import org.apache.flink.api.connector.source.Source; - -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.event.Event; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.event.Event; /** * {@code FlinkSourceProvider} is used to provide a Flink {@link Source} for reading events from diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/source/MetadataAccessor.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/MetadataAccessor.java similarity index 91% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/source/MetadataAccessor.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/MetadataAccessor.java index 640828f50..8984bcb7a 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/source/MetadataAccessor.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/source/MetadataAccessor.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.source; +package org.apache.flink.cdc.common.source; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Schema; import javax.annotation.Nullable; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/text/ParsingException.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/text/ParsingException.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/text/ParsingException.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/text/ParsingException.java index bf32db12c..ac38f6db2 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/text/ParsingException.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/text/ParsingException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.text; +package org.apache.flink.cdc.common.text; /** An exception representing a problem during parsing of text. */ public class ParsingException extends RuntimeException { diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/text/Position.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/text/Position.java similarity index 98% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/text/Position.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/text/Position.java index eb5e2d96a..625570383 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/text/Position.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/text/Position.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.text; +package org.apache.flink.cdc.common.text; /** * A class that represents the position of a particular character in terms of the lines and columns diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/text/TokenStream.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/text/TokenStream.java similarity index 99% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/text/TokenStream.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/text/TokenStream.java index 45bcd8e98..0fa138e94 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/text/TokenStream.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/text/TokenStream.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.text; +package org.apache.flink.cdc.common.text; import javax.annotation.concurrent.Immutable; import javax.annotation.concurrent.NotThreadSafe; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/ArrayType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/ArrayType.java similarity index 94% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/ArrayType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/ArrayType.java index 9780ec7f8..2e8599ae3 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/ArrayType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/ArrayType.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.utils.Preconditions; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.utils.Preconditions; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/BigIntType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/BigIntType.java similarity index 94% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/BigIntType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/BigIntType.java index 5812275a6..6f2214e9e 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/BigIntType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/BigIntType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/BinaryType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/BinaryType.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/BinaryType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/BinaryType.java index 433a11dea..df478da61 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/BinaryType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/BinaryType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/BooleanType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/BooleanType.java similarity index 94% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/BooleanType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/BooleanType.java index f9cc70929..b338a7ddc 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/BooleanType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/BooleanType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/CharType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/CharType.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/CharType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/CharType.java index d9d2bbf1b..a8ccaa322 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/CharType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/CharType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataField.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataField.java similarity index 91% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataField.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataField.java index 1e5bff650..2adcbb714 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataField.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataField.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.utils.Preconditions; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.utils.Preconditions; import javax.annotation.Nullable; import java.io.Serializable; import java.util.Objects; -import static com.ververica.cdc.common.utils.EncodingUtils.escapeIdentifier; -import static com.ververica.cdc.common.utils.EncodingUtils.escapeSingleQuotes; +import static org.apache.flink.cdc.common.utils.EncodingUtils.escapeIdentifier; +import static org.apache.flink.cdc.common.utils.EncodingUtils.escapeSingleQuotes; /** * Defines the field of a row type. diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataType.java similarity index 98% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataType.java index 8bad2ce00..1204e9295 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.utils.Preconditions; +import org.apache.flink.cdc.common.utils.Preconditions; import java.io.Serializable; import java.util.Arrays; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeChecks.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeChecks.java similarity index 99% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeChecks.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeChecks.java index 11e17a761..bb88e6ff7 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeChecks.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeChecks.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; import java.util.Arrays; import java.util.Collections; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeDefaultVisitor.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeDefaultVisitor.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeDefaultVisitor.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeDefaultVisitor.java index 28ebf6641..31036eeb6 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeDefaultVisitor.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeDefaultVisitor.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** * Implementation of {@link DataTypeVisitor} that redirects all calls to {@link diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeFamily.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeFamily.java similarity index 92% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeFamily.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeFamily.java index b718be7db..6db25cb1f 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeFamily.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeFamily.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** An enumeration of data type families for clustering {@link DataTypeRoot}s into categories. */ @PublicEvolving diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeRoot.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeRoot.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeRoot.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeRoot.java index 796be7770..357fea64f 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeRoot.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeRoot.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.EnumSet; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeVisitor.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeVisitor.java similarity index 94% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeVisitor.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeVisitor.java index 0eca469f5..fe38fa8ee 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypeVisitor.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypeVisitor.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; /** * The visitor definition of {@link DataType}. The visitor transforms a data type into instances of diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypes.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypes.java similarity index 99% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypes.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypes.java index 4d264bb24..4c5b6cb4d 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DataTypes.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DataTypes.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Arrays; import java.util.OptionalInt; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DateType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DateType.java similarity index 94% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DateType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DateType.java index 62fd17fda..eb06c1fff 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DateType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DateType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DecimalType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DecimalType.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DecimalType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DecimalType.java index a56846d93..5fcc3c598 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DecimalType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DecimalType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DoubleType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DoubleType.java similarity index 94% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DoubleType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DoubleType.java index 36a68efa3..651b5e73a 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/DoubleType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/DoubleType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/FloatType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/FloatType.java similarity index 94% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/FloatType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/FloatType.java index 4f2789ec1..5c2f77368 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/FloatType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/FloatType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/IntType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/IntType.java similarity index 94% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/IntType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/IntType.java index 106f1c193..53881c46a 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/IntType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/IntType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/LocalZonedTimestampType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/LocalZonedTimestampType.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/LocalZonedTimestampType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/LocalZonedTimestampType.java index 92ebf7951..5a85fe443 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/LocalZonedTimestampType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/LocalZonedTimestampType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/MapType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/MapType.java similarity index 95% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/MapType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/MapType.java index 8ff8b8146..41696c278 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/MapType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/MapType.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.utils.Preconditions; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.utils.Preconditions; import java.util.Arrays; import java.util.Collections; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/RowType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/RowType.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/RowType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/RowType.java index 594022bdf..47ff546d2 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/RowType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/RowType.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.utils.Preconditions; -import com.ververica.cdc.common.utils.StringUtils; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.utils.Preconditions; +import org.apache.flink.cdc.common.utils.StringUtils; import java.util.ArrayList; import java.util.Collections; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/SmallIntType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/SmallIntType.java similarity index 94% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/SmallIntType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/SmallIntType.java index d8346443a..bf6bb26c3 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/SmallIntType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/SmallIntType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/TimeType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/TimeType.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/TimeType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/TimeType.java index 82ba3f924..a83ec2ae7 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/TimeType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/TimeType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/TimestampType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/TimestampType.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/TimestampType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/TimestampType.java index 06b18b583..0f72a2ef6 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/TimestampType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/TimestampType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/TinyIntType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/TinyIntType.java similarity index 94% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/TinyIntType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/TinyIntType.java index e7d7a9d14..18b6b81d5 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/TinyIntType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/TinyIntType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/VarBinaryType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/VarBinaryType.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/VarBinaryType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/VarBinaryType.java index 1b5fc9401..0864c75b9 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/VarBinaryType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/VarBinaryType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/VarCharType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/VarCharType.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/VarCharType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/VarCharType.java index a94251369..ded988eb8 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/VarCharType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/VarCharType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/ZonedTimestampType.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/ZonedTimestampType.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/ZonedTimestampType.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/ZonedTimestampType.java index 6774add8a..e736ef4cb 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/ZonedTimestampType.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/ZonedTimestampType.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.types; +package org.apache.flink.cdc.common.types; -import com.ververica.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/utils/DataTypeUtils.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/utils/DataTypeUtils.java similarity index 90% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/utils/DataTypeUtils.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/utils/DataTypeUtils.java index 46672836e..38ef13c0d 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/utils/DataTypeUtils.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/utils/DataTypeUtils.java @@ -15,21 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.common.types.utils; +package org.apache.flink.cdc.common.types.utils; +import org.apache.flink.cdc.common.data.ArrayData; +import org.apache.flink.cdc.common.data.DecimalData; +import org.apache.flink.cdc.common.data.MapData; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.data.StringData; +import org.apache.flink.cdc.common.data.TimestampData; +import org.apache.flink.cdc.common.data.ZonedTimestampData; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.utils.Preconditions; import org.apache.flink.util.CollectionUtil; -import com.ververica.cdc.common.data.ArrayData; -import com.ververica.cdc.common.data.DecimalData; -import com.ververica.cdc.common.data.MapData; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.data.StringData; -import com.ververica.cdc.common.data.TimestampData; -import com.ververica.cdc.common.data.ZonedTimestampData; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.utils.Preconditions; - import java.util.List; /** Utilities for handling {@link DataType}s. */ diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/utils/runtime/DataInputViewStream.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/utils/runtime/DataInputViewStream.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/utils/runtime/DataInputViewStream.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/utils/runtime/DataInputViewStream.java index 551b5335b..8fecafba7 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/utils/runtime/DataInputViewStream.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/utils/runtime/DataInputViewStream.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.types.utils.runtime; +package org.apache.flink.cdc.common.types.utils.runtime; import org.apache.flink.core.memory.DataInputView; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/utils/runtime/DataOutputViewStream.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/utils/runtime/DataOutputViewStream.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/types/utils/runtime/DataOutputViewStream.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/utils/runtime/DataOutputViewStream.java index a29afc640..5798ceb12 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/types/utils/runtime/DataOutputViewStream.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/types/utils/runtime/DataOutputViewStream.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.types.utils.runtime; +package org.apache.flink.cdc.common.types.utils.runtime; import org.apache.flink.core.memory.DataOutputView; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/EncodingUtils.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/EncodingUtils.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/EncodingUtils.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/EncodingUtils.java index 1380b84d6..b029886d1 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/EncodingUtils.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/EncodingUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.utils; +package org.apache.flink.cdc.common.utils; /** General utilities for string-encoding. */ public abstract class EncodingUtils { diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/InstantiationUtil.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/InstantiationUtil.java similarity index 99% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/InstantiationUtil.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/InstantiationUtil.java index 1006c7d82..09e2285c9 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/InstantiationUtil.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/InstantiationUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.utils; +package org.apache.flink.cdc.common.utils; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.core.memory.DataInputViewStreamWrapper; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/Preconditions.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/Preconditions.java similarity index 99% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/Preconditions.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/Preconditions.java index 071c96b89..4ab278486 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/Preconditions.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/Preconditions.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.utils; +package org.apache.flink.cdc.common.utils; import javax.annotation.Nullable; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/Predicates.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/Predicates.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/Predicates.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/Predicates.java index e7828b244..570e87418 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/Predicates.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/Predicates.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.utils; +package org.apache.flink.cdc.common.utils; -import com.ververica.cdc.common.text.ParsingException; -import com.ververica.cdc.common.text.TokenStream; +import org.apache.flink.cdc.common.text.ParsingException; +import org.apache.flink.cdc.common.text.TokenStream; import java.util.ArrayList; import java.util.Collection; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/SchemaUtils.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/SchemaUtils.java similarity index 93% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/SchemaUtils.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/SchemaUtils.java index 0f59a7ef5..1d8fa1e80 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/SchemaUtils.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/SchemaUtils.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.common.utils; +package org.apache.flink.cdc.common.utils; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.Schema; import java.util.ArrayList; import java.util.LinkedList; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/StringUtf8Utils.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/StringUtf8Utils.java similarity index 99% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/StringUtf8Utils.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/StringUtf8Utils.java index 2d02a5ae0..ecd071c6f 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/StringUtf8Utils.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/StringUtf8Utils.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.common.utils; +package org.apache.flink.cdc.common.utils; -import com.ververica.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.annotation.Internal; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/StringUtils.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/StringUtils.java similarity index 97% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/StringUtils.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/StringUtils.java index 054fe784d..7e539e48c 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/StringUtils.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/StringUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.utils; +package org.apache.flink.cdc.common.utils; /** Utility class to convert objects into strings in vice-versa. */ public class StringUtils { diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/TimeUtils.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/TimeUtils.java similarity index 96% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/TimeUtils.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/TimeUtils.java index 636644d10..8e01594d2 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/TimeUtils.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/TimeUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.common.utils; +package org.apache.flink.cdc.common.utils; import java.time.Duration; import java.time.temporal.ChronoUnit; @@ -28,9 +28,6 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.IntStream; -import static com.ververica.cdc.common.utils.Preconditions.checkArgument; -import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; - /** Collection of utilities about time intervals. */ public class TimeUtils { @@ -57,10 +54,11 @@ public class TimeUtils { * @param text string to parse. */ public static Duration parseDuration(String text) { - checkNotNull(text); + Preconditions.checkNotNull(text); final String trimmed = text.trim(); - checkArgument(!trimmed.isEmpty(), "argument is an empty- or whitespace-only string"); + Preconditions.checkArgument( + !trimmed.isEmpty(), "argument is an empty- or whitespace-only string"); final int len = trimmed.length(); int pos = 0; diff --git a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/TypeCheckUtils.java b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/TypeCheckUtils.java similarity index 81% rename from flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/TypeCheckUtils.java rename to flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/TypeCheckUtils.java index f003863a6..27e2a23e3 100644 --- a/flink-cdc-common/src/main/java/com/ververica/cdc/common/utils/TypeCheckUtils.java +++ b/flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/TypeCheckUtils.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package com.ververica.cdc.common.utils; - -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypeFamily; - -import static com.ververica.cdc.common.types.DataTypeRoot.ARRAY; -import static com.ververica.cdc.common.types.DataTypeRoot.BIGINT; -import static com.ververica.cdc.common.types.DataTypeRoot.BOOLEAN; -import static com.ververica.cdc.common.types.DataTypeRoot.DECIMAL; -import static com.ververica.cdc.common.types.DataTypeRoot.INTEGER; -import static com.ververica.cdc.common.types.DataTypeRoot.MAP; -import static com.ververica.cdc.common.types.DataTypeRoot.ROW; -import static com.ververica.cdc.common.types.DataTypeRoot.TIMESTAMP_WITHOUT_TIME_ZONE; -import static com.ververica.cdc.common.types.DataTypeRoot.TIMESTAMP_WITH_LOCAL_TIME_ZONE; -import static com.ververica.cdc.common.types.DataTypeRoot.TIMESTAMP_WITH_TIME_ZONE; +package org.apache.flink.cdc.common.utils; + +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypeFamily; + +import static org.apache.flink.cdc.common.types.DataTypeRoot.ARRAY; +import static org.apache.flink.cdc.common.types.DataTypeRoot.BIGINT; +import static org.apache.flink.cdc.common.types.DataTypeRoot.BOOLEAN; +import static org.apache.flink.cdc.common.types.DataTypeRoot.DECIMAL; +import static org.apache.flink.cdc.common.types.DataTypeRoot.INTEGER; +import static org.apache.flink.cdc.common.types.DataTypeRoot.MAP; +import static org.apache.flink.cdc.common.types.DataTypeRoot.ROW; +import static org.apache.flink.cdc.common.types.DataTypeRoot.TIMESTAMP_WITHOUT_TIME_ZONE; +import static org.apache.flink.cdc.common.types.DataTypeRoot.TIMESTAMP_WITH_LOCAL_TIME_ZONE; +import static org.apache.flink.cdc.common.types.DataTypeRoot.TIMESTAMP_WITH_TIME_ZONE; /** Utils for type check purpose. */ public class TypeCheckUtils { diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/schema/SelectorsTest.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/schema/SelectorsTest.java similarity index 97% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/schema/SelectorsTest.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/schema/SelectorsTest.java index cf9f46a37..88b41c897 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/schema/SelectorsTest.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/schema/SelectorsTest.java @@ -15,14 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.common.schema; +package org.apache.flink.cdc.common.schema; + +import org.apache.flink.cdc.common.event.TableId; -import com.ververica.cdc.common.event.TableId; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -/** Test for {@link Selectors}. */ +/** Test for {@link org.apache.flink.cdc.common.schema.Selectors}. */ class SelectorsTest { @Test diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/AddColumnEventAssert.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/AddColumnEventAssert.java similarity index 93% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/AddColumnEventAssert.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/AddColumnEventAssert.java index 09bf02f17..d9f66a56f 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/AddColumnEventAssert.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/AddColumnEventAssert.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.testutils.assertions; +package org.apache.flink.cdc.common.testutils.assertions; + +import org.apache.flink.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.AddColumnEvent; import org.assertj.core.internal.Iterables; import java.util.List; diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/AlterColumnTypeEventAssert.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/AlterColumnTypeEventAssert.java similarity index 90% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/AlterColumnTypeEventAssert.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/AlterColumnTypeEventAssert.java index 270660afc..1923987f6 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/AlterColumnTypeEventAssert.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/AlterColumnTypeEventAssert.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.testutils.assertions; +package org.apache.flink.cdc.common.testutils.assertions; + +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.types.DataType; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.types.DataType; import org.assertj.core.internal.Maps; import java.util.Map; diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/ChangeEventAssert.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/ChangeEventAssert.java similarity index 91% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/ChangeEventAssert.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/ChangeEventAssert.java index 2b75e7dc8..53f4ec57b 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/ChangeEventAssert.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/ChangeEventAssert.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.testutils.assertions; +package org.apache.flink.cdc.common.testutils.assertions; + +import org.apache.flink.cdc.common.event.ChangeEvent; +import org.apache.flink.cdc.common.event.TableId; -import com.ververica.cdc.common.event.ChangeEvent; -import com.ververica.cdc.common.event.TableId; import org.assertj.core.api.AbstractAssert; /** Assertions for {@link ChangeEvent}. */ diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/CreateTableEventAssert.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/CreateTableEventAssert.java similarity index 90% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/CreateTableEventAssert.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/CreateTableEventAssert.java index d44247535..119a2ace3 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/CreateTableEventAssert.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/CreateTableEventAssert.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.testutils.assertions; +package org.apache.flink.cdc.common.testutils.assertions; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.schema.Schema; /** Assertions for {@link CreateTableEvent}. */ public class CreateTableEventAssert diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/DataChangeEventAssert.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/DataChangeEventAssert.java similarity index 92% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/DataChangeEventAssert.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/DataChangeEventAssert.java index e149df841..10f47cc71 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/DataChangeEventAssert.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/DataChangeEventAssert.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.testutils.assertions; +package org.apache.flink.cdc.common.testutils.assertions; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.OperationType; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.OperationType; /** Assertions for {@link DataChangeEvent}. */ public class DataChangeEventAssert diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/DropColumnEventAssert.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/DropColumnEventAssert.java similarity index 93% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/DropColumnEventAssert.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/DropColumnEventAssert.java index 8e6f787dd..d4e8a9167 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/DropColumnEventAssert.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/DropColumnEventAssert.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.testutils.assertions; +package org.apache.flink.cdc.common.testutils.assertions; + +import org.apache.flink.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.DropColumnEvent; import org.assertj.core.internal.Iterables; import java.util.List; diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/EventAssert.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/EventAssert.java similarity index 87% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/EventAssert.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/EventAssert.java index c197dccb0..3db619eff 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/EventAssert.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/EventAssert.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.common.testutils.assertions; +package org.apache.flink.cdc.common.testutils.assertions; + +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.SchemaChangeEvent; import org.assertj.core.api.AbstractAssert; /** Assertions for {@link EventAssert}. */ diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/EventAssertions.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/EventAssertions.java similarity index 81% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/EventAssertions.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/EventAssertions.java index 5a3c8b34d..ab3c14c1a 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/EventAssertions.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/EventAssertions.java @@ -15,17 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.common.testutils.assertions; +package org.apache.flink.cdc.common.testutils.assertions; + +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.ChangeEvent; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.ChangeEvent; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; import org.assertj.core.api.Assertions; /** Collection for entries of customized event-related assertions. */ diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/RecordDataAssert.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/RecordDataAssert.java similarity index 91% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/RecordDataAssert.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/RecordDataAssert.java index b2a8e6553..c6df25ee2 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/RecordDataAssert.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/RecordDataAssert.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.common.testutils.assertions; +package org.apache.flink.cdc.common.testutils.assertions; + +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.schema.Schema; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.schema.Schema; import org.assertj.core.api.AbstractAssert; /** Assertions for {@link RecordData}. */ diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/RecordDataWithSchemaAssert.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/RecordDataWithSchemaAssert.java similarity index 89% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/RecordDataWithSchemaAssert.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/RecordDataWithSchemaAssert.java index 38c876052..5fdc69cbb 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/RecordDataWithSchemaAssert.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/RecordDataWithSchemaAssert.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.common.testutils.assertions; +package org.apache.flink.cdc.common.testutils.assertions; + +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.utils.SchemaUtils; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.utils.SchemaUtils; import org.assertj.core.internal.Iterables; import java.util.ArrayList; diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/RenameColumnEventAssert.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/RenameColumnEventAssert.java similarity index 93% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/RenameColumnEventAssert.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/RenameColumnEventAssert.java index 3c45a78c3..1ee91af9c 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/RenameColumnEventAssert.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/RenameColumnEventAssert.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.common.testutils.assertions; +package org.apache.flink.cdc.common.testutils.assertions; + +import org.apache.flink.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.RenameColumnEvent; import org.assertj.core.internal.Maps; import java.util.Map; diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/SchemaChangeEventAssert.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/SchemaChangeEventAssert.java similarity index 84% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/SchemaChangeEventAssert.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/SchemaChangeEventAssert.java index 5c5d747f3..5bac9f477 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/testutils/assertions/SchemaChangeEventAssert.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/testutils/assertions/SchemaChangeEventAssert.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.common.testutils.assertions; +package org.apache.flink.cdc.common.testutils.assertions; -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; /** Assertions for {@link SchemaChangeEvent}. */ public class SchemaChangeEventAssert diff --git a/flink-cdc-common/src/test/java/com/ververica/cdc/common/utils/SchemaUtilsTest.java b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/utils/SchemaUtilsTest.java similarity index 92% rename from flink-cdc-common/src/test/java/com/ververica/cdc/common/utils/SchemaUtilsTest.java rename to flink-cdc-common/src/test/java/org/apache/flink/cdc/common/utils/SchemaUtilsTest.java index 9906763d4..83fb358b2 100644 --- a/flink-cdc-common/src/test/java/com/ververica/cdc/common/utils/SchemaUtilsTest.java +++ b/flink-cdc-common/src/test/java/org/apache/flink/cdc/common/utils/SchemaUtilsTest.java @@ -15,17 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.common.utils; +package org.apache.flink.cdc.common.utils; + +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; import org.junit.Assert; import org.junit.Test; @@ -35,7 +36,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -/** A test for the {@link SchemaUtils}. */ +/** A test for the {@link org.apache.flink.cdc.common.utils.SchemaUtils}. */ public class SchemaUtilsTest { @Test diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/PipelineComposer.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/PipelineComposer.java similarity index 91% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/PipelineComposer.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/PipelineComposer.java index b92dc408b..8d28a8e61 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/PipelineComposer.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/PipelineComposer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.composer; +package org.apache.flink.cdc.composer; -import com.ververica.cdc.composer.definition.PipelineDef; +import org.apache.flink.cdc.composer.definition.PipelineDef; /** Composer for translating a pipeline definition to an execution. */ public interface PipelineComposer { diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/PipelineExecution.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/PipelineExecution.java similarity index 97% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/PipelineExecution.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/PipelineExecution.java index 420be0729..8c3d1632b 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/PipelineExecution.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/PipelineExecution.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.composer; +package org.apache.flink.cdc.composer; /** A pipeline execution that can be executed by a computing engine. */ public interface PipelineExecution { diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/PipelineDef.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/PipelineDef.java similarity index 89% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/PipelineDef.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/PipelineDef.java index c7fc59612..49e6a4a0c 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/PipelineDef.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/PipelineDef.java @@ -15,18 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.composer.definition; +package org.apache.flink.cdc.composer.definition; -import com.ververica.cdc.common.annotation.VisibleForTesting; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.types.LocalZonedTimestampType; +import org.apache.flink.cdc.common.annotation.VisibleForTesting; +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.types.LocalZonedTimestampType; +import org.apache.flink.cdc.composer.PipelineComposer; +import org.apache.flink.cdc.composer.PipelineExecution; import java.time.ZoneId; import java.util.List; import java.util.Objects; import java.util.TimeZone; -import static com.ververica.cdc.common.pipeline.PipelineOptions.PIPELINE_LOCAL_TIME_ZONE; +import static org.apache.flink.cdc.common.pipeline.PipelineOptions.PIPELINE_LOCAL_TIME_ZONE; /** * Definition of a pipeline. @@ -44,9 +46,8 @@ import static com.ververica.cdc.common.pipeline.PipelineOptions.PIPELINE_LOCAL_T * * *

This class keeps track of the raw pipeline definition made by users via pipeline definition - * file. A definition will be translated to a {@link com.ververica.cdc.composer.PipelineExecution} - * by {@link com.ververica.cdc.composer.PipelineComposer} before being submitted to the computing - * engine. + * file. A definition will be translated to a {@link PipelineExecution} by {@link PipelineComposer} + * before being submitted to the computing engine. */ public class PipelineDef { private final SourceDef source; diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/RouteDef.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/RouteDef.java similarity index 98% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/RouteDef.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/RouteDef.java index ada6a8880..ee55eb366 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/RouteDef.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/RouteDef.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.composer.definition; +package org.apache.flink.cdc.composer.definition; import javax.annotation.Nullable; diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/SinkDef.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/SinkDef.java similarity index 95% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/SinkDef.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/SinkDef.java index cddd7c104..e2579f75b 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/SinkDef.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/SinkDef.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.composer.definition; +package org.apache.flink.cdc.composer.definition; -import com.ververica.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.configuration.Configuration; import javax.annotation.Nullable; diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/SourceDef.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/SourceDef.java similarity index 95% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/SourceDef.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/SourceDef.java index 47161ee90..5a28281d5 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/SourceDef.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/SourceDef.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.composer.definition; +package org.apache.flink.cdc.composer.definition; -import com.ververica.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.configuration.Configuration; import javax.annotation.Nullable; diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/TransformDef.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/TransformDef.java similarity index 95% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/TransformDef.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/TransformDef.java index 97be48ead..6b31255d7 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/definition/TransformDef.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/definition/TransformDef.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.composer.definition; +package org.apache.flink.cdc.composer.definition; /** * Definition of transformation. diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/FlinkEnvironmentUtils.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/FlinkEnvironmentUtils.java similarity index 95% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/FlinkEnvironmentUtils.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/FlinkEnvironmentUtils.java index 06961e98d..1f1034c09 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/FlinkEnvironmentUtils.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/FlinkEnvironmentUtils.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.composer.flink; +package org.apache.flink.cdc.composer.flink; +import org.apache.flink.cdc.common.annotation.Internal; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.PipelineOptions; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.common.annotation.Internal; - import java.lang.reflect.Field; import java.net.URL; import java.util.ArrayList; diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/FlinkPipelineComposer.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposer.java similarity index 85% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/FlinkPipelineComposer.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposer.java index 2b20e4a1f..f8a322839 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/FlinkPipelineComposer.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposer.java @@ -15,32 +15,31 @@ * limitations under the License. */ -package com.ververica.cdc.composer.flink; - +package org.apache.flink.cdc.composer.flink; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.factories.DataSinkFactory; +import org.apache.flink.cdc.common.factories.FactoryHelper; +import org.apache.flink.cdc.common.pipeline.PipelineOptions; +import org.apache.flink.cdc.common.sink.DataSink; +import org.apache.flink.cdc.composer.PipelineComposer; +import org.apache.flink.cdc.composer.PipelineExecution; +import org.apache.flink.cdc.composer.definition.PipelineDef; +import org.apache.flink.cdc.composer.definition.SinkDef; +import org.apache.flink.cdc.composer.flink.coordination.OperatorIDGenerator; +import org.apache.flink.cdc.composer.flink.translator.DataSinkTranslator; +import org.apache.flink.cdc.composer.flink.translator.DataSourceTranslator; +import org.apache.flink.cdc.composer.flink.translator.PartitioningTranslator; +import org.apache.flink.cdc.composer.flink.translator.RouteTranslator; +import org.apache.flink.cdc.composer.flink.translator.SchemaOperatorTranslator; +import org.apache.flink.cdc.composer.utils.FactoryDiscoveryUtils; +import org.apache.flink.cdc.runtime.serializer.event.EventSerializer; import org.apache.flink.configuration.DeploymentOptions; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.factories.DataSinkFactory; -import com.ververica.cdc.common.factories.FactoryHelper; -import com.ververica.cdc.common.pipeline.PipelineOptions; -import com.ververica.cdc.common.sink.DataSink; -import com.ververica.cdc.composer.PipelineComposer; -import com.ververica.cdc.composer.PipelineExecution; -import com.ververica.cdc.composer.definition.PipelineDef; -import com.ververica.cdc.composer.definition.SinkDef; -import com.ververica.cdc.composer.flink.coordination.OperatorIDGenerator; -import com.ververica.cdc.composer.flink.translator.DataSinkTranslator; -import com.ververica.cdc.composer.flink.translator.DataSourceTranslator; -import com.ververica.cdc.composer.flink.translator.PartitioningTranslator; -import com.ververica.cdc.composer.flink.translator.RouteTranslator; -import com.ververica.cdc.composer.flink.translator.SchemaOperatorTranslator; -import com.ververica.cdc.composer.utils.FactoryDiscoveryUtils; -import com.ververica.cdc.runtime.serializer.event.EventSerializer; - import java.net.URI; import java.net.URL; import java.nio.file.Files; diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/FlinkPipelineExecution.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/FlinkPipelineExecution.java similarity index 94% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/FlinkPipelineExecution.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/FlinkPipelineExecution.java index df8b00f8a..018d5546f 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/FlinkPipelineExecution.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/FlinkPipelineExecution.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.composer.flink; +package org.apache.flink.cdc.composer.flink; +import org.apache.flink.cdc.composer.PipelineExecution; import org.apache.flink.core.execution.JobClient; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.composer.PipelineExecution; - /** * A pipeline execution that run the defined pipeline via Flink's {@link * StreamExecutionEnvironment}. diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/coordination/OperatorIDGenerator.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/coordination/OperatorIDGenerator.java similarity index 94% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/coordination/OperatorIDGenerator.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/coordination/OperatorIDGenerator.java index 86bed6cdc..7164ef55a 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/coordination/OperatorIDGenerator.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/coordination/OperatorIDGenerator.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.composer.flink.coordination; +package org.apache.flink.cdc.composer.flink.coordination; +import org.apache.flink.cdc.common.annotation.Internal; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.shaded.guava31.com.google.common.hash.Hashing; -import com.ververica.cdc.common.annotation.Internal; - import static java.nio.charset.StandardCharsets.UTF_8; /** Generating {@link OperatorID} for communication between Flink operators. */ diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/DataSinkTranslator.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/DataSinkTranslator.java similarity index 91% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/DataSinkTranslator.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/DataSinkTranslator.java index 954ec9469..8be9a1c5d 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/DataSinkTranslator.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/DataSinkTranslator.java @@ -15,11 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.composer.flink.translator; +package org.apache.flink.cdc.composer.flink.translator; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.connector.sink2.Sink; import org.apache.flink.api.connector.sink2.TwoPhaseCommittingSink; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.sink.DataSink; +import org.apache.flink.cdc.common.sink.EventSinkProvider; +import org.apache.flink.cdc.common.sink.FlinkSinkProvider; +import org.apache.flink.cdc.composer.definition.SinkDef; +import org.apache.flink.cdc.runtime.operators.sink.DataSinkWriterOperatorFactory; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.streaming.api.connector.sink2.CommittableMessage; import org.apache.flink.streaming.api.connector.sink2.CommittableMessageTypeInfo; @@ -29,14 +36,6 @@ import org.apache.flink.streaming.api.connector.sink2.WithPreWriteTopology; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.runtime.operators.sink.CommitterOperatorFactory; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.sink.DataSink; -import com.ververica.cdc.common.sink.EventSinkProvider; -import com.ververica.cdc.common.sink.FlinkSinkProvider; -import com.ververica.cdc.composer.definition.SinkDef; -import com.ververica.cdc.runtime.operators.sink.DataSinkWriterOperatorFactory; - /** Translator for building sink into the DataStream. */ @Internal public class DataSinkTranslator { diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/DataSourceTranslator.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/DataSourceTranslator.java similarity index 81% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/DataSourceTranslator.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/DataSourceTranslator.java index 852132e04..f3c7b8372 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/DataSourceTranslator.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/DataSourceTranslator.java @@ -15,27 +15,26 @@ * limitations under the License. */ -package com.ververica.cdc.composer.flink.translator; +package org.apache.flink.cdc.composer.flink.translator; import org.apache.flink.api.common.eventtime.WatermarkStrategy; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.factories.DataSourceFactory; +import org.apache.flink.cdc.common.factories.FactoryHelper; +import org.apache.flink.cdc.common.pipeline.PipelineOptions; +import org.apache.flink.cdc.common.source.DataSource; +import org.apache.flink.cdc.common.source.EventSourceProvider; +import org.apache.flink.cdc.common.source.FlinkSourceFunctionProvider; +import org.apache.flink.cdc.common.source.FlinkSourceProvider; +import org.apache.flink.cdc.composer.definition.SourceDef; +import org.apache.flink.cdc.composer.flink.FlinkEnvironmentUtils; +import org.apache.flink.cdc.composer.utils.FactoryDiscoveryUtils; +import org.apache.flink.cdc.runtime.typeutils.EventTypeInfo; import org.apache.flink.streaming.api.datastream.DataStreamSource; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.factories.DataSourceFactory; -import com.ververica.cdc.common.factories.FactoryHelper; -import com.ververica.cdc.common.pipeline.PipelineOptions; -import com.ververica.cdc.common.source.DataSource; -import com.ververica.cdc.common.source.EventSourceProvider; -import com.ververica.cdc.common.source.FlinkSourceFunctionProvider; -import com.ververica.cdc.common.source.FlinkSourceProvider; -import com.ververica.cdc.composer.definition.SourceDef; -import com.ververica.cdc.composer.flink.FlinkEnvironmentUtils; -import com.ververica.cdc.composer.utils.FactoryDiscoveryUtils; -import com.ververica.cdc.runtime.typeutils.EventTypeInfo; - /** * Translator for building source and generate a {@link * org.apache.flink.streaming.api.datastream.DataStream}. diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/PartitioningTranslator.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/PartitioningTranslator.java similarity index 74% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/PartitioningTranslator.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/PartitioningTranslator.java index 5ca068796..3723c8e71 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/PartitioningTranslator.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/PartitioningTranslator.java @@ -15,20 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.composer.flink.translator; +package org.apache.flink.cdc.composer.flink.translator; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.runtime.partitioning.EventPartitioner; +import org.apache.flink.cdc.runtime.partitioning.PartitioningEventKeySelector; +import org.apache.flink.cdc.runtime.partitioning.PostPartitionProcessor; +import org.apache.flink.cdc.runtime.partitioning.PrePartitionOperator; +import org.apache.flink.cdc.runtime.typeutils.EventTypeInfo; +import org.apache.flink.cdc.runtime.typeutils.PartitioningEventTypeInfo; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.streaming.api.datastream.DataStream; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.runtime.partitioning.EventPartitioner; -import com.ververica.cdc.runtime.partitioning.PartitioningEventKeySelector; -import com.ververica.cdc.runtime.partitioning.PostPartitionProcessor; -import com.ververica.cdc.runtime.partitioning.PrePartitionOperator; -import com.ververica.cdc.runtime.typeutils.EventTypeInfo; -import com.ververica.cdc.runtime.typeutils.PartitioningEventTypeInfo; - /** Translator for building partitioning related transformations. */ @Internal public class PartitioningTranslator { diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/RouteTranslator.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/RouteTranslator.java similarity index 81% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/RouteTranslator.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/RouteTranslator.java index 23cfb290f..28dde2d5c 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/RouteTranslator.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/RouteTranslator.java @@ -15,16 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.composer.flink.translator; +package org.apache.flink.cdc.composer.flink.translator; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.composer.definition.RouteDef; +import org.apache.flink.cdc.runtime.operators.route.RouteFunction; +import org.apache.flink.cdc.runtime.typeutils.EventTypeInfo; import org.apache.flink.streaming.api.datastream.DataStream; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.composer.definition.RouteDef; -import com.ververica.cdc.runtime.operators.route.RouteFunction; -import com.ververica.cdc.runtime.typeutils.EventTypeInfo; - import java.util.List; /** Translator for router. */ diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/SchemaOperatorTranslator.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/SchemaOperatorTranslator.java similarity index 84% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/SchemaOperatorTranslator.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/SchemaOperatorTranslator.java index 1d4cebadf..405f7fc10 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/flink/translator/SchemaOperatorTranslator.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/flink/translator/SchemaOperatorTranslator.java @@ -15,23 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.composer.flink.translator; +package org.apache.flink.cdc.composer.flink.translator; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.pipeline.SchemaChangeBehavior; +import org.apache.flink.cdc.common.sink.MetadataApplier; +import org.apache.flink.cdc.runtime.operators.schema.SchemaOperator; +import org.apache.flink.cdc.runtime.operators.schema.SchemaOperatorFactory; +import org.apache.flink.cdc.runtime.typeutils.EventTypeInfo; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.SingleOutputStreamOperator; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.pipeline.SchemaChangeBehavior; -import com.ververica.cdc.common.sink.MetadataApplier; -import com.ververica.cdc.runtime.operators.schema.SchemaOperatorFactory; -import com.ververica.cdc.runtime.typeutils.EventTypeInfo; - -/** - * Translator for building {@link com.ververica.cdc.runtime.operators.schema.SchemaOperator} into - * DataStream. - */ +/** Translator for building {@link SchemaOperator} into DataStream. */ @Internal public class SchemaOperatorTranslator { private final SchemaChangeBehavior schemaChangeBehavior; diff --git a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/utils/FactoryDiscoveryUtils.java b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/utils/FactoryDiscoveryUtils.java similarity index 96% rename from flink-cdc-composer/src/main/java/com/ververica/cdc/composer/utils/FactoryDiscoveryUtils.java rename to flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/utils/FactoryDiscoveryUtils.java index 87dd53e91..2eb79aead 100644 --- a/flink-cdc-composer/src/main/java/com/ververica/cdc/composer/utils/FactoryDiscoveryUtils.java +++ b/flink-cdc-composer/src/main/java/org/apache/flink/cdc/composer/utils/FactoryDiscoveryUtils.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.composer.utils; +package org.apache.flink.cdc.composer.utils; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.factories.Factory; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.factories.Factory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/flink/FlinkPipelineComposerITCase.java b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerITCase.java similarity index 92% rename from flink-cdc-composer/src/test/java/com/ververica/cdc/composer/flink/FlinkPipelineComposerITCase.java rename to flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerITCase.java index 93ff8b50d..834887738 100644 --- a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/flink/FlinkPipelineComposerITCase.java +++ b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerITCase.java @@ -15,22 +15,22 @@ * limitations under the License. */ -package com.ververica.cdc.composer.flink; - +package org.apache.flink.cdc.composer.flink; + +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.pipeline.PipelineOptions; +import org.apache.flink.cdc.composer.PipelineExecution; +import org.apache.flink.cdc.composer.definition.PipelineDef; +import org.apache.flink.cdc.composer.definition.SinkDef; +import org.apache.flink.cdc.composer.definition.SourceDef; +import org.apache.flink.cdc.connectors.values.ValuesDatabase; +import org.apache.flink.cdc.connectors.values.factory.ValuesDataFactory; +import org.apache.flink.cdc.connectors.values.sink.ValuesDataSinkOptions; +import org.apache.flink.cdc.connectors.values.source.ValuesDataSourceHelper; +import org.apache.flink.cdc.connectors.values.source.ValuesDataSourceOptions; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; import org.apache.flink.test.junit5.MiniClusterExtension; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.pipeline.PipelineOptions; -import com.ververica.cdc.composer.PipelineExecution; -import com.ververica.cdc.composer.definition.PipelineDef; -import com.ververica.cdc.composer.definition.SinkDef; -import com.ververica.cdc.composer.definition.SourceDef; -import com.ververica.cdc.connectors.values.ValuesDatabase; -import com.ververica.cdc.connectors.values.factory.ValuesDataFactory; -import com.ververica.cdc.connectors.values.sink.ValuesDataSinkOptions; -import com.ververica.cdc.connectors.values.source.ValuesDataSourceHelper; -import com.ververica.cdc.connectors.values.source.ValuesDataSourceOptions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -41,8 +41,8 @@ import java.io.PrintStream; import java.util.Collections; import java.util.List; -import static com.ververica.cdc.connectors.values.source.ValuesDataSourceHelper.TABLE_1; -import static com.ververica.cdc.connectors.values.source.ValuesDataSourceHelper.TABLE_2; +import static org.apache.flink.cdc.connectors.values.source.ValuesDataSourceHelper.TABLE_1; +import static org.apache.flink.cdc.connectors.values.source.ValuesDataSourceHelper.TABLE_2; import static org.apache.flink.configuration.CoreOptions.ALWAYS_PARENT_FIRST_LOADER_PATTERNS_ADDITIONAL; import static org.assertj.core.api.Assertions.assertThat; @@ -59,7 +59,7 @@ class FlinkPipelineComposerITCase { static { MINI_CLUSTER_CONFIG.set( ALWAYS_PARENT_FIRST_LOADER_PATTERNS_ADDITIONAL, - Collections.singletonList("com.ververica.cdc")); + Collections.singletonList("org.apache.flink.cdc")); } /** diff --git a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/flink/FlinkPipelineComposerTest.java b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerTest.java similarity index 81% rename from flink-cdc-composer/src/test/java/com/ververica/cdc/composer/flink/FlinkPipelineComposerTest.java rename to flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerTest.java index d498843f5..31ca3520f 100644 --- a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/flink/FlinkPipelineComposerTest.java +++ b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerTest.java @@ -15,17 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.composer.flink; +package org.apache.flink.cdc.composer.flink; + +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.factories.DataSinkFactory; +import org.apache.flink.cdc.common.factories.FactoryHelper; +import org.apache.flink.cdc.common.sink.DataSink; +import org.apache.flink.cdc.composer.definition.SinkDef; +import org.apache.flink.cdc.composer.utils.FactoryDiscoveryUtils; +import org.apache.flink.cdc.composer.utils.factory.DataSinkFactory1; import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.factories.DataSinkFactory; -import com.ververica.cdc.common.factories.FactoryHelper; -import com.ververica.cdc.common.sink.DataSink; -import com.ververica.cdc.composer.definition.SinkDef; -import com.ververica.cdc.composer.utils.FactoryDiscoveryUtils; -import com.ververica.cdc.composer.utils.factory.DataSinkFactory1; import org.junit.Assert; import org.junit.Test; diff --git a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/flink/translator/DataSourceTranslatorTest.java b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/translator/DataSourceTranslatorTest.java similarity index 81% rename from flink-cdc-composer/src/test/java/com/ververica/cdc/composer/flink/translator/DataSourceTranslatorTest.java rename to flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/translator/DataSourceTranslatorTest.java index 5df5417de..c08c976c7 100644 --- a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/flink/translator/DataSourceTranslatorTest.java +++ b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/flink/translator/DataSourceTranslatorTest.java @@ -15,17 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.composer.flink.translator; +package org.apache.flink.cdc.composer.flink.translator; + +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.factories.DataSourceFactory; +import org.apache.flink.cdc.common.factories.FactoryHelper; +import org.apache.flink.cdc.common.source.DataSource; +import org.apache.flink.cdc.composer.definition.SourceDef; +import org.apache.flink.cdc.composer.utils.FactoryDiscoveryUtils; +import org.apache.flink.cdc.composer.utils.factory.DataSourceFactory1; import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.factories.DataSourceFactory; -import com.ververica.cdc.common.factories.FactoryHelper; -import com.ververica.cdc.common.source.DataSource; -import com.ververica.cdc.composer.definition.SourceDef; -import com.ververica.cdc.composer.utils.FactoryDiscoveryUtils; -import com.ververica.cdc.composer.utils.factory.DataSourceFactory1; import org.junit.Assert; import org.junit.Test; diff --git a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/FactoryDiscoveryUtilsTest.java b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/FactoryDiscoveryUtilsTest.java similarity index 89% rename from flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/FactoryDiscoveryUtilsTest.java rename to flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/FactoryDiscoveryUtilsTest.java index f0d2f193a..5f6a9e62e 100644 --- a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/FactoryDiscoveryUtilsTest.java +++ b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/FactoryDiscoveryUtilsTest.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.composer.utils; +package org.apache.flink.cdc.composer.utils; + +import org.apache.flink.cdc.common.factories.Factory; +import org.apache.flink.cdc.composer.utils.factory.DataSinkFactory1; +import org.apache.flink.cdc.composer.utils.factory.DataSourceFactory1; -import com.ververica.cdc.common.factories.Factory; -import com.ververica.cdc.composer.utils.factory.DataSinkFactory1; -import com.ververica.cdc.composer.utils.factory.DataSourceFactory1; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/DataSinkFactory1.java b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/DataSinkFactory1.java similarity index 85% rename from flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/DataSinkFactory1.java rename to flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/DataSinkFactory1.java index c0850bfee..19a9e00e6 100644 --- a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/DataSinkFactory1.java +++ b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/DataSinkFactory1.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.composer.utils.factory; +package org.apache.flink.cdc.composer.utils.factory; -import com.ververica.cdc.common.configuration.ConfigOption; -import com.ververica.cdc.common.factories.DataSinkFactory; -import com.ververica.cdc.common.sink.DataSink; -import com.ververica.cdc.common.sink.EventSinkProvider; -import com.ververica.cdc.common.sink.MetadataApplier; +import org.apache.flink.cdc.common.configuration.ConfigOption; +import org.apache.flink.cdc.common.factories.DataSinkFactory; +import org.apache.flink.cdc.common.sink.DataSink; +import org.apache.flink.cdc.common.sink.EventSinkProvider; +import org.apache.flink.cdc.common.sink.MetadataApplier; import java.util.HashSet; import java.util.Set; diff --git a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/DataSinkFactory2.java b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/DataSinkFactory2.java similarity index 82% rename from flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/DataSinkFactory2.java rename to flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/DataSinkFactory2.java index bf63758f1..c010faae4 100644 --- a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/DataSinkFactory2.java +++ b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/DataSinkFactory2.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.composer.utils.factory; +package org.apache.flink.cdc.composer.utils.factory; -import com.ververica.cdc.common.configuration.ConfigOption; -import com.ververica.cdc.common.factories.DataSinkFactory; -import com.ververica.cdc.common.sink.DataSink; -import com.ververica.cdc.common.sink.EventSinkProvider; -import com.ververica.cdc.common.sink.MetadataApplier; +import org.apache.flink.cdc.common.configuration.ConfigOption; +import org.apache.flink.cdc.common.factories.DataSinkFactory; +import org.apache.flink.cdc.common.sink.DataSink; +import org.apache.flink.cdc.common.sink.EventSinkProvider; +import org.apache.flink.cdc.common.sink.MetadataApplier; import java.util.HashSet; import java.util.Set; diff --git a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/DataSourceFactory1.java b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/DataSourceFactory1.java similarity index 85% rename from flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/DataSourceFactory1.java rename to flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/DataSourceFactory1.java index 3e8c8ea90..aec7068a3 100644 --- a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/DataSourceFactory1.java +++ b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/DataSourceFactory1.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.composer.utils.factory; +package org.apache.flink.cdc.composer.utils.factory; -import com.ververica.cdc.common.configuration.ConfigOption; -import com.ververica.cdc.common.factories.DataSourceFactory; -import com.ververica.cdc.common.source.DataSource; -import com.ververica.cdc.common.source.EventSourceProvider; -import com.ververica.cdc.common.source.MetadataAccessor; +import org.apache.flink.cdc.common.configuration.ConfigOption; +import org.apache.flink.cdc.common.factories.DataSourceFactory; +import org.apache.flink.cdc.common.source.DataSource; +import org.apache.flink.cdc.common.source.EventSourceProvider; +import org.apache.flink.cdc.common.source.MetadataAccessor; import java.util.HashSet; import java.util.Set; diff --git a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/DataSourceFactory2.java b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/DataSourceFactory2.java similarity index 82% rename from flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/DataSourceFactory2.java rename to flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/DataSourceFactory2.java index 6cad4ea4e..d40207248 100644 --- a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/DataSourceFactory2.java +++ b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/DataSourceFactory2.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.composer.utils.factory; +package org.apache.flink.cdc.composer.utils.factory; -import com.ververica.cdc.common.configuration.ConfigOption; -import com.ververica.cdc.common.factories.DataSourceFactory; -import com.ververica.cdc.common.source.DataSource; -import com.ververica.cdc.common.source.EventSourceProvider; -import com.ververica.cdc.common.source.MetadataAccessor; +import org.apache.flink.cdc.common.configuration.ConfigOption; +import org.apache.flink.cdc.common.factories.DataSourceFactory; +import org.apache.flink.cdc.common.source.DataSource; +import org.apache.flink.cdc.common.source.EventSourceProvider; +import org.apache.flink.cdc.common.source.MetadataAccessor; import java.util.HashSet; import java.util.Set; diff --git a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/TestOptions.java b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/TestOptions.java similarity index 79% rename from flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/TestOptions.java rename to flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/TestOptions.java index e50d5bcc9..1d8448626 100644 --- a/flink-cdc-composer/src/test/java/com/ververica/cdc/composer/utils/factory/TestOptions.java +++ b/flink-cdc-composer/src/test/java/org/apache/flink/cdc/composer/utils/factory/TestOptions.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.composer.utils.factory; +package org.apache.flink.cdc.composer.utils.factory; -import com.ververica.cdc.common.configuration.ConfigOption; -import com.ververica.cdc.common.configuration.ConfigOptions; -import com.ververica.cdc.common.factories.DataSinkFactory; -import com.ververica.cdc.common.factories.DataSourceFactory; +import org.apache.flink.cdc.common.configuration.ConfigOption; +import org.apache.flink.cdc.common.configuration.ConfigOptions; +import org.apache.flink.cdc.common.factories.DataSinkFactory; +import org.apache.flink.cdc.common.factories.DataSourceFactory; /** * A class used to provide simulation configuration parameters for {@link DataSourceFactory} and diff --git a/flink-cdc-composer/src/test/resources/META-INF/services/com.ververica.cdc.common.factories.Factory b/flink-cdc-composer/src/test/resources/META-INF/services/org.apache.flink.cdc.common.factories.Factory similarity index 75% rename from flink-cdc-composer/src/test/resources/META-INF/services/com.ververica.cdc.common.factories.Factory rename to flink-cdc-composer/src/test/resources/META-INF/services/org.apache.flink.cdc.common.factories.Factory index 7938060ae..6cea454e0 100644 --- a/flink-cdc-composer/src/test/resources/META-INF/services/com.ververica.cdc.common.factories.Factory +++ b/flink-cdc-composer/src/test/resources/META-INF/services/org.apache.flink.cdc.common.factories.Factory @@ -12,7 +12,7 @@ # 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. -com.ververica.cdc.composer.utils.factory.DataSinkFactory1 -com.ververica.cdc.composer.utils.factory.DataSinkFactory2 -com.ververica.cdc.composer.utils.factory.DataSourceFactory1 -com.ververica.cdc.composer.utils.factory.DataSourceFactory2 +org.apache.flink.cdc.composer.utils.factory.DataSinkFactory1 +org.apache.flink.cdc.composer.utils.factory.DataSinkFactory2 +org.apache.flink.cdc.composer.utils.factory.DataSourceFactory1 +org.apache.flink.cdc.composer.utils.factory.DataSourceFactory2 diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/factory/DorisDataSinkFactory.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/factory/DorisDataSinkFactory.java similarity index 68% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/factory/DorisDataSinkFactory.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/factory/DorisDataSinkFactory.java index 7d2b07b4c..8bd36f439 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/factory/DorisDataSinkFactory.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/factory/DorisDataSinkFactory.java @@ -15,16 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.doris.factory; +package org.apache.flink.cdc.connectors.doris.factory; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.configuration.ConfigOption; +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.factories.DataSinkFactory; +import org.apache.flink.cdc.common.pipeline.PipelineOptions; +import org.apache.flink.cdc.common.sink.DataSink; +import org.apache.flink.cdc.connectors.doris.sink.DorisDataSink; +import org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.configuration.ConfigOption; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.factories.DataSinkFactory; -import com.ververica.cdc.common.pipeline.PipelineOptions; -import com.ververica.cdc.common.sink.DataSink; -import com.ververica.cdc.connectors.doris.sink.DorisDataSink; -import com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions; import org.apache.doris.flink.cfg.DorisExecutionOptions; import org.apache.doris.flink.cfg.DorisOptions; import org.apache.doris.flink.cfg.DorisReadOptions; @@ -35,27 +36,27 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.AUTO_REDIRECT; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.BENODES; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.FENODES; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.JDBC_URL; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.PASSWORD; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_BUFFER_COUNT; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_BUFFER_FLUSH_INTERVAL; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_BUFFER_FLUSH_MAX_BYTES; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_BUFFER_SIZE; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_CHECK_INTERVAL; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_ENABLE_2PC; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_ENABLE_BATCH_MODE; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_ENABLE_DELETE; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_FLUSH_QUEUE_SIZE; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_IGNORE_UPDATE_BEFORE; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_LABEL_PREFIX; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_MAX_RETRIES; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_USE_CACHE; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.STREAM_LOAD_PROP_PREFIX; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.USERNAME; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.AUTO_REDIRECT; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.BENODES; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.FENODES; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.JDBC_URL; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.PASSWORD; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_BUFFER_COUNT; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_BUFFER_FLUSH_INTERVAL; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_BUFFER_FLUSH_MAX_BYTES; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_BUFFER_SIZE; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_CHECK_INTERVAL; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_ENABLE_2PC; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_ENABLE_BATCH_MODE; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_ENABLE_DELETE; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_FLUSH_QUEUE_SIZE; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_IGNORE_UPDATE_BEFORE; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_LABEL_PREFIX; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_MAX_RETRIES; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.SINK_USE_CACHE; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.STREAM_LOAD_PROP_PREFIX; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.USERNAME; /** A dummy {@link DataSinkFactory} to create {@link DorisDataSink}. */ @Internal diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisDataSink.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisDataSink.java similarity index 88% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisDataSink.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisDataSink.java index fbba869e7..130d2170c 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisDataSink.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisDataSink.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.doris.sink; +package org.apache.flink.cdc.connectors.doris.sink; + +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.sink.DataSink; +import org.apache.flink.cdc.common.sink.EventSinkProvider; +import org.apache.flink.cdc.common.sink.FlinkSinkProvider; +import org.apache.flink.cdc.common.sink.MetadataApplier; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.sink.DataSink; -import com.ververica.cdc.common.sink.EventSinkProvider; -import com.ververica.cdc.common.sink.FlinkSinkProvider; -import com.ververica.cdc.common.sink.MetadataApplier; import org.apache.doris.flink.cfg.DorisExecutionOptions; import org.apache.doris.flink.cfg.DorisOptions; import org.apache.doris.flink.cfg.DorisReadOptions; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisDataSinkOptions.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisDataSinkOptions.java similarity index 96% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisDataSinkOptions.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisDataSinkOptions.java index 02ff8b65d..62613c059 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisDataSinkOptions.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisDataSinkOptions.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.doris.sink; +package org.apache.flink.cdc.connectors.doris.sink; + +import org.apache.flink.cdc.common.configuration.ConfigOption; +import org.apache.flink.cdc.common.configuration.ConfigOptions; +import org.apache.flink.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.configuration.ConfigOption; -import com.ververica.cdc.common.configuration.ConfigOptions; -import com.ververica.cdc.common.configuration.Configuration; import org.apache.doris.flink.table.DorisConfigOptions; import java.time.Duration; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisEventSerializer.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisEventSerializer.java similarity index 88% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisEventSerializer.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisEventSerializer.java index 556090410..a3d6f21d0 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisEventSerializer.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisEventSerializer.java @@ -15,22 +15,23 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.doris.sink; +package org.apache.flink.cdc.connectors.doris.sink; + +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.OperationType; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.utils.Preconditions; +import org.apache.flink.cdc.common.utils.SchemaUtils; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.OperationType; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.utils.Preconditions; -import com.ververica.cdc.common.utils.SchemaUtils; import org.apache.doris.flink.sink.writer.serializer.DorisRecord; import org.apache.doris.flink.sink.writer.serializer.DorisRecordSerializer; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisMetadataApplier.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisMetadataApplier.java similarity index 87% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisMetadataApplier.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisMetadataApplier.java index 724b071fc..7e107eac1 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisMetadataApplier.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisMetadataApplier.java @@ -15,26 +15,26 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.doris.sink; - +package org.apache.flink.cdc.connectors.doris.sink; + +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.sink.MetadataApplier; +import org.apache.flink.cdc.common.types.DataTypeChecks; +import org.apache.flink.cdc.common.types.LocalZonedTimestampType; +import org.apache.flink.cdc.common.types.TimestampType; +import org.apache.flink.cdc.common.types.ZonedTimestampType; +import org.apache.flink.cdc.common.types.utils.DataTypeUtils; import org.apache.flink.util.CollectionUtil; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.sink.MetadataApplier; -import com.ververica.cdc.common.types.DataTypeChecks; -import com.ververica.cdc.common.types.LocalZonedTimestampType; -import com.ververica.cdc.common.types.TimestampType; -import com.ververica.cdc.common.types.ZonedTimestampType; -import com.ververica.cdc.common.types.utils.DataTypeUtils; import org.apache.doris.flink.catalog.DorisTypeMapper; import org.apache.doris.flink.catalog.doris.DataModel; import org.apache.doris.flink.catalog.doris.FieldSchema; @@ -52,7 +52,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.doris.sink.DorisDataSinkOptions.TABLE_CREATE_PROPERTIES_PREFIX; +import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.TABLE_CREATE_PROPERTIES_PREFIX; /** Supports {@link DorisDataSink} to schema evolution. */ public class DorisMetadataApplier implements MetadataApplier { diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisRowConverter.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisRowConverter.java similarity index 87% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisRowConverter.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisRowConverter.java index 0f309db9e..45576032f 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/com/ververica/cdc/connectors/doris/sink/DorisRowConverter.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/java/org/apache/flink/cdc/connectors/doris/sink/DorisRowConverter.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.doris.sink; +package org.apache.flink.cdc.connectors.doris.sink; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.flink.cdc.common.data.ArrayData; +import org.apache.flink.cdc.common.data.GenericArrayData; +import org.apache.flink.cdc.common.data.GenericMapData; +import org.apache.flink.cdc.common.data.MapData; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.types.DataField; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypeChecks; +import org.apache.flink.cdc.common.types.DecimalType; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.common.types.ZonedTimestampType; -import com.ververica.cdc.common.data.ArrayData; -import com.ververica.cdc.common.data.GenericArrayData; -import com.ververica.cdc.common.data.GenericMapData; -import com.ververica.cdc.common.data.MapData; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.types.DataField; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypeChecks; -import com.ververica.cdc.common.types.DecimalType; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.common.types.ZonedTimestampType; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.io.Serializable; @@ -41,9 +41,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.doris.sink.DorisEventSerializer.DATE_FORMATTER; -import static com.ververica.cdc.connectors.doris.sink.DorisEventSerializer.DATE_TIME_FORMATTER; - /** converter {@link RecordData} type object to doris field. */ public class DorisRowConverter implements Serializable { private static final long serialVersionUID = 1L; @@ -100,12 +97,13 @@ public class DorisRowConverter implements Serializable { return (index, val) -> val.getDouble(index); case DATE: return (index, val) -> - LocalDate.ofEpochDay(val.getInt(index)).format(DATE_FORMATTER); + LocalDate.ofEpochDay(val.getInt(index)) + .format(DorisEventSerializer.DATE_FORMATTER); case TIMESTAMP_WITHOUT_TIME_ZONE: return (index, val) -> val.getTimestamp(index, DataTypeChecks.getPrecision(type)) .toLocalDateTime() - .format(DATE_TIME_FORMATTER); + .format(DorisEventSerializer.DATE_TIME_FORMATTER); case TIMESTAMP_WITH_LOCAL_TIME_ZONE: return (index, val) -> ZonedDateTime.ofInstant( @@ -114,7 +112,7 @@ public class DorisRowConverter implements Serializable { .toInstant(), pipelineZoneId) .toLocalDateTime() - .format(DATE_TIME_FORMATTER); + .format(DorisEventSerializer.DATE_TIME_FORMATTER); case TIMESTAMP_WITH_TIME_ZONE: final int zonedP = ((ZonedTimestampType) type).getPrecision(); return (index, val) -> val.getTimestamp(index, zonedP).toTimestamp(); diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/resources/META-INF/services/com.ververica.cdc.common.factories.Factory b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/resources/META-INF/services/org.apache.flink.cdc.common.factories.Factory similarity index 92% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/resources/META-INF/services/com.ververica.cdc.common.factories.Factory rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/resources/META-INF/services/org.apache.flink.cdc.common.factories.Factory index 0d01c867d..e332d1e20 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/resources/META-INF/services/com.ververica.cdc.common.factories.Factory +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/main/resources/META-INF/services/org.apache.flink.cdc.common.factories.Factory @@ -13,5 +13,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.ververica.cdc.connectors.doris.factory.DorisDataSinkFactory +org.apache.flink.cdc.connectors.doris.factory.DorisDataSinkFactory diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/test/java/com/ververica/cdc/connectors/doris/sink/DorisRowConverterTest.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/test/java/org/apache/flink/cdc/connectors/doris/sink/DorisRowConverterTest.java similarity index 85% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/test/java/com/ververica/cdc/connectors/doris/sink/DorisRowConverterTest.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/test/java/org/apache/flink/cdc/connectors/doris/sink/DorisRowConverterTest.java index 56530f98c..92ca83119 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/test/java/com/ververica/cdc/connectors/doris/sink/DorisRowConverterTest.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/src/test/java/org/apache/flink/cdc/connectors/doris/sink/DorisRowConverterTest.java @@ -15,16 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.doris.sink; +package org.apache.flink.cdc.connectors.doris.sink; + +import org.apache.flink.cdc.common.data.TimestampData; +import org.apache.flink.cdc.common.data.binary.BinaryRecordData; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.runtime.typeutils.BinaryRecordDataGenerator; -import com.ververica.cdc.common.data.TimestampData; -import com.ververica.cdc.common.data.binary.BinaryRecordData; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.runtime.typeutils.BinaryRecordDataGenerator; import org.junit.Assert; import org.junit.Test; @@ -36,7 +37,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -/** A test for {@link DorisRowConverter} . */ +/** A test for {@link org.apache.flink.cdc.connectors.doris.sink.DorisRowConverter} . */ public class DorisRowConverterTest { @Test diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/factory/MySqlDataSourceFactory.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/factory/MySqlDataSourceFactory.java similarity index 77% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/factory/MySqlDataSourceFactory.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/factory/MySqlDataSourceFactory.java index 02e03b8f0..744041d25 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/factory/MySqlDataSourceFactory.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/factory/MySqlDataSourceFactory.java @@ -15,27 +15,27 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.factory; - +package org.apache.flink.cdc.connectors.mysql.factory; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.configuration.ConfigOption; +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.factories.DataSourceFactory; +import org.apache.flink.cdc.common.factories.Factory; +import org.apache.flink.cdc.common.schema.Selectors; +import org.apache.flink.cdc.common.source.DataSource; +import org.apache.flink.cdc.connectors.mysql.source.MySqlDataSource; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.source.config.ServerIdRange; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffsetBuilder; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; +import org.apache.flink.cdc.connectors.mysql.utils.MySqlSchemaUtils; +import org.apache.flink.cdc.connectors.mysql.utils.OptionUtils; import org.apache.flink.table.api.ValidationException; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.configuration.ConfigOption; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.factories.DataSourceFactory; -import com.ververica.cdc.common.factories.Factory; -import com.ververica.cdc.common.schema.Selectors; -import com.ververica.cdc.common.source.DataSource; -import com.ververica.cdc.connectors.mysql.source.MySqlDataSource; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.source.config.ServerIdRange; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetBuilder; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.connectors.mysql.utils.MySqlSchemaUtils; -import com.ververica.cdc.connectors.mysql.utils.OptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,34 +46,34 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.CHUNK_META_GROUP_SIZE; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.CONNECTION_POOL_SIZE; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.CONNECT_MAX_RETRIES; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.CONNECT_TIMEOUT; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.HEARTBEAT_INTERVAL; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.HOSTNAME; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.PASSWORD; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.PORT; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_SNAPSHOT_FETCH_SIZE; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_MODE; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_FILE; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_GTID_SET; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_POS; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_EVENTS; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_ROWS; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_TIMESTAMP_MILLIS; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCHEMA_CHANGE_ENABLED; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SERVER_ID; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SERVER_TIME_ZONE; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.TABLES; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.USERNAME; -import static com.ververica.cdc.connectors.mysql.source.utils.ObjectUtils.doubleCompare; -import static com.ververica.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; -import static com.ververica.cdc.debezium.utils.JdbcUrlUtils.getJdbcProperties; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.CHUNK_META_GROUP_SIZE; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.CONNECTION_POOL_SIZE; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.CONNECT_MAX_RETRIES; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.CONNECT_TIMEOUT; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.HEARTBEAT_INTERVAL; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.HOSTNAME; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.PASSWORD; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.PORT; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_SNAPSHOT_FETCH_SIZE; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_MODE; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_FILE; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_GTID_SET; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_POS; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_EVENTS; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_ROWS; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCAN_STARTUP_TIMESTAMP_MILLIS; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCHEMA_CHANGE_ENABLED; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SERVER_ID; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SERVER_TIME_ZONE; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.TABLES; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.USERNAME; +import static org.apache.flink.cdc.connectors.mysql.source.utils.ObjectUtils.doubleCompare; +import static org.apache.flink.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; +import static org.apache.flink.cdc.debezium.utils.JdbcUrlUtils.getJdbcProperties; import static org.apache.flink.util.Preconditions.checkState; /** A {@link Factory} to create {@link MySqlDataSource}. */ diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlDataSource.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlDataSource.java similarity index 73% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlDataSource.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlDataSource.java index fefde7590..d1dc487c0 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlDataSource.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlDataSource.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.annotation.VisibleForTesting; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.source.DataSource; -import com.ververica.cdc.common.source.EventSourceProvider; -import com.ververica.cdc.common.source.FlinkSourceProvider; -import com.ververica.cdc.common.source.MetadataAccessor; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlPipelineRecordEmitter; -import com.ververica.cdc.debezium.table.DebeziumChangelogMode; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.annotation.VisibleForTesting; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.source.DataSource; +import org.apache.flink.cdc.common.source.EventSourceProvider; +import org.apache.flink.cdc.common.source.FlinkSourceProvider; +import org.apache.flink.cdc.common.source.MetadataAccessor; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlPipelineRecordEmitter; +import org.apache.flink.cdc.debezium.table.DebeziumChangelogMode; /** A {@link DataSource} for mysql cdc connector. */ @Internal diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlDataSourceOptions.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlDataSourceOptions.java similarity index 97% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlDataSourceOptions.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlDataSourceOptions.java index c09799192..7c7dcadb8 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlDataSourceOptions.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlDataSourceOptions.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; -import com.ververica.cdc.common.annotation.Experimental; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.configuration.ConfigOption; -import com.ververica.cdc.common.configuration.ConfigOptions; +import org.apache.flink.cdc.common.annotation.Experimental; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.configuration.ConfigOption; +import org.apache.flink.cdc.common.configuration.ConfigOptions; import java.time.Duration; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlEventDeserializer.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlEventDeserializer.java similarity index 90% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlEventDeserializer.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlEventDeserializer.java index 2ceb25665..548e603fa 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlEventDeserializer.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlEventDeserializer.java @@ -15,18 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.connectors.mysql.source.parser.CustomMySqlAntlrDdlParser; +import org.apache.flink.cdc.debezium.event.DebeziumEventDeserializationSchema; +import org.apache.flink.cdc.debezium.table.DebeziumChangelogMode; import com.esri.core.geometry.ogc.OGCGeometry; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.connectors.mysql.source.parser.CustomMySqlAntlrDdlParser; -import com.ververica.cdc.debezium.event.DebeziumEventDeserializationSchema; -import com.ververica.cdc.debezium.table.DebeziumChangelogMode; import io.debezium.data.Envelope; import io.debezium.data.geometry.Geometry; import io.debezium.data.geometry.Point; @@ -44,7 +45,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getHistoryRecord; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.getHistoryRecord; /** Event deserializer for {@link MySqlDataSource}. */ @Internal diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlMetadataAccessor.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlMetadataAccessor.java similarity index 86% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlMetadataAccessor.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlMetadataAccessor.java index 1ea5cade1..4ef336bcd 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlMetadataAccessor.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlMetadataAccessor.java @@ -15,14 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.source.MetadataAccessor; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.utils.MySqlSchemaUtils; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.source.MetadataAccessor; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.utils.MySqlSchemaUtils; import io.debezium.connector.mysql.MySqlPartition; import javax.annotation.Nullable; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlSchemaDataTypeInference.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSchemaDataTypeInference.java similarity index 84% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlSchemaDataTypeInference.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSchemaDataTypeInference.java index 9950a59ca..a12429631 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlSchemaDataTypeInference.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSchemaDataTypeInference.java @@ -15,12 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.debezium.event.DebeziumSchemaDataTypeInference; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.debezium.event.DebeziumSchemaDataTypeInference; import io.debezium.data.geometry.Geometry; import io.debezium.data.geometry.Point; import org.apache.kafka.connect.data.Schema; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/parser/CustomAlterTableParserListener.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/parser/CustomAlterTableParserListener.java similarity index 92% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/parser/CustomAlterTableParserListener.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/parser/CustomAlterTableParserListener.java index d27134835..6f3fb9a8c 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/parser/CustomAlterTableParserListener.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/parser/CustomAlterTableParserListener.java @@ -15,14 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.parser; +package org.apache.flink.cdc.connectors.mysql.source.parser; + +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.types.DataType; -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.types.DataType; import io.debezium.connector.mysql.antlr.MySqlAntlrDdlParser; import io.debezium.connector.mysql.antlr.listener.AlterTableParserListener; import io.debezium.ddl.parser.mysql.generated.MySqlParser; @@ -41,7 +42,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.mysql.utils.MySqlTypeUtils.fromDbzColumn; +import static org.apache.flink.cdc.connectors.mysql.utils.MySqlTypeUtils.fromDbzColumn; /** Copied from {@link AlterTableParserListener} in Debezium 1.9.8.Final. */ public class CustomAlterTableParserListener extends MySqlParserBaseListener { @@ -53,7 +54,7 @@ public class CustomAlterTableParserListener extends MySqlParserBaseListener { private final MySqlAntlrDdlParser parser; private final List listeners; private final LinkedList changes; - private com.ververica.cdc.common.event.TableId currentTable; + private org.apache.flink.cdc.common.event.TableId currentTable; private List columnEditors; private CustomColumnDefinitionParserListener columnDefinitionListener; @@ -250,13 +251,13 @@ public class CustomAlterTableParserListener extends MySqlParserBaseListener { super.exitAlterByRenameColumn(ctx); } - private com.ververica.cdc.common.schema.Column toCdcColumn(Column dbzColumn) { - return com.ververica.cdc.common.schema.Column.physicalColumn( + private org.apache.flink.cdc.common.schema.Column toCdcColumn(Column dbzColumn) { + return org.apache.flink.cdc.common.schema.Column.physicalColumn( dbzColumn.name(), fromDbzColumn(dbzColumn), dbzColumn.comment()); } - private com.ververica.cdc.common.event.TableId toCdcTableId(TableId dbzTableId) { - return com.ververica.cdc.common.event.TableId.tableId( + private org.apache.flink.cdc.common.event.TableId toCdcTableId(TableId dbzTableId) { + return org.apache.flink.cdc.common.event.TableId.tableId( dbzTableId.catalog(), dbzTableId.table()); } } diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/parser/CustomColumnDefinitionParserListener.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/parser/CustomColumnDefinitionParserListener.java similarity index 99% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/parser/CustomColumnDefinitionParserListener.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/parser/CustomColumnDefinitionParserListener.java index bbc16f9a9..591836418 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/parser/CustomColumnDefinitionParserListener.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/parser/CustomColumnDefinitionParserListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.parser; +package org.apache.flink.cdc.connectors.mysql.source.parser; import io.debezium.antlr.AntlrDdlParser; import io.debezium.antlr.DataTypeResolver; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParser.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParser.java similarity index 99% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParser.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParser.java index 323682598..1264aa8d6 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParser.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParser.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.parser; +package org.apache.flink.cdc.connectors.mysql.source.parser; + +import org.apache.flink.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; import io.debezium.antlr.AntlrDdlParserListener; import io.debezium.antlr.DataTypeResolver; import io.debezium.connector.mysql.antlr.MySqlAntlrDdlParser; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParserListener.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParserListener.java similarity index 97% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParserListener.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParserListener.java index e913bede4..445373309 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParserListener.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/parser/CustomMySqlAntlrDdlParserListener.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.parser; +package org.apache.flink.cdc.connectors.mysql.source.parser; + +import org.apache.flink.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; import io.debezium.antlr.AntlrDdlParserListener; import io.debezium.antlr.ProxyParseTreeListenerUtil; import io.debezium.connector.mysql.antlr.MySqlAntlrDdlParser; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlPipelineRecordEmitter.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlPipelineRecordEmitter.java similarity index 87% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlPipelineRecordEmitter.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlPipelineRecordEmitter.java index 2b766c21b..b7434bf94 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlPipelineRecordEmitter.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlPipelineRecordEmitter.java @@ -15,23 +15,23 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.reader; +package org.apache.flink.cdc.connectors.mysql.source.reader; import org.apache.flink.api.connector.source.SourceOutput; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.connectors.mysql.schema.MySqlFieldDefinition; +import org.apache.flink.cdc.connectors.mysql.schema.MySqlTableDefinition; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.metrics.MySqlSourceReaderMetrics; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplitState; +import org.apache.flink.cdc.connectors.mysql.table.StartupMode; +import org.apache.flink.cdc.connectors.mysql.utils.MySqlTypeUtils; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; import org.apache.flink.connector.base.source.reader.RecordEmitter; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.connectors.mysql.schema.MySqlFieldDefinition; -import com.ververica.cdc.connectors.mysql.schema.MySqlTableDefinition; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.metrics.MySqlSourceReaderMetrics; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplitState; -import com.ververica.cdc.connectors.mysql.table.StartupMode; -import com.ververica.cdc.connectors.mysql.utils.MySqlTypeUtils; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; import io.debezium.connector.mysql.antlr.MySqlAntlrDdlParser; import io.debezium.jdbc.JdbcConnection; import io.debezium.relational.Column; @@ -51,9 +51,9 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import static com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils.openJdbcConnection; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isLowWatermarkEvent; -import static com.ververica.cdc.connectors.mysql.source.utils.TableDiscoveryUtils.listTables; +import static org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils.openJdbcConnection; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.isLowWatermarkEvent; +import static org.apache.flink.cdc.connectors.mysql.source.utils.TableDiscoveryUtils.listTables; /** The {@link RecordEmitter} implementation for pipeline mysql connector. */ public class MySqlPipelineRecordEmitter extends MySqlRecordEmitter { @@ -89,7 +89,7 @@ public class MySqlPipelineRecordEmitter extends MySqlRecordEmitter { Schema schema = getSchema(jdbc, tableId); createTableEventCache.add( new CreateTableEvent( - com.ververica.cdc.common.event.TableId.tableId( + org.apache.flink.cdc.common.event.TableId.tableId( tableId.catalog(), tableId.table()), schema)); } @@ -125,7 +125,7 @@ public class MySqlPipelineRecordEmitter extends MySqlRecordEmitter { Schema schema = getSchema(jdbc, tableId); output.collect( new CreateTableEvent( - com.ververica.cdc.common.event.TableId.tableId( + org.apache.flink.cdc.common.event.TableId.tableId( tableId.catalog(), tableId.table()), schema)); } diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/utils/MySqlSchemaUtils.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/utils/MySqlSchemaUtils.java similarity index 92% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/utils/MySqlSchemaUtils.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/utils/MySqlSchemaUtils.java index 7d7981b34..bc4135cd1 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/utils/MySqlSchemaUtils.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/utils/MySqlSchemaUtils.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.utils; +package org.apache.flink.cdc.connectors.mysql.utils; + +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.connectors.mysql.schema.MySqlSchema; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.connectors.mysql.schema.MySqlSchema; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; import io.debezium.connector.mysql.MySqlConnection; import io.debezium.connector.mysql.MySqlPartition; import io.debezium.jdbc.JdbcConnection; @@ -38,8 +39,8 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils.createMySqlConnection; -import static com.ververica.cdc.connectors.mysql.source.utils.StatementUtils.quote; +import static org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils.createMySqlConnection; +import static org.apache.flink.cdc.connectors.mysql.source.utils.StatementUtils.quote; /** Utilities for converting from debezium {@link Table} types to {@link Schema}. */ public class MySqlSchemaUtils { diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/utils/MySqlTypeUtils.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/utils/MySqlTypeUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/utils/MySqlTypeUtils.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/utils/MySqlTypeUtils.java index 7dff7f006..a3bb16ea3 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/com/ververica/cdc/connectors/mysql/utils/MySqlTypeUtils.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/java/org/apache/flink/cdc/connectors/mysql/utils/MySqlTypeUtils.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.utils; +package org.apache.flink.cdc.connectors.mysql.utils; + +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; import io.debezium.relational.Column; /** Utilities for converting from MySQL types to {@link DataType}s. */ diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/resources/META-INF/services/com.ververica.cdc.common.factories.Factory b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/resources/META-INF/services/org.apache.flink.cdc.common.factories.Factory similarity index 91% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/resources/META-INF/services/com.ververica.cdc.common.factories.Factory rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/resources/META-INF/services/org.apache.flink.cdc.common.factories.Factory index fba02b95f..3d7f0dc03 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/resources/META-INF/services/com.ververica.cdc.common.factories.Factory +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/main/resources/META-INF/services/org.apache.flink.cdc.common.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.ververica.cdc.connectors.mysql.factory.MySqlDataSourceFactory +org.apache.flink.cdc.connectors.mysql.factory.MySqlDataSourceFactory diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlDataSourceFactoryTest.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlDataSourceFactoryTest.java similarity index 79% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlDataSourceFactoryTest.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlDataSourceFactoryTest.java index ef8a40cf2..025415abb 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlDataSourceFactoryTest.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlDataSourceFactoryTest.java @@ -15,25 +15,26 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; + +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.factories.Factory; +import org.apache.flink.cdc.connectors.mysql.factory.MySqlDataSourceFactory; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.factories.Factory; -import com.ververica.cdc.connectors.mysql.factory.MySqlDataSourceFactory; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; import org.junit.Test; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.HOSTNAME; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.PASSWORD; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.PORT; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.TABLES; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.USERNAME; -import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_PASSWORD; -import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_USER; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.HOSTNAME; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.PASSWORD; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.PORT; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.TABLES; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.USERNAME; +import static org.apache.flink.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_PASSWORD; +import static org.apache.flink.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_USER; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlFullTypesITCase.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlFullTypesITCase.java similarity index 87% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlFullTypesITCase.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlFullTypesITCase.java index 8b5e61fea..41613a86e 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlFullTypesITCase.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlFullTypesITCase.java @@ -15,28 +15,31 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.cdc.common.data.DecimalData; +import org.apache.flink.cdc.common.data.LocalZonedTimestampData; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.data.TimestampData; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.source.FlinkSourceProvider; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqSourceTestUtils; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlVersion; +import org.apache.flink.cdc.connectors.mysql.testutils.RecordDataTestUtils; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.util.CloseableIterator; -import com.ververica.cdc.common.data.DecimalData; -import com.ververica.cdc.common.data.LocalZonedTimestampData; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.data.TimestampData; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.source.FlinkSourceProvider; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer; -import com.ververica.cdc.connectors.mysql.testutils.MySqlVersion; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; +import org.assertj.core.api.Assertions; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -53,13 +56,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_PASSWORD; -import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_USER; -import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.fetchResults; -import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.getServerId; -import static com.ververica.cdc.connectors.mysql.testutils.RecordDataTestUtils.recordFields; import static javax.xml.bind.DatatypeConverter.parseHexBinary; -import static org.assertj.core.api.Assertions.assertThat; /** IT case for MySQL event source. */ public class MySqlFullTypesITCase extends MySqlSourceTestBase { @@ -68,10 +65,17 @@ public class MySqlFullTypesITCase extends MySqlSourceTestBase { createMySqlContainer(MySqlVersion.V8_0, "docker/server-gtids/expire-seconds/my.cnf"); private final UniqueDatabase fullTypesMySql57Database = - new UniqueDatabase(MYSQL_CONTAINER, "column_type_test", TEST_USER, TEST_PASSWORD); + new UniqueDatabase( + MYSQL_CONTAINER, + "column_type_test", + MySqSourceTestUtils.TEST_USER, + MySqSourceTestUtils.TEST_PASSWORD); private final UniqueDatabase fullTypesMySql8Database = new UniqueDatabase( - MYSQL8_CONTAINER, "column_type_test_mysql8", TEST_USER, TEST_PASSWORD); + MYSQL8_CONTAINER, + "column_type_test_mysql8", + MySqSourceTestUtils.TEST_USER, + MySqSourceTestUtils.TEST_PASSWORD); private final StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); @@ -304,9 +308,10 @@ public class MySqlFullTypesITCase extends MySqlSourceTestBase { }; // skip CreateTableEvent - List snapshotResults = fetchResults(iterator, 2); + List snapshotResults = MySqSourceTestUtils.fetchResults(iterator, 2); RecordData snapshotRecord = ((DataChangeEvent) snapshotResults.get(1)).after(); - assertThat(recordFields(snapshotRecord, COMMON_TYPES)).isEqualTo(expectedSnapshot); + Assertions.assertThat(RecordDataTestUtils.recordFields(snapshotRecord, COMMON_TYPES)) + .isEqualTo(expectedSnapshot); try (Connection connection = database.getJdbcConnection(); Statement statement = connection.createStatement()) { @@ -318,9 +323,10 @@ public class MySqlFullTypesITCase extends MySqlSourceTestBase { expectedSnapshot[44] = BinaryStringData.fromString("{\"key1\":\"value1\"}"); Object[] expectedStreamRecord = expectedSnapshot; - List streamResults = fetchResults(iterator, 1); + List streamResults = MySqSourceTestUtils.fetchResults(iterator, 1); RecordData streamRecord = ((DataChangeEvent) streamResults.get(0)).after(); - assertThat(recordFields(streamRecord, COMMON_TYPES)).isEqualTo(expectedStreamRecord); + Assertions.assertThat(RecordDataTestUtils.recordFields(streamRecord, COMMON_TYPES)) + .isEqualTo(expectedStreamRecord); } private Instant toInstant(String ts) { @@ -343,10 +349,11 @@ public class MySqlFullTypesITCase extends MySqlSourceTestBase { .executeAndCollect(); // skip CreateTableEvent - List snapshotResults = fetchResults(iterator, 2); + List snapshotResults = MySqSourceTestUtils.fetchResults(iterator, 2); RecordData snapshotRecord = ((DataChangeEvent) snapshotResults.get(1)).after(); - assertThat(recordFields(snapshotRecord, recordType)).isEqualTo(expectedSnapshot); + Assertions.assertThat(RecordDataTestUtils.recordFields(snapshotRecord, recordType)) + .isEqualTo(expectedSnapshot); try (Connection connection = database.getJdbcConnection(); Statement statement = connection.createStatement()) { @@ -354,9 +361,10 @@ public class MySqlFullTypesITCase extends MySqlSourceTestBase { "UPDATE time_types SET time_6_c = null, timestamp_def_c = default WHERE id = 1;"); } - List streamResults = fetchResults(iterator, 1); + List streamResults = MySqSourceTestUtils.fetchResults(iterator, 1); RecordData streamRecord = ((DataChangeEvent) streamResults.get(0)).after(); - assertThat(recordFields(streamRecord, recordType)).isEqualTo(expectedStreamRecord); + Assertions.assertThat(RecordDataTestUtils.recordFields(streamRecord, recordType)) + .isEqualTo(expectedStreamRecord); } private FlinkSourceProvider getFlinkSourceProvider( @@ -379,7 +387,7 @@ public class MySqlFullTypesITCase extends MySqlSourceTestBase { .username(database.getUsername()) .password(database.getPassword()) .serverTimeZone(ZoneId.of("UTC").toString()) - .serverId(getServerId(env.getParallelism())); + .serverId(MySqSourceTestUtils.getServerId(env.getParallelism())); return (FlinkSourceProvider) new MySqlDataSource(configFactory).getEventSourceProvider(); } diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlMetadataAccessorITCase.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlMetadataAccessorITCase.java similarity index 93% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlMetadataAccessorITCase.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlMetadataAccessorITCase.java index 56355cec8..4b45e1079 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlMetadataAccessorITCase.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlMetadataAccessorITCase.java @@ -15,22 +15,23 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqSourceTestUtils; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlVersion; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer; -import com.ververica.cdc.connectors.mysql.testutils.MySqlVersion; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -43,8 +44,6 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_PASSWORD; -import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_USER; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -55,11 +54,18 @@ public class MySqlMetadataAccessorITCase extends MySqlSourceTestBase { createMySqlContainer(MySqlVersion.V8_0, "docker/server-gtids/expire-seconds/my.cnf"); private final UniqueDatabase fullTypesMySql57Database = - new UniqueDatabase(MYSQL_CONTAINER, "column_type_test", TEST_USER, TEST_PASSWORD); + new UniqueDatabase( + MYSQL_CONTAINER, + "column_type_test", + MySqSourceTestUtils.TEST_USER, + MySqSourceTestUtils.TEST_PASSWORD); private final UniqueDatabase fullTypesMySql8Database = new UniqueDatabase( - MYSQL8_CONTAINER, "column_type_test_mysql8", TEST_USER, TEST_PASSWORD); + MYSQL8_CONTAINER, + "column_type_test_mysql8", + MySqSourceTestUtils.TEST_USER, + MySqSourceTestUtils.TEST_PASSWORD); private final StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlPipelineITCase.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlPipelineITCase.java similarity index 92% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlPipelineITCase.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlPipelineITCase.java index b2987c9da..e09ac58b4 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlPipelineITCase.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlPipelineITCase.java @@ -15,37 +15,37 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.source.FlinkSourceProvider; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.connectors.mysql.factory.MySqlDataSourceFactory; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlVersion; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; +import org.apache.flink.cdc.runtime.typeutils.BinaryRecordDataGenerator; +import org.apache.flink.cdc.runtime.typeutils.EventTypeInfo; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.util.CloseableIterator; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.source.FlinkSourceProvider; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.connectors.mysql.factory.MySqlDataSourceFactory; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer; -import com.ververica.cdc.connectors.mysql.testutils.MySqlVersion; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; -import com.ververica.cdc.runtime.typeutils.BinaryRecordDataGenerator; -import com.ververica.cdc.runtime.typeutils.EventTypeInfo; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -61,11 +61,11 @@ import java.util.Collections; import java.util.List; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCHEMA_CHANGE_ENABLED; -import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_PASSWORD; -import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_USER; -import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.fetchResults; -import static com.ververica.cdc.connectors.mysql.testutils.MySqSourceTestUtils.getServerId; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlDataSourceOptions.SCHEMA_CHANGE_ENABLED; +import static org.apache.flink.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_PASSWORD; +import static org.apache.flink.cdc.connectors.mysql.testutils.MySqSourceTestUtils.TEST_USER; +import static org.apache.flink.cdc.connectors.mysql.testutils.MySqSourceTestUtils.fetchResults; +import static org.apache.flink.cdc.connectors.mysql.testutils.MySqSourceTestUtils.getServerId; import static org.assertj.core.api.Assertions.assertThat; /** IT tests for {@link MySqlDataSource}. */ diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/testutils/MySqSourceTestUtils.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/MySqSourceTestUtils.java similarity index 96% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/testutils/MySqSourceTestUtils.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/MySqSourceTestUtils.java index da6d21da1..0708cd8cd 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/testutils/MySqSourceTestUtils.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/MySqSourceTestUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.testutils; +package org.apache.flink.cdc.connectors.mysql.testutils; import java.util.ArrayList; import java.util.Iterator; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/testutils/RecordDataTestUtils.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/RecordDataTestUtils.java similarity index 88% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/testutils/RecordDataTestUtils.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/RecordDataTestUtils.java index eaa903157..2e193ae27 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/com/ververica/cdc/connectors/mysql/testutils/RecordDataTestUtils.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-mysql/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/RecordDataTestUtils.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.testutils; +package org.apache.flink.cdc.connectors.mysql.testutils; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.RowType; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.RowType; import java.util.List; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/EventRecordSerializationSchema.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/EventRecordSerializationSchema.java similarity index 87% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/EventRecordSerializationSchema.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/EventRecordSerializationSchema.java index 742b2c915..76b55aafc 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/EventRecordSerializationSchema.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/EventRecordSerializationSchema.java @@ -15,33 +15,31 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.starrocks.sink; +package org.apache.flink.cdc.connectors.starrocks.sink; import org.apache.flink.api.common.serialization.SerializationSchema; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.utils.Preconditions; +import org.apache.flink.cdc.common.utils.SchemaUtils; import com.starrocks.connector.flink.table.data.DefaultStarRocksRowData; import com.starrocks.connector.flink.table.data.StarRocksRowData; import com.starrocks.connector.flink.table.sink.v2.RecordSerializationSchema; import com.starrocks.connector.flink.table.sink.v2.StarRocksSinkContext; import com.starrocks.connector.flink.tools.JsonWrapper; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.utils.Preconditions; -import com.ververica.cdc.common.utils.SchemaUtils; import java.time.ZoneId; import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksUtils.createFieldGetter; - /** Serializer for the input {@link Event}. It will serialize a row to a json string. */ public class EventRecordSerializationSchema implements RecordSerializationSchema { @@ -99,7 +97,8 @@ public class EventRecordSerializationSchema implements RecordSerializationSchema tableInfo.fieldGetters = new RecordData.FieldGetter[newSchema.getColumnCount()]; for (int i = 0; i < newSchema.getColumnCount(); i++) { tableInfo.fieldGetters[i] = - createFieldGetter(newSchema.getColumns().get(i).getType(), i, zoneId); + StarRocksUtils.createFieldGetter( + newSchema.getColumns().get(i).getType(), i, zoneId); } tableInfoMap.put(tableId, tableInfo); } diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/SchemaChangeConfig.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/SchemaChangeConfig.java similarity index 79% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/SchemaChangeConfig.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/SchemaChangeConfig.java index cd526e356..ab484676b 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/SchemaChangeConfig.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/SchemaChangeConfig.java @@ -15,15 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.starrocks.sink; +package org.apache.flink.cdc.connectors.starrocks.sink; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.utils.Preconditions; +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.utils.Preconditions; import java.io.Serializable; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.TABLE_SCHEMA_CHANGE_TIMEOUT; - /** Configurations for schema change. */ public class SchemaChangeConfig implements Serializable { @@ -43,7 +41,11 @@ public class SchemaChangeConfig implements Serializable { } public static SchemaChangeConfig from(Configuration config) { - long timeoutSecond = Math.max(1, config.get(TABLE_SCHEMA_CHANGE_TIMEOUT).getSeconds()); + long timeoutSecond = + Math.max( + 1, + config.get(StarRocksDataSinkOptions.TABLE_SCHEMA_CHANGE_TIMEOUT) + .getSeconds()); return new SchemaChangeConfig(timeoutSecond); } } diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksDataSink.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksDataSink.java similarity index 89% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksDataSink.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksDataSink.java index 18d9e1c6f..4c1969ae9 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksDataSink.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksDataSink.java @@ -15,17 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.starrocks.sink; +package org.apache.flink.cdc.connectors.starrocks.sink; + +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.sink.DataSink; +import org.apache.flink.cdc.common.sink.EventSinkProvider; +import org.apache.flink.cdc.common.sink.FlinkSinkProvider; +import org.apache.flink.cdc.common.sink.MetadataApplier; import com.starrocks.connector.flink.catalog.StarRocksCatalog; import com.starrocks.connector.flink.table.sink.SinkFunctionFactory; import com.starrocks.connector.flink.table.sink.StarRocksSinkOptions; import com.starrocks.connector.flink.table.sink.v2.StarRocksSink; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.sink.DataSink; -import com.ververica.cdc.common.sink.EventSinkProvider; -import com.ververica.cdc.common.sink.FlinkSinkProvider; -import com.ververica.cdc.common.sink.MetadataApplier; import java.io.Serializable; import java.time.ZoneId; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksDataSinkFactory.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksDataSinkFactory.java similarity index 61% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksDataSinkFactory.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksDataSinkFactory.java index 89cc4fdf7..f78659bbe 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksDataSinkFactory.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksDataSinkFactory.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.starrocks.sink; +package org.apache.flink.cdc.connectors.starrocks.sink; + +import org.apache.flink.cdc.common.configuration.ConfigOption; +import org.apache.flink.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.factories.DataSinkFactory; +import org.apache.flink.cdc.common.sink.DataSink; import com.starrocks.connector.flink.table.sink.StarRocksSinkOptions; -import com.ververica.cdc.common.configuration.ConfigOption; -import com.ververica.cdc.common.configuration.Configuration; -import com.ververica.cdc.common.factories.DataSinkFactory; -import com.ververica.cdc.common.sink.DataSink; import java.time.ZoneId; import java.util.HashSet; @@ -29,23 +30,7 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import static com.ververica.cdc.common.pipeline.PipelineOptions.PIPELINE_LOCAL_TIME_ZONE; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.JDBC_URL; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.LOAD_URL; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.PASSWORD; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.SINK_AT_LEAST_ONCE_USE_TRANSACTION_LOAD; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.SINK_BATCH_FLUSH_INTERVAL; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.SINK_BATCH_MAX_SIZE; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.SINK_CONNECT_TIMEOUT; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.SINK_IO_THREAD_COUNT; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.SINK_LABEL_PREFIX; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.SINK_METRIC_HISTOGRAM_WINDOW_SIZE; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.SINK_PROPERTIES_PREFIX; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.SINK_SCAN_FREQUENCY; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.SINK_WAIT_FOR_CONTINUE_TIMEOUT; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.TABLE_CREATE_NUM_BUCKETS; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.TABLE_SCHEMA_CHANGE_TIMEOUT; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.USERNAME; +import static org.apache.flink.cdc.common.pipeline.PipelineOptions.PIPELINE_LOCAL_TIME_ZONE; /** A {@link DataSinkFactory} to create {@link StarRocksDataSink}. */ public class StarRocksDataSinkFactory implements DataSinkFactory { @@ -72,48 +57,52 @@ public class StarRocksDataSinkFactory implements DataSinkFactory { org.apache.flink.configuration.Configuration sinkConfig = new org.apache.flink.configuration.Configuration(); // required sink configurations - sinkConfig.set(StarRocksSinkOptions.JDBC_URL, cdcConfig.get(JDBC_URL)); - sinkConfig.set(StarRocksSinkOptions.LOAD_URL, cdcConfig.get(LOAD_URL)); - sinkConfig.set(StarRocksSinkOptions.USERNAME, cdcConfig.get(USERNAME)); - sinkConfig.set(StarRocksSinkOptions.PASSWORD, cdcConfig.get(PASSWORD)); + sinkConfig.set( + StarRocksSinkOptions.JDBC_URL, cdcConfig.get(StarRocksDataSinkOptions.JDBC_URL)); + sinkConfig.set( + StarRocksSinkOptions.LOAD_URL, cdcConfig.get(StarRocksDataSinkOptions.LOAD_URL)); + sinkConfig.set( + StarRocksSinkOptions.USERNAME, cdcConfig.get(StarRocksDataSinkOptions.USERNAME)); + sinkConfig.set( + StarRocksSinkOptions.PASSWORD, cdcConfig.get(StarRocksDataSinkOptions.PASSWORD)); // optional sink configurations cdcConfig - .getOptional(SINK_LABEL_PREFIX) + .getOptional(StarRocksDataSinkOptions.SINK_LABEL_PREFIX) .ifPresent( config -> sinkConfig.set(StarRocksSinkOptions.SINK_LABEL_PREFIX, config)); cdcConfig - .getOptional(SINK_CONNECT_TIMEOUT) + .getOptional(StarRocksDataSinkOptions.SINK_CONNECT_TIMEOUT) .ifPresent( config -> sinkConfig.set(StarRocksSinkOptions.SINK_CONNECT_TIMEOUT, config)); cdcConfig - .getOptional(SINK_WAIT_FOR_CONTINUE_TIMEOUT) + .getOptional(StarRocksDataSinkOptions.SINK_WAIT_FOR_CONTINUE_TIMEOUT) .ifPresent( config -> sinkConfig.set( StarRocksSinkOptions.SINK_WAIT_FOR_CONTINUE_TIMEOUT, config)); cdcConfig - .getOptional(SINK_BATCH_MAX_SIZE) + .getOptional(StarRocksDataSinkOptions.SINK_BATCH_MAX_SIZE) .ifPresent( config -> sinkConfig.set(StarRocksSinkOptions.SINK_BATCH_MAX_SIZE, config)); cdcConfig - .getOptional(SINK_BATCH_FLUSH_INTERVAL) + .getOptional(StarRocksDataSinkOptions.SINK_BATCH_FLUSH_INTERVAL) .ifPresent( config -> sinkConfig.set( StarRocksSinkOptions.SINK_BATCH_FLUSH_INTERVAL, config)); cdcConfig - .getOptional(SINK_SCAN_FREQUENCY) + .getOptional(StarRocksDataSinkOptions.SINK_SCAN_FREQUENCY) .ifPresent( config -> sinkConfig.set(StarRocksSinkOptions.SINK_SCAN_FREQUENCY, config)); cdcConfig - .getOptional(SINK_IO_THREAD_COUNT) + .getOptional(StarRocksDataSinkOptions.SINK_IO_THREAD_COUNT) .ifPresent( config -> sinkConfig.set(StarRocksSinkOptions.SINK_IO_THREAD_COUNT, config)); cdcConfig - .getOptional(SINK_AT_LEAST_ONCE_USE_TRANSACTION_LOAD) + .getOptional(StarRocksDataSinkOptions.SINK_AT_LEAST_ONCE_USE_TRANSACTION_LOAD) .ifPresent( config -> sinkConfig.set( @@ -121,7 +110,7 @@ public class StarRocksDataSinkFactory implements DataSinkFactory { .SINK_AT_LEAST_ONCE_USE_TRANSACTION_LOAD, config)); cdcConfig - .getOptional(SINK_METRIC_HISTOGRAM_WINDOW_SIZE) + .getOptional(StarRocksDataSinkOptions.SINK_METRIC_HISTOGRAM_WINDOW_SIZE) .ifPresent( config -> sinkConfig.set( @@ -135,7 +124,8 @@ public class StarRocksDataSinkFactory implements DataSinkFactory { sinkConfig.set(StarRocksSinkOptions.SINK_SEMANTIC, "at-least-once"); Map streamProperties = - getPrefixConfigs(cdcConfig.toMap(), SINK_PROPERTIES_PREFIX); + getPrefixConfigs( + cdcConfig.toMap(), StarRocksDataSinkOptions.SINK_PROPERTIES_PREFIX); // force to use json format for stream load to simplify the configuration, // such as there is no need to reconfigure the "columns" property after // schema change. csv format can be supported in the future if needed @@ -160,27 +150,27 @@ public class StarRocksDataSinkFactory implements DataSinkFactory { @Override public Set> requiredOptions() { Set> requiredOptions = new HashSet<>(); - requiredOptions.add(JDBC_URL); - requiredOptions.add(LOAD_URL); - requiredOptions.add(USERNAME); - requiredOptions.add(PASSWORD); + requiredOptions.add(StarRocksDataSinkOptions.JDBC_URL); + requiredOptions.add(StarRocksDataSinkOptions.LOAD_URL); + requiredOptions.add(StarRocksDataSinkOptions.USERNAME); + requiredOptions.add(StarRocksDataSinkOptions.PASSWORD); return requiredOptions; } @Override public Set> optionalOptions() { Set> optionalOptions = new HashSet<>(); - optionalOptions.add(SINK_LABEL_PREFIX); - optionalOptions.add(SINK_CONNECT_TIMEOUT); - optionalOptions.add(SINK_WAIT_FOR_CONTINUE_TIMEOUT); - optionalOptions.add(SINK_BATCH_MAX_SIZE); - optionalOptions.add(SINK_BATCH_FLUSH_INTERVAL); - optionalOptions.add(SINK_SCAN_FREQUENCY); - optionalOptions.add(SINK_IO_THREAD_COUNT); - optionalOptions.add(SINK_AT_LEAST_ONCE_USE_TRANSACTION_LOAD); - optionalOptions.add(SINK_METRIC_HISTOGRAM_WINDOW_SIZE); - optionalOptions.add(TABLE_CREATE_NUM_BUCKETS); - optionalOptions.add(TABLE_SCHEMA_CHANGE_TIMEOUT); + optionalOptions.add(StarRocksDataSinkOptions.SINK_LABEL_PREFIX); + optionalOptions.add(StarRocksDataSinkOptions.SINK_CONNECT_TIMEOUT); + optionalOptions.add(StarRocksDataSinkOptions.SINK_WAIT_FOR_CONTINUE_TIMEOUT); + optionalOptions.add(StarRocksDataSinkOptions.SINK_BATCH_MAX_SIZE); + optionalOptions.add(StarRocksDataSinkOptions.SINK_BATCH_FLUSH_INTERVAL); + optionalOptions.add(StarRocksDataSinkOptions.SINK_SCAN_FREQUENCY); + optionalOptions.add(StarRocksDataSinkOptions.SINK_IO_THREAD_COUNT); + optionalOptions.add(StarRocksDataSinkOptions.SINK_AT_LEAST_ONCE_USE_TRANSACTION_LOAD); + optionalOptions.add(StarRocksDataSinkOptions.SINK_METRIC_HISTOGRAM_WINDOW_SIZE); + optionalOptions.add(StarRocksDataSinkOptions.TABLE_CREATE_NUM_BUCKETS); + optionalOptions.add(StarRocksDataSinkOptions.TABLE_SCHEMA_CHANGE_TIMEOUT); return optionalOptions; } } diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksDataSinkOptions.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksDataSinkOptions.java similarity index 97% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksDataSinkOptions.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksDataSinkOptions.java index 3116d0b94..d9cb611fb 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksDataSinkOptions.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksDataSinkOptions.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.starrocks.sink; +package org.apache.flink.cdc.connectors.starrocks.sink; + +import org.apache.flink.cdc.common.configuration.ConfigOption; +import org.apache.flink.cdc.common.configuration.ConfigOptions; import com.starrocks.connector.flink.table.sink.StarRocksSinkOptions; -import com.ververica.cdc.common.configuration.ConfigOption; -import com.ververica.cdc.common.configuration.ConfigOptions; import java.time.Duration; import java.util.List; diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksMetadataApplier.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksMetadataApplier.java similarity index 94% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksMetadataApplier.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksMetadataApplier.java index 690fe6176..5ee93ff62 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksMetadataApplier.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksMetadataApplier.java @@ -15,29 +15,28 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.starrocks.sink; +package org.apache.flink.cdc.connectors.starrocks.sink; + +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.sink.MetadataApplier; import com.starrocks.connector.flink.catalog.StarRocksCatalog; import com.starrocks.connector.flink.catalog.StarRocksCatalogException; import com.starrocks.connector.flink.catalog.StarRocksColumn; import com.starrocks.connector.flink.catalog.StarRocksTable; -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.sink.MetadataApplier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksUtils.toStarRocksDataType; - /** A {@code MetadataApplier} that applies metadata changes to StarRocks. */ public class StarRocksMetadataApplier implements MetadataApplier { @@ -119,7 +118,7 @@ public class StarRocksMetadataApplier implements MetadataApplier { .setColumnName(column.getName()) .setOrdinalPosition(-1) .setColumnComment(column.getComment()); - toStarRocksDataType(column, false, builder); + StarRocksUtils.toStarRocksDataType(column, false, builder); addColumns.add(builder.build()); } diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksUtils.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksUtils.java similarity index 92% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksUtils.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksUtils.java index 8c301e804..ea43f0898 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/StarRocksUtils.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/StarRocksUtils.java @@ -15,29 +15,30 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.starrocks.sink; +package org.apache.flink.cdc.connectors.starrocks.sink; + +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.types.BigIntType; +import org.apache.flink.cdc.common.types.BooleanType; +import org.apache.flink.cdc.common.types.CharType; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypeDefaultVisitor; +import org.apache.flink.cdc.common.types.DateType; +import org.apache.flink.cdc.common.types.DecimalType; +import org.apache.flink.cdc.common.types.DoubleType; +import org.apache.flink.cdc.common.types.FloatType; +import org.apache.flink.cdc.common.types.IntType; +import org.apache.flink.cdc.common.types.LocalZonedTimestampType; +import org.apache.flink.cdc.common.types.SmallIntType; +import org.apache.flink.cdc.common.types.TimestampType; +import org.apache.flink.cdc.common.types.TinyIntType; +import org.apache.flink.cdc.common.types.VarCharType; import com.starrocks.connector.flink.catalog.StarRocksColumn; import com.starrocks.connector.flink.catalog.StarRocksTable; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.types.BigIntType; -import com.ververica.cdc.common.types.BooleanType; -import com.ververica.cdc.common.types.CharType; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypeDefaultVisitor; -import com.ververica.cdc.common.types.DateType; -import com.ververica.cdc.common.types.DecimalType; -import com.ververica.cdc.common.types.DoubleType; -import com.ververica.cdc.common.types.FloatType; -import com.ververica.cdc.common.types.IntType; -import com.ververica.cdc.common.types.LocalZonedTimestampType; -import com.ververica.cdc.common.types.SmallIntType; -import com.ververica.cdc.common.types.TimestampType; -import com.ververica.cdc.common.types.TinyIntType; -import com.ververica.cdc.common.types.VarCharType; import java.time.LocalDate; import java.time.ZoneId; @@ -46,8 +47,8 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; -import static com.ververica.cdc.common.types.DataTypeChecks.getPrecision; -import static com.ververica.cdc.common.types.DataTypeChecks.getScale; +import static org.apache.flink.cdc.common.types.DataTypeChecks.getPrecision; +import static org.apache.flink.cdc.common.types.DataTypeChecks.getScale; /** Utilities for conversion from source table to StarRocks table. */ public class StarRocksUtils { diff --git a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/TableCreateConfig.java b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/TableCreateConfig.java similarity index 79% rename from flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/TableCreateConfig.java rename to flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/TableCreateConfig.java index b0c22cea2..b3bae0f7b 100644 --- a/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/com/ververica/cdc/connectors/starrocks/sink/TableCreateConfig.java +++ b/flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-starrocks/src/main/java/org/apache/flink/cdc/connectors/starrocks/sink/TableCreateConfig.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.starrocks.sink; +package org.apache.flink.cdc.connectors.starrocks.sink; -import com.ververica.cdc.common.configuration.Configuration; +import org.apache.flink.cdc.common.configuration.Configuration; import javax.annotation.Nullable; @@ -28,9 +28,6 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.TABLE_CREATE_NUM_BUCKETS; -import static com.ververica.cdc.connectors.starrocks.sink.StarRocksDataSinkOptions.TABLE_CREATE_PROPERTIES_PREFIX; - /** * Configurations for creating a StarRocks table. See discoverDataCollectionSchemas(JdbcSourceConfig sourceConfig) { final List capturedTableIds = discoverDataCollections(sourceConfig); - try (MySqlConnection jdbc = createMySqlConnection(sourceConfig.getDbzConfiguration())) { + try (MySqlConnection jdbc = + MySqlConnectionUtils.createMySqlConnection(sourceConfig.getDbzConfiguration())) { // fetch table schemas Map tableSchemas = new HashMap<>(); for (TableId tableId : capturedTableIds) { @@ -158,9 +155,9 @@ public class MySqlDialect implements JdbcDataSourceDialect { @Override public MySqlSourceFetchTaskContext createFetchTaskContext(JdbcSourceConfig taskSourceConfig) { final MySqlConnection jdbcConnection = - createMySqlConnection(taskSourceConfig.getDbzConfiguration()); + MySqlConnectionUtils.createMySqlConnection(taskSourceConfig.getDbzConfiguration()); final BinaryLogClient binaryLogClient = - createBinaryClient(taskSourceConfig.getDbzConfiguration()); + MySqlConnectionUtils.createBinaryClient(taskSourceConfig.getDbzConfiguration()); return new MySqlSourceFetchTaskContext( taskSourceConfig, this, jdbcConnection, binaryLogClient); } diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/MySqlSourceBuilder.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/MySqlSourceBuilder.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/MySqlSourceBuilder.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/MySqlSourceBuilder.java index 7ea413a7f..2e7346b27 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/MySqlSourceBuilder.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/MySqlSourceBuilder.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental; +package org.apache.flink.cdc.connectors.base.experimental; -import com.ververica.cdc.common.annotation.Experimental; -import com.ververica.cdc.connectors.base.experimental.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.base.experimental.offset.BinlogOffsetFactory; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.IncrementalSource; -import com.ververica.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.common.annotation.Experimental; +import org.apache.flink.cdc.connectors.base.experimental.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.base.experimental.offset.BinlogOffsetFactory; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.IncrementalSource; +import org.apache.flink.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; import java.time.Duration; import java.util.Properties; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/MysqlPooledDataSourceFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/MysqlPooledDataSourceFactory.java similarity index 83% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/MysqlPooledDataSourceFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/MysqlPooledDataSourceFactory.java index 0b8482458..a857a16c9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/MysqlPooledDataSourceFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/MysqlPooledDataSourceFactory.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental; +package org.apache.flink.cdc.connectors.base.experimental; -import com.ververica.cdc.common.annotation.Experimental; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; +import org.apache.flink.cdc.common.annotation.Experimental; +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; /** A MySQL datasource factory. */ @Experimental diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/config/MySqlSourceConfig.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/config/MySqlSourceConfig.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/config/MySqlSourceConfig.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/config/MySqlSourceConfig.java index 3d824a5ad..5d7c201d7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/config/MySqlSourceConfig.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/config/MySqlSourceConfig.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.config; +package org.apache.flink.cdc.connectors.base.experimental.config; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.options.StartupOptions; import io.debezium.config.Configuration; import io.debezium.connector.mysql.MySqlConnectorConfig; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/config/MySqlSourceConfigFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/config/MySqlSourceConfigFactory.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/config/MySqlSourceConfigFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/config/MySqlSourceConfigFactory.java index 047acd593..cebec367c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/config/MySqlSourceConfigFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/config/MySqlSourceConfigFactory.java @@ -15,17 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.config; +package org.apache.flink.cdc.connectors.base.experimental.config; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfigFactory; +import org.apache.flink.cdc.connectors.base.experimental.EmbeddedFlinkDatabaseHistory; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfigFactory; -import com.ververica.cdc.connectors.base.experimental.EmbeddedFlinkDatabaseHistory; import io.debezium.config.Configuration; import io.debezium.connector.mysql.MySqlConnectorConfig; import java.util.Properties; import java.util.UUID; -import static com.ververica.cdc.connectors.base.utils.EnvironmentUtils.checkSupportCheckpointsAfterTasksFinished; +import static org.apache.flink.cdc.connectors.base.utils.EnvironmentUtils.checkSupportCheckpointsAfterTasksFinished; import static org.apache.flink.util.Preconditions.checkNotNull; /** A factory to initialize {@link MySqlSourceConfig}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/config/ServerIdRange.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/config/ServerIdRange.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/config/ServerIdRange.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/config/ServerIdRange.java index c2acfddc1..de7a7e0a9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/config/ServerIdRange.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/config/ServerIdRange.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.config; +package org.apache.flink.cdc.connectors.base.experimental.config; -import com.ververica.cdc.connectors.base.options.JdbcSourceOptions; +import org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions; import javax.annotation.Nullable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/fetch/MySqlScanFetchTask.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/fetch/MySqlScanFetchTask.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/fetch/MySqlScanFetchTask.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/fetch/MySqlScanFetchTask.java index 818f8048a..791415b41 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/fetch/MySqlScanFetchTask.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/fetch/MySqlScanFetchTask.java @@ -15,13 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.fetch; +package org.apache.flink.cdc.connectors.base.experimental.fetch; + +import org.apache.flink.cdc.connectors.base.experimental.fetch.MySqlStreamFetchTask.MySqlBinlogSplitReadTask; +import org.apache.flink.cdc.connectors.base.experimental.utils.MySqlUtils; +import org.apache.flink.cdc.connectors.base.relational.JdbcSourceEventDispatcher; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplit; +import org.apache.flink.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; -import com.ververica.cdc.connectors.base.experimental.fetch.MySqlStreamFetchTask.MySqlBinlogSplitReadTask; -import com.ververica.cdc.connectors.base.relational.JdbcSourceEventDispatcher; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplit; -import com.ververica.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; import io.debezium.DebeziumException; import io.debezium.config.Configuration; import io.debezium.connector.mysql.MySqlConnection; @@ -53,9 +55,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.time.Duration; -import static com.ververica.cdc.connectors.base.experimental.utils.MySqlConnectionUtils.createMySqlConnection; -import static com.ververica.cdc.connectors.base.experimental.utils.MySqlUtils.buildSplitScanQuery; -import static com.ververica.cdc.connectors.base.experimental.utils.MySqlUtils.readTableSplitDataStatement; +import static org.apache.flink.cdc.connectors.base.experimental.utils.MySqlConnectionUtils.createMySqlConnection; /** The task to work for fetching data of MySQL table snapshot split . */ public class MySqlScanFetchTask extends AbstractScanFetchTask { @@ -246,7 +246,7 @@ public class MySqlScanFetchTask extends AbstractScanFetchTask { table.id()); final String selectSql = - buildSplitScanQuery( + MySqlUtils.buildSplitScanQuery( snapshotSplit.getTableId(), snapshotSplit.getSplitKeyType(), snapshotSplit.getSplitStart() == null, @@ -258,7 +258,7 @@ public class MySqlScanFetchTask extends AbstractScanFetchTask { selectSql); try (PreparedStatement selectStatement = - readTableSplitDataStatement( + MySqlUtils.readTableSplitDataStatement( jdbcConnection, selectSql, snapshotSplit.getSplitStart() == null, diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/fetch/MySqlSourceFetchTaskContext.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/fetch/MySqlSourceFetchTaskContext.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/fetch/MySqlSourceFetchTaskContext.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/fetch/MySqlSourceFetchTaskContext.java index fe7e4238e..6422de433 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/fetch/MySqlSourceFetchTaskContext.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/fetch/MySqlSourceFetchTaskContext.java @@ -15,22 +15,22 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.fetch; - +package org.apache.flink.cdc.connectors.base.experimental.fetch; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.dialect.JdbcDataSourceDialect; +import org.apache.flink.cdc.connectors.base.experimental.EmbeddedFlinkDatabaseHistory; +import org.apache.flink.cdc.connectors.base.experimental.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.base.experimental.handler.MySqlSchemaChangeEventHandler; +import org.apache.flink.cdc.connectors.base.experimental.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.base.experimental.utils.MySqlUtils; +import org.apache.flink.cdc.connectors.base.relational.JdbcSourceEventDispatcher; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.reader.external.JdbcSourceFetchTaskContext; import org.apache.flink.table.types.logical.RowType; import com.github.shyiko.mysql.binlog.BinaryLogClient; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.dialect.JdbcDataSourceDialect; -import com.ververica.cdc.connectors.base.experimental.EmbeddedFlinkDatabaseHistory; -import com.ververica.cdc.connectors.base.experimental.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.base.experimental.handler.MySqlSchemaChangeEventHandler; -import com.ververica.cdc.connectors.base.experimental.offset.BinlogOffset; -import com.ververica.cdc.connectors.base.experimental.utils.MySqlUtils; -import com.ververica.cdc.connectors.base.relational.JdbcSourceEventDispatcher; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.reader.external.JdbcSourceFetchTaskContext; import io.debezium.connector.AbstractSourceInfo; import io.debezium.connector.base.ChangeEventQueue; import io.debezium.connector.mysql.MySqlChangeEventSourceMetricsFactory; @@ -65,8 +65,6 @@ import java.time.Instant; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.base.experimental.offset.BinlogOffset.BINLOG_FILENAME_OFFSET_KEY; - /** The context for fetch task that fetching data of snapshot split from MySQL data source. */ public class MySqlSourceFetchTaskContext extends JdbcSourceFetchTaskContext { @@ -263,7 +261,8 @@ public class MySqlSourceFetchTaskContext extends JdbcSourceFetchTaskContext { } private boolean isBinlogAvailable(MySqlOffsetContext offset) { - String binlogFilename = offset.getSourceInfo().getString(BINLOG_FILENAME_OFFSET_KEY); + String binlogFilename = + offset.getSourceInfo().getString(BinlogOffset.BINLOG_FILENAME_OFFSET_KEY); if (binlogFilename == null) { return true; // start at current position } diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/fetch/MySqlStreamFetchTask.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/fetch/MySqlStreamFetchTask.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/fetch/MySqlStreamFetchTask.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/fetch/MySqlStreamFetchTask.java index 89f50bc82..cdfb02c69 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/fetch/MySqlStreamFetchTask.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/fetch/MySqlStreamFetchTask.java @@ -15,15 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.fetch; +package org.apache.flink.cdc.connectors.base.experimental.fetch; + +import org.apache.flink.cdc.connectors.base.experimental.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.base.relational.JdbcSourceEventDispatcher; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplit; +import org.apache.flink.cdc.connectors.base.source.meta.wartermark.WatermarkKind; +import org.apache.flink.cdc.connectors.base.source.reader.external.FetchTask; import com.github.shyiko.mysql.binlog.event.Event; -import com.ververica.cdc.connectors.base.experimental.offset.BinlogOffset; -import com.ververica.cdc.connectors.base.relational.JdbcSourceEventDispatcher; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplit; -import com.ververica.cdc.connectors.base.source.meta.wartermark.WatermarkKind; -import com.ververica.cdc.connectors.base.source.reader.external.FetchTask; import io.debezium.DebeziumException; import io.debezium.connector.mysql.MySqlConnection; import io.debezium.connector.mysql.MySqlConnectorConfig; @@ -41,8 +42,6 @@ import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.Map; -import static com.ververica.cdc.connectors.base.experimental.offset.BinlogOffset.NO_STOPPING_OFFSET; - /** The task to work for fetching data of MySQL table stream split . */ public class MySqlStreamFetchTask implements FetchTask { @@ -162,7 +161,7 @@ public class MySqlStreamFetchTask implements FetchTask { } private boolean isBoundedRead() { - return !NO_STOPPING_OFFSET.equals(binlogSplit.getEndingOffset()); + return !BinlogOffset.NO_STOPPING_OFFSET.equals(binlogSplit.getEndingOffset()); } public static BinlogOffset getBinlogPosition(Map offset) { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/handler/MySqlSchemaChangeEventHandler.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/handler/MySqlSchemaChangeEventHandler.java similarity index 78% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/handler/MySqlSchemaChangeEventHandler.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/handler/MySqlSchemaChangeEventHandler.java index 02319073f..45858321a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/handler/MySqlSchemaChangeEventHandler.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/handler/MySqlSchemaChangeEventHandler.java @@ -15,18 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.handler; +package org.apache.flink.cdc.connectors.base.experimental.handler; + +import org.apache.flink.cdc.connectors.base.relational.handler.SchemaChangeEventHandler; -import com.ververica.cdc.connectors.base.relational.handler.SchemaChangeEventHandler; import io.debezium.schema.SchemaChangeEvent; import org.apache.kafka.connect.data.Struct; import java.util.HashMap; import java.util.Map; -import static com.ververica.cdc.connectors.base.experimental.offset.BinlogOffset.BINLOG_FILENAME_OFFSET_KEY; -import static com.ververica.cdc.connectors.base.experimental.offset.BinlogOffset.BINLOG_POSITION_OFFSET_KEY; -import static com.ververica.cdc.connectors.base.experimental.offset.BinlogOffset.SERVER_ID_KEY; +import static org.apache.flink.cdc.connectors.base.experimental.offset.BinlogOffset.BINLOG_FILENAME_OFFSET_KEY; +import static org.apache.flink.cdc.connectors.base.experimental.offset.BinlogOffset.BINLOG_POSITION_OFFSET_KEY; +import static org.apache.flink.cdc.connectors.base.experimental.offset.BinlogOffset.SERVER_ID_KEY; /** * This MySqlSchemaChangeEventHandler helps to parse the source struct in SchemaChangeEvent and diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/offset/BinlogOffset.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/offset/BinlogOffset.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/offset/BinlogOffset.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/offset/BinlogOffset.java index 472aab5f5..e4ecdd2a1 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/offset/BinlogOffset.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/offset/BinlogOffset.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.offset; +package org.apache.flink.cdc.connectors.base.experimental.offset; + +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; import io.debezium.connector.mysql.GtidSet; import org.apache.commons.lang3.StringUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/offset/BinlogOffsetFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/offset/BinlogOffsetFactory.java similarity index 89% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/offset/BinlogOffsetFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/offset/BinlogOffsetFactory.java index 66199c767..1fe782169 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/offset/BinlogOffsetFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/offset/BinlogOffsetFactory.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.offset; +package org.apache.flink.cdc.connectors.base.experimental.offset; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.offset.OffsetFactory; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.OffsetFactory; - import java.util.Map; /** An offset factory class create {@link BinlogOffset} instance. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/MySqlConnectionUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/MySqlConnectionUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/MySqlConnectionUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/MySqlConnectionUtils.java index 55bcde334..1a1903baa 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/MySqlConnectionUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/MySqlConnectionUtils.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.utils; +package org.apache.flink.cdc.connectors.base.experimental.utils; +import org.apache.flink.cdc.connectors.base.experimental.offset.BinlogOffset; import org.apache.flink.util.FlinkRuntimeException; import com.github.shyiko.mysql.binlog.BinaryLogClient; -import com.ververica.cdc.connectors.base.experimental.offset.BinlogOffset; import io.debezium.config.Configuration; import io.debezium.connector.mysql.MySqlConnection; import io.debezium.connector.mysql.MySqlConnectorConfig; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/MySqlSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/MySqlSchema.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/MySqlSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/MySqlSchema.java index 78dc2d2fb..8954007bb 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/MySqlSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/MySqlSchema.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.utils; +package org.apache.flink.cdc.connectors.base.experimental.utils; +import org.apache.flink.cdc.connectors.base.experimental.config.MySqlSourceConfig; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.base.experimental.config.MySqlSourceConfig; import io.debezium.connector.mysql.MySqlConnectorConfig; import io.debezium.connector.mysql.MySqlDatabaseSchema; import io.debezium.connector.mysql.MySqlOffsetContext; @@ -36,7 +36,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.base.experimental.utils.MySqlConnectionUtils.createMySqlDatabaseSchema; +import static org.apache.flink.cdc.connectors.base.experimental.utils.MySqlConnectionUtils.createMySqlDatabaseSchema; /** A component used to get schema by table path. */ public class MySqlSchema { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/MySqlTypeUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/MySqlTypeUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/MySqlTypeUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/MySqlTypeUtils.java index dba4abe9e..ea17b6d69 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/MySqlTypeUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/MySqlTypeUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.utils; +package org.apache.flink.cdc.connectors.base.experimental.utils; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/MySqlUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/MySqlUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/MySqlUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/MySqlUtils.java index 96c40a516..0d6ef1f88 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/MySqlUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/MySqlUtils.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.utils; +package org.apache.flink.cdc.connectors.base.experimental.utils; +import org.apache.flink.cdc.connectors.base.experimental.offset.BinlogOffset; import org.apache.flink.table.api.ValidationException; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.base.experimental.offset.BinlogOffset; import io.debezium.connector.mysql.MySqlConnectorConfig; import io.debezium.connector.mysql.MySqlDatabaseSchema; import io.debezium.connector.mysql.MySqlTopicSelector; @@ -45,7 +45,7 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.base.utils.SourceRecordUtils.rowToArray; +import static org.apache.flink.cdc.connectors.base.utils.SourceRecordUtils.rowToArray; import static org.apache.flink.table.api.DataTypes.FIELD; import static org.apache.flink.table.api.DataTypes.ROW; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/TableDiscoveryUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/TableDiscoveryUtils.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/TableDiscoveryUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/TableDiscoveryUtils.java index 295a5574b..2b997024b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/experimental/utils/TableDiscoveryUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/experimental/utils/TableDiscoveryUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.experimental.utils; +package org.apache.flink.cdc.connectors.base.experimental.utils; import io.debezium.jdbc.JdbcConnection; import io.debezium.relational.RelationalTableFilters; @@ -27,8 +27,6 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import static com.ververica.cdc.connectors.base.experimental.utils.MySqlUtils.quote; - /** Utilities to discovery matched tables. */ public class TableDiscoveryUtils { private static final Logger LOG = LoggerFactory.getLogger(TableDiscoveryUtils.class); @@ -63,7 +61,9 @@ public class TableDiscoveryUtils { for (String dbName : databaseNames) { try { jdbc.query( - "SHOW FULL TABLES IN " + quote(dbName) + " where Table_Type = 'BASE TABLE'", + "SHOW FULL TABLES IN " + + MySqlUtils.quote(dbName) + + " where Table_Type = 'BASE TABLE'", rs -> { while (rs.next()) { TableId tableId = new TableId(dbName, null, rs.getString(1)); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializerTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializerTest.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializerTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializerTest.java index a42d6a90f..1557818f3 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializerTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/PendingSplitsStateSerializerTest.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.source.assigner.state; - +package org.apache.flink.cdc.connectors.base.source.assigner.state; + +import org.apache.flink.cdc.connectors.base.source.assigner.AssignerStatus; +import org.apache.flink.cdc.connectors.base.source.assigner.state.version5.HybridPendingSplitsStateVersion5; +import org.apache.flink.cdc.connectors.base.source.assigner.state.version5.PendingSplitsStateSerializerVersion5; +import org.apache.flink.cdc.connectors.base.source.assigner.state.version5.SnapshotPendingSplitsStateVersion5; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.offset.OffsetFactory; +import org.apache.flink.cdc.connectors.base.source.meta.split.SchemalessSnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitSerializer; import org.apache.flink.table.types.logical.BigIntType; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.base.source.assigner.AssignerStatus; -import com.ververica.cdc.connectors.base.source.assigner.state.version5.HybridPendingSplitsStateVersion5; -import com.ververica.cdc.connectors.base.source.assigner.state.version5.PendingSplitsStateSerializerVersion5; -import com.ververica.cdc.connectors.base.source.assigner.state.version5.SnapshotPendingSplitsStateVersion5; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.OffsetFactory; -import com.ververica.cdc.connectors.base.source.meta.split.SchemalessSnapshotSplit; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitSerializer; import io.debezium.relational.Column; import io.debezium.relational.Table; import io.debezium.relational.TableEditor; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/assigner/state/version5/HybridPendingSplitsStateVersion5.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/version5/HybridPendingSplitsStateVersion5.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/assigner/state/version5/HybridPendingSplitsStateVersion5.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/version5/HybridPendingSplitsStateVersion5.java index 1ab5ab2b7..4659c1fc8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/assigner/state/version5/HybridPendingSplitsStateVersion5.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/version5/HybridPendingSplitsStateVersion5.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.source.assigner.state.version5; +package org.apache.flink.cdc.connectors.base.source.assigner.state.version5; -import com.ververica.cdc.connectors.base.source.assigner.state.PendingSplitsState; +import org.apache.flink.cdc.connectors.base.source.assigner.state.PendingSplitsState; /** * The 5th version of HybridPendingSplitsState. The modification of the 6th version: Change diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/assigner/state/version5/PendingSplitsStateSerializerVersion5.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/version5/PendingSplitsStateSerializerVersion5.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/assigner/state/version5/PendingSplitsStateSerializerVersion5.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/version5/PendingSplitsStateSerializerVersion5.java index 263587979..29b644fbe 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/assigner/state/version5/PendingSplitsStateSerializerVersion5.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/version5/PendingSplitsStateSerializerVersion5.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.source.assigner.state.version5; - +package org.apache.flink.cdc.connectors.base.source.assigner.state.version5; + +import org.apache.flink.cdc.connectors.base.source.assigner.state.PendingSplitsState; +import org.apache.flink.cdc.connectors.base.source.assigner.state.StreamPendingSplitsState; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.SchemalessSnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.meta.split.version4.LegacySourceSplitSerializierVersion4; +import org.apache.flink.cdc.connectors.base.utils.SerializerUtils; +import org.apache.flink.cdc.debezium.history.FlinkJsonTableChangeSerializer; import org.apache.flink.core.memory.DataOutputSerializer; -import com.ververica.cdc.connectors.base.source.assigner.state.PendingSplitsState; -import com.ververica.cdc.connectors.base.source.assigner.state.StreamPendingSplitsState; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.SchemalessSnapshotSplit; -import com.ververica.cdc.connectors.base.source.meta.split.version4.LegacySourceSplitSerializierVersion4; -import com.ververica.cdc.connectors.base.utils.SerializerUtils; -import com.ververica.cdc.debezium.history.FlinkJsonTableChangeSerializer; import io.debezium.document.DocumentWriter; import io.debezium.relational.TableId; import io.debezium.relational.history.TableChanges; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/assigner/state/version5/SnapshotPendingSplitsStateVersion5.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/version5/SnapshotPendingSplitsStateVersion5.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/assigner/state/version5/SnapshotPendingSplitsStateVersion5.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/version5/SnapshotPendingSplitsStateVersion5.java index 448df6533..177bb242a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/assigner/state/version5/SnapshotPendingSplitsStateVersion5.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/assigner/state/version5/SnapshotPendingSplitsStateVersion5.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.source.assigner.state.version5; +package org.apache.flink.cdc.connectors.base.source.assigner.state.version5; + +import org.apache.flink.cdc.connectors.base.source.assigner.state.PendingSplitsState; +import org.apache.flink.cdc.connectors.base.source.enumerator.IncrementalSourceEnumerator; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.SchemalessSnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.reader.IncrementalSourceSplitReader; -import com.ververica.cdc.connectors.base.source.assigner.state.PendingSplitsState; -import com.ververica.cdc.connectors.base.source.enumerator.IncrementalSourceEnumerator; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.SchemalessSnapshotSplit; -import com.ververica.cdc.connectors.base.source.reader.IncrementalSourceSplitReader; import io.debezium.relational.TableId; import io.debezium.relational.history.TableChanges; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/meta/split/SourceSplitSerializerTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/meta/split/SourceSplitSerializerTest.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/meta/split/SourceSplitSerializerTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/meta/split/SourceSplitSerializerTest.java index 3c92b62a8..af1c0eb33 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/meta/split/SourceSplitSerializerTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/meta/split/SourceSplitSerializerTest.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.source.meta.split; +package org.apache.flink.cdc.connectors.base.source.meta.split; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.offset.OffsetFactory; +import org.apache.flink.cdc.connectors.base.source.meta.split.version4.LegacySourceSplitSerializierVersion4; +import org.apache.flink.cdc.connectors.base.source.meta.split.version4.StreamSplitVersion4; import org.apache.flink.table.types.logical.BigIntType; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.OffsetFactory; -import com.ververica.cdc.connectors.base.source.meta.split.version4.LegacySourceSplitSerializierVersion4; -import com.ververica.cdc.connectors.base.source.meta.split.version4.StreamSplitVersion4; import io.debezium.relational.TableId; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/meta/split/version4/LegacySourceSplitSerializierVersion4.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/meta/split/version4/LegacySourceSplitSerializierVersion4.java similarity index 89% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/meta/split/version4/LegacySourceSplitSerializierVersion4.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/meta/split/version4/LegacySourceSplitSerializierVersion4.java index 4fe488c45..780e5c4f2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/meta/split/version4/LegacySourceSplitSerializierVersion4.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/meta/split/version4/LegacySourceSplitSerializierVersion4.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.source.meta.split.version4; +package org.apache.flink.cdc.connectors.base.source.meta.split.version4; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.offset.OffsetDeserializerSerializer; +import org.apache.flink.cdc.connectors.base.source.meta.split.FinishedSnapshotSplitInfo; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.utils.SerializerUtils; +import org.apache.flink.cdc.debezium.history.FlinkJsonTableChangeSerializer; import org.apache.flink.core.memory.DataOutputSerializer; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.OffsetDeserializerSerializer; -import com.ververica.cdc.connectors.base.source.meta.split.FinishedSnapshotSplitInfo; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.utils.SerializerUtils; -import com.ververica.cdc.debezium.history.FlinkJsonTableChangeSerializer; import io.debezium.document.DocumentWriter; import io.debezium.relational.TableId; import io.debezium.relational.history.TableChanges; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/meta/split/version4/StreamSplitVersion4.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/meta/split/version4/StreamSplitVersion4.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/meta/split/version4/StreamSplitVersion4.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/meta/split/version4/StreamSplitVersion4.java index bd44c24f5..c47b802b0 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/source/meta/split/version4/StreamSplitVersion4.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/source/meta/split/version4/StreamSplitVersion4.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.source.meta.split.version4; +package org.apache.flink.cdc.connectors.base.source.meta.split.version4; + +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.FinishedSnapshotSplitInfo; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.FinishedSnapshotSplitInfo; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; import io.debezium.relational.TableId; import io.debezium.relational.history.TableChanges; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/testutils/MySqlContainer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/testutils/MySqlContainer.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/testutils/MySqlContainer.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/testutils/MySqlContainer.java index e6929fa07..445ed69e8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/testutils/MySqlContainer.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/testutils/MySqlContainer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.testutils; +package org.apache.flink.cdc.connectors.base.testutils; import org.testcontainers.containers.ContainerLaunchException; import org.testcontainers.containers.JdbcDatabaseContainer; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/testutils/MySqlVersion.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/testutils/MySqlVersion.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/testutils/MySqlVersion.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/testutils/MySqlVersion.java index 75f717dba..0b1ff47a5 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/testutils/MySqlVersion.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/testutils/MySqlVersion.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.testutils; +package org.apache.flink.cdc.connectors.base.testutils; /** MySql version enum. */ public enum MySqlVersion { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/testutils/UniqueDatabase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/testutils/UniqueDatabase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/testutils/UniqueDatabase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/testutils/UniqueDatabase.java index dc45b14fc..1b4400436 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/com/ververica/cdc/connectors/base/testutils/UniqueDatabase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/test/java/org/apache/flink/cdc/connectors/base/testutils/UniqueDatabase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.testutils; +package org.apache.flink.cdc.connectors.base.testutils; import java.net.URL; import java.nio.file.Files; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/Db2Source.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/Db2Source.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/Db2Source.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/Db2Source.java index 4e7fff07f..39479c3fe 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/Db2Source.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/Db2Source.java @@ -15,12 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.db2; +package org.apache.flink.cdc.connectors.db2; + +import org.apache.flink.cdc.connectors.db2.table.StartupOptions; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.Validator; -import com.ververica.cdc.connectors.db2.table.StartupOptions; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.Validator; import io.debezium.connector.db2.Db2Connector; import java.util.Properties; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/Db2ReadableMetaData.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/Db2ReadableMetaData.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/Db2ReadableMetaData.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/Db2ReadableMetaData.java index f2ebf00ca..8fe9f51c8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/Db2ReadableMetaData.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/Db2ReadableMetaData.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.db2.table; +package org.apache.flink.cdc.connectors.db2.table; +import org.apache.flink.cdc.debezium.table.MetadataConverter; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.data.StringData; import org.apache.flink.table.data.TimestampData; import org.apache.flink.table.types.DataType; -import com.ververica.cdc.debezium.table.MetadataConverter; import io.debezium.connector.AbstractSourceInfo; import io.debezium.data.Envelope; import org.apache.kafka.connect.data.Struct; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/Db2TableSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/Db2TableSource.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/Db2TableSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/Db2TableSource.java index 26774cf46..7411dfa97 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/Db2TableSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/Db2TableSource.java @@ -15,9 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.db2.table; +package org.apache.flink.cdc.connectors.db2.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.db2.Db2Source; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.table.MetadataConverter; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.connector.ChangelogMode; import org.apache.flink.table.connector.source.DynamicTableSource; @@ -28,12 +33,6 @@ import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.db2.Db2Source; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.table.MetadataConverter; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; - import java.time.ZoneId; import java.util.Collections; import java.util.List; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/Db2TableSourceFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/Db2TableSourceFactory.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/Db2TableSourceFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/Db2TableSourceFactory.java index bc79da3c5..7ad2238c4 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/Db2TableSourceFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/Db2TableSourceFactory.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.db2.table; +package org.apache.flink.cdc.connectors.db2.table; +import org.apache.flink.cdc.connectors.db2.utils.OptionUtils; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; import org.apache.flink.configuration.Configuration; @@ -27,14 +28,12 @@ import org.apache.flink.table.connector.source.DynamicTableSource; import org.apache.flink.table.factories.DynamicTableSourceFactory; import org.apache.flink.table.factories.FactoryUtil; -import com.ververica.cdc.connectors.db2.utils.OptionUtils; - import java.time.ZoneId; import java.util.HashSet; import java.util.Set; -import static com.ververica.cdc.debezium.table.DebeziumOptions.DEBEZIUM_OPTIONS_PREFIX; -import static com.ververica.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; +import static org.apache.flink.cdc.debezium.table.DebeziumOptions.DEBEZIUM_OPTIONS_PREFIX; +import static org.apache.flink.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; /** Table source factory for DB2 CDC connector. */ public class Db2TableSourceFactory implements DynamicTableSourceFactory { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/StartupMode.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/StartupMode.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/StartupMode.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/StartupMode.java index f8363225c..43b97c3d1 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/StartupMode.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/StartupMode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.db2.table; +package org.apache.flink.cdc.connectors.db2.table; /** * Startup modes for the Db2 CDC Consumer. diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/StartupOptions.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/StartupOptions.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/StartupOptions.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/StartupOptions.java index 84be8f145..a06140889 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/table/StartupOptions.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/table/StartupOptions.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.db2.table; +package org.apache.flink.cdc.connectors.db2.table; import java.util.Objects; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/utils/OptionUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/utils/OptionUtils.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/utils/OptionUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/utils/OptionUtils.java index 4d1653f97..387d5f474 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-cdc-base/src/main/java/com/ververica/cdc/connectors/base/utils/OptionUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/utils/OptionUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.base.utils; +package org.apache.flink.cdc.connectors.db2.utils; import org.apache.flink.configuration.ConfigurationUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 78bc00df2..c435320ce 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.ververica.cdc.connectors.db2.table.Db2TableSourceFactory +org.apache.flink.cdc.connectors.db2.table.Db2TableSourceFactory diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/com/ververica/cdc/connectors/db2/Db2SourceTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/Db2SourceTest.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/com/ververica/cdc/connectors/db2/Db2SourceTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/Db2SourceTest.java index 5237c9e62..a6c4041fe 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/com/ververica/cdc/connectors/db2/Db2SourceTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/Db2SourceTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.db2; +package org.apache.flink.cdc.connectors.db2; import org.apache.flink.api.common.state.BroadcastState; import org.apache.flink.api.common.state.KeyedStateStore; @@ -24,6 +24,9 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.OperatorStateStore; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.utils.TestSourceContext; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.testutils.CheckedThread; import org.apache.flink.runtime.state.FunctionInitializationContext; @@ -34,9 +37,6 @@ import org.apache.flink.util.Collector; import org.apache.flink.util.Preconditions; import com.jayway.jsonpath.JsonPath; -import com.ververica.cdc.connectors.utils.TestSourceContext; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; import org.apache.kafka.connect.source.SourceRecord; import org.junit.Test; @@ -56,10 +56,10 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertDelete; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertInsert; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertRead; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertUpdate; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertDelete; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertInsert; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertRead; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertUpdate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/com/ververica/cdc/connectors/db2/Db2TestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/Db2TestBase.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/com/ververica/cdc/connectors/db2/Db2TestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/Db2TestBase.java index c98ac9443..4a4c57b36 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/com/ververica/cdc/connectors/db2/Db2TestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/Db2TestBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.db2; +package org.apache.flink.cdc.connectors.db2; import org.junit.BeforeClass; import org.slf4j.Logger; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/com/ververica/cdc/connectors/db2/table/Db2ConnectorITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/table/Db2ConnectorITCase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/com/ververica/cdc/connectors/db2/table/Db2ConnectorITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/table/Db2ConnectorITCase.java index 67d3b47eb..40e855931 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/com/ververica/cdc/connectors/db2/table/Db2ConnectorITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/table/Db2ConnectorITCase.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.db2.table; +package org.apache.flink.cdc.connectors.db2.table; +import org.apache.flink.cdc.connectors.db2.Db2TestBase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableResult; @@ -24,7 +25,6 @@ import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.table.utils.LegacyRowResource; -import com.ververica.cdc.connectors.db2.Db2TestBase; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/com/ververica/cdc/connectors/db2/table/Db2TableSourceFactoryTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/table/Db2TableSourceFactoryTest.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/com/ververica/cdc/connectors/db2/table/Db2TableSourceFactoryTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/table/Db2TableSourceFactoryTest.java index a4df078e7..7d4852a37 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/com/ververica/cdc/connectors/db2/table/Db2TableSourceFactoryTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-db2-cdc/src/test/java/org/apache/flink/cdc/connectors/db2/table/Db2TableSourceFactoryTest.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.db2.table; +package org.apache.flink.cdc.connectors.db2.table; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; import org.apache.flink.table.api.DataTypes; @@ -35,7 +36,6 @@ import org.apache.flink.table.factories.FactoryUtil; import org.apache.flink.table.runtime.connector.source.ScanRuntimeProviderContext; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.debezium.DebeziumSourceFunction; import org.junit.Test; import java.time.ZoneId; @@ -46,8 +46,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertProducedTypeOfSourceFunction; -import static com.ververica.cdc.debezium.utils.ResolvedSchemaUtils.getPhysicalSchema; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertProducedTypeOfSourceFunction; +import static org.apache.flink.cdc.debezium.utils.ResolvedSchemaUtils.getPhysicalSchema; import static org.apache.flink.table.api.TableSchema.fromResolvedSchema; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/io/debezium/embedded/EmbeddedEngineChangeEvent.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/io/debezium/embedded/EmbeddedEngineChangeEvent.java index 1e027811e..cf39b79f4 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/io/debezium/embedded/EmbeddedEngineChangeEvent.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/io/debezium/embedded/EmbeddedEngineChangeEvent.java @@ -6,7 +6,8 @@ package io.debezium.embedded; -import com.ververica.cdc.debezium.internal.DebeziumChangeFetcher; +import org.apache.flink.cdc.debezium.internal.DebeziumChangeFetcher; + import io.debezium.engine.ChangeEvent; import io.debezium.engine.RecordChangeEvent; import org.apache.kafka.connect.source.SourceRecord; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/DebeziumDeserializationSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/DebeziumDeserializationSchema.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/DebeziumDeserializationSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/DebeziumDeserializationSchema.java index 4801c0e30..50b813af3 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/DebeziumDeserializationSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/DebeziumDeserializationSchema.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.debezium; +package org.apache.flink.cdc.debezium; import org.apache.flink.api.java.typeutils.ResultTypeQueryable; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import org.apache.flink.util.Collector; -import com.ververica.cdc.common.annotation.PublicEvolving; import org.apache.kafka.connect.source.SourceRecord; import java.io.Serializable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/DebeziumSourceFunction.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/DebeziumSourceFunction.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/DebeziumSourceFunction.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/DebeziumSourceFunction.java index 47cdbbb72..bdc985b71 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/DebeziumSourceFunction.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/DebeziumSourceFunction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.debezium; +package org.apache.flink.cdc.debezium; import org.apache.flink.api.common.state.CheckpointListener; import org.apache.flink.api.common.state.ListState; @@ -25,6 +25,17 @@ import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.PrimitiveArrayTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.typeutils.ResultTypeQueryable; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.VisibleForTesting; +import org.apache.flink.cdc.debezium.internal.DebeziumChangeConsumer; +import org.apache.flink.cdc.debezium.internal.DebeziumChangeFetcher; +import org.apache.flink.cdc.debezium.internal.DebeziumOffset; +import org.apache.flink.cdc.debezium.internal.DebeziumOffsetSerializer; +import org.apache.flink.cdc.debezium.internal.FlinkDatabaseHistory; +import org.apache.flink.cdc.debezium.internal.FlinkDatabaseSchemaHistory; +import org.apache.flink.cdc.debezium.internal.FlinkOffsetBackingStore; +import org.apache.flink.cdc.debezium.internal.Handover; +import org.apache.flink.cdc.debezium.internal.SchemaRecord; import org.apache.flink.configuration.Configuration; import org.apache.flink.metrics.Gauge; import org.apache.flink.metrics.groups.OperatorMetricGroup; @@ -38,17 +49,6 @@ import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.annotation.VisibleForTesting; -import com.ververica.cdc.debezium.internal.DebeziumChangeConsumer; -import com.ververica.cdc.debezium.internal.DebeziumChangeFetcher; -import com.ververica.cdc.debezium.internal.DebeziumOffset; -import com.ververica.cdc.debezium.internal.DebeziumOffsetSerializer; -import com.ververica.cdc.debezium.internal.FlinkDatabaseHistory; -import com.ververica.cdc.debezium.internal.FlinkDatabaseSchemaHistory; -import com.ververica.cdc.debezium.internal.FlinkOffsetBackingStore; -import com.ververica.cdc.debezium.internal.Handover; -import com.ververica.cdc.debezium.internal.SchemaRecord; import io.debezium.document.DocumentReader; import io.debezium.document.DocumentWriter; import io.debezium.embedded.Connect; @@ -72,9 +72,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import static com.ververica.cdc.debezium.internal.Handover.ClosedException.isGentlyClosedException; -import static com.ververica.cdc.debezium.utils.DatabaseHistoryUtil.registerHistory; -import static com.ververica.cdc.debezium.utils.DatabaseHistoryUtil.retrieveHistory; +import static org.apache.flink.cdc.debezium.internal.Handover.ClosedException.isGentlyClosedException; +import static org.apache.flink.cdc.debezium.utils.DatabaseHistoryUtil.registerHistory; +import static org.apache.flink.cdc.debezium.utils.DatabaseHistoryUtil.retrieveHistory; /** * The {@link DebeziumSourceFunction} is a streaming data source that pulls captured change data diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/JsonDebeziumDeserializationSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/JsonDebeziumDeserializationSchema.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/JsonDebeziumDeserializationSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/JsonDebeziumDeserializationSchema.java index a836db128..b3820dd5d 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/JsonDebeziumDeserializationSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/JsonDebeziumDeserializationSchema.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.debezium; +package org.apache.flink.cdc.debezium; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/StringDebeziumDeserializationSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/StringDebeziumDeserializationSchema.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/StringDebeziumDeserializationSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/StringDebeziumDeserializationSchema.java index 2ae310c04..55722ea37 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/StringDebeziumDeserializationSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/StringDebeziumDeserializationSchema.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.debezium; +package org.apache.flink.cdc.debezium; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/Validator.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/Validator.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/Validator.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/Validator.java index f0ad20ad1..f285a8951 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/Validator.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/Validator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.debezium; +package org.apache.flink.cdc.debezium; import java.io.Serializable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/event/DebeziumEventDeserializationSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/event/DebeziumEventDeserializationSchema.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/event/DebeziumEventDeserializationSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/event/DebeziumEventDeserializationSchema.java index 1becbbc82..f77d1aa18 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/event/DebeziumEventDeserializationSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/event/DebeziumEventDeserializationSchema.java @@ -15,30 +15,30 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.event; +package org.apache.flink.cdc.debezium.event; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.data.DecimalData; +import org.apache.flink.cdc.common.data.LocalZonedTimestampData; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.data.TimestampData; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.types.DataField; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DecimalType; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.table.DebeziumChangelogMode; +import org.apache.flink.cdc.debezium.table.DeserializationRuntimeConverter; +import org.apache.flink.cdc.debezium.utils.TemporalConversions; +import org.apache.flink.cdc.runtime.typeutils.BinaryRecordDataGenerator; +import org.apache.flink.cdc.runtime.typeutils.EventTypeInfo; import org.apache.flink.util.Collector; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.data.DecimalData; -import com.ververica.cdc.common.data.LocalZonedTimestampData; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.data.TimestampData; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.types.DataField; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DecimalType; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.table.DebeziumChangelogMode; -import com.ververica.cdc.debezium.table.DeserializationRuntimeConverter; -import com.ververica.cdc.debezium.utils.TemporalConversions; -import com.ververica.cdc.runtime.typeutils.BinaryRecordDataGenerator; -import com.ververica.cdc.runtime.typeutils.EventTypeInfo; import io.debezium.data.Envelope; import io.debezium.data.SpecialValueDecimal; import io.debezium.data.VariableScaleDecimal; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/event/DebeziumSchemaDataTypeInference.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/event/DebeziumSchemaDataTypeInference.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/event/DebeziumSchemaDataTypeInference.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/event/DebeziumSchemaDataTypeInference.java index b7db00548..61c55ef8e 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/event/DebeziumSchemaDataTypeInference.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/event/DebeziumSchemaDataTypeInference.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.event; +package org.apache.flink.cdc.debezium.event; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.types.DataField; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.types.DecimalType; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.types.DataField; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.DecimalType; import io.debezium.data.SpecialValueDecimal; import io.debezium.data.VariableScaleDecimal; import io.debezium.time.MicroTime; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/event/SchemaDataTypeInference.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/event/SchemaDataTypeInference.java similarity index 89% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/event/SchemaDataTypeInference.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/event/SchemaDataTypeInference.java index 4ef387ab9..841ae3934 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/event/SchemaDataTypeInference.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/event/SchemaDataTypeInference.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.event; +package org.apache.flink.cdc.debezium.event; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.types.DataType; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.types.DataType; import org.apache.kafka.connect.data.Schema; /** {@link DataType} inference for kafka connect {@link Schema}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/event/SourceRecordEventDeserializer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/event/SourceRecordEventDeserializer.java similarity index 89% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/event/SourceRecordEventDeserializer.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/event/SourceRecordEventDeserializer.java index 32b166918..70b3d2546 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/event/SourceRecordEventDeserializer.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/event/SourceRecordEventDeserializer.java @@ -15,14 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.event; - -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.EventDeserializer; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; +package org.apache.flink.cdc.debezium.event; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.EventDeserializer; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; + import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.Struct; import org.apache.kafka.connect.source.SourceRecord; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/history/FlinkJsonTableChangeSerializer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/history/FlinkJsonTableChangeSerializer.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/history/FlinkJsonTableChangeSerializer.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/history/FlinkJsonTableChangeSerializer.java index e248c7f89..234673c3d 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/history/FlinkJsonTableChangeSerializer.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/history/FlinkJsonTableChangeSerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.history; +package org.apache.flink.cdc.debezium.history; import io.debezium.document.Array; import io.debezium.document.Array.Entry; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/DebeziumChangeConsumer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/DebeziumChangeConsumer.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/DebeziumChangeConsumer.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/DebeziumChangeConsumer.java index 12d2b3c42..03aae4b3f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/DebeziumChangeConsumer.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/DebeziumChangeConsumer.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.internal; +package org.apache.flink.cdc.debezium.internal; + +import org.apache.flink.cdc.common.annotation.Internal; -import com.ververica.cdc.common.annotation.Internal; import io.debezium.embedded.EmbeddedEngineChangeEvent; import io.debezium.engine.ChangeEvent; import io.debezium.engine.DebeziumEngine; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/DebeziumChangeFetcher.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/DebeziumChangeFetcher.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/DebeziumChangeFetcher.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/DebeziumChangeFetcher.java index 4b1928eac..96d6a67ff 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/DebeziumChangeFetcher.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/DebeziumChangeFetcher.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.internal; +package org.apache.flink.cdc.debezium.internal; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; import org.apache.flink.streaming.api.functions.source.SourceFunction; import org.apache.flink.util.Collector; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; import io.debezium.connector.SnapshotRecord; import io.debezium.data.Envelope; import io.debezium.engine.ChangeEvent; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/DebeziumOffset.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/DebeziumOffset.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/DebeziumOffset.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/DebeziumOffset.java index 75548d30a..a8865152a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/DebeziumOffset.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/DebeziumOffset.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.internal; +package org.apache.flink.cdc.debezium.internal; -import com.ververica.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.annotation.Internal; import java.io.Serializable; import java.util.Map; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/DebeziumOffsetSerializer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/DebeziumOffsetSerializer.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/DebeziumOffsetSerializer.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/DebeziumOffsetSerializer.java index 8a7d5a0bd..7b368eb0c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/DebeziumOffsetSerializer.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/DebeziumOffsetSerializer.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.internal; +package org.apache.flink.cdc.debezium.internal; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.flink.cdc.common.annotation.Internal; -import com.ververica.cdc.common.annotation.Internal; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/FlinkDatabaseHistory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/FlinkDatabaseHistory.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/FlinkDatabaseHistory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/FlinkDatabaseHistory.java index e53b2c953..f4f880b9f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/FlinkDatabaseHistory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/FlinkDatabaseHistory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.internal; +package org.apache.flink.cdc.debezium.internal; import io.debezium.config.Configuration; import io.debezium.relational.history.AbstractDatabaseHistory; @@ -28,9 +28,9 @@ import java.util.Collection; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.function.Consumer; -import static com.ververica.cdc.debezium.utils.DatabaseHistoryUtil.registerHistory; -import static com.ververica.cdc.debezium.utils.DatabaseHistoryUtil.removeHistory; -import static com.ververica.cdc.debezium.utils.DatabaseHistoryUtil.retrieveHistory; +import static org.apache.flink.cdc.debezium.utils.DatabaseHistoryUtil.registerHistory; +import static org.apache.flink.cdc.debezium.utils.DatabaseHistoryUtil.removeHistory; +import static org.apache.flink.cdc.debezium.utils.DatabaseHistoryUtil.retrieveHistory; /** * Inspired from {@link io.debezium.relational.history.MemoryDatabaseHistory} but we will store the diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/FlinkDatabaseSchemaHistory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/FlinkDatabaseSchemaHistory.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/FlinkDatabaseSchemaHistory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/FlinkDatabaseSchemaHistory.java index 77af02af2..b9fc8fd77 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/FlinkDatabaseSchemaHistory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/FlinkDatabaseSchemaHistory.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.internal; +package org.apache.flink.cdc.debezium.internal; + +import org.apache.flink.cdc.debezium.history.FlinkJsonTableChangeSerializer; -import com.ververica.cdc.debezium.history.FlinkJsonTableChangeSerializer; import io.debezium.config.Configuration; import io.debezium.relational.TableId; import io.debezium.relational.Tables; @@ -35,10 +36,10 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import static com.ververica.cdc.debezium.utils.DatabaseHistoryUtil.registerHistory; -import static com.ververica.cdc.debezium.utils.DatabaseHistoryUtil.removeHistory; -import static com.ververica.cdc.debezium.utils.DatabaseHistoryUtil.retrieveHistory; import static io.debezium.relational.history.TableChanges.TableChange; +import static org.apache.flink.cdc.debezium.utils.DatabaseHistoryUtil.registerHistory; +import static org.apache.flink.cdc.debezium.utils.DatabaseHistoryUtil.removeHistory; +import static org.apache.flink.cdc.debezium.utils.DatabaseHistoryUtil.retrieveHistory; /** * The {@link FlinkDatabaseSchemaHistory} only stores the latest schema of the monitored tables. diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/FlinkOffsetBackingStore.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/FlinkOffsetBackingStore.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/FlinkOffsetBackingStore.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/FlinkOffsetBackingStore.java index 0e2a5fda8..dbce64eb7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/FlinkOffsetBackingStore.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/FlinkOffsetBackingStore.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.internal; +package org.apache.flink.cdc.debezium.internal; + +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.DebeziumSourceFunction; import io.debezium.embedded.EmbeddedEngine; import io.debezium.engine.DebeziumEngine; import org.apache.kafka.common.utils.ThreadUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/Handover.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/Handover.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/Handover.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/Handover.java index a37bbf358..4dfb8155a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/Handover.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/Handover.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.internal; +package org.apache.flink.cdc.debezium.internal; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.annotation.VisibleForTesting; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.annotation.VisibleForTesting; import io.debezium.engine.ChangeEvent; import org.apache.kafka.connect.source.SourceRecord; import org.slf4j.Logger; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/SchemaRecord.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/SchemaRecord.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/SchemaRecord.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/SchemaRecord.java index bd9fb0e4b..13b2473dd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/internal/SchemaRecord.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/internal/SchemaRecord.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.internal; +package org.apache.flink.cdc.debezium.internal; import io.debezium.document.Document; import io.debezium.document.DocumentWriter; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/AppendMetadataCollector.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/AppendMetadataCollector.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/AppendMetadataCollector.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/AppendMetadataCollector.java index 1484e9ae1..6b8d95ab0 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/AppendMetadataCollector.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/AppendMetadataCollector.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.table; +package org.apache.flink.cdc.debezium.table; +import org.apache.flink.cdc.common.annotation.Internal; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.utils.JoinedRowData; import org.apache.flink.util.Collector; -import com.ververica.cdc.common.annotation.Internal; import org.apache.kafka.connect.source.SourceRecord; import java.io.Serializable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/DebeziumChangelogMode.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/DebeziumChangelogMode.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/DebeziumChangelogMode.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/DebeziumChangelogMode.java index 92b373eb2..e8d4fe163 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/DebeziumChangelogMode.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/DebeziumChangelogMode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.table; +package org.apache.flink.cdc.debezium.table; /** Changelog modes used to encode changes from Debezium to Flink internal structure. */ public enum DebeziumChangelogMode { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/DebeziumOptions.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/DebeziumOptions.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/DebeziumOptions.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/DebeziumOptions.java index 76562b2f7..a5b1c7fdb 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/DebeziumOptions.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/DebeziumOptions.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.table; +package org.apache.flink.cdc.debezium.table; import java.util.Map; import java.util.Properties; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/DeserializationRuntimeConverter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/DeserializationRuntimeConverter.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/DeserializationRuntimeConverter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/DeserializationRuntimeConverter.java index 7efb1b964..0cdb6e091 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/DeserializationRuntimeConverter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/DeserializationRuntimeConverter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.table; +package org.apache.flink.cdc.debezium.table; import org.apache.kafka.connect.data.Schema; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/DeserializationRuntimeConverterFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/DeserializationRuntimeConverterFactory.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/DeserializationRuntimeConverterFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/DeserializationRuntimeConverterFactory.java index e3ff723ca..3003e129b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/DeserializationRuntimeConverterFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/DeserializationRuntimeConverterFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.table; +package org.apache.flink.cdc.debezium.table; import org.apache.flink.table.types.logical.LogicalType; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/MetadataConverter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/MetadataConverter.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/MetadataConverter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/MetadataConverter.java index 4df04627f..9b5dffede 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/MetadataConverter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/MetadataConverter.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.table; +package org.apache.flink.cdc.debezium.table; + +import org.apache.flink.cdc.common.annotation.Internal; -import com.ververica.cdc.common.annotation.Internal; import org.apache.kafka.connect.source.SourceRecord; import java.io.Serializable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/RowDataDebeziumDeserializeSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/RowDataDebeziumDeserializeSchema.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/RowDataDebeziumDeserializeSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/RowDataDebeziumDeserializeSchema.java index eed8e8e9e..6a9642075 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/RowDataDebeziumDeserializeSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/RowDataDebeziumDeserializeSchema.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.table; +package org.apache.flink.cdc.debezium.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.utils.TemporalConversions; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -29,8 +31,6 @@ import org.apache.flink.table.types.logical.RowType; import org.apache.flink.types.RowKind; import org.apache.flink.util.Collector; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.utils.TemporalConversions; import io.debezium.data.Envelope; import io.debezium.data.SpecialValueDecimal; import io.debezium.data.VariableScaleDecimal; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/RowDataMetadataConverter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/RowDataMetadataConverter.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/RowDataMetadataConverter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/RowDataMetadataConverter.java index 51c9480f5..caaa49546 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/table/RowDataMetadataConverter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/table/RowDataMetadataConverter.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.table; +package org.apache.flink.cdc.debezium.table; +import org.apache.flink.cdc.common.annotation.Internal; import org.apache.flink.table.data.RowData; -import com.ververica.cdc.common.annotation.Internal; - /** A converter converts {@link RowData} metadata into Flink internal data structures. */ @Internal public interface RowDataMetadataConverter extends MetadataConverter { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/utils/DatabaseHistoryUtil.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/utils/DatabaseHistoryUtil.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/utils/DatabaseHistoryUtil.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/utils/DatabaseHistoryUtil.java index ca7f5cf2e..70b86cf0c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/utils/DatabaseHistoryUtil.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/utils/DatabaseHistoryUtil.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.utils; +package org.apache.flink.cdc.debezium.utils; + +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.internal.SchemaRecord; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.internal.SchemaRecord; import io.debezium.relational.history.DatabaseHistory; import java.util.Collection; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/utils/JdbcUrlUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/utils/JdbcUrlUtils.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/utils/JdbcUrlUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/utils/JdbcUrlUtils.java index 5b8da4e25..5947cb3bd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/utils/JdbcUrlUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/utils/JdbcUrlUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.utils; +package org.apache.flink.cdc.debezium.utils; import java.util.Map; import java.util.Properties; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/utils/ResolvedSchemaUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/utils/ResolvedSchemaUtils.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/utils/ResolvedSchemaUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/utils/ResolvedSchemaUtils.java index fdf35797b..2e1442f68 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/utils/ResolvedSchemaUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/utils/ResolvedSchemaUtils.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.utils; +package org.apache.flink.cdc.debezium.utils; +import org.apache.flink.cdc.common.annotation.Internal; import org.apache.flink.table.catalog.Column; import org.apache.flink.table.catalog.ResolvedSchema; -import com.ververica.cdc.common.annotation.Internal; - import java.util.stream.Collectors; /** Utilities to {@link ResolvedSchema}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/utils/TemporalConversions.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/utils/TemporalConversions.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/utils/TemporalConversions.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/utils/TemporalConversions.java index 9c452f7c0..24a17c1ed 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/com/ververica/cdc/debezium/utils/TemporalConversions.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-debezium/src/main/java/org/apache/flink/cdc/debezium/utils/TemporalConversions.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.debezium.utils; +package org.apache.flink.cdc.debezium.utils; import java.time.Duration; import java.time.Instant; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/MongoDBSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/MongoDBSource.java similarity index 89% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/MongoDBSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/MongoDBSource.java index 342decb38..428d273f8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/MongoDBSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/MongoDBSource.java @@ -15,17 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb; +package org.apache.flink.cdc.connectors.mongodb; + +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.mongodb.internal.MongoDBConnectorSourceConnector; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.Validator; import com.mongodb.client.model.changestream.FullDocument; import com.mongodb.kafka.connect.source.MongoSourceConfig; import com.mongodb.kafka.connect.source.MongoSourceConfig.ErrorTolerance; import com.mongodb.kafka.connect.source.MongoSourceConfig.OutputFormat; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.mongodb.internal.MongoDBConnectorSourceConnector; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.Validator; import io.debezium.heartbeat.Heartbeat; import java.util.Arrays; @@ -33,22 +34,22 @@ import java.util.List; import java.util.Locale; import java.util.Properties; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBConnectorSourceTask.COLLECTION_INCLUDE_LIST; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBConnectorSourceTask.DATABASE_INCLUDE_LIST; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBConnectorSourceTask.STARTUP_MODE_INITIAL_SNAPSHOTTING_MAX_THREADS_CONFIG; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBConnectorSourceTask.STARTUP_MODE_INITIAL_SNAPSHOTTING_PIPELINE_CONFIG; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBConnectorSourceTask.STARTUP_MODE_INITIAL_SNAPSHOTTING_QUEUE_SIZE_CONFIG; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBConnectorSourceTask.STARTUP_MODE_TIMESTAMP_START_AT_OPERATION_TIME_CONFIG; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.HEARTBEAT_TOPIC_NAME; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.MONGODB_SCHEME; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.MONGODB_SRV_SCHEME; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.OUTPUT_SCHEMA; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.BATCH_SIZE; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.HEARTBEAT_INTERVAL_MILLIS; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_AWAIT_TIME_MILLIS; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_MAX_BATCH_SIZE; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCHEME; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.buildConnectionString; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBConnectorSourceTask.COLLECTION_INCLUDE_LIST; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBConnectorSourceTask.DATABASE_INCLUDE_LIST; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBConnectorSourceTask.STARTUP_MODE_INITIAL_SNAPSHOTTING_MAX_THREADS_CONFIG; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBConnectorSourceTask.STARTUP_MODE_INITIAL_SNAPSHOTTING_PIPELINE_CONFIG; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBConnectorSourceTask.STARTUP_MODE_INITIAL_SNAPSHOTTING_QUEUE_SIZE_CONFIG; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBConnectorSourceTask.STARTUP_MODE_TIMESTAMP_START_AT_OPERATION_TIME_CONFIG; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.HEARTBEAT_TOPIC_NAME; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.MONGODB_SCHEME; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.MONGODB_SRV_SCHEME; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.OUTPUT_SCHEMA; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.BATCH_SIZE; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.HEARTBEAT_INTERVAL_MILLIS; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_AWAIT_TIME_MILLIS; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_MAX_BATCH_SIZE; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCHEME; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.buildConnectionString; import static org.apache.flink.util.Preconditions.checkArgument; /** diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/internal/MongoDBConnectorSourceConnector.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/internal/MongoDBConnectorSourceConnector.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/internal/MongoDBConnectorSourceConnector.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/internal/MongoDBConnectorSourceConnector.java index c5c7ff8ec..83894ac90 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/internal/MongoDBConnectorSourceConnector.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/internal/MongoDBConnectorSourceConnector.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.internal; +package org.apache.flink.cdc.connectors.mongodb.internal; import com.mongodb.kafka.connect.MongoSourceConnector; import org.apache.kafka.connect.connector.Task; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/internal/MongoDBConnectorSourceTask.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/internal/MongoDBConnectorSourceTask.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/internal/MongoDBConnectorSourceTask.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/internal/MongoDBConnectorSourceTask.java index 442e9c890..f3ebd6662 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/internal/MongoDBConnectorSourceTask.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/internal/MongoDBConnectorSourceTask.java @@ -15,7 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.internal; +package org.apache.flink.cdc.connectors.mongodb.internal; + +import org.apache.flink.cdc.debezium.internal.DebeziumChangeFetcher; import com.mongodb.ConnectionString; import com.mongodb.MongoNamespace; @@ -47,23 +49,23 @@ import java.util.stream.Collectors; import static com.mongodb.client.model.Aggregates.match; import static com.mongodb.client.model.Filters.and; import static com.mongodb.client.model.Filters.regex; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.HEARTBEAT_VALUE_SCHEMA; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.ADD_NS_FIELD; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.ADD_NS_FIELD_NAME; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.bsonListToJson; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.collectionNames; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.collectionsFilter; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.completionPattern; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.databaseFilter; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.databaseNames; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.includeListAsPatterns; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.isIncludeListExplicitlySpecified; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.isHeartbeatEvent; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.isSnapshotRecord; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.HEARTBEAT_VALUE_SCHEMA; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.ADD_NS_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.ADD_NS_FIELD_NAME; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.bsonListToJson; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.collectionNames; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.collectionsFilter; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.completionPattern; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.databaseFilter; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.databaseNames; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.includeListAsPatterns; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.isIncludeListExplicitlySpecified; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoRecordUtils.isHeartbeatEvent; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoRecordUtils.isSnapshotRecord; /** * Source Task that proxies mongodb kafka connector's {@link MongoSourceTask} to adapt to {@link - * com.ververica.cdc.debezium.internal.DebeziumChangeFetcher}. + * DebeziumChangeFetcher}. */ public class MongoDBConnectorSourceTask extends SourceTask { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/internal/MongoDBEnvelope.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/internal/MongoDBEnvelope.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/internal/MongoDBEnvelope.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/internal/MongoDBEnvelope.java index 473e7cc41..27e5da983 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/internal/MongoDBEnvelope.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/internal/MongoDBEnvelope.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.internal; +package org.apache.flink.cdc.connectors.mongodb.internal; import com.mongodb.kafka.connect.source.json.formatter.DefaultJson; import com.mongodb.kafka.connect.source.schema.AvroSchema; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/MongoDBSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBSource.java similarity index 71% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/MongoDBSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBSource.java index 8a995532f..e69ff3aef 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/MongoDBSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBSource.java @@ -15,25 +15,24 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source; +package org.apache.flink.cdc.connectors.mongodb.source; +import org.apache.flink.cdc.common.annotation.Experimental; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.connectors.base.config.SourceConfig; +import org.apache.flink.cdc.connectors.base.source.IncrementalSource; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceRecords; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitState; +import org.apache.flink.cdc.connectors.base.source.metrics.SourceReaderMetrics; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfigFactory; +import org.apache.flink.cdc.connectors.mongodb.source.dialect.MongoDBDialect; +import org.apache.flink.cdc.connectors.mongodb.source.offset.ChangeStreamOffsetFactory; +import org.apache.flink.cdc.connectors.mongodb.source.reader.MongoDBRecordEmitter; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; import org.apache.flink.connector.base.source.reader.RecordEmitter; -import com.ververica.cdc.common.annotation.Experimental; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.connectors.base.config.SourceConfig; -import com.ververica.cdc.connectors.base.source.IncrementalSource; -import com.ververica.cdc.connectors.base.source.meta.split.SourceRecords; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitState; -import com.ververica.cdc.connectors.base.source.metrics.SourceReaderMetrics; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfigFactory; -import com.ververica.cdc.connectors.mongodb.source.dialect.MongoDBDialect; -import com.ververica.cdc.connectors.mongodb.source.offset.ChangeStreamOffsetFactory; -import com.ververica.cdc.connectors.mongodb.source.reader.MongoDBRecordEmitter; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; - /** * The MongoDB CDC Source based on FLIP-27 which supports parallel reading snapshot of collection * and then continue to capture data change from change stream. diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/MongoDBSourceBuilder.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBSourceBuilder.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/MongoDBSourceBuilder.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBSourceBuilder.java index 1808f6a48..8836a08ef 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/MongoDBSourceBuilder.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBSourceBuilder.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source; +package org.apache.flink.cdc.connectors.mongodb.source; -import com.ververica.cdc.common.annotation.Experimental; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfigFactory; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.common.annotation.Experimental; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.enumerator.IncrementalSourceEnumerator; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfigFactory; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; import java.util.Arrays; import java.util.stream.Stream; @@ -260,9 +261,7 @@ public class MongoDBSourceBuilder { } /** - * Whether the {@link - * com.ververica.cdc.connectors.base.source.enumerator.IncrementalSourceEnumerator} should scan - * the newly added tables or not. + * Whether the {@link IncrementalSourceEnumerator} should scan the newly added tables or not. */ public MongoDBSourceBuilder scanNewlyAddedTableEnabled(boolean scanNewlyAddedTableEnabled) { this.configFactory.scanNewlyAddedTableEnabled(scanNewlyAddedTableEnabled); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/MongoDBChunkSplitter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/MongoDBChunkSplitter.java similarity index 80% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/MongoDBChunkSplitter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/MongoDBChunkSplitter.java index f03ea6801..9b01df4d9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/MongoDBChunkSplitter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/MongoDBChunkSplitter.java @@ -15,12 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.assigners.splitters; +package org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters; + +import org.apache.flink.cdc.common.annotation.Experimental; +import org.apache.flink.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; -import com.ververica.cdc.common.annotation.Experimental; -import com.ververica.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; import io.debezium.relational.TableId; import java.util.Collection; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SampleBucketSplitStrategy.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SampleBucketSplitStrategy.java similarity index 81% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SampleBucketSplitStrategy.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SampleBucketSplitStrategy.java index 32a5d8ea3..ad3c00213 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SampleBucketSplitStrategy.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SampleBucketSplitStrategy.java @@ -15,13 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.assigners.splitters; +package org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.mongodb.source.dialect.MongoDBDialect; +import org.apache.flink.cdc.connectors.mongodb.source.utils.ChunkUtils; import org.apache.flink.table.types.logical.RowType; import com.mongodb.client.MongoCollection; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; import io.debezium.relational.TableId; import io.debezium.relational.history.TableChanges; import org.bson.BsonDocument; @@ -39,14 +41,10 @@ import java.util.Map; import static com.mongodb.client.model.Aggregates.bucketAuto; import static com.mongodb.client.model.Aggregates.sample; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.MAX_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.MIN_FIELD; -import static com.ververica.cdc.connectors.mongodb.source.dialect.MongoDBDialect.collectionSchema; -import static com.ververica.cdc.connectors.mongodb.source.utils.ChunkUtils.boundOfId; -import static com.ververica.cdc.connectors.mongodb.source.utils.ChunkUtils.maxUpperBoundOfId; -import static com.ververica.cdc.connectors.mongodb.source.utils.ChunkUtils.minLowerBoundOfId; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.collectionFor; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.MAX_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.MIN_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.collectionFor; /** * The Sample Splitter. @@ -126,15 +124,15 @@ public class SampleBucketSplitStrategy implements SplitStrategy { List snapshotSplits = new ArrayList<>(chunks.size() + 2); Map schema = new HashMap<>(); - schema.put(collectionId, collectionSchema(collectionId)); + schema.put(collectionId, MongoDBDialect.collectionSchema(collectionId)); SnapshotSplit firstSplit = new SnapshotSplit( collectionId, splitId(collectionId, 0), rowType, - minLowerBoundOfId(), - boundOfId(lowerBoundOfBucket(chunks.get(0))), + ChunkUtils.minLowerBoundOfId(), + ChunkUtils.boundOfId(lowerBoundOfBucket(chunks.get(0))), null, schema); snapshotSplits.add(firstSplit); @@ -146,8 +144,8 @@ public class SampleBucketSplitStrategy implements SplitStrategy { collectionId, splitId(collectionId, i + 1), rowType, - boundOfId(lowerBoundOfBucket(bucket)), - boundOfId(upperBoundOfBucket(bucket)), + ChunkUtils.boundOfId(lowerBoundOfBucket(bucket)), + ChunkUtils.boundOfId(upperBoundOfBucket(bucket)), null, schema)); } @@ -157,8 +155,8 @@ public class SampleBucketSplitStrategy implements SplitStrategy { collectionId, splitId(collectionId, chunks.size() + 1), rowType, - boundOfId(upperBoundOfBucket(chunks.get(chunks.size() - 1))), - maxUpperBoundOfId(), + ChunkUtils.boundOfId(upperBoundOfBucket(chunks.get(chunks.size() - 1))), + ChunkUtils.maxUpperBoundOfId(), null, schema); snapshotSplits.add(lastSplit); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/ShardedSplitStrategy.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/ShardedSplitStrategy.java similarity index 83% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/ShardedSplitStrategy.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/ShardedSplitStrategy.java index 1cbbc9045..bc451d85b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/ShardedSplitStrategy.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/ShardedSplitStrategy.java @@ -15,14 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.assigners.splitters; +package org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.mongodb.source.dialect.MongoDBDialect; import org.apache.flink.table.types.logical.RowType; import com.mongodb.MongoQueryException; import com.mongodb.client.MongoClient; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; import io.debezium.relational.TableId; import io.debezium.relational.history.TableChanges; import org.bson.BsonBoolean; @@ -36,14 +37,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.DROPPED_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.KEY_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.MAX_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.MIN_FIELD; -import static com.ververica.cdc.connectors.mongodb.source.dialect.MongoDBDialect.collectionSchema; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.UNAUTHORIZED_ERROR; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.readChunks; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.readCollectionMetadata; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.DROPPED_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.KEY_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.MAX_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.MIN_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.UNAUTHORIZED_ERROR; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.readChunks; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.readCollectionMetadata; /** * The Sharded Splitter @@ -108,7 +108,7 @@ public class ShardedSplitStrategy implements SplitStrategy { RowType rowType = shardKeysToRowType(splitKeys); Map schema = new HashMap<>(); - schema.put(collectionId, collectionSchema(collectionId)); + schema.put(collectionId, MongoDBDialect.collectionSchema(collectionId)); List snapshotSplits = new ArrayList<>(chunks.size()); for (int i = 0; i < chunks.size(); i++) { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SingleSplitStrategy.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SingleSplitStrategy.java similarity index 72% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SingleSplitStrategy.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SingleSplitStrategy.java index 37fec8742..ea57fb1fb 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SingleSplitStrategy.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SingleSplitStrategy.java @@ -15,10 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.assigners.splitters; +package org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.mongodb.source.dialect.MongoDBDialect; +import org.apache.flink.cdc.connectors.mongodb.source.utils.ChunkUtils; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; import io.debezium.relational.TableId; import io.debezium.relational.history.TableChanges; @@ -26,12 +29,9 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; -import static com.ververica.cdc.connectors.mongodb.source.dialect.MongoDBDialect.collectionSchema; -import static com.ververica.cdc.connectors.mongodb.source.utils.ChunkUtils.maxUpperBoundOfId; -import static com.ververica.cdc.connectors.mongodb.source.utils.ChunkUtils.minLowerBoundOfId; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; /** * The Single Partitioner @@ -49,15 +49,15 @@ public class SingleSplitStrategy implements SplitStrategy { public Collection split(SplitContext splitContext) { TableId collectionId = splitContext.getCollectionId(); Map schema = new HashMap<>(); - schema.put(collectionId, collectionSchema(collectionId)); + schema.put(collectionId, MongoDBDialect.collectionSchema(collectionId)); SnapshotSplit snapshotSplit = new SnapshotSplit( collectionId, splitId(collectionId, 0), shardKeysToRowType(singleton(ID_FIELD)), - minLowerBoundOfId(), - maxUpperBoundOfId(), + ChunkUtils.minLowerBoundOfId(), + ChunkUtils.maxUpperBoundOfId(), null, schema); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SplitContext.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SplitContext.java similarity index 89% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SplitContext.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SplitContext.java index 3ff4b004e..0b063d05e 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SplitContext.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SplitContext.java @@ -15,18 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.assigners.splitters; +package org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; import com.mongodb.client.MongoClient; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; import io.debezium.relational.TableId; import org.bson.BsonBoolean; import org.bson.BsonDocument; import org.bson.BsonInt64; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.clientFor; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.collStats; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.clientFor; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.collStats; /** * The split context used by {@link SplitStrategy} to split collection into a set of chunks for diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SplitStrategy.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SplitStrategy.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SplitStrategy.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SplitStrategy.java index 005f34a08..dc8262178 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SplitStrategy.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SplitStrategy.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.assigners.splitters; +package org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; import io.debezium.relational.TableId; import org.bson.BsonDocument; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SplitVectorSplitStrategy.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SplitVectorSplitStrategy.java similarity index 79% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SplitVectorSplitStrategy.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SplitVectorSplitStrategy.java index 8b0e8ab3c..2aae73e25 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/assigners/splitters/SplitVectorSplitStrategy.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/assigners/splitters/SplitVectorSplitStrategy.java @@ -15,14 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.assigners.splitters; +package org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.mongodb.source.dialect.MongoDBDialect; +import org.apache.flink.cdc.connectors.mongodb.source.utils.ChunkUtils; import org.apache.flink.table.types.logical.RowType; import com.mongodb.MongoCommandException; import com.mongodb.client.MongoClient; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; import io.debezium.relational.TableId; import io.debezium.relational.history.TableChanges; import org.apache.commons.collections.CollectionUtils; @@ -40,14 +42,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.BSON_MIN_KEY; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; -import static com.ververica.cdc.connectors.mongodb.source.dialect.MongoDBDialect.collectionSchema; -import static com.ververica.cdc.connectors.mongodb.source.utils.ChunkUtils.boundOfId; -import static com.ververica.cdc.connectors.mongodb.source.utils.ChunkUtils.maxUpperBoundOfId; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.UNAUTHORIZED_ERROR; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.isCommandSucceed; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.splitVector; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.BSON_MIN_KEY; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.UNAUTHORIZED_ERROR; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.isCommandSucceed; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.splitVector; /** * The SplitVector Splitter. @@ -103,7 +102,7 @@ public class SplitVectorSplitStrategy implements SplitStrategy { } Map schema = new HashMap<>(); - schema.put(collectionId, collectionSchema(collectionId)); + schema.put(collectionId, MongoDBDialect.collectionSchema(collectionId)); RowType rowType = shardKeysToRowType(Collections.singleton(ID_FIELD)); List snapshotSplits = new ArrayList<>(splitKeys.size() + 1); @@ -116,8 +115,8 @@ public class SplitVectorSplitStrategy implements SplitStrategy { collectionId, splitId(collectionId, i), rowType, - boundOfId(lowerValue), - boundOfId(splitKeyValue), + ChunkUtils.boundOfId(lowerValue), + ChunkUtils.boundOfId(splitKeyValue), null, schema)); lowerValue = splitKeyValue; @@ -128,8 +127,8 @@ public class SplitVectorSplitStrategy implements SplitStrategy { collectionId, splitId(collectionId, splitKeys.size()), rowType, - boundOfId(lowerValue), - maxUpperBoundOfId(), + ChunkUtils.boundOfId(lowerValue), + ChunkUtils.maxUpperBoundOfId(), null, schema); snapshotSplits.add(lastSplit); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/config/MongoDBSourceConfig.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/config/MongoDBSourceConfig.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/config/MongoDBSourceConfig.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/config/MongoDBSourceConfig.java index 19ffa4124..363acb01d 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/config/MongoDBSourceConfig.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/config/MongoDBSourceConfig.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.config; +package org.apache.flink.cdc.connectors.mongodb.source.config; -import com.ververica.cdc.connectors.base.config.SourceConfig; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.mongodb.source.MongoDBSource; +import org.apache.flink.cdc.connectors.base.config.SourceConfig; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.mongodb.source.MongoDBSource; import javax.annotation.Nullable; import java.util.List; import java.util.Objects; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.buildConnectionString; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.buildConnectionString; import static org.apache.flink.util.Preconditions.checkNotNull; /** A MongoDB Source configuration which is used by {@link MongoDBSource}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/config/MongoDBSourceConfigFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/config/MongoDBSourceConfigFactory.java similarity index 84% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/config/MongoDBSourceConfigFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/config/MongoDBSourceConfigFactory.java index b8d086a26..b2000f54d 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/config/MongoDBSourceConfigFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/config/MongoDBSourceConfigFactory.java @@ -15,26 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.config; +package org.apache.flink.cdc.connectors.mongodb.source.config; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.base.config.SourceConfig.Factory; -import com.ververica.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.base.config.SourceConfig.Factory; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; import java.util.Arrays; import java.util.List; -import static com.ververica.cdc.connectors.base.options.SourceOptions.CHUNK_META_GROUP_SIZE; -import static com.ververica.cdc.connectors.base.utils.EnvironmentUtils.checkSupportCheckpointsAfterTasksFinished; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.MONGODB_SCHEME; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.MONGODB_SRV_SCHEME; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.BATCH_SIZE; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.HEARTBEAT_INTERVAL_MILLIS; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_AWAIT_TIME_MILLIS; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_MAX_BATCH_SIZE; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SAMPLES; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE_MB; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCHEME; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.CHUNK_META_GROUP_SIZE; +import static org.apache.flink.cdc.connectors.base.utils.EnvironmentUtils.checkSupportCheckpointsAfterTasksFinished; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.MONGODB_SCHEME; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.MONGODB_SRV_SCHEME; import static org.apache.flink.util.Preconditions.checkArgument; import static org.apache.flink.util.Preconditions.checkNotNull; @@ -44,22 +37,26 @@ public class MongoDBSourceConfigFactory implements Factory private static final long serialVersionUID = 1L; - private String scheme = SCHEME.defaultValue(); + private String scheme = MongoDBSourceOptions.SCHEME.defaultValue(); private String hosts; private String username; private String password; private List databaseList; private List collectionList; private String connectionOptions; - private Integer batchSize = BATCH_SIZE.defaultValue(); - private Integer pollAwaitTimeMillis = POLL_AWAIT_TIME_MILLIS.defaultValue(); - private Integer pollMaxBatchSize = POLL_MAX_BATCH_SIZE.defaultValue(); + private Integer batchSize = MongoDBSourceOptions.BATCH_SIZE.defaultValue(); + private Integer pollAwaitTimeMillis = + MongoDBSourceOptions.POLL_AWAIT_TIME_MILLIS.defaultValue(); + private Integer pollMaxBatchSize = MongoDBSourceOptions.POLL_MAX_BATCH_SIZE.defaultValue(); private boolean updateLookup = true; private StartupOptions startupOptions = StartupOptions.initial(); - private Integer heartbeatIntervalMillis = HEARTBEAT_INTERVAL_MILLIS.defaultValue(); + private Integer heartbeatIntervalMillis = + MongoDBSourceOptions.HEARTBEAT_INTERVAL_MILLIS.defaultValue(); private Integer splitMetaGroupSize = CHUNK_META_GROUP_SIZE.defaultValue(); - private Integer splitSizeMB = SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE_MB.defaultValue(); - private Integer samplesPerChunk = SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SAMPLES.defaultValue(); + private Integer splitSizeMB = + MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE_MB.defaultValue(); + private Integer samplesPerChunk = + MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SAMPLES.defaultValue(); private boolean closeIdleReaders = false; private boolean enableFullDocPrePostImage = false; private boolean disableCursorTimeout = true; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/config/MongoDBSourceOptions.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/config/MongoDBSourceOptions.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/config/MongoDBSourceOptions.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/config/MongoDBSourceOptions.java index 52d48b7d3..6d2fb1654 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/config/MongoDBSourceOptions.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/config/MongoDBSourceOptions.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.config; +package org.apache.flink.cdc.connectors.mongodb.source.config; +import org.apache.flink.cdc.common.annotation.Experimental; +import org.apache.flink.cdc.connectors.mongodb.source.MongoDBSource; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; -import com.ververica.cdc.common.annotation.Experimental; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.MONGODB_SCHEME; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.MONGODB_SCHEME; - -/** Configurations for {@link com.ververica.cdc.connectors.mongodb.source.MongoDBSource}. */ +/** Configurations for {@link MongoDBSource}. */ public class MongoDBSourceOptions { public static final ConfigOption SCHEME = diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/connection/MongoClientPool.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/connection/MongoClientPool.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/connection/MongoClientPool.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/connection/MongoClientPool.java index 8a7ec154e..40fe9e6e8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/connection/MongoClientPool.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/connection/MongoClientPool.java @@ -15,12 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.connection; +package org.apache.flink.cdc.connectors.mongodb.source.connection; + +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; import com.mongodb.ConnectionString; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/dialect/MongoDBDialect.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/dialect/MongoDBDialect.java similarity index 78% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/dialect/MongoDBDialect.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/dialect/MongoDBDialect.java index 60f51ad8f..a11ad6eb3 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/dialect/MongoDBDialect.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/dialect/MongoDBDialect.java @@ -15,22 +15,23 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.dialect; +package org.apache.flink.cdc.connectors.mongodb.source.dialect; + +import org.apache.flink.cdc.common.annotation.Experimental; +import org.apache.flink.cdc.connectors.base.dialect.DataSourceDialect; +import org.apache.flink.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.reader.external.FetchTask; +import org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters.MongoDBChunkSplitter; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; +import org.apache.flink.cdc.connectors.mongodb.source.offset.ChangeStreamDescriptor; +import org.apache.flink.cdc.connectors.mongodb.source.offset.ChangeStreamOffset; +import org.apache.flink.cdc.connectors.mongodb.source.reader.fetch.MongoDBFetchTaskContext; +import org.apache.flink.cdc.connectors.mongodb.source.reader.fetch.MongoDBScanFetchTask; +import org.apache.flink.cdc.connectors.mongodb.source.reader.fetch.MongoDBStreamFetchTask; +import org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.CollectionDiscoveryInfo; import com.mongodb.client.MongoClient; -import com.ververica.cdc.common.annotation.Experimental; -import com.ververica.cdc.connectors.base.dialect.DataSourceDialect; -import com.ververica.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.reader.external.FetchTask; -import com.ververica.cdc.connectors.mongodb.source.assigners.splitters.MongoDBChunkSplitter; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; -import com.ververica.cdc.connectors.mongodb.source.offset.ChangeStreamDescriptor; -import com.ververica.cdc.connectors.mongodb.source.offset.ChangeStreamOffset; -import com.ververica.cdc.connectors.mongodb.source.reader.fetch.MongoDBFetchTaskContext; -import com.ververica.cdc.connectors.mongodb.source.reader.fetch.MongoDBScanFetchTask; -import com.ververica.cdc.connectors.mongodb.source.reader.fetch.MongoDBStreamFetchTask; -import com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.CollectionDiscoveryInfo; import io.debezium.relational.Column; import io.debezium.relational.Table; import io.debezium.relational.TableId; @@ -47,15 +48,15 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.collectionNames; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.collectionsFilter; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.databaseFilter; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.databaseNames; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.clientFor; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.getChangeStreamDescriptor; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.getCurrentClusterTime; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.getLatestResumeToken; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.collectionNames; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.collectionsFilter; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.databaseFilter; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.databaseNames; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.clientFor; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.getChangeStreamDescriptor; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.getCurrentClusterTime; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.getLatestResumeToken; /** The {@link DataSourceDialect} implementation for MongoDB datasource. */ @Experimental diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/offset/ChangeStreamDescriptor.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/offset/ChangeStreamDescriptor.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/offset/ChangeStreamDescriptor.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/offset/ChangeStreamDescriptor.java index d5c498be8..430cfbe1f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/offset/ChangeStreamDescriptor.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/offset/ChangeStreamDescriptor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.offset; +package org.apache.flink.cdc.connectors.mongodb.source.offset; import io.debezium.relational.TableId; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/offset/ChangeStreamOffset.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/offset/ChangeStreamOffset.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/offset/ChangeStreamOffset.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/offset/ChangeStreamOffset.java index 35b0c76e3..599658136 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/offset/ChangeStreamOffset.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/offset/ChangeStreamOffset.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.offset; +package org.apache.flink.cdc.connectors.mongodb.source.offset; + +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; import org.bson.BsonDocument; import org.bson.BsonTimestamp; @@ -28,8 +29,8 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.maximumBsonTimestamp; -import static com.ververica.cdc.connectors.mongodb.source.utils.ResumeTokenUtils.decodeTimestamp; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoRecordUtils.maximumBsonTimestamp; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.ResumeTokenUtils.decodeTimestamp; /** * A structure describes a fine grained offset in a change log event including resumeToken and diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/offset/ChangeStreamOffsetFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/offset/ChangeStreamOffsetFactory.java similarity index 76% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/offset/ChangeStreamOffsetFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/offset/ChangeStreamOffsetFactory.java index f659d3c88..465a6a6f7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/offset/ChangeStreamOffsetFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/offset/ChangeStreamOffsetFactory.java @@ -15,16 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.offset; +package org.apache.flink.cdc.connectors.mongodb.source.offset; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.OffsetFactory; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.offset.OffsetFactory; +import org.apache.flink.cdc.connectors.mongodb.source.utils.MongoRecordUtils; import java.util.Map; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.bsonTimestampFromEpochMillis; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.currentBsonTimestamp; - /** An change stream offset factory class create {@link ChangeStreamOffset} instance. */ public class ChangeStreamOffsetFactory extends OffsetFactory { @@ -46,12 +44,13 @@ public class ChangeStreamOffsetFactory extends OffsetFactory { @Override public Offset createTimestampOffset(long timestampMillis) { - return new ChangeStreamOffset(bsonTimestampFromEpochMillis(timestampMillis)); + return new ChangeStreamOffset( + MongoRecordUtils.bsonTimestampFromEpochMillis(timestampMillis)); } @Override public ChangeStreamOffset createInitialOffset() { - return new ChangeStreamOffset(currentBsonTimestamp()); + return new ChangeStreamOffset(MongoRecordUtils.currentBsonTimestamp()); } @Override diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/reader/MongoDBRecordEmitter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/reader/MongoDBRecordEmitter.java similarity index 71% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/reader/MongoDBRecordEmitter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/reader/MongoDBRecordEmitter.java index 8c0c03313..af102c146 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/reader/MongoDBRecordEmitter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/reader/MongoDBRecordEmitter.java @@ -15,32 +15,32 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.reader; +package org.apache.flink.cdc.connectors.mongodb.source.reader; import org.apache.flink.api.connector.source.SourceOutput; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.offset.OffsetFactory; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitState; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplitState; +import org.apache.flink.cdc.connectors.base.source.metrics.SourceReaderMetrics; +import org.apache.flink.cdc.connectors.base.source.reader.IncrementalSourceReader; +import org.apache.flink.cdc.connectors.base.source.reader.IncrementalSourceRecordEmitter; +import org.apache.flink.cdc.connectors.mongodb.source.offset.ChangeStreamOffset; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; import org.apache.flink.connector.base.source.reader.RecordEmitter; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.OffsetFactory; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitState; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplitState; -import com.ververica.cdc.connectors.base.source.metrics.SourceReaderMetrics; -import com.ververica.cdc.connectors.base.source.reader.IncrementalSourceReader; -import com.ververica.cdc.connectors.base.source.reader.IncrementalSourceRecordEmitter; -import com.ververica.cdc.connectors.mongodb.source.offset.ChangeStreamOffset; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; import org.apache.kafka.connect.source.SourceRecord; import org.bson.BsonDocument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.ververica.cdc.connectors.base.source.meta.wartermark.WatermarkEvent.isHighWatermarkEvent; -import static com.ververica.cdc.connectors.base.source.meta.wartermark.WatermarkEvent.isWatermarkEvent; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.getFetchTimestamp; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.getMessageTimestamp; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.getResumeToken; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.isDataChangeRecord; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.isHeartbeatEvent; +import static org.apache.flink.cdc.connectors.base.source.meta.wartermark.WatermarkEvent.isHighWatermarkEvent; +import static org.apache.flink.cdc.connectors.base.source.meta.wartermark.WatermarkEvent.isWatermarkEvent; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoRecordUtils.getFetchTimestamp; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoRecordUtils.getMessageTimestamp; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoRecordUtils.getResumeToken; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoRecordUtils.isDataChangeRecord; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoRecordUtils.isHeartbeatEvent; /** * The {@link RecordEmitter} implementation for {@link IncrementalSourceReader}. diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/reader/fetch/MongoDBFetchTaskContext.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/reader/fetch/MongoDBFetchTaskContext.java similarity index 86% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/reader/fetch/MongoDBFetchTaskContext.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/reader/fetch/MongoDBFetchTaskContext.java index 1a9cc9686..878e31d35 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/reader/fetch/MongoDBFetchTaskContext.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/reader/fetch/MongoDBFetchTaskContext.java @@ -15,18 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.reader.fetch; +package org.apache.flink.cdc.connectors.mongodb.source.reader.fetch; + +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.reader.external.FetchTask; +import org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; +import org.apache.flink.cdc.connectors.mongodb.source.dialect.MongoDBDialect; +import org.apache.flink.cdc.connectors.mongodb.source.offset.ChangeStreamDescriptor; +import org.apache.flink.cdc.connectors.mongodb.source.offset.ChangeStreamOffset; +import org.apache.flink.cdc.connectors.mongodb.source.utils.MongoRecordUtils; import com.mongodb.client.model.changestream.OperationType; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.reader.external.FetchTask; -import com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; -import com.ververica.cdc.connectors.mongodb.source.dialect.MongoDBDialect; -import com.ververica.cdc.connectors.mongodb.source.offset.ChangeStreamDescriptor; -import com.ververica.cdc.connectors.mongodb.source.offset.ChangeStreamOffset; -import com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils; import io.debezium.connector.base.ChangeEventQueue; import io.debezium.pipeline.DataChangeEvent; import io.debezium.relational.TableId; @@ -44,9 +45,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mongodb.source.utils.BsonUtils.compareBsonValue; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.getDocumentKey; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.getResumeToken; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.BsonUtils.compareBsonValue; /** The context for fetch task that fetching data of snapshot split from MongoDB data source. */ public class MongoDBFetchTaskContext implements FetchTask.Context { @@ -121,7 +120,7 @@ public class MongoDBFetchTaskContext implements FetchTask.Context { @Override public Offset getStreamOffset(SourceRecord record) { - return new ChangeStreamOffset(getResumeToken(record)); + return new ChangeStreamOffset(MongoRecordUtils.getResumeToken(record)); } @Override @@ -131,7 +130,7 @@ public class MongoDBFetchTaskContext implements FetchTask.Context { @Override public boolean isRecordBetween(SourceRecord record, Object[] splitStart, Object[] splitEnd) { - BsonDocument documentKey = getDocumentKey(record); + BsonDocument documentKey = MongoRecordUtils.getDocumentKey(record); // In the case of a compound index, we can also agree to only compare the range of the first // key. BsonDocument splitKeys = (BsonDocument) splitStart[0]; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/reader/fetch/MongoDBScanFetchTask.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/reader/fetch/MongoDBScanFetchTask.java similarity index 75% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/reader/fetch/MongoDBScanFetchTask.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/reader/fetch/MongoDBScanFetchTask.java index 2062eb09f..48ac8bfe3 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/reader/fetch/MongoDBScanFetchTask.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/reader/fetch/MongoDBScanFetchTask.java @@ -15,20 +15,22 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.reader.fetch; +package org.apache.flink.cdc.connectors.mongodb.source.reader.fetch; + +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplit; +import org.apache.flink.cdc.connectors.base.source.meta.wartermark.WatermarkEvent; +import org.apache.flink.cdc.connectors.base.source.meta.wartermark.WatermarkKind; +import org.apache.flink.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; +import org.apache.flink.cdc.connectors.mongodb.source.utils.MongoRecordUtils; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoCursor; import com.mongodb.client.model.changestream.OperationType; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplit; -import com.ververica.cdc.connectors.base.source.meta.wartermark.WatermarkEvent; -import com.ververica.cdc.connectors.base.source.meta.wartermark.WatermarkKind; -import com.ververica.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; import io.debezium.connector.base.ChangeEventQueue; import io.debezium.pipeline.DataChangeEvent; import io.debezium.relational.TableId; @@ -40,23 +42,19 @@ import org.bson.RawBsonDocument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.DOCUMENT_KEY_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.FULL_DOCUMENT_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_COLLECTION_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_DATABASE_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.OPERATION_TYPE_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.SNAPSHOT_KEY_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.SOURCE_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.TIMESTAMP_KEY_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.WATERMARK_TOPIC_NAME; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.createPartitionMap; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.createSourceOffsetMap; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.createSourceRecord; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.createWatermarkPartitionMap; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.clientFor; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.collectionFor; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.DOCUMENT_KEY_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.FULL_DOCUMENT_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_COLLECTION_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_DATABASE_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.OPERATION_TYPE_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.SNAPSHOT_KEY_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.SOURCE_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.TIMESTAMP_KEY_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.WATERMARK_TOPIC_NAME; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.clientFor; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.collectionFor; /** The task to work for fetching data of MongoDB collection snapshot split . */ public class MongoDBScanFetchTask extends AbstractScanFetchTask { @@ -104,13 +102,14 @@ public class MongoDBScanFetchTask extends AbstractScanFetchTask { keyDocument = new BsonDocument(ID_FIELD, valueDocument.get(ID_FIELD)); SourceRecord snapshotRecord = - createSourceRecord( - createPartitionMap( + MongoRecordUtils.createSourceRecord( + MongoRecordUtils.createPartitionMap( sourceConfig.getScheme(), sourceConfig.getHosts(), collectionId.catalog(), collectionId.table()), - createSourceOffsetMap(keyDocument.getDocument(ID_FIELD), true), + MongoRecordUtils.createSourceOffsetMap( + keyDocument.getDocument(ID_FIELD), true), collectionId.identifier(), keyDocument, valueDocument); @@ -147,7 +146,7 @@ public class MongoDBScanFetchTask extends AbstractScanFetchTask { changeEventQueue.enqueue( new DataChangeEvent( WatermarkEvent.create( - createWatermarkPartitionMap( + MongoRecordUtils.createWatermarkPartitionMap( snapshotSplit.getTableId().identifier()), WATERMARK_TOPIC_NAME, snapshotSplit.splitId(), @@ -163,7 +162,7 @@ public class MongoDBScanFetchTask extends AbstractScanFetchTask { changeEventQueue.enqueue( new DataChangeEvent( WatermarkEvent.create( - createWatermarkPartitionMap( + MongoRecordUtils.createWatermarkPartitionMap( snapshotSplit.getTableId().identifier()), WATERMARK_TOPIC_NAME, split.splitId(), @@ -179,7 +178,7 @@ public class MongoDBScanFetchTask extends AbstractScanFetchTask { changeEventQueue.enqueue( new DataChangeEvent( WatermarkEvent.create( - createWatermarkPartitionMap( + MongoRecordUtils.createWatermarkPartitionMap( snapshotSplit.getTableId().identifier()), WATERMARK_TOPIC_NAME, split.splitId(), diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/reader/fetch/MongoDBStreamFetchTask.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/reader/fetch/MongoDBStreamFetchTask.java similarity index 77% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/reader/fetch/MongoDBStreamFetchTask.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/reader/fetch/MongoDBStreamFetchTask.java index 115d78815..12e94b852 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/reader/fetch/MongoDBStreamFetchTask.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/reader/fetch/MongoDBStreamFetchTask.java @@ -15,8 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.reader.fetch; - +package org.apache.flink.cdc.connectors.mongodb.source.reader.fetch; + +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplit; +import org.apache.flink.cdc.connectors.base.source.meta.wartermark.WatermarkEvent; +import org.apache.flink.cdc.connectors.base.source.meta.wartermark.WatermarkKind; +import org.apache.flink.cdc.connectors.base.source.reader.external.FetchTask; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; +import org.apache.flink.cdc.connectors.mongodb.source.offset.ChangeStreamDescriptor; +import org.apache.flink.cdc.connectors.mongodb.source.offset.ChangeStreamOffset; +import org.apache.flink.cdc.connectors.mongodb.source.utils.MongoRecordUtils; import org.apache.flink.util.FlinkRuntimeException; import com.mongodb.MongoCommandException; @@ -26,14 +35,6 @@ import com.mongodb.client.MongoChangeStreamCursor; import com.mongodb.client.MongoClient; import com.mongodb.client.model.changestream.OperationType; import com.mongodb.kafka.connect.source.heartbeat.HeartbeatManager; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplit; -import com.ververica.cdc.connectors.base.source.meta.wartermark.WatermarkEvent; -import com.ververica.cdc.connectors.base.source.meta.wartermark.WatermarkKind; -import com.ververica.cdc.connectors.base.source.reader.external.FetchTask; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; -import com.ververica.cdc.connectors.mongodb.source.offset.ChangeStreamDescriptor; -import com.ververica.cdc.connectors.mongodb.source.offset.ChangeStreamOffset; import io.debezium.connector.base.ChangeEventQueue; import io.debezium.pipeline.DataChangeEvent; import org.apache.kafka.common.utils.SystemTime; @@ -51,35 +52,26 @@ import org.slf4j.LoggerFactory; import java.time.Instant; import java.util.Optional; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.CLUSTER_TIME_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.DOCUMENT_KEY_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.HEARTBEAT_TOPIC_NAME; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.HEARTBEAT_VALUE_SCHEMA; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_COLLECTION_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_DATABASE_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.OPERATION_TYPE_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.SNAPSHOT_KEY_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.SOURCE_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.TIMESTAMP_KEY_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.WATERMARK_TOPIC_NAME; -import static com.ververica.cdc.connectors.mongodb.source.offset.ChangeStreamOffset.NO_STOPPING_OFFSET; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.bsonTimestampFromEpochMillis; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.createHeartbeatPartitionMap; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.createPartitionMap; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.createSourceOffsetMap; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.createSourceRecord; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.createWatermarkPartitionMap; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.currentBsonTimestamp; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoRecordUtils.getResumeToken; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.FAILED_TO_PARSE_ERROR; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.ILLEGAL_OPERATION_ERROR; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.UNAUTHORIZED_ERROR; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.UNKNOWN_FIELD_ERROR; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.clientFor; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.getChangeStreamIterable; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.getCurrentClusterTime; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.CLUSTER_TIME_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.DOCUMENT_KEY_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.HEARTBEAT_TOPIC_NAME; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.HEARTBEAT_VALUE_SCHEMA; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_COLLECTION_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_DATABASE_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.OPERATION_TYPE_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.SNAPSHOT_KEY_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.SOURCE_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.TIMESTAMP_KEY_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.WATERMARK_TOPIC_NAME; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.FAILED_TO_PARSE_ERROR; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.ILLEGAL_OPERATION_ERROR; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.UNAUTHORIZED_ERROR; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.UNKNOWN_FIELD_ERROR; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.clientFor; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.getChangeStreamIterable; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.getCurrentClusterTime; /** The task to work for fetching data of MongoDB stream split . */ public class MongoDBStreamFetchTask implements FetchTask { @@ -153,13 +145,14 @@ public class MongoDBStreamFetchTask implements FetchTask { LOG.trace("Adding {} to {}", valueDocument, namespace.getFullName()); changeRecord = - createSourceRecord( - createPartitionMap( + MongoRecordUtils.createSourceRecord( + MongoRecordUtils.createPartitionMap( sourceConfig.getScheme(), sourceConfig.getHosts(), namespace.getDatabaseName(), namespace.getCollectionName()), - createSourceOffsetMap(resumeToken, false), + MongoRecordUtils.createSourceOffsetMap( + resumeToken, false), namespace.getFullName(), changeStreamDocument.getDocument(ID_FIELD), valueDocument); @@ -177,7 +170,9 @@ public class MongoDBStreamFetchTask implements FetchTask { if (isBoundedRead()) { ChangeStreamOffset currentOffset; if (changeRecord != null) { - currentOffset = new ChangeStreamOffset(getResumeToken(changeRecord)); + currentOffset = + new ChangeStreamOffset( + MongoRecordUtils.getResumeToken(changeRecord)); // The log after the high watermark won't emit. if (currentOffset.isAtOrBefore(streamSplit.getEndingOffset())) { queue.enqueue(new DataChangeEvent(changeRecord)); @@ -193,7 +188,8 @@ public class MongoDBStreamFetchTask implements FetchTask { // send watermark end event SourceRecord watermark = WatermarkEvent.create( - createWatermarkPartitionMap(descriptor.toString()), + MongoRecordUtils.createWatermarkPartitionMap( + descriptor.toString()), WATERMARK_TOPIC_NAME, streamSplit.splitId(), WatermarkKind.END, @@ -302,7 +298,8 @@ public class MongoDBStreamFetchTask implements FetchTask { changeStreamCursor, sourceConfig.getHeartbeatIntervalMillis(), HEARTBEAT_TOPIC_NAME, - createHeartbeatPartitionMap(sourceConfig.getScheme(), sourceConfig.getHosts())); + MongoRecordUtils.createHeartbeatPartitionMap( + sourceConfig.getScheme(), sourceConfig.getHosts())); } return null; } @@ -323,12 +320,14 @@ public class MongoDBStreamFetchTask implements FetchTask { // Legacy ts_ms of MongoDB version [3.6, 4.0) if (changeStreamDocument.containsKey(TIMESTAMP_KEY_FIELD)) { long timestampValue = changeStreamDocument.getInt64(TIMESTAMP_KEY_FIELD).getValue(); - BsonTimestamp legacyTimestamp = bsonTimestampFromEpochMillis(timestampValue); + BsonTimestamp legacyTimestamp = + MongoRecordUtils.bsonTimestampFromEpochMillis(timestampValue); changeStreamDocument.put(CLUSTER_TIME_FIELD, legacyTimestamp); } else { // Fallback to current timestamp. LOG.warn( "Cannot extract clusterTime from change stream event, fallback to current timestamp."); - changeStreamDocument.put(CLUSTER_TIME_FIELD, currentBsonTimestamp()); + changeStreamDocument.put( + CLUSTER_TIME_FIELD, MongoRecordUtils.currentBsonTimestamp()); } } @@ -376,6 +375,6 @@ public class MongoDBStreamFetchTask implements FetchTask { } private boolean isBoundedRead() { - return !NO_STOPPING_OFFSET.equals(streamSplit.getEndingOffset()); + return !ChangeStreamOffset.NO_STOPPING_OFFSET.equals(streamSplit.getEndingOffset()); } } diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/BsonUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/BsonUtils.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/BsonUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/BsonUtils.java index 344ee44fa..2586d79bc 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/BsonUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/BsonUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.utils; +package org.apache.flink.cdc.connectors.mongodb.source.utils; import org.bson.BsonArray; import org.bson.BsonBinary; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/ChunkUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/ChunkUtils.java similarity index 75% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/ChunkUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/ChunkUtils.java index e54fc3d72..41d949236 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/ChunkUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/ChunkUtils.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.utils; +package org.apache.flink.cdc.connectors.mongodb.source.utils; import org.bson.BsonDocument; import org.bson.BsonValue; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.BSON_MAX_KEY; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.BSON_MIN_KEY; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_INDEX; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.BSON_MAX_KEY; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.BSON_MIN_KEY; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_INDEX; /** Utilities to split chunks of collection. */ public class ChunkUtils { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/CollectionDiscoveryUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/CollectionDiscoveryUtils.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/CollectionDiscoveryUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/CollectionDiscoveryUtils.java index 58f57cf88..be9b76a52 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/CollectionDiscoveryUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/CollectionDiscoveryUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.utils; +package org.apache.flink.cdc.connectors.mongodb.source.utils; import com.mongodb.MongoNamespace; import com.mongodb.client.MongoClient; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/MongoRecordUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/MongoRecordUtils.java similarity index 88% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/MongoRecordUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/MongoRecordUtils.java index 8ef9ca2bd..f345fb2f7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/MongoRecordUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/MongoRecordUtils.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.utils; +package org.apache.flink.cdc.connectors.mongodb.source.utils; + +import org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope; import com.mongodb.kafka.connect.source.schema.BsonValueToSchemaAndValue; -import com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope; import io.debezium.data.Envelope; import io.debezium.relational.TableId; import org.apache.commons.lang3.StringUtils; @@ -34,16 +35,16 @@ import java.time.Instant; import java.util.HashMap; import java.util.Map; -import static com.ververica.cdc.connectors.base.source.meta.wartermark.WatermarkEvent.isWatermarkEvent; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.COPY_KEY_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.HEARTBEAT_TOPIC_NAME; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.JSON_WRITER_SETTINGS_STRICT; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.SOURCE_RECORD_KEY_SCHEMA; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.SOURCE_RECORD_VALUE_SCHEMA; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.TIMESTAMP_KEY_FIELD; import static java.util.Collections.singletonMap; +import static org.apache.flink.cdc.connectors.base.source.meta.wartermark.WatermarkEvent.isWatermarkEvent; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.COPY_KEY_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.HEARTBEAT_TOPIC_NAME; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.JSON_WRITER_SETTINGS_STRICT; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.SOURCE_RECORD_KEY_SCHEMA; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.SOURCE_RECORD_VALUE_SCHEMA; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.TIMESTAMP_KEY_FIELD; /** Utility class to deal record. */ public class MongoRecordUtils { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/MongoUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/MongoUtils.java similarity index 88% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/MongoUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/MongoUtils.java index 4d0a3ffea..055fc9e07 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/MongoUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/MongoUtils.java @@ -15,19 +15,21 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.utils; +package org.apache.flink.cdc.connectors.mongodb.source.utils; + +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; +import org.apache.flink.cdc.connectors.mongodb.source.connection.MongoClientPool; +import org.apache.flink.cdc.connectors.mongodb.source.offset.ChangeStreamDescriptor; import com.mongodb.client.ChangeStreamIterable; import com.mongodb.client.MongoChangeStreamCursor; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; +import com.mongodb.client.model.Filters; import com.mongodb.client.model.changestream.ChangeStreamDocument; import com.mongodb.client.model.changestream.FullDocument; import com.mongodb.client.model.changestream.FullDocumentBeforeChange; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; -import com.ververica.cdc.connectors.mongodb.source.connection.MongoClientPool; -import com.ververica.cdc.connectors.mongodb.source.offset.ChangeStreamDescriptor; import io.debezium.relational.TableId; import org.apache.commons.lang3.StringUtils; import org.bson.BsonDocument; @@ -54,16 +56,12 @@ import static com.mongodb.client.model.Filters.or; import static com.mongodb.client.model.Filters.regex; import static com.mongodb.client.model.Projections.include; import static com.mongodb.client.model.Sorts.ascending; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.DROPPED_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.KEY_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.UUID_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.encodeValue; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.ADD_NS_FIELD; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.ADD_NS_FIELD_NAME; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.includeListAsFlatPattern; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.isIncludeListExplicitlySpecified; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.DROPPED_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.ID_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.KEY_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.NAMESPACE_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.UUID_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.encodeValue; import static org.apache.flink.util.Preconditions.checkNotNull; /** Utilities of MongoDB operations. */ @@ -90,19 +88,23 @@ public class MongoUtils { ChangeStreamDescriptor changeStreamFilter; if (collectionList != null) { // Watching collections changes - if (isIncludeListExplicitlySpecified(collectionList, discoveredCollections)) { + if (CollectionDiscoveryUtils.isIncludeListExplicitlySpecified( + collectionList, discoveredCollections)) { changeStreamFilter = ChangeStreamDescriptor.collection( TableId.parse(discoveredCollections.get(0))); } else { - Pattern namespaceRegex = includeListAsFlatPattern(collectionList); + Pattern namespaceRegex = + CollectionDiscoveryUtils.includeListAsFlatPattern(collectionList); if (databaseList != null) { - if (isIncludeListExplicitlySpecified(databaseList, discoveredDatabases)) { + if (CollectionDiscoveryUtils.isIncludeListExplicitlySpecified( + databaseList, discoveredDatabases)) { changeStreamFilter = ChangeStreamDescriptor.database( discoveredDatabases.get(0), namespaceRegex); } else { - Pattern databaseRegex = includeListAsFlatPattern(databaseList); + Pattern databaseRegex = + CollectionDiscoveryUtils.includeListAsFlatPattern(databaseList); changeStreamFilter = ChangeStreamDescriptor.deployment(databaseRegex, namespaceRegex); } @@ -111,10 +113,12 @@ public class MongoUtils { } } } else if (databaseList != null) { - if (isIncludeListExplicitlySpecified(databaseList, discoveredDatabases)) { + if (CollectionDiscoveryUtils.isIncludeListExplicitlySpecified( + databaseList, discoveredDatabases)) { changeStreamFilter = ChangeStreamDescriptor.database(discoveredDatabases.get(0)); } else { - Pattern databaseRegex = includeListAsFlatPattern(databaseList); + Pattern databaseRegex = + CollectionDiscoveryUtils.includeListAsFlatPattern(databaseList); changeStreamFilter = ChangeStreamDescriptor.deployment(databaseRegex); } } else { @@ -172,8 +176,9 @@ public class MongoUtils { } else if (StringUtils.isNotEmpty(database) && namespaceRegex != null) { MongoDatabase db = mongoClient.getDatabase(database); List pipeline = new ArrayList<>(); - pipeline.add(ADD_NS_FIELD); - Bson nsFilter = regex(ADD_NS_FIELD_NAME, namespaceRegex); + pipeline.add(CollectionDiscoveryUtils.ADD_NS_FIELD); + Bson nsFilter = + Filters.regex(CollectionDiscoveryUtils.ADD_NS_FIELD_NAME, namespaceRegex); pipeline.add(match(nsFilter)); LOG.info( "Preparing change stream for database {} with namespace regex filter {}", @@ -186,9 +191,10 @@ public class MongoUtils { changeStream = db.watch(); } else if (namespaceRegex != null) { List pipeline = new ArrayList<>(); - pipeline.add(ADD_NS_FIELD); + pipeline.add(CollectionDiscoveryUtils.ADD_NS_FIELD); - Bson nsFilter = regex(ADD_NS_FIELD_NAME, namespaceRegex); + Bson nsFilter = + Filters.regex(CollectionDiscoveryUtils.ADD_NS_FIELD_NAME, namespaceRegex); if (databaseRegex != null) { Bson dbFilter = regex("ns.db", databaseRegex); nsFilter = and(dbFilter, nsFilter); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/ResumeTokenUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/ResumeTokenUtils.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/ResumeTokenUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/ResumeTokenUtils.java index 8b5178f3a..8169ab483 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/source/utils/ResumeTokenUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/source/utils/ResumeTokenUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.utils; +package org.apache.flink.cdc.connectors.mongodb.source.utils; import org.bson.BsonDocument; import org.bson.BsonTimestamp; @@ -25,7 +25,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Objects; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.DATA_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.DATA_FIELD; /** Utility class to decode resumeToken. */ public class ResumeTokenUtils { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBConnectorDeserializationSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBConnectorDeserializationSchema.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBConnectorDeserializationSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBConnectorDeserializationSchema.java index 5b1a588b5..cd656247d 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBConnectorDeserializationSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBConnectorDeserializationSchema.java @@ -15,9 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.table; +package org.apache.flink.cdc.connectors.mongodb.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.table.AppendMetadataCollector; +import org.apache.flink.cdc.debezium.table.MetadataConverter; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericArrayData; import org.apache.flink.table.data.GenericMapData; @@ -36,11 +41,6 @@ import org.apache.flink.util.Collector; import com.mongodb.client.model.changestream.OperationType; import com.mongodb.internal.HexUtils; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.table.AppendMetadataCollector; -import com.ververica.cdc.debezium.table.MetadataConverter; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.Struct; import org.apache.kafka.connect.source.SourceRecord; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBConnectorFullChangelogDeserializationSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBConnectorFullChangelogDeserializationSchema.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBConnectorFullChangelogDeserializationSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBConnectorFullChangelogDeserializationSchema.java index 70304d18f..485e114ea 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBConnectorFullChangelogDeserializationSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBConnectorFullChangelogDeserializationSchema.java @@ -15,9 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.table; +package org.apache.flink.cdc.connectors.mongodb.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope; +import org.apache.flink.cdc.debezium.table.MetadataConverter; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.RowType; @@ -25,9 +28,6 @@ import org.apache.flink.types.RowKind; import org.apache.flink.util.Collector; import com.mongodb.client.model.changestream.OperationType; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope; -import com.ververica.cdc.debezium.table.MetadataConverter; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.Struct; import org.apache.kafka.connect.source.SourceRecord; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBReadableMetadata.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBReadableMetadata.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBReadableMetadata.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBReadableMetadata.java index 4c24acf73..c2baf021c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBReadableMetadata.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBReadableMetadata.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.table; +package org.apache.flink.cdc.connectors.mongodb.table; +import org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope; +import org.apache.flink.cdc.debezium.table.MetadataConverter; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.data.StringData; import org.apache.flink.table.data.TimestampData; import org.apache.flink.table.types.DataType; -import com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope; -import com.ververica.cdc.debezium.table.MetadataConverter; import io.debezium.connector.AbstractSourceInfo; import io.debezium.data.Envelope; import org.apache.kafka.connect.data.Struct; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBTableSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBTableSource.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBTableSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBTableSource.java index eefff7a5b..d40094bd3 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBTableSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBTableSource.java @@ -15,9 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.table; +package org.apache.flink.cdc.connectors.mongodb.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.mongodb.source.MongoDBSource; +import org.apache.flink.cdc.connectors.mongodb.source.MongoDBSourceBuilder; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.table.MetadataConverter; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.connector.ChangelogMode; import org.apache.flink.table.connector.source.DynamicTableSource; @@ -29,11 +34,6 @@ import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.mongodb.source.MongoDBSource; -import com.ververica.cdc.connectors.mongodb.source.MongoDBSourceBuilder; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.table.MetadataConverter; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +51,7 @@ import java.util.stream.Stream; import static com.mongodb.MongoNamespace.checkCollectionNameValidity; import static com.mongodb.MongoNamespace.checkDatabaseNameValidity; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.inferIsRegularExpression; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.inferIsRegularExpression; import static org.apache.flink.util.Preconditions.checkNotNull; /** @@ -224,8 +224,8 @@ public class MongoDBTableSource implements ScanTableSource, SupportsReadingMetad Optional.ofNullable(samplesPerChunk).ifPresent(builder::samplesPerChunk); return SourceProvider.of(builder.build()); } else { - com.ververica.cdc.connectors.mongodb.MongoDBSource.Builder builder = - com.ververica.cdc.connectors.mongodb.MongoDBSource.builder() + org.apache.flink.cdc.connectors.mongodb.MongoDBSource.Builder builder = + org.apache.flink.cdc.connectors.mongodb.MongoDBSource.builder() .scheme(scheme) .hosts(hosts) .scanFullChangelog(enableFullDocPrePostImage) diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBTableSourceFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBTableSourceFactory.java similarity index 76% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBTableSourceFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBTableSourceFactory.java index 2daf7139b..59a419b80 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/table/MongoDBTableSourceFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBTableSourceFactory.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.table; +package org.apache.flink.cdc.connectors.mongodb.table; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.utils.OptionUtils; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.ReadableConfig; @@ -28,37 +30,34 @@ import org.apache.flink.table.connector.source.DynamicTableSource; import org.apache.flink.table.factories.DynamicTableSourceFactory; import org.apache.flink.table.factories.FactoryUtil; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.utils.OptionUtils; - import java.time.ZoneId; import java.util.HashSet; import java.util.Set; -import static com.ververica.cdc.connectors.base.options.SourceOptions.CHUNK_META_GROUP_SIZE; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_NEWLY_ADDED_TABLE_ENABLED; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_STARTUP_MODE; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_STARTUP_TIMESTAMP_MILLIS; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.BATCH_SIZE; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.COLLECTION; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.CONNECTION_OPTIONS; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.DATABASE; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.FULL_DOCUMENT_PRE_POST_IMAGE; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.HEARTBEAT_INTERVAL_MILLIS; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.HOSTS; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.INITIAL_SNAPSHOTTING_QUEUE_SIZE; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.PASSWORD; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_AWAIT_TIME_MILLIS; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_MAX_BATCH_SIZE; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SAMPLES; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE_MB; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_NO_CURSOR_TIMEOUT; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCHEME; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.USERNAME; -import static com.ververica.cdc.debezium.utils.ResolvedSchemaUtils.getPhysicalSchema; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.CHUNK_META_GROUP_SIZE; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_NEWLY_ADDED_TABLE_ENABLED; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_STARTUP_MODE; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_STARTUP_TIMESTAMP_MILLIS; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.BATCH_SIZE; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.COLLECTION; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.CONNECTION_OPTIONS; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.DATABASE; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.FULL_DOCUMENT_PRE_POST_IMAGE; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.HEARTBEAT_INTERVAL_MILLIS; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.HOSTS; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.INITIAL_SNAPSHOTTING_QUEUE_SIZE; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.PASSWORD; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_AWAIT_TIME_MILLIS; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_MAX_BATCH_SIZE; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SAMPLES; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE_MB; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_NO_CURSOR_TIMEOUT; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCHEME; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.USERNAME; +import static org.apache.flink.cdc.debezium.utils.ResolvedSchemaUtils.getPhysicalSchema; import static org.apache.flink.util.Preconditions.checkArgument; import static org.apache.flink.util.Preconditions.checkNotNull; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 80e5f6df5..de4c7ca76 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.ververica.cdc.connectors.mongodb.table.MongoDBTableSourceFactory +org.apache.flink.cdc.connectors.mongodb.table.MongoDBTableSourceFactory diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBContainer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBContainer.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBContainer.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBContainer.java index ea47768f3..caad393a7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBContainer.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBContainer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb; +package org.apache.flink.cdc.connectors.mongodb; import com.github.dockerjava.api.command.InspectContainerResponse; import org.apache.commons.lang3.StringUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBSourceExampleTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBSourceExampleTest.java similarity index 84% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBSourceExampleTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBSourceExampleTest.java index 2e27fba9c..7204f8d8f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBSourceExampleTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBSourceExampleTest.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb; +package org.apache.flink.cdc.connectors.mongodb; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.source.SourceFunction; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; import org.junit.Ignore; import org.junit.Test; -import static com.ververica.cdc.connectors.mongodb.LegacyMongoDBContainer.FLINK_USER; -import static com.ververica.cdc.connectors.mongodb.LegacyMongoDBContainer.FLINK_USER_PASSWORD; -import static com.ververica.cdc.connectors.mongodb.LegacyMongoDBTestBase.MONGODB_CONTAINER; +import static org.apache.flink.cdc.connectors.mongodb.LegacyMongoDBContainer.FLINK_USER; +import static org.apache.flink.cdc.connectors.mongodb.LegacyMongoDBContainer.FLINK_USER_PASSWORD; +import static org.apache.flink.cdc.connectors.mongodb.LegacyMongoDBTestBase.MONGODB_CONTAINER; /** Example Tests for {@link MongoDBSource}. */ public class LegacyMongoDBSourceExampleTest extends LegacyMongoDBSourceTestBase { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBSourceTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBSourceTest.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBSourceTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBSourceTest.java index 72837564a..3b8f72ef4 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBSourceTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBSourceTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb; +package org.apache.flink.cdc.connectors.mongodb; import org.apache.flink.api.common.state.BroadcastState; import org.apache.flink.api.common.state.KeyedStateStore; @@ -24,6 +24,9 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.OperatorStateStore; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.utils.TestSourceContext; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.testutils.CheckedThread; import org.apache.flink.runtime.state.FunctionInitializationContext; @@ -38,9 +41,6 @@ import com.mongodb.ConnectionString; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Updates; -import com.ververica.cdc.connectors.utils.TestSourceContext; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; import org.apache.kafka.connect.source.SourceRecord; import org.bson.Document; import org.bson.types.ObjectId; @@ -58,14 +58,14 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import static com.ververica.cdc.connectors.mongodb.LegacyMongoDBContainer.FLINK_USER; -import static com.ververica.cdc.connectors.mongodb.LegacyMongoDBContainer.FLINK_USER_PASSWORD; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.buildConnectionString; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertDelete; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertInsert; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertObjectIdEquals; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertReplace; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertUpdate; +import static org.apache.flink.cdc.connectors.mongodb.LegacyMongoDBContainer.FLINK_USER; +import static org.apache.flink.cdc.connectors.mongodb.LegacyMongoDBContainer.FLINK_USER_PASSWORD; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.buildConnectionString; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertDelete; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertInsert; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertObjectIdEquals; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertReplace; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertUpdate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBSourceTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBSourceTestBase.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBSourceTestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBSourceTestBase.java index f662fc573..dc4b17348 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBSourceTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBSourceTestBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb; +package org.apache.flink.cdc.connectors.mongodb; import org.apache.flink.runtime.minicluster.RpcServiceSharing; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; @@ -38,8 +38,8 @@ import org.testcontainers.lifecycle.Startables; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.mongodb.LegacyMongoDBContainer.MONGO_SUPER_PASSWORD; -import static com.ververica.cdc.connectors.mongodb.LegacyMongoDBContainer.MONGO_SUPER_USER; +import static org.apache.flink.cdc.connectors.mongodb.LegacyMongoDBContainer.MONGO_SUPER_PASSWORD; +import static org.apache.flink.cdc.connectors.mongodb.LegacyMongoDBContainer.MONGO_SUPER_USER; /** Basic class for testing {@link MongoDBSource}. */ public abstract class LegacyMongoDBSourceTestBase extends TestLogger { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBTestBase.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBTestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBTestBase.java index 06879fae9..9e95779d5 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/LegacyMongoDBTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/LegacyMongoDBTestBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb; +package org.apache.flink.cdc.connectors.mongodb; import org.apache.flink.test.util.AbstractTestBase; @@ -34,8 +34,8 @@ import org.testcontainers.lifecycle.Startables; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.mongodb.LegacyMongoDBContainer.MONGO_SUPER_PASSWORD; -import static com.ververica.cdc.connectors.mongodb.LegacyMongoDBContainer.MONGO_SUPER_USER; +import static org.apache.flink.cdc.connectors.mongodb.LegacyMongoDBContainer.MONGO_SUPER_PASSWORD; +import static org.apache.flink.cdc.connectors.mongodb.LegacyMongoDBContainer.MONGO_SUPER_USER; /** * Basic class for testing MongoDB source, this contains a MongoDB container which enables change diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/MongoDBFullChangelogITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBFullChangelogITCase.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/MongoDBFullChangelogITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBFullChangelogITCase.java index 86ca16014..02d6a82d1 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/MongoDBFullChangelogITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBFullChangelogITCase.java @@ -15,11 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source; +package org.apache.flink.cdc.connectors.mongodb.source; import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHook; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfigFactory; +import org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils; +import org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils; +import org.apache.flink.cdc.connectors.mongodb.utils.TestTable; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.TableResult; import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; @@ -34,14 +42,6 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Updates; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHook; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfigFactory; -import com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils; -import com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils; -import com.ververica.cdc.connectors.mongodb.utils.TestTable; import org.bson.Document; import org.junit.Rule; import org.junit.Test; @@ -56,12 +56,12 @@ import java.util.List; import java.util.Random; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertEqualsInAnyOrder; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.fetchRowData; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.fetchRows; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.triggerFailover; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertEqualsInAnyOrder; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils.fetchRowData; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils.fetchRows; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils.triggerFailover; import static org.apache.flink.table.api.DataTypes.BIGINT; import static org.apache.flink.table.api.DataTypes.STRING; import static org.apache.flink.table.catalog.Column.physical; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/MongoDBParallelSourceExampleTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBParallelSourceExampleTest.java similarity index 89% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/MongoDBParallelSourceExampleTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBParallelSourceExampleTest.java index c3b0d3f8a..dd2134136 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/MongoDBParallelSourceExampleTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBParallelSourceExampleTest.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source; +package org.apache.flink.cdc.connectors.mongodb.source; import org.apache.flink.api.common.eventtime.WatermarkStrategy; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; import org.apache.flink.configuration.Configuration; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; import org.junit.Ignore; import org.junit.Test; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; import static org.apache.flink.streaming.api.environment.ExecutionCheckpointingOptions.ENABLE_CHECKPOINTS_AFTER_TASKS_FINISH; /** Example Tests for {@link MongoDBSource}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/MongoDBParallelSourceITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBParallelSourceITCase.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/MongoDBParallelSourceITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBParallelSourceITCase.java index e31c01182..11332eb74 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/MongoDBParallelSourceITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBParallelSourceITCase.java @@ -15,11 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source; +package org.apache.flink.cdc.connectors.mongodb.source; import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHook; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; +import org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils; +import org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils.FailoverPhase; +import org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils.FailoverType; +import org.apache.flink.cdc.connectors.mongodb.utils.TestTable; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.TableResult; import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; @@ -34,14 +42,6 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Updates; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHook; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; -import com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils; -import com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.FailoverPhase; -import com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.FailoverType; -import com.ververica.cdc.connectors.mongodb.utils.TestTable; import org.bson.Document; import org.junit.Rule; import org.junit.Test; @@ -53,12 +53,12 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertEqualsInAnyOrder; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.fetchRowData; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.fetchRows; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.triggerFailover; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertEqualsInAnyOrder; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils.fetchRowData; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils.fetchRows; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils.triggerFailover; import static org.apache.flink.table.api.DataTypes.BIGINT; import static org.apache.flink.table.api.DataTypes.STRING; import static org.apache.flink.table.catalog.Column.physical; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/MongoDBSourceTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBSourceTestBase.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/MongoDBSourceTestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBSourceTestBase.java index aa8470132..6bfcca824 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/MongoDBSourceTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/MongoDBSourceTestBase.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source; +package org.apache.flink.cdc.connectors.mongodb.source; +import org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer; import org.apache.flink.runtime.minicluster.RpcServiceSharing; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; import org.apache.flink.test.util.MiniClusterWithClientResource; @@ -25,7 +26,6 @@ import com.mongodb.ConnectionString; import com.mongodb.MongoClientSettings; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; -import com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/NewlyAddedTableITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/NewlyAddedTableITCase.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/NewlyAddedTableITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/NewlyAddedTableITCase.java index 58acc2b4e..dc86f637a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/NewlyAddedTableITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/NewlyAddedTableITCase.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source; +package org.apache.flink.cdc.connectors.mongodb.source; import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.cdc.connectors.mongodb.utils.MongoDBAssertUtils; +import org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.execution.JobClient; import org.apache.flink.runtime.checkpoint.CheckpointException; @@ -32,7 +34,6 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Updates; -import com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils; import org.bson.Document; import org.junit.After; import org.junit.Before; @@ -56,12 +57,9 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBAssertUtils.assertEqualsInAnyOrder; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.triggerFailover; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.waitForSinkSize; import static java.lang.String.format; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; import static org.apache.flink.util.Preconditions.checkState; /** IT tests to cover various newly added collections during capture process. */ @@ -389,8 +387,9 @@ public class NewlyAddedTableITCase extends MongoDBSourceTestBase { "+I[%s, 417022095255614379, China, %s, %s West Town address 3]", collection0, cityName0, cityName0))); - waitForSinkSize("sink", fetchedDataList.size()); - assertEqualsInAnyOrder(fetchedDataList, TestValuesTableFactory.getRawResults("sink")); + MongoDBTestUtils.waitForSinkSize("sink", fetchedDataList.size()); + MongoDBAssertUtils.assertEqualsInAnyOrder( + fetchedDataList, TestValuesTableFactory.getRawResults("sink")); // first round's changelog data makeOplogForAddressTableInRound(database, collection0, 0); @@ -405,8 +404,9 @@ public class NewlyAddedTableITCase extends MongoDBSourceTestBase { format( "+I[%s, %d, China, %s, %s West Town address 4]", collection0, 417022095255614380L, cityName0, cityName0))); - waitForSinkSize("sink", fetchedDataList.size()); - assertEqualsInAnyOrder(fetchedDataList, TestValuesTableFactory.getRawResults("sink")); + MongoDBTestUtils.waitForSinkSize("sink", fetchedDataList.size()); + MongoDBAssertUtils.assertEqualsInAnyOrder( + fetchedDataList, TestValuesTableFactory.getRawResults("sink")); finishedSavePointPath = triggerSavepointWithRetry(jobClient, savepointDirectory); jobClient.cancel().get(); } @@ -452,8 +452,9 @@ public class NewlyAddedTableITCase extends MongoDBSourceTestBase { format( "+I[%s, 417022095255614379, China, %s, %s West Town address 3]", captureTableThisRound, cityName, cityName))); - waitForSinkSize("sink", fetchedDataList.size()); - assertEqualsInAnyOrder(fetchedDataList, TestValuesTableFactory.getRawResults("sink")); + MongoDBTestUtils.waitForSinkSize("sink", fetchedDataList.size()); + MongoDBAssertUtils.assertEqualsInAnyOrder( + fetchedDataList, TestValuesTableFactory.getRawResults("sink")); // step 4: make changelog data for all collections before this round(also includes this // round), @@ -496,9 +497,10 @@ public class NewlyAddedTableITCase extends MongoDBSourceTestBase { cityName))); // assert fetched changelog data in this round - waitForSinkSize("sink", fetchedDataList.size()); + MongoDBTestUtils.waitForSinkSize("sink", fetchedDataList.size()); - assertEqualsInAnyOrder(fetchedDataList, TestValuesTableFactory.getRawResults("sink")); + MongoDBAssertUtils.assertEqualsInAnyOrder( + fetchedDataList, TestValuesTableFactory.getRawResults("sink")); // step 6: trigger savepoint if (round != captureAddressCollections.length - 1) { finishedSavePointPath = triggerSavepointWithRetry(jobClient, savepointDirectory); @@ -568,14 +570,15 @@ public class NewlyAddedTableITCase extends MongoDBSourceTestBase { // trigger failover after some snapshot data read finished if (failoverPhase == MongoDBTestUtils.FailoverPhase.SNAPSHOT) { - triggerFailover( + MongoDBTestUtils.triggerFailover( failoverType, jobClient.getJobID(), miniClusterResource.getMiniCluster(), () -> sleepMs(100)); } - waitForSinkSize("sink", fetchedDataList.size()); - assertEqualsInAnyOrder(fetchedDataList, TestValuesTableFactory.getRawResults("sink")); + MongoDBTestUtils.waitForSinkSize("sink", fetchedDataList.size()); + MongoDBAssertUtils.assertEqualsInAnyOrder( + fetchedDataList, TestValuesTableFactory.getRawResults("sink")); finishedSavePointPath = triggerSavepointWithRetry(jobClient, savepointDirectory); jobClient.cancel().get(); } @@ -612,8 +615,9 @@ public class NewlyAddedTableITCase extends MongoDBSourceTestBase { "insert into sink select collection_name, cid, country, city, detail_address from address"); JobClient jobClient = tableResult.getJobClient().get(); - waitForSinkSize("sink", fetchedDataList.size()); - assertEqualsInAnyOrder(fetchedDataList, TestValuesTableFactory.getRawResults("sink")); + MongoDBTestUtils.waitForSinkSize("sink", fetchedDataList.size()); + MongoDBAssertUtils.assertEqualsInAnyOrder( + fetchedDataList, TestValuesTableFactory.getRawResults("sink")); // step 3: make oplog data for all collections List expectedOplogDataThisRound = new ArrayList<>(); @@ -651,7 +655,7 @@ public class NewlyAddedTableITCase extends MongoDBSourceTestBase { if (failoverPhase == MongoDBTestUtils.FailoverPhase.STREAM && TestValuesTableFactory.getRawResults("sink").size() > fetchedDataList.size()) { - triggerFailover( + MongoDBTestUtils.triggerFailover( failoverType, jobClient.getJobID(), miniClusterResource.getMiniCluster(), @@ -660,9 +664,10 @@ public class NewlyAddedTableITCase extends MongoDBSourceTestBase { fetchedDataList.addAll(expectedOplogDataThisRound); // step 4: assert fetched oplog data in this round - waitForSinkSize("sink", fetchedDataList.size()); + MongoDBTestUtils.waitForSinkSize("sink", fetchedDataList.size()); - assertEqualsInAnyOrder(fetchedDataList, TestValuesTableFactory.getRawResults("sink")); + MongoDBAssertUtils.assertEqualsInAnyOrder( + fetchedDataList, TestValuesTableFactory.getRawResults("sink")); // step 5: trigger savepoint finishedSavePointPath = triggerSavepointWithRetry(jobClient, savepointDirectory); @@ -772,7 +777,7 @@ public class NewlyAddedTableITCase extends MongoDBSourceTestBase { // trigger failover after some snapshot data read finished if (failoverPhase == MongoDBTestUtils.FailoverPhase.SNAPSHOT) { - triggerFailover( + MongoDBTestUtils.triggerFailover( failoverType, jobClient.getJobID(), miniClusterResource.getMiniCluster(), @@ -780,13 +785,14 @@ public class NewlyAddedTableITCase extends MongoDBSourceTestBase { } fetchedDataList.addAll(expectedSnapshotDataThisRound); waitForUpsertSinkSize("sink", fetchedDataList.size()); - assertEqualsInAnyOrder(fetchedDataList, TestValuesTableFactory.getResults("sink")); + MongoDBAssertUtils.assertEqualsInAnyOrder( + fetchedDataList, TestValuesTableFactory.getResults("sink")); // step 3: make some changelog data for this round makeFirstPartOplogForAddressCollection( mongodbClient.getDatabase(customerDatabase), newlyAddedCollection); if (failoverPhase == MongoDBTestUtils.FailoverPhase.STREAM) { - triggerFailover( + MongoDBTestUtils.triggerFailover( failoverType, jobClient.getJobID(), miniClusterResource.getMiniCluster(), @@ -824,7 +830,8 @@ public class NewlyAddedTableITCase extends MongoDBSourceTestBase { // the result size of sink may arrive fetchedDataList.size() with old data, wait one // checkpoint to wait retract old record and send new record Thread.sleep(1000); - assertEqualsInAnyOrder(fetchedDataList, TestValuesTableFactory.getResults("sink")); + MongoDBAssertUtils.assertEqualsInAnyOrder( + fetchedDataList, TestValuesTableFactory.getResults("sink")); // step 6: trigger savepoint if (round != captureAddressCollections.length - 1) { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/reader/MongoDBSnapshotSplitReaderTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/reader/MongoDBSnapshotSplitReaderTest.java similarity index 78% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/reader/MongoDBSnapshotSplitReaderTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/reader/MongoDBSnapshotSplitReaderTest.java index 55b5f9c10..e439c098f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/reader/MongoDBSnapshotSplitReaderTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/reader/MongoDBSnapshotSplitReaderTest.java @@ -15,27 +15,27 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.reader; - +package org.apache.flink.cdc.connectors.mongodb.source.reader; + +import org.apache.flink.cdc.connectors.base.source.meta.split.ChangeEventRecords; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceRecords; +import org.apache.flink.cdc.connectors.base.source.reader.IncrementalSourceReaderContext; +import org.apache.flink.cdc.connectors.base.source.reader.IncrementalSourceSplitReader; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; +import org.apache.flink.cdc.connectors.mongodb.source.MongoDBSourceTestBase; +import org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters.SampleBucketSplitStrategy; +import org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters.ShardedSplitStrategy; +import org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters.SingleSplitStrategy; +import org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters.SplitContext; +import org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters.SplitStrategy; +import org.apache.flink.cdc.connectors.mongodb.source.assigners.splitters.SplitVectorSplitStrategy; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfigFactory; +import org.apache.flink.cdc.connectors.mongodb.source.dialect.MongoDBDialect; import org.apache.flink.connector.base.source.reader.splitreader.SplitsAddition; import org.apache.flink.connector.testutils.source.reader.TestingReaderContext; -import com.ververica.cdc.connectors.base.source.meta.split.ChangeEventRecords; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.source.meta.split.SourceRecords; -import com.ververica.cdc.connectors.base.source.reader.IncrementalSourceReaderContext; -import com.ververica.cdc.connectors.base.source.reader.IncrementalSourceSplitReader; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; -import com.ververica.cdc.connectors.mongodb.source.MongoDBSourceTestBase; -import com.ververica.cdc.connectors.mongodb.source.assigners.splitters.SampleBucketSplitStrategy; -import com.ververica.cdc.connectors.mongodb.source.assigners.splitters.ShardedSplitStrategy; -import com.ververica.cdc.connectors.mongodb.source.assigners.splitters.SingleSplitStrategy; -import com.ververica.cdc.connectors.mongodb.source.assigners.splitters.SplitContext; -import com.ververica.cdc.connectors.mongodb.source.assigners.splitters.SplitStrategy; -import com.ververica.cdc.connectors.mongodb.source.assigners.splitters.SplitVectorSplitStrategy; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfigFactory; -import com.ververica.cdc.connectors.mongodb.source.dialect.MongoDBDialect; import io.debezium.relational.TableId; import org.apache.kafka.connect.data.Struct; import org.apache.kafka.connect.source.SourceRecord; @@ -48,11 +48,11 @@ import org.slf4j.LoggerFactory; import java.util.Iterator; import java.util.LinkedList; -import static com.ververica.cdc.connectors.base.source.meta.wartermark.WatermarkEvent.isWatermarkEvent; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.FULL_DOCUMENT_FIELD; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; import static java.util.Collections.singletonList; +import static org.apache.flink.cdc.connectors.base.source.meta.wartermark.WatermarkEvent.isWatermarkEvent; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.FULL_DOCUMENT_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/reader/MongoDBStreamSplitReaderTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/reader/MongoDBStreamSplitReaderTest.java similarity index 78% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/reader/MongoDBStreamSplitReaderTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/reader/MongoDBStreamSplitReaderTest.java index 8040073ef..1699a550c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/reader/MongoDBStreamSplitReaderTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/reader/MongoDBStreamSplitReaderTest.java @@ -15,26 +15,26 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.reader; - +package org.apache.flink.cdc.connectors.mongodb.source.reader; + +import org.apache.flink.cdc.connectors.base.source.meta.split.ChangeEventRecords; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceRecords; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplit; +import org.apache.flink.cdc.connectors.base.source.reader.IncrementalSourceReaderContext; +import org.apache.flink.cdc.connectors.base.source.reader.IncrementalSourceSplitReader; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; +import org.apache.flink.cdc.connectors.mongodb.source.MongoDBSourceTestBase; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; +import org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceConfigFactory; +import org.apache.flink.cdc.connectors.mongodb.source.dialect.MongoDBDialect; +import org.apache.flink.cdc.connectors.mongodb.source.offset.ChangeStreamDescriptor; +import org.apache.flink.cdc.connectors.mongodb.source.offset.ChangeStreamOffset; +import org.apache.flink.cdc.connectors.mongodb.source.offset.ChangeStreamOffsetFactory; import org.apache.flink.connector.base.source.reader.splitreader.SplitsAddition; import org.apache.flink.connector.testutils.source.reader.TestingReaderContext; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.changestream.OperationType; -import com.ververica.cdc.connectors.base.source.meta.split.ChangeEventRecords; -import com.ververica.cdc.connectors.base.source.meta.split.SourceRecords; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplit; -import com.ververica.cdc.connectors.base.source.reader.IncrementalSourceReaderContext; -import com.ververica.cdc.connectors.base.source.reader.IncrementalSourceSplitReader; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; -import com.ververica.cdc.connectors.mongodb.source.MongoDBSourceTestBase; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfig; -import com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceConfigFactory; -import com.ververica.cdc.connectors.mongodb.source.dialect.MongoDBDialect; -import com.ververica.cdc.connectors.mongodb.source.offset.ChangeStreamDescriptor; -import com.ververica.cdc.connectors.mongodb.source.offset.ChangeStreamOffset; -import com.ververica.cdc.connectors.mongodb.source.offset.ChangeStreamOffsetFactory; import org.apache.kafka.connect.data.Struct; import org.apache.kafka.connect.source.SourceRecord; import org.bson.BsonDocument; @@ -50,17 +50,17 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.FULL_DOCUMENT_FIELD; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.OPERATION_TYPE_FIELD; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.collectionNames; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.collectionsFilter; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.databaseFilter; -import static com.ververica.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.databaseNames; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.getChangeStreamDescriptor; -import static com.ververica.cdc.connectors.mongodb.source.utils.MongoUtils.getLatestResumeToken; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; import static java.util.Collections.singletonList; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.FULL_DOCUMENT_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.OPERATION_TYPE_FIELD; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.collectionNames; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.collectionsFilter; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.databaseFilter; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.CollectionDiscoveryUtils.databaseNames; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.getChangeStreamDescriptor; +import static org.apache.flink.cdc.connectors.mongodb.source.utils.MongoUtils.getLatestResumeToken; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/utils/BsonUtilsTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/utils/BsonUtilsTest.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/utils/BsonUtilsTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/utils/BsonUtilsTest.java index 581234923..af24ff723 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/utils/BsonUtilsTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/utils/BsonUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.utils; +package org.apache.flink.cdc.connectors.mongodb.source.utils; import org.bson.BsonArray; import org.bson.BsonBinary; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/utils/ResumeTokenUtilsTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/utils/ResumeTokenUtilsTest.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/utils/ResumeTokenUtilsTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/utils/ResumeTokenUtilsTest.java index d4f5b914f..981e588e7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/source/utils/ResumeTokenUtilsTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/source/utils/ResumeTokenUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.source.utils; +package org.apache.flink.cdc.connectors.mongodb.source.utils; import org.bson.BsonDocument; import org.bson.BsonTimestamp; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/table/MongoDBConnectorITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBConnectorITCase.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/table/MongoDBConnectorITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBConnectorITCase.java index c33f1556c..b15ebd1fc 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/table/MongoDBConnectorITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBConnectorITCase.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.table; +package org.apache.flink.cdc.connectors.mongodb.table; +import org.apache.flink.cdc.connectors.mongodb.source.MongoDBSourceTestBase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableResult; @@ -27,7 +28,6 @@ import org.apache.flink.table.utils.LegacyRowResource; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Updates; -import com.ververica.cdc.connectors.mongodb.source.MongoDBSourceTestBase; import org.bson.BsonDateTime; import org.bson.BsonTimestamp; import org.bson.Document; @@ -46,10 +46,10 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.waitForSinkSize; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.waitForSnapshotStarted; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils.waitForSinkSize; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils.waitForSnapshotStarted; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/table/MongoDBRegexFilterITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBRegexFilterITCase.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/table/MongoDBRegexFilterITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBRegexFilterITCase.java index b735fc155..317dc7468 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/table/MongoDBRegexFilterITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBRegexFilterITCase.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.table; +package org.apache.flink.cdc.connectors.mongodb.table; +import org.apache.flink.cdc.connectors.mongodb.source.MongoDBSourceTestBase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableResult; @@ -24,7 +25,6 @@ import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; import org.apache.flink.table.planner.factories.TestValuesTableFactory; import com.mongodb.client.MongoDatabase; -import com.ververica.cdc.connectors.mongodb.source.MongoDBSourceTestBase; import org.bson.Document; import org.junit.Before; import org.junit.Test; @@ -33,10 +33,10 @@ import org.junit.runners.Parameterized; import java.util.List; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.waitForSinkSize; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBTestUtils.waitForSnapshotStarted; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils.waitForSinkSize; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBTestUtils.waitForSnapshotStarted; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.junit.Assert.assertThat; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/table/MongoDBTableFactoryTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBTableFactoryTest.java similarity index 87% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/table/MongoDBTableFactoryTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBTableFactoryTest.java index 37e3a8b84..b8b024238 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/table/MongoDBTableFactoryTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBTableFactoryTest.java @@ -15,8 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.table; +package org.apache.flink.cdc.connectors.mongodb.table; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.utils.ResolvedSchemaUtils; import org.apache.flink.configuration.Configuration; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.api.Schema; @@ -34,9 +37,6 @@ import org.apache.flink.table.factories.FactoryUtil; import org.apache.flink.table.runtime.connector.source.ScanRuntimeProviderContext; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.utils.ResolvedSchemaUtils; import org.junit.Test; import java.time.ZoneId; @@ -46,22 +46,22 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import static com.ververica.cdc.connectors.base.options.SourceOptions.CHUNK_META_GROUP_SIZE; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_NEWLY_ADDED_TABLE_ENABLED; -import static com.ververica.cdc.connectors.mongodb.internal.MongoDBEnvelope.MONGODB_SRV_SCHEME; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.BATCH_SIZE; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.FULL_DOCUMENT_PRE_POST_IMAGE; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.HEARTBEAT_INTERVAL_MILLIS; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_AWAIT_TIME_MILLIS; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_MAX_BATCH_SIZE; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SAMPLES; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE_MB; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_NO_CURSOR_TIMEOUT; -import static com.ververica.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCHEME; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertProducedTypeOfSourceFunction; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.CHUNK_META_GROUP_SIZE; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_NEWLY_ADDED_TABLE_ENABLED; +import static org.apache.flink.cdc.connectors.mongodb.internal.MongoDBEnvelope.MONGODB_SRV_SCHEME; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.BATCH_SIZE; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.FULL_DOCUMENT_PRE_POST_IMAGE; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.HEARTBEAT_INTERVAL_MILLIS; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_AWAIT_TIME_MILLIS; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.POLL_MAX_BATCH_SIZE; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SAMPLES; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE_MB; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCAN_NO_CURSOR_TIMEOUT; +import static org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions.SCHEME; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertProducedTypeOfSourceFunction; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/table/MongoDBTimeZoneITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBTimeZoneITCase.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/table/MongoDBTimeZoneITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBTimeZoneITCase.java index 25d497884..c3e7112c2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/table/MongoDBTimeZoneITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/table/MongoDBTimeZoneITCase.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.table; +package org.apache.flink.cdc.connectors.mongodb.table; +import org.apache.flink.cdc.connectors.mongodb.source.MongoDBSourceTestBase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableResult; @@ -25,7 +26,6 @@ import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.types.Row; import org.apache.flink.util.CloseableIterator; -import com.ververica.cdc.connectors.mongodb.source.MongoDBSourceTestBase; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,8 +36,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.FLINK_USER_PASSWORD; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.junit.Assert.assertThat; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/MongoDBAssertUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/MongoDBAssertUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/MongoDBAssertUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/MongoDBAssertUtils.java index a3f386cfb..35888d73a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/MongoDBAssertUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/MongoDBAssertUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.utils; +package org.apache.flink.cdc.connectors.mongodb.utils; import com.jayway.jsonpath.JsonPath; import com.mongodb.client.model.changestream.OperationType; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/MongoDBContainer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/MongoDBContainer.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/MongoDBContainer.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/MongoDBContainer.java index 402ffce4d..9156810ba 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/MongoDBContainer.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/MongoDBContainer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.utils; +package org.apache.flink.cdc.connectors.mongodb.utils; import com.github.dockerjava.api.command.InspectContainerResponse; import org.apache.commons.lang3.StringUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/MongoDBTestUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/MongoDBTestUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/MongoDBTestUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/MongoDBTestUtils.java index e5d606827..260270a20 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/MongoDBTestUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/MongoDBTestUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.utils; +package org.apache.flink.cdc.connectors.mongodb.utils; import org.apache.flink.api.common.JobID; import org.apache.flink.runtime.highavailability.nonha.embedded.HaLeadershipControl; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/RecordsFormatter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/RecordsFormatter.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/RecordsFormatter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/RecordsFormatter.java index d7df41cf5..9cdd1bfc7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/RecordsFormatter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/RecordsFormatter.java @@ -15,9 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.utils; +package org.apache.flink.cdc.connectors.mongodb.utils; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.base.utils.SourceRecordUtils; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.conversion.RowRowConverter; import org.apache.flink.table.types.DataType; @@ -26,9 +29,6 @@ import org.apache.flink.table.types.utils.TypeConversions; import org.apache.flink.types.Row; import org.apache.flink.util.Collector; -import com.ververica.cdc.connectors.base.utils.SourceRecordUtils; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.kafka.connect.source.SourceRecord; import java.time.ZoneId; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/TestTable.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/TestTable.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/TestTable.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/TestTable.java index 0d1ecc488..82e6cf507 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/com/ververica/cdc/connectors/mongodb/utils/TestTable.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mongodb-cdc/src/test/java/org/apache/flink/cdc/connectors/mongodb/utils/TestTable.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb.utils; +package org.apache.flink.cdc.connectors.mongodb.utils; +import org.apache.flink.cdc.connectors.mongodb.table.MongoDBConnectorDeserializationSchema; +import org.apache.flink.cdc.connectors.mongodb.table.MongoDBConnectorFullChangelogDeserializationSchema; +import org.apache.flink.cdc.debezium.table.MetadataConverter; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.conversion.RowRowConverter; import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.mongodb.table.MongoDBConnectorDeserializationSchema; -import com.ververica.cdc.connectors.mongodb.table.MongoDBConnectorFullChangelogDeserializationSchema; -import com.ververica.cdc.debezium.table.MetadataConverter; import org.apache.kafka.connect.source.SourceRecord; import java.time.ZoneId; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/MySqlSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/MySqlSource.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/MySqlSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/MySqlSource.java index 05d160319..49187838f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/MySqlSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/MySqlSource.java @@ -15,26 +15,27 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql; +package org.apache.flink.cdc.connectors.mysql; + +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.internal.DebeziumOffset; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.internal.DebeziumOffset; import io.debezium.connector.mysql.MySqlConnector; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import static com.ververica.cdc.debezium.DebeziumSourceFunction.LEGACY_IMPLEMENTATION_KEY; -import static com.ververica.cdc.debezium.DebeziumSourceFunction.LEGACY_IMPLEMENTATION_VALUE; +import static org.apache.flink.cdc.debezium.DebeziumSourceFunction.LEGACY_IMPLEMENTATION_KEY; +import static org.apache.flink.cdc.debezium.DebeziumSourceFunction.LEGACY_IMPLEMENTATION_VALUE; import static org.apache.flink.util.Preconditions.checkNotNull; /** * A builder to build a SourceFunction which can read snapshot and continue to consume binlog. * - * @deprecated please use {@link com.ververica.cdc.connectors.mysql.source.MySqlSource} instead + * @deprecated please use {@link org.apache.flink.cdc.connectors.mysql.source.MySqlSource} instead * which supports more rich features, e.g. parallel reading from historical data. The {@link * MySqlSource} will be dropped in the future version. */ @@ -51,8 +52,8 @@ public class MySqlSource { * Builder class of {@link MySqlSource}. * * @deprecated please use {@link - * com.ververica.cdc.connectors.mysql.source.MySqlSource#builder()} instead which supports - * more rich features, e.g. parallel reading from historical data. The {@link + * org.apache.flink.cdc.connectors.mysql.source.MySqlSource#builder()} instead which + * supports more rich features, e.g. parallel reading from historical data. The {@link * MySqlSource.Builder} will be dropped in the future version. */ @Deprecated diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/MySqlValidator.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/MySqlValidator.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/MySqlValidator.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/MySqlValidator.java index 8c5cce97a..514b11b96 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/MySqlValidator.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/MySqlValidator.java @@ -15,14 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql; +package org.apache.flink.cdc.connectors.mysql; +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions; +import org.apache.flink.cdc.debezium.Validator; import org.apache.flink.table.api.TableException; import org.apache.flink.table.api.ValidationException; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.debezium.Validator; import io.debezium.jdbc.JdbcConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +37,6 @@ import java.util.Properties; import java.util.TimeZone; import java.util.concurrent.TimeUnit; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SERVER_TIME_ZONE; import static io.debezium.config.Configuration.from; /** @@ -165,7 +165,7 @@ public class MySqlValidator implements Validator { if (timeZoneProperty == null) { LOG.warn( "{} is not set, which might cause data inconsistencies for time-related fields.", - SERVER_TIME_ZONE.key()); + MySqlSourceOptions.SERVER_TIME_ZONE.key()); return; } @@ -189,7 +189,7 @@ public class MySqlValidator implements Validator { Math.abs(timeDiffInSeconds), timeDiffInSeconds >= 0 ? "ahead of" : "behind", zoneId.getId(), - SERVER_TIME_ZONE.key())); + MySqlSourceOptions.SERVER_TIME_ZONE.key())); } } diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/SeekBinlogToTimestampFilter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/SeekBinlogToTimestampFilter.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/SeekBinlogToTimestampFilter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/SeekBinlogToTimestampFilter.java index bc6c00b90..3ee51eab7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/SeekBinlogToTimestampFilter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/SeekBinlogToTimestampFilter.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql; +package org.apache.flink.cdc.connectors.mysql; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; import org.apache.flink.util.Collector; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; import io.debezium.data.Envelope; import org.apache.kafka.connect.data.Struct; import org.apache.kafka.connect.source.SourceRecord; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/DebeziumUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/DebeziumUtils.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/DebeziumUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/DebeziumUtils.java index e8d12a62d..33dac6771 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/DebeziumUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/DebeziumUtils.java @@ -15,17 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.debezium; +package org.apache.flink.cdc.connectors.mysql.debezium; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.connection.JdbcConnectionFactory; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.utils.TableDiscoveryUtils; import org.apache.flink.util.FlinkRuntimeException; import com.github.shyiko.mysql.binlog.BinaryLogClient; import com.github.shyiko.mysql.binlog.event.EventData; import com.github.shyiko.mysql.binlog.event.EventHeaderV4; import com.github.shyiko.mysql.binlog.event.RotateEventData; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.connection.JdbcConnectionFactory; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; import io.debezium.config.Configuration; import io.debezium.connector.mysql.MySqlConnection; import io.debezium.connector.mysql.MySqlConnectorConfig; @@ -55,8 +56,6 @@ import java.util.Properties; import java.util.concurrent.ArrayBlockingQueue; import java.util.function.Predicate; -import static com.ververica.cdc.connectors.mysql.source.utils.TableDiscoveryUtils.listTables; - /** Utilities related to Debezium. */ public class DebeziumUtils { private static final String QUOTED_CHARACTER = "`"; @@ -194,7 +193,7 @@ public class DebeziumUtils { final List capturedTableIds; try { - capturedTableIds = listTables(jdbc, sourceConfig.getTableFilters()); + capturedTableIds = TableDiscoveryUtils.listTables(jdbc, sourceConfig.getTableFilters()); } catch (SQLException e) { throw new FlinkRuntimeException("Failed to discover captured tables", e); } diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/EmbeddedFlinkDatabaseHistory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/EmbeddedFlinkDatabaseHistory.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/EmbeddedFlinkDatabaseHistory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/EmbeddedFlinkDatabaseHistory.java index 2d9440219..293e0c76f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/EmbeddedFlinkDatabaseHistory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/EmbeddedFlinkDatabaseHistory.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.debezium; +package org.apache.flink.cdc.connectors.mysql.debezium; + +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplitState; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplitState; import io.debezium.config.Configuration; import io.debezium.pipeline.spi.Offsets; import io.debezium.relational.TableId; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/dispatcher/EventDispatcherImpl.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/dispatcher/EventDispatcherImpl.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/dispatcher/EventDispatcherImpl.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/dispatcher/EventDispatcherImpl.java index 7b7654140..11553ccda 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/dispatcher/EventDispatcherImpl.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/dispatcher/EventDispatcherImpl.java @@ -15,7 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.debezium.dispatcher; +package org.apache.flink.cdc.connectors.mysql.debezium.dispatcher; + +import org.apache.flink.cdc.connectors.mysql.debezium.task.context.StatefulTaskContext; import io.debezium.config.CommonConnectorConfig; import io.debezium.connector.base.ChangeEventQueue; @@ -47,9 +49,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import static com.ververica.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher.BINLOG_FILENAME_OFFSET_KEY; -import static com.ververica.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher.BINLOG_POSITION_OFFSET_KEY; -import static com.ververica.cdc.connectors.mysql.debezium.task.context.StatefulTaskContext.MySqlEventMetadataProvider.SERVER_ID_KEY; +import static org.apache.flink.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher.BINLOG_FILENAME_OFFSET_KEY; +import static org.apache.flink.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher.BINLOG_POSITION_OFFSET_KEY; /** * A subclass implementation of {@link EventDispatcher}. @@ -188,8 +189,10 @@ public class EventDispatcherImpl Map source = new HashMap<>(); String fileName = sourceInfo.getString(BINLOG_FILENAME_OFFSET_KEY); Long pos = sourceInfo.getInt64(BINLOG_POSITION_OFFSET_KEY); - Long serverId = sourceInfo.getInt64(SERVER_ID_KEY); - source.put(SERVER_ID_KEY, serverId); + Long serverId = + sourceInfo.getInt64( + StatefulTaskContext.MySqlEventMetadataProvider.SERVER_ID_KEY); + source.put(StatefulTaskContext.MySqlEventMetadataProvider.SERVER_ID_KEY, serverId); source.put(BINLOG_FILENAME_OFFSET_KEY, fileName); source.put(BINLOG_POSITION_OFFSET_KEY, pos); HistoryRecord historyRecord = diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/dispatcher/SignalEventDispatcher.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/dispatcher/SignalEventDispatcher.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/dispatcher/SignalEventDispatcher.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/dispatcher/SignalEventDispatcher.java index 36ef54585..bbd4a5d2a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/dispatcher/SignalEventDispatcher.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/dispatcher/SignalEventDispatcher.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.debezium.dispatcher; +package org.apache.flink.cdc.connectors.mysql.debezium.dispatcher; + +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; import io.debezium.connector.base.ChangeEventQueue; import io.debezium.pipeline.DataChangeEvent; import io.debezium.util.SchemaNameAdjuster; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReader.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/reader/BinlogSplitReader.java similarity index 87% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReader.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/reader/BinlogSplitReader.java index 429c9e428..69afb6059 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReader.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/reader/BinlogSplitReader.java @@ -15,8 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.debezium.reader; +package org.apache.flink.cdc.connectors.mysql.debezium.reader; +import org.apache.flink.cdc.common.annotation.VisibleForTesting; +import org.apache.flink.cdc.connectors.mysql.debezium.task.MySqlBinlogSplitReadTask; +import org.apache.flink.cdc.connectors.mysql.debezium.task.context.StatefulTaskContext; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffsetKind; +import org.apache.flink.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.SourceRecords; +import org.apache.flink.cdc.connectors.mysql.source.utils.ChunkUtils; +import org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.FlinkRuntimeException; @@ -24,17 +35,6 @@ import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadF import com.github.shyiko.mysql.binlog.event.Event; import com.github.shyiko.mysql.binlog.event.EventType; -import com.ververica.cdc.common.annotation.VisibleForTesting; -import com.ververica.cdc.connectors.mysql.debezium.task.MySqlBinlogSplitReadTask; -import com.ververica.cdc.connectors.mysql.debezium.task.context.StatefulTaskContext; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetKind; -import com.ververica.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; -import com.ververica.cdc.connectors.mysql.source.split.SourceRecords; -import com.ververica.cdc.connectors.mysql.source.utils.ChunkUtils; -import com.ververica.cdc.connectors.mysql.source.utils.RecordUtils; import io.debezium.connector.base.ChangeEventQueue; import io.debezium.connector.mysql.MySqlStreamingChangeEventSourceMetrics; import io.debezium.pipeline.DataChangeEvent; @@ -60,14 +60,6 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getBinlogPosition; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getSplitKey; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getStructContainsChunkKey; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getTableId; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isDataChangeRecord; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isSchemaChangeEvent; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isTableChangeRecord; - /** * A Debezium binlog reader implementation that also support reads binlog and filter overlapping * snapshot data that {@link SnapshotSplitReader} read. @@ -220,9 +212,9 @@ public class BinlogSplitReader implements DebeziumReader */ private boolean shouldEmit(SourceRecord sourceRecord) { - if (isDataChangeRecord(sourceRecord)) { - TableId tableId = getTableId(sourceRecord); - BinlogOffset position = getBinlogPosition(sourceRecord); + if (RecordUtils.isDataChangeRecord(sourceRecord)) { + TableId tableId = RecordUtils.getTableId(sourceRecord); + BinlogOffset position = RecordUtils.getBinlogPosition(sourceRecord); if (hasEnterPureBinlogPhase(tableId, position)) { return true; } @@ -234,9 +226,9 @@ public class BinlogSplitReader implements DebeziumReader normalizedRecords = new ArrayList<>(); normalizedRecords.add(lowWatermark); normalizedRecords.addAll( - formatMessageTimestamp( + RecordUtils.formatMessageTimestamp( snapshotRecords.values().stream() .flatMap(Collection::stream) .collect(Collectors.toList()))); @@ -359,8 +354,8 @@ public class SnapshotSplitReader implements DebeziumReader { @@ -153,7 +153,7 @@ public class MySqlSnapshotSplitReadTask if (hooks.getPreLowWatermarkAction() != null) { hooks.getPreLowWatermarkAction().accept(jdbcConnection, snapshotSplit); } - final BinlogOffset lowWatermark = currentBinlogOffset(jdbcConnection); + final BinlogOffset lowWatermark = DebeziumUtils.currentBinlogOffset(jdbcConnection); LOG.info( "Snapshot step 1 - Determining low watermark {} for split {}", lowWatermark, @@ -186,7 +186,7 @@ public class MySqlSnapshotSplitReadTask highWatermark = lowWatermark; } else { // Get the current binlog offset as HW - highWatermark = currentBinlogOffset(jdbcConnection); + highWatermark = DebeziumUtils.currentBinlogOffset(jdbcConnection); } LOG.info( diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/task/context/MySqlErrorHandler.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/task/context/MySqlErrorHandler.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/task/context/MySqlErrorHandler.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/task/context/MySqlErrorHandler.java index d32168d86..a0133b548 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/task/context/MySqlErrorHandler.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/task/context/MySqlErrorHandler.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.debezium.task.context; +package org.apache.flink.cdc.connectors.mysql.debezium.task.context; + +import org.apache.flink.cdc.connectors.mysql.debezium.task.context.exception.SchemaOutOfSyncException; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.debezium.task.context.exception.SchemaOutOfSyncException; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; import io.debezium.DebeziumException; import io.debezium.connector.base.ChangeEventQueue; import io.debezium.connector.mysql.MySqlConnector; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/task/context/MySqlTaskContextImpl.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/task/context/MySqlTaskContextImpl.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/task/context/MySqlTaskContextImpl.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/task/context/MySqlTaskContextImpl.java index 2f0b57bcb..4d82e195c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/task/context/MySqlTaskContextImpl.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/task/context/MySqlTaskContextImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.debezium.task.context; +package org.apache.flink.cdc.connectors.mysql.debezium.task.context; import com.github.shyiko.mysql.binlog.BinaryLogClient; import io.debezium.connector.mysql.MySqlConnectorConfig; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/task/context/StatefulTaskContext.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/task/context/StatefulTaskContext.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/task/context/StatefulTaskContext.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/task/context/StatefulTaskContext.java index 1b0ee0900..5fc342a4c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/task/context/StatefulTaskContext.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/task/context/StatefulTaskContext.java @@ -15,16 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.debezium.task.context; +package org.apache.flink.cdc.connectors.mysql.debezium.task.context; + +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.debezium.EmbeddedFlinkDatabaseHistory; +import org.apache.flink.cdc.connectors.mysql.debezium.dispatcher.EventDispatcherImpl; +import org.apache.flink.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; import com.github.shyiko.mysql.binlog.BinaryLogClient; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.debezium.EmbeddedFlinkDatabaseHistory; -import com.ververica.cdc.connectors.mysql.debezium.dispatcher.EventDispatcherImpl; -import com.ververica.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; import io.debezium.connector.AbstractSourceInfo; import io.debezium.connector.base.ChangeEventQueue; import io.debezium.connector.mysql.GtidSet; @@ -61,8 +62,8 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import static com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset.BINLOG_FILENAME_OFFSET_KEY; -import static com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetUtils.initializeEffectiveOffset; +import static org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset.BINLOG_FILENAME_OFFSET_KEY; +import static org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffsetUtils.initializeEffectiveOffset; /** * A stateful task context that contains entries the debezium mysql connector task required. diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/task/context/exception/SchemaOutOfSyncException.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/task/context/exception/SchemaOutOfSyncException.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/task/context/exception/SchemaOutOfSyncException.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/task/context/exception/SchemaOutOfSyncException.java index 7b41a52d3..aa2044348 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/task/context/exception/SchemaOutOfSyncException.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/debezium/task/context/exception/SchemaOutOfSyncException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.debezium.task.context.exception; +package org.apache.flink.cdc.connectors.mysql.debezium.task.context.exception; /** * A wrapper class for clearly show the possible reason of a schema-out-of-sync exception thrown diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/schema/MySqlFieldDefinition.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/schema/MySqlFieldDefinition.java similarity index 89% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/schema/MySqlFieldDefinition.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/schema/MySqlFieldDefinition.java index 3ee8ef4e0..a4cb82e7e 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/schema/MySqlFieldDefinition.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/schema/MySqlFieldDefinition.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.schema; +package org.apache.flink.cdc.connectors.mysql.schema; -import org.apache.commons.lang3.StringUtils; +import org.apache.flink.cdc.connectors.mysql.source.utils.StatementUtils; -import static com.ververica.cdc.connectors.mysql.source.utils.StatementUtils.quote; +import org.apache.commons.lang3.StringUtils; /** used to generate field definition in ddl with "desc table". */ public class MySqlFieldDefinition { @@ -92,6 +92,10 @@ public class MySqlFieldDefinition { } public String toDdl() { - return quote(columnName) + " " + columnType + " " + (nullable ? "" : "NOT NULL"); + return StatementUtils.quote(columnName) + + " " + + columnType + + " " + + (nullable ? "" : "NOT NULL"); } } diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/schema/MySqlSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/schema/MySqlSchema.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/schema/MySqlSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/schema/MySqlSchema.java index 9aa50e220..5cc06625a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/schema/MySqlSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/schema/MySqlSchema.java @@ -15,11 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.schema; +package org.apache.flink.cdc.connectors.mysql.schema; +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.utils.StatementUtils; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; import io.debezium.connector.mysql.MySqlConnectorConfig; import io.debezium.connector.mysql.MySqlDatabaseSchema; import io.debezium.connector.mysql.MySqlOffsetContext; @@ -37,9 +39,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils.createMySqlDatabaseSchema; -import static com.ververica.cdc.connectors.mysql.source.utils.StatementUtils.quote; - /** A component used to get schema by table path. */ public class MySqlSchema implements AutoCloseable { private static final String SHOW_CREATE_TABLE = "SHOW CREATE TABLE "; @@ -51,7 +50,8 @@ public class MySqlSchema implements AutoCloseable { public MySqlSchema(MySqlSourceConfig sourceConfig, boolean isTableIdCaseSensitive) { this.connectorConfig = sourceConfig.getMySqlConnectorConfig(); - this.databaseSchema = createMySqlDatabaseSchema(connectorConfig, isTableIdCaseSensitive); + this.databaseSchema = + DebeziumUtils.createMySqlDatabaseSchema(connectorConfig, isTableIdCaseSensitive); this.schemasByTableId = new HashMap<>(); } @@ -77,11 +77,11 @@ public class MySqlSchema implements AutoCloseable { private TableChange buildTableSchema( MySqlPartition partition, JdbcConnection jdbc, TableId tableId) { final Map tableChangeMap = new HashMap<>(); - String showCreateTable = SHOW_CREATE_TABLE + quote(tableId); + String showCreateTable = SHOW_CREATE_TABLE + StatementUtils.quote(tableId); buildSchemaByShowCreateTable(partition, jdbc, tableId, tableChangeMap); if (!tableChangeMap.containsKey(tableId)) { // fallback to desc table - String descTable = DESC_TABLE + quote(tableId); + String descTable = DESC_TABLE + StatementUtils.quote(tableId); buildSchemaByDescTable(partition, jdbc, descTable, tableId, tableChangeMap); if (!tableChangeMap.containsKey(tableId)) { throw new FlinkRuntimeException( @@ -98,7 +98,7 @@ public class MySqlSchema implements AutoCloseable { JdbcConnection jdbc, TableId tableId, Map tableChangeMap) { - final String sql = SHOW_CREATE_TABLE + quote(tableId); + final String sql = SHOW_CREATE_TABLE + StatementUtils.quote(tableId); try { jdbc.query( sql, diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/schema/MySqlTableDefinition.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/schema/MySqlTableDefinition.java similarity index 89% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/schema/MySqlTableDefinition.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/schema/MySqlTableDefinition.java index 7ccc36c2f..2dc1985ce 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/schema/MySqlTableDefinition.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/schema/MySqlTableDefinition.java @@ -15,18 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.schema; +package org.apache.flink.cdc.connectors.mysql.schema; +import org.apache.flink.cdc.connectors.mysql.source.utils.StatementUtils; import org.apache.flink.util.CollectionUtil; -import com.ververica.cdc.connectors.mysql.source.utils.StatementUtils; import io.debezium.relational.TableId; import java.util.List; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mysql.source.utils.StatementUtils.quote; - /** used to generate table definition in ddl with "desc table". */ public class MySqlTableDefinition { TableId tableId; @@ -45,7 +43,7 @@ public class MySqlTableDefinition { public String toDdl() { return String.format( "CREATE TABLE %s (\n\t %s %s );", - quote(tableId), fieldDefinitions(), pkDefinition()); + StatementUtils.quote(tableId), fieldDefinitions(), pkDefinition()); } private String fieldDefinitions() { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/schema/MySqlTypeUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/schema/MySqlTypeUtils.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/schema/MySqlTypeUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/schema/MySqlTypeUtils.java index cc4928406..577632852 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/schema/MySqlTypeUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/schema/MySqlTypeUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.schema; +package org.apache.flink.cdc.connectors.mysql.schema; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSource.java similarity index 82% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSource.java index 9dd7db6a5..47c3af92b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSource.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.connector.source.Boundedness; @@ -25,6 +25,32 @@ import org.apache.flink.api.connector.source.SourceReaderContext; import org.apache.flink.api.connector.source.SplitEnumerator; import org.apache.flink.api.connector.source.SplitEnumeratorContext; import org.apache.flink.api.java.typeutils.ResultTypeQueryable; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.VisibleForTesting; +import org.apache.flink.cdc.connectors.mysql.MySqlValidator; +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlBinlogSplitAssigner; +import org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlHybridSplitAssigner; +import org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlSplitAssigner; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.BinlogPendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.HybridPendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.PendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.PendingSplitsStateSerializer; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; +import org.apache.flink.cdc.connectors.mysql.source.metrics.MySqlSourceReaderMetrics; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlRecordEmitter; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSourceReader; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSourceReaderContext; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSplitReader; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplitSerializer; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplitState; +import org.apache.flink.cdc.connectors.mysql.source.split.SourceRecords; +import org.apache.flink.cdc.connectors.mysql.source.utils.hooks.SnapshotPhaseHooks; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; import org.apache.flink.connector.base.source.reader.RecordEmitter; import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds; import org.apache.flink.connector.base.source.reader.synchronization.FutureCompletingBlockingQueue; @@ -32,32 +58,6 @@ import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.metrics.MetricGroup; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.annotation.VisibleForTesting; -import com.ververica.cdc.connectors.mysql.MySqlValidator; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.source.assigners.MySqlBinlogSplitAssigner; -import com.ververica.cdc.connectors.mysql.source.assigners.MySqlHybridSplitAssigner; -import com.ververica.cdc.connectors.mysql.source.assigners.MySqlSplitAssigner; -import com.ververica.cdc.connectors.mysql.source.assigners.state.BinlogPendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.assigners.state.HybridPendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.assigners.state.PendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.assigners.state.PendingSplitsStateSerializer; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; -import com.ververica.cdc.connectors.mysql.source.metrics.MySqlSourceReaderMetrics; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlRecordEmitter; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSourceReader; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSourceReaderContext; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSplitReader; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplitSerializer; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplitState; -import com.ververica.cdc.connectors.mysql.source.split.SourceRecords; -import com.ververica.cdc.connectors.mysql.source.utils.hooks.SnapshotPhaseHooks; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; import io.debezium.jdbc.JdbcConnection; import java.io.Serializable; @@ -65,8 +65,6 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.function.Supplier; -import static com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils.openJdbcConnection; - /** * The MySQL CDC Source based on FLIP-27 and Watermark Signal Algorithm which supports parallel * reading snapshot of table and then continue to capture data change from binlog. @@ -203,7 +201,7 @@ public class MySqlSource final MySqlSplitAssigner splitAssigner; if (!sourceConfig.getStartupOptions().isStreamOnly()) { - try (JdbcConnection jdbc = openJdbcConnection(sourceConfig)) { + try (JdbcConnection jdbc = DebeziumUtils.openJdbcConnection(sourceConfig)) { boolean isTableIdCaseSensitive = DebeziumUtils.isTableIdCaseSensitive(jdbc); splitAssigner = new MySqlHybridSplitAssigner( diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlSourceBuilder.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSourceBuilder.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlSourceBuilder.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSourceBuilder.java index 0565299ce..c03aa36b0 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/MySqlSourceBuilder.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSourceBuilder.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; import org.apache.flink.table.catalog.ObjectPath; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; - import java.time.Duration; import java.util.Properties; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/AssignerStatus.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/AssignerStatus.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/AssignerStatus.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/AssignerStatus.java index bfcc0e4b3..72615d81a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/AssignerStatus.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/AssignerStatus.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners; +package org.apache.flink.cdc.connectors.mysql.source.assigners; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/ChunkRange.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/ChunkRange.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/ChunkRange.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/ChunkRange.java index 9ec1e36ce..ff2affe28 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/ChunkRange.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/ChunkRange.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners; +package org.apache.flink.cdc.connectors.mysql.source.assigners; import javax.annotation.Nullable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/ChunkSplitter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/ChunkSplitter.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/ChunkSplitter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/ChunkSplitter.java index 4863b5666..5638f91a7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/ChunkSplitter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/ChunkSplitter.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners; +package org.apache.flink.cdc.connectors.mysql.source.assigners; import org.apache.flink.api.common.state.CheckpointListener; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.ChunkSplitterState; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.assigners.state.ChunkSplitterState; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; import io.debezium.connector.mysql.MySqlPartition; import io.debezium.relational.TableId; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssigner.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssigner.java similarity index 86% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssigner.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssigner.java index 7b5b2a609..dd80e23b8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssigner.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssigner.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners; - +package org.apache.flink.cdc.connectors.mysql.source.assigners; + +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.BinlogPendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.PendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; import org.apache.flink.util.CollectionUtil; -import com.ververica.cdc.connectors.mysql.source.assigners.state.BinlogPendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.assigners.state.PendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlChunkSplitter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlChunkSplitter.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlChunkSplitter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlChunkSplitter.java index dc5117f93..ec0bab77f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlChunkSplitter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlChunkSplitter.java @@ -15,21 +15,23 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners; - +package org.apache.flink.cdc.connectors.mysql.source.assigners; + +import org.apache.flink.cdc.common.annotation.VisibleForTesting; +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.schema.MySqlSchema; +import org.apache.flink.cdc.connectors.mysql.schema.MySqlTypeUtils; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.ChunkSplitterState; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.utils.ChunkUtils; +import org.apache.flink.cdc.connectors.mysql.source.utils.ObjectUtils; +import org.apache.flink.cdc.connectors.mysql.source.utils.StatementUtils; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.LogicalTypeRoot; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.Preconditions; -import com.ververica.cdc.common.annotation.VisibleForTesting; -import com.ververica.cdc.connectors.mysql.schema.MySqlSchema; -import com.ververica.cdc.connectors.mysql.schema.MySqlTypeUtils; -import com.ververica.cdc.connectors.mysql.source.assigners.state.ChunkSplitterState; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.utils.ChunkUtils; -import com.ververica.cdc.connectors.mysql.source.utils.ObjectUtils; import io.debezium.connector.mysql.MySqlPartition; import io.debezium.jdbc.JdbcConnection; import io.debezium.relational.Column; @@ -51,12 +53,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import static com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils.openJdbcConnection; -import static com.ververica.cdc.connectors.mysql.source.utils.ObjectUtils.doubleCompare; -import static com.ververica.cdc.connectors.mysql.source.utils.StatementUtils.queryApproximateRowCnt; -import static com.ververica.cdc.connectors.mysql.source.utils.StatementUtils.queryMin; -import static com.ververica.cdc.connectors.mysql.source.utils.StatementUtils.queryMinMax; -import static com.ververica.cdc.connectors.mysql.source.utils.StatementUtils.queryNextChunkMax; import static java.math.BigDecimal.ROUND_CEILING; /** The {@link ChunkSplitter} implementation for MySQL. */ @@ -110,7 +106,7 @@ public class MySqlChunkSplitter implements ChunkSplitter { @Override public void open() { - this.jdbcConnection = openJdbcConnection(sourceConfig); + this.jdbcConnection = DebeziumUtils.openJdbcConnection(sourceConfig); } @Override @@ -153,8 +149,9 @@ public class MySqlChunkSplitter implements ChunkSplitter { ChunkUtils.getChunkKeyColumn( currentSplittingTable, sourceConfig.getChunkKeyColumns()); splitType = ChunkUtils.getChunkKeyColumnType(splitColumn); - minMaxOfSplitColumn = queryMinMax(jdbcConnection, tableId, splitColumn.name()); - approximateRowCnt = queryApproximateRowCnt(jdbcConnection, tableId); + minMaxOfSplitColumn = + StatementUtils.queryMinMax(jdbcConnection, tableId, splitColumn.name()); + approximateRowCnt = StatementUtils.queryApproximateRowCnt(jdbcConnection, tableId); } catch (Exception e) { throw new RuntimeException("Fail to analyze table in chunk splitter.", e); } @@ -332,11 +329,12 @@ public class MySqlChunkSplitter implements ChunkSplitter { throws SQLException { // chunk end might be null when max values are removed Object chunkEnd = - queryNextChunkMax(jdbc, tableId, splitColumnName, chunkSize, previousChunkEnd); + StatementUtils.queryNextChunkMax( + jdbc, tableId, splitColumnName, chunkSize, previousChunkEnd); if (Objects.equals(previousChunkEnd, chunkEnd)) { // we don't allow equal chunk start and end, // should query the next one larger than chunkEnd - chunkEnd = queryMin(jdbc, tableId, splitColumnName, chunkEnd); + chunkEnd = StatementUtils.queryMin(jdbc, tableId, splitColumnName, chunkEnd); // queryMin will return null when the chunkEnd is the max value, // this will happen when the mysql table ignores the capitalization. @@ -401,8 +399,9 @@ public class MySqlChunkSplitter implements ChunkSplitter { double distributionFactor = calculateDistributionFactor(tableId, min, max, approximateRowCnt); boolean dataIsEvenlyDistributed = - doubleCompare(distributionFactor, distributionFactorLower) >= 0 - && doubleCompare(distributionFactor, distributionFactorUpper) <= 0; + ObjectUtils.doubleCompare(distributionFactor, distributionFactorLower) >= 0 + && ObjectUtils.doubleCompare(distributionFactor, distributionFactorUpper) + <= 0; LOG.info( "The actual distribution factor for table {} is {}, the lower bound of evenly distribution factor is {}, the upper bound of evenly distribution factor is {}", tableId, diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssigner.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssigner.java similarity index 87% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssigner.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssigner.java index bf3ac1263..fb6546879 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssigner.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssigner.java @@ -15,16 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners; - -import com.ververica.cdc.connectors.mysql.source.assigners.state.HybridPendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.assigners.state.PendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSchemalessSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; +package org.apache.flink.cdc.connectors.mysql.source.assigners; + +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.HybridPendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.PendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSchemalessSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; + import io.debezium.relational.TableId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,10 +39,6 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mysql.source.assigners.AssignerStatus.isInitialAssigningFinished; -import static com.ververica.cdc.connectors.mysql.source.assigners.AssignerStatus.isNewlyAddedAssigningFinished; -import static com.ververica.cdc.connectors.mysql.source.assigners.AssignerStatus.isNewlyAddedAssigningSnapshotFinished; - /** * A {@link MySqlSplitAssigner} that splits tables into small chunk splits based on primary key * range and chunk size and also continue with a binlog split. @@ -101,7 +98,7 @@ public class MySqlHybridSplitAssigner implements MySqlSplitAssigner { @Override public Optional getNext() { - if (isNewlyAddedAssigningSnapshotFinished(getAssignerStatus())) { + if (AssignerStatus.isNewlyAddedAssigningSnapshotFinished(getAssignerStatus())) { // do not assign split until the adding table process finished return Optional.empty(); } @@ -110,13 +107,15 @@ public class MySqlHybridSplitAssigner implements MySqlSplitAssigner { if (isBinlogSplitAssigned) { // no more splits for the assigner return Optional.empty(); - } else if (isInitialAssigningFinished(snapshotSplitAssigner.getAssignerStatus())) { + } else if (AssignerStatus.isInitialAssigningFinished( + snapshotSplitAssigner.getAssignerStatus())) { // we need to wait snapshot-assigner to be finished before // assigning the binlog split. Otherwise, records emitted from binlog split // might be out-of-order in terms of same primary key with snapshot splits. isBinlogSplitAssigned = true; return Optional.of(createBinlogSplit()); - } else if (isNewlyAddedAssigningFinished(snapshotSplitAssigner.getAssignerStatus())) { + } else if (AssignerStatus.isNewlyAddedAssigningFinished( + snapshotSplitAssigner.getAssignerStatus())) { // do not need to create binlog, but send event to wake up the binlog reader isBinlogSplitAssigned = true; return Optional.empty(); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssigner.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssigner.java similarity index 89% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssigner.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssigner.java index e56033195..1cefdfe8c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssigner.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssigner.java @@ -15,24 +15,24 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners; - +package org.apache.flink.cdc.connectors.mysql.source.assigners; + +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.schema.MySqlSchema; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.ChunkSplitterState; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.SnapshotPendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSchemalessSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.Preconditions; import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.schema.MySqlSchema; -import com.ververica.cdc.connectors.mysql.source.assigners.state.ChunkSplitterState; -import com.ververica.cdc.connectors.mysql.source.assigners.state.SnapshotPendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSchemalessSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; import io.debezium.connector.mysql.MySqlPartition; import io.debezium.jdbc.JdbcConnection; import io.debezium.relational.TableId; @@ -60,14 +60,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils.discoverCapturedTables; -import static com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils.openJdbcConnection; -import static com.ververica.cdc.connectors.mysql.source.assigners.AssignerStatus.isAssigningFinished; -import static com.ververica.cdc.connectors.mysql.source.assigners.AssignerStatus.isAssigningSnapshotSplits; -import static com.ververica.cdc.connectors.mysql.source.assigners.AssignerStatus.isNewlyAddedAssigningSnapshotFinished; -import static com.ververica.cdc.connectors.mysql.source.assigners.AssignerStatus.isSnapshotAssigningFinished; -import static com.ververica.cdc.connectors.mysql.source.assigners.state.ChunkSplitterState.NO_SPLITTING_TABLE_STATE; - /** * A {@link MySqlSplitAssigner} that splits tables into small chunk splits based on primary key * range and chunk size. @@ -115,7 +107,7 @@ public class MySqlSnapshotSplitAssigner implements MySqlSplitAssigner { remainingTables, isTableIdCaseSensitive, true, - NO_SPLITTING_TABLE_STATE); + ChunkSplitterState.NO_SPLITTING_TABLE_STATE); } public MySqlSnapshotSplitAssigner( @@ -190,8 +182,9 @@ public class MySqlSnapshotSplitAssigner implements MySqlSplitAssigner { if (needToDiscoveryTables()) { long start = System.currentTimeMillis(); LOG.debug("The remainingTables is empty, start to discovery tables"); - try (JdbcConnection jdbc = openJdbcConnection(sourceConfig)) { - final List discoverTables = discoverCapturedTables(jdbc, sourceConfig); + try (JdbcConnection jdbc = DebeziumUtils.openJdbcConnection(sourceConfig)) { + final List discoverTables = + DebeziumUtils.discoverCapturedTables(jdbc, sourceConfig); this.remainingTables.addAll(discoverTables); this.isTableIdCaseSensitive = DebeziumUtils.isTableIdCaseSensitive(jdbc); } catch (Exception e) { @@ -203,9 +196,11 @@ public class MySqlSnapshotSplitAssigner implements MySqlSplitAssigner { } // when restore the job from legacy savepoint, the legacy state may haven't snapshot // remaining tables, discovery remaining table here - else if (!isRemainingTablesCheckpointed && !isSnapshotAssigningFinished(assignerStatus)) { - try (JdbcConnection jdbc = openJdbcConnection(sourceConfig)) { - final List discoverTables = discoverCapturedTables(jdbc, sourceConfig); + else if (!isRemainingTablesCheckpointed + && !AssignerStatus.isSnapshotAssigningFinished(assignerStatus)) { + try (JdbcConnection jdbc = DebeziumUtils.openJdbcConnection(sourceConfig)) { + final List discoverTables = + DebeziumUtils.discoverCapturedTables(jdbc, sourceConfig); discoverTables.removeAll(alreadyProcessedTables); this.remainingTables.addAll(discoverTables); this.isTableIdCaseSensitive = DebeziumUtils.isTableIdCaseSensitive(jdbc); @@ -221,9 +216,9 @@ public class MySqlSnapshotSplitAssigner implements MySqlSplitAssigner { if (sourceConfig.isScanNewlyAddedTableEnabled() && !sourceConfig.getStartupOptions().isSnapshotOnly()) { // check whether we got newly added tables - try (JdbcConnection jdbc = openJdbcConnection(sourceConfig)) { + try (JdbcConnection jdbc = DebeziumUtils.openJdbcConnection(sourceConfig)) { final List currentCapturedTables = - discoverCapturedTables(jdbc, sourceConfig); + DebeziumUtils.discoverCapturedTables(jdbc, sourceConfig); final Set previousCapturedTables = new HashSet<>(); List tablesInRemainingSplits = remainingSplits.stream() @@ -270,7 +265,7 @@ public class MySqlSnapshotSplitAssigner implements MySqlSplitAssigner { // add new tables remainingTables.addAll(newlyAddedTables); - if (isAssigningFinished(assignerStatus)) { + if (AssignerStatus.isAssigningFinished(assignerStatus)) { // start the newly added tables process under binlog reading phase LOG.info( "Found newly added tables, start capture newly added tables process under binlog reading phase"); @@ -399,7 +394,8 @@ public class MySqlSnapshotSplitAssigner implements MySqlSplitAssigner { @Override public void onFinishedSplits(Map splitFinishedOffsets) { this.splitFinishedOffsets.putAll(splitFinishedOffsets); - if (allSnapshotSplitsFinished() && isAssigningSnapshotSplits(assignerStatus)) { + if (allSnapshotSplitsFinished() + && AssignerStatus.isAssigningSnapshotSplits(assignerStatus)) { // Skip the waiting checkpoint when current parallelism is 1 which means we do not need // to care about the global output data order of snapshot splits and binlog split. if (currentParallelism == 1) { @@ -442,7 +438,7 @@ public class MySqlSnapshotSplitAssigner implements MySqlSplitAssigner { // we need a complete checkpoint before mark this assigner to be finished, to wait for // all records of snapshot splits are completely processed if (checkpointIdToFinish == null - && isAssigningSnapshotSplits(assignerStatus) + && AssignerStatus.isAssigningSnapshotSplits(assignerStatus) && allSnapshotSplitsFinished()) { checkpointIdToFinish = checkpointId; } @@ -454,7 +450,7 @@ public class MySqlSnapshotSplitAssigner implements MySqlSplitAssigner { // we have waited for at-least one complete checkpoint after all snapshot-splits are // finished, then we can mark snapshot assigner as finished. if (checkpointIdToFinish != null - && isAssigningSnapshotSplits(assignerStatus) + && AssignerStatus.isAssigningSnapshotSplits(assignerStatus) && allSnapshotSplitsFinished()) { if (checkpointId >= checkpointIdToFinish) { assignerStatus = assignerStatus.onFinish(); @@ -471,14 +467,16 @@ public class MySqlSnapshotSplitAssigner implements MySqlSplitAssigner { @Override public void startAssignNewlyAddedTables() { Preconditions.checkState( - isAssigningFinished(assignerStatus), "Invalid assigner status {}", assignerStatus); + AssignerStatus.isAssigningFinished(assignerStatus), + "Invalid assigner status {}", + assignerStatus); assignerStatus = assignerStatus.startAssignNewlyTables(); } @Override public void onBinlogSplitUpdated() { Preconditions.checkState( - isNewlyAddedAssigningSnapshotFinished(assignerStatus), + AssignerStatus.isNewlyAddedAssigningSnapshotFinished(assignerStatus), "Invalid assigner status {}", assignerStatus); assignerStatus = assignerStatus.onBinlogSplitUpdated(); @@ -593,7 +591,7 @@ public class MySqlSnapshotSplitAssigner implements MySqlSplitAssigner { boolean isTableIdCaseSensitive, ChunkSplitterState chunkSplitterState) { MySqlSchema mySqlSchema = new MySqlSchema(sourceConfig, isTableIdCaseSensitive); - if (!NO_SPLITTING_TABLE_STATE.equals(chunkSplitterState)) { + if (!ChunkSplitterState.NO_SPLITTING_TABLE_STATE.equals(chunkSplitterState)) { TableId tableId = chunkSplitterState.getCurrentSplittingTableId(); return new MySqlChunkSplitter( mySqlSchema, @@ -604,7 +602,7 @@ public class MySqlSnapshotSplitAssigner implements MySqlSplitAssigner { .dataCollectionFilter() .isIncluded(tableId) ? chunkSplitterState - : NO_SPLITTING_TABLE_STATE); + : ChunkSplitterState.NO_SPLITTING_TABLE_STATE); } return new MySqlChunkSplitter(mySqlSchema, sourceConfig); } diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlSplitAssigner.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlSplitAssigner.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlSplitAssigner.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlSplitAssigner.java index ee6ac8a3a..2673d9d7e 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlSplitAssigner.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlSplitAssigner.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners; +package org.apache.flink.cdc.connectors.mysql.source.assigners; import org.apache.flink.api.common.state.CheckpointListener; - -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.mysql.source.assigners.state.PendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.PendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; import java.util.Collection; import java.util.List; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/BinlogPendingSplitsState.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/BinlogPendingSplitsState.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/BinlogPendingSplitsState.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/BinlogPendingSplitsState.java index 8c7577806..162af756e 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/BinlogPendingSplitsState.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/BinlogPendingSplitsState.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners.state; +package org.apache.flink.cdc.connectors.mysql.source.assigners.state; import java.util.Objects; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/ChunkSplitterState.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/ChunkSplitterState.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/ChunkSplitterState.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/ChunkSplitterState.java index 92b15477e..5cbc4891b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/ChunkSplitterState.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/ChunkSplitterState.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners.state; +package org.apache.flink.cdc.connectors.mysql.source.assigners.state; + +import org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlChunkSplitter; -import com.ververica.cdc.connectors.mysql.source.assigners.MySqlChunkSplitter; import io.debezium.relational.TableId; import javax.annotation.Nullable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/HybridPendingSplitsState.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/HybridPendingSplitsState.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/HybridPendingSplitsState.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/HybridPendingSplitsState.java index 073467770..7239d81b2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/HybridPendingSplitsState.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/HybridPendingSplitsState.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners.state; +package org.apache.flink.cdc.connectors.mysql.source.assigners.state; import java.util.Objects; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/PendingSplitsState.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsState.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/PendingSplitsState.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsState.java index 285e44465..8191d347b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/PendingSplitsState.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsState.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners.state; +package org.apache.flink.cdc.connectors.mysql.source.assigners.state; import javax.annotation.Nullable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializer.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializer.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializer.java index 3b2296a4b..2793702e8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializer.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializer.java @@ -15,17 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners.state; - +package org.apache.flink.cdc.connectors.mysql.source.assigners.state; + +import org.apache.flink.cdc.connectors.mysql.source.assigners.AssignerStatus; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSchemalessSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplitSerializer; +import org.apache.flink.cdc.connectors.mysql.source.utils.SerializerUtils; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; -import com.ververica.cdc.connectors.mysql.source.assigners.AssignerStatus; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSchemalessSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; import io.debezium.relational.TableId; import io.debezium.relational.history.TableChanges; @@ -36,14 +38,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.mysql.source.assigners.state.ChunkSplitterState.NO_SPLITTING_TABLE_STATE; -import static com.ververica.cdc.connectors.mysql.source.split.MySqlSplitSerializer.readTableSchemas; -import static com.ververica.cdc.connectors.mysql.source.split.MySqlSplitSerializer.writeTableSchemas; -import static com.ververica.cdc.connectors.mysql.source.utils.SerializerUtils.readBinlogPosition; -import static com.ververica.cdc.connectors.mysql.source.utils.SerializerUtils.rowToSerializedString; -import static com.ververica.cdc.connectors.mysql.source.utils.SerializerUtils.serializedStringToRow; -import static com.ververica.cdc.connectors.mysql.source.utils.SerializerUtils.writeBinlogPosition; - /** * The {@link SimpleVersionedSerializer Serializer} for the {@link PendingSplitsState} of MySQL CDC * source. @@ -164,7 +158,7 @@ public class PendingSplitsStateSerializer implements SimpleVersionedSerializer

(), false, false, - NO_SPLITTING_TABLE_STATE); + ChunkSplitterState.NO_SPLITTING_TABLE_STATE); } private HybridPendingSplitsState deserializeLegacyHybridPendingSplitsState( @@ -286,7 +280,7 @@ public class PendingSplitsStateSerializer implements SimpleVersionedSerializer

= 4) { - tableSchemas.putAll(readTableSchemas(splitVersion, in)); + tableSchemas.putAll(MySqlSplitSerializer.readTableSchemas(splitVersion, in)); } TableId splittingTableId = null; @@ -296,7 +290,7 @@ public class PendingSplitsStateSerializer implements SimpleVersionedSerializer

splitInfo : splitsInfo.entrySet()) { out.writeUTF(splitInfo.getKey()); - writeBinlogPosition(splitInfo.getValue(), out); + SerializerUtils.writeBinlogPosition(splitInfo.getValue(), out); } } @@ -351,7 +345,7 @@ public class PendingSplitsStateSerializer implements SimpleVersionedSerializer

tableList; private String serverTimeZone = ZoneId.systemDefault().getId(); private StartupOptions startupOptions = StartupOptions.initial(); - private int splitSize = SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE.defaultValue(); - private int splitMetaGroupSize = CHUNK_META_GROUP_SIZE.defaultValue(); - private int fetchSize = SCAN_SNAPSHOT_FETCH_SIZE.defaultValue(); - private Duration connectTimeout = CONNECT_TIMEOUT.defaultValue(); - private int connectMaxRetries = CONNECT_MAX_RETRIES.defaultValue(); - private int connectionPoolSize = CONNECTION_POOL_SIZE.defaultValue(); + private int splitSize = MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE.defaultValue(); + private int splitMetaGroupSize = MySqlSourceOptions.CHUNK_META_GROUP_SIZE.defaultValue(); + private int fetchSize = MySqlSourceOptions.SCAN_SNAPSHOT_FETCH_SIZE.defaultValue(); + private Duration connectTimeout = MySqlSourceOptions.CONNECT_TIMEOUT.defaultValue(); + private int connectMaxRetries = MySqlSourceOptions.CONNECT_MAX_RETRIES.defaultValue(); + private int connectionPoolSize = MySqlSourceOptions.CONNECTION_POOL_SIZE.defaultValue(); private double distributionFactorUpper = - CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND.defaultValue(); + MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND.defaultValue(); private double distributionFactorLower = - CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND.defaultValue(); + MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND.defaultValue(); private boolean includeSchemaChanges = false; private boolean scanNewlyAddedTableEnabled = false; private boolean closeIdleReaders = false; private Properties jdbcProperties; - private Duration heartbeatInterval = HEARTBEAT_INTERVAL.defaultValue(); + private Duration heartbeatInterval = MySqlSourceOptions.HEARTBEAT_INTERVAL.defaultValue(); private Properties dbzProperties; private Map chunkKeyColumns = new HashMap<>(); private boolean skipSnapshotBackfill = false; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/config/MySqlSourceOptions.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/config/MySqlSourceOptions.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/config/MySqlSourceOptions.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/config/MySqlSourceOptions.java index 59b708e14..c00f639af 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/config/MySqlSourceOptions.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/config/MySqlSourceOptions.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.config; +package org.apache.flink.cdc.connectors.mysql.source.config; +import org.apache.flink.cdc.common.annotation.Experimental; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSource; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; -import com.ververica.cdc.common.annotation.Experimental; -import com.ververica.cdc.connectors.mysql.source.MySqlSource; - import java.time.Duration; /** Configurations for {@link MySqlSource}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/config/ServerIdRange.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/config/ServerIdRange.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/config/ServerIdRange.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/config/ServerIdRange.java index 7d2a0ef6c..32f0e9e62 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/config/ServerIdRange.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/config/ServerIdRange.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.config; +package org.apache.flink.cdc.connectors.mysql.source.config; import javax.annotation.Nullable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/ConnectionPoolId.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/ConnectionPoolId.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/ConnectionPoolId.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/ConnectionPoolId.java index cb6c92226..16c831b64 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/ConnectionPoolId.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/ConnectionPoolId.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.connection; +package org.apache.flink.cdc.connectors.mysql.source.connection; import java.io.Serializable; import java.util.Objects; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/ConnectionPools.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/ConnectionPools.java similarity index 85% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/ConnectionPools.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/ConnectionPools.java index 82aa3a29b..8a7334800 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/ConnectionPools.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/ConnectionPools.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.connection; +package org.apache.flink.cdc.connectors.mysql.source.connection; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; import com.zaxxer.hikari.HikariDataSource; /** A JDBC connection pools that consists of {@link HikariDataSource}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/JdbcConnectionFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/JdbcConnectionFactory.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/JdbcConnectionFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/JdbcConnectionFactory.java index ceac48420..320c88686 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/JdbcConnectionFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/JdbcConnectionFactory.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.connection; +package org.apache.flink.cdc.connectors.mysql.source.connection; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; import com.zaxxer.hikari.HikariDataSource; import io.debezium.jdbc.JdbcConfiguration; import io.debezium.jdbc.JdbcConnection; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/JdbcConnectionPools.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/JdbcConnectionPools.java similarity index 84% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/JdbcConnectionPools.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/JdbcConnectionPools.java index 3b6769c41..4396156fe 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/JdbcConnectionPools.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/JdbcConnectionPools.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.connection; +package org.apache.flink.cdc.connectors.mysql.source.connection; + +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; import com.zaxxer.hikari.HikariDataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,8 +26,6 @@ import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.Map; -import static com.ververica.cdc.connectors.mysql.source.connection.PooledDataSourceFactory.createPooledDataSource; - /** A Jdbc Connection pools implementation. */ public class JdbcConnectionPools implements ConnectionPools { @@ -47,7 +46,7 @@ public class JdbcConnectionPools implements ConnectionPools { synchronized (pools) { if (!pools.containsKey(poolId)) { LOG.info("Create and register connection pool {}", poolId); - pools.put(poolId, createPooledDataSource(sourceConfig)); + pools.put(poolId, PooledDataSourceFactory.createPooledDataSource(sourceConfig)); } return pools.get(poolId); } diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/PooledDataSourceFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/PooledDataSourceFactory.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/PooledDataSourceFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/PooledDataSourceFactory.java index 809504203..424a17b0f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/connection/PooledDataSourceFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/connection/PooledDataSourceFactory.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.connection; +package org.apache.flink.cdc.connectors.mysql.source.connection; + +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import io.debezium.connector.mysql.MySqlConnectorConfig; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/enumerator/MySqlSourceEnumerator.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/enumerator/MySqlSourceEnumerator.java similarity index 87% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/enumerator/MySqlSourceEnumerator.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/enumerator/MySqlSourceEnumerator.java index 502e6dbf3..a31197805 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/enumerator/MySqlSourceEnumerator.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/enumerator/MySqlSourceEnumerator.java @@ -15,35 +15,35 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.enumerator; +package org.apache.flink.cdc.connectors.mysql.source.enumerator; import org.apache.flink.api.connector.source.Boundedness; import org.apache.flink.api.connector.source.SourceEvent; import org.apache.flink.api.connector.source.SplitEnumerator; import org.apache.flink.api.connector.source.SplitEnumeratorContext; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlHybridSplitAssigner; +import org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlSplitAssigner; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.PendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.events.BinlogSplitAssignedEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.BinlogSplitMetaEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.BinlogSplitMetaRequestEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.BinlogSplitUpdateAckEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.BinlogSplitUpdateRequestEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.FinishedSnapshotSplitsAckEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.FinishedSnapshotSplitsReportEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.FinishedSnapshotSplitsRequestEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.LatestFinishedSplitsNumberEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.LatestFinishedSplitsNumberRequestEvent; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.mysql.source.assigners.MySqlHybridSplitAssigner; -import com.ververica.cdc.connectors.mysql.source.assigners.MySqlSplitAssigner; -import com.ververica.cdc.connectors.mysql.source.assigners.state.PendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.events.BinlogSplitAssignedEvent; -import com.ververica.cdc.connectors.mysql.source.events.BinlogSplitMetaEvent; -import com.ververica.cdc.connectors.mysql.source.events.BinlogSplitMetaRequestEvent; -import com.ververica.cdc.connectors.mysql.source.events.BinlogSplitUpdateAckEvent; -import com.ververica.cdc.connectors.mysql.source.events.BinlogSplitUpdateRequestEvent; -import com.ververica.cdc.connectors.mysql.source.events.FinishedSnapshotSplitsAckEvent; -import com.ververica.cdc.connectors.mysql.source.events.FinishedSnapshotSplitsReportEvent; -import com.ververica.cdc.connectors.mysql.source.events.FinishedSnapshotSplitsRequestEvent; -import com.ververica.cdc.connectors.mysql.source.events.LatestFinishedSplitsNumberEvent; -import com.ververica.cdc.connectors.mysql.source.events.LatestFinishedSplitsNumberRequestEvent; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,7 +57,7 @@ import java.util.Optional; import java.util.TreeSet; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mysql.source.assigners.AssignerStatus.isNewlyAddedAssigningSnapshotFinished; +import static org.apache.flink.cdc.connectors.mysql.source.assigners.AssignerStatus.isNewlyAddedAssigningSnapshotFinished; /** * A MySQL CDC source enumerator that enumerates receive the split request and assign the split to diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitAssignedEvent.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitAssignedEvent.java similarity index 79% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitAssignedEvent.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitAssignedEvent.java index de1e2e460..81b055fab 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitAssignedEvent.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitAssignedEvent.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.events; +package org.apache.flink.cdc.connectors.mysql.source.events; import org.apache.flink.api.connector.source.SourceEvent; - -import com.ververica.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSourceReader; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit; +import org.apache.flink.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSourceReader; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplit; /** * The {@link SourceEvent} that {@link MySqlSourceReader} sends to {@link MySqlSourceEnumerator} to diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitMetaEvent.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitMetaEvent.java similarity index 86% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitMetaEvent.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitMetaEvent.java index 96ca6357b..60688bbd0 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitMetaEvent.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitMetaEvent.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.events; +package org.apache.flink.cdc.connectors.mysql.source.events; import org.apache.flink.api.connector.source.SourceEvent; - -import com.ververica.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSourceReader; -import com.ververica.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; +import org.apache.flink.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSourceReader; +import org.apache.flink.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; import java.util.List; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitMetaRequestEvent.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitMetaRequestEvent.java similarity index 87% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitMetaRequestEvent.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitMetaRequestEvent.java index cde378fd1..d3a2b8f33 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitMetaRequestEvent.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitMetaRequestEvent.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.events; +package org.apache.flink.cdc.connectors.mysql.source.events; import org.apache.flink.api.connector.source.SourceEvent; - -import com.ververica.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSourceReader; +import org.apache.flink.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSourceReader; /** * The {@link SourceEvent} that {@link MySqlSourceReader} sends to {@link MySqlSourceEnumerator} to diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitUpdateAckEvent.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitUpdateAckEvent.java similarity index 84% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitUpdateAckEvent.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitUpdateAckEvent.java index 9e70dbd6e..3652470c0 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitUpdateAckEvent.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitUpdateAckEvent.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.events; +package org.apache.flink.cdc.connectors.mysql.source.events; import org.apache.flink.api.connector.source.SourceEvent; - -import com.ververica.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSourceReader; +import org.apache.flink.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSourceReader; /** * The {@link SourceEvent} that {@link MySqlSourceReader} sends to {@link MySqlSourceEnumerator} to diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitUpdateRequestEvent.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitUpdateRequestEvent.java similarity index 84% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitUpdateRequestEvent.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitUpdateRequestEvent.java index 24a4bb367..77842dca6 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/BinlogSplitUpdateRequestEvent.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/BinlogSplitUpdateRequestEvent.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.events; +package org.apache.flink.cdc.connectors.mysql.source.events; import org.apache.flink.api.connector.source.SourceEvent; - -import com.ververica.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSourceReader; +import org.apache.flink.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSourceReader; /** * The {@link SourceEvent} that {@link MySqlSourceEnumerator} broadcasts to {@link diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsAckEvent.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsAckEvent.java similarity index 87% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsAckEvent.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsAckEvent.java index 710910f1f..89a41b487 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsAckEvent.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsAckEvent.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.events; +package org.apache.flink.cdc.connectors.mysql.source.events; import org.apache.flink.api.connector.source.SourceEvent; - -import com.ververica.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSourceReader; +import org.apache.flink.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSourceReader; import java.util.List; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsReportEvent.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsReportEvent.java similarity index 84% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsReportEvent.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsReportEvent.java index d3533e394..c26d9dff4 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsReportEvent.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsReportEvent.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.events; +package org.apache.flink.cdc.connectors.mysql.source.events; import org.apache.flink.api.connector.source.SourceEvent; - -import com.ververica.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSourceReader; +import org.apache.flink.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSourceReader; import java.util.Map; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsRequestEvent.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsRequestEvent.java similarity index 84% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsRequestEvent.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsRequestEvent.java index 6d5baabb0..097f1cb79 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsRequestEvent.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/FinishedSnapshotSplitsRequestEvent.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.events; +package org.apache.flink.cdc.connectors.mysql.source.events; import org.apache.flink.api.connector.source.SourceEvent; - -import com.ververica.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSourceReader; +import org.apache.flink.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSourceReader; /** * The {@link SourceEvent} that {@link MySqlSourceEnumerator} sends to {@link MySqlSourceReader} to diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberEvent.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberEvent.java similarity index 88% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberEvent.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberEvent.java index cf49f5029..acd440846 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberEvent.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberEvent.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.events; +package org.apache.flink.cdc.connectors.mysql.source.events; import org.apache.flink.api.connector.source.SourceEvent; - -import com.ververica.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSourceReader; +import org.apache.flink.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSourceReader; /** * The {@link SourceEvent} that {@link MySqlSourceEnumerator} sends to {@link MySqlSourceReader} to diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberRequestEvent.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberRequestEvent.java similarity index 84% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberRequestEvent.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberRequestEvent.java index 6e7a87ec2..2032e5ea7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberRequestEvent.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/events/LatestFinishedSplitsNumberRequestEvent.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.events; +package org.apache.flink.cdc.connectors.mysql.source.events; import org.apache.flink.api.connector.source.SourceEvent; - -import com.ververica.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSourceReader; +import org.apache.flink.cdc.connectors.mysql.source.enumerator.MySqlSourceEnumerator; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSourceReader; /** * The {@link SourceEvent} that {@link MySqlSourceReader} sends to {@link MySqlSourceEnumerator} to diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/metrics/MySqlSourceReaderMetrics.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/metrics/MySqlSourceReaderMetrics.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/metrics/MySqlSourceReaderMetrics.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/metrics/MySqlSourceReaderMetrics.java index e75c0b1a5..d435e9393 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/metrics/MySqlSourceReaderMetrics.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/metrics/MySqlSourceReaderMetrics.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.metrics; +package org.apache.flink.cdc.connectors.mysql.source.metrics; +import org.apache.flink.cdc.connectors.mysql.source.reader.MySqlSourceReader; import org.apache.flink.metrics.Gauge; import org.apache.flink.metrics.MetricGroup; import org.apache.flink.runtime.metrics.MetricNames; -import com.ververica.cdc.connectors.mysql.source.reader.MySqlSourceReader; - /** A collection class for handling metrics in {@link MySqlSourceReader}. */ public class MySqlSourceReaderMetrics { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffset.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffset.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffset.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffset.java index bdf240425..af7948ac9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffset.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffset.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.offset; +package org.apache.flink.cdc.connectors.mysql.source.offset; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.annotation.VisibleForTesting; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.annotation.VisibleForTesting; import io.debezium.connector.mysql.GtidSet; import org.apache.commons.lang3.StringUtils; import org.apache.kafka.connect.errors.ConnectException; @@ -30,11 +31,6 @@ import java.io.Serializable; import java.util.Map; import java.util.Objects; -import static com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetKind.EARLIEST; -import static com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetKind.LATEST; -import static com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetKind.NON_STOPPING; -import static com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetKind.TIMESTAMP; - /** * A structure describes a fine grained offset in a binlog event including binlog position and gtid * set etc. @@ -79,22 +75,25 @@ public class BinlogOffset implements Comparable, Serializable { /** Create offset which represents the earliest accessible binlog offset. */ public static BinlogOffset ofEarliest() { - return builder().setOffsetKind(EARLIEST).build(); + return builder().setOffsetKind(BinlogOffsetKind.EARLIEST).build(); } /** Create offset which represents the latest offset at the point of access. */ public static BinlogOffset ofLatest() { - return builder().setOffsetKind(LATEST).build(); + return builder().setOffsetKind(BinlogOffsetKind.LATEST).build(); } /** Create offset specified by a timestamp in second. */ public static BinlogOffset ofTimestampSec(long timestampSec) { - return builder().setOffsetKind(TIMESTAMP).setTimestampSec(timestampSec).build(); + return builder() + .setOffsetKind(BinlogOffsetKind.TIMESTAMP) + .setTimestampSec(timestampSec) + .build(); } @Internal public static BinlogOffset ofNonStopping() { - return builder().setOffsetKind(NON_STOPPING).build(); + return builder().setOffsetKind(BinlogOffsetKind.NON_STOPPING).build(); } @VisibleForTesting @@ -172,13 +171,14 @@ public class BinlogOffset implements Comparable, Serializable { @Override public int compareTo(BinlogOffset that) { // the NON_STOPPING is the max offset - if (that.getOffsetKind() == NON_STOPPING && this.getOffsetKind() == NON_STOPPING) { + if (that.getOffsetKind() == BinlogOffsetKind.NON_STOPPING + && this.getOffsetKind() == BinlogOffsetKind.NON_STOPPING) { return 0; } - if (this.getOffsetKind() == NON_STOPPING) { + if (this.getOffsetKind() == BinlogOffsetKind.NON_STOPPING) { return 1; } - if (that.getOffsetKind() == NON_STOPPING) { + if (that.getOffsetKind() == BinlogOffsetKind.NON_STOPPING) { return -1; } diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffsetBuilder.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffsetBuilder.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffsetBuilder.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffsetBuilder.java index 1ec6b5953..efe7f54e2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffsetBuilder.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffsetBuilder.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.offset; +package org.apache.flink.cdc.connectors.mysql.source.offset; import java.util.HashMap; import java.util.Map; -import static com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetKind.EARLIEST; -import static com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetKind.NON_STOPPING; +import static org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffsetKind.EARLIEST; +import static org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffsetKind.NON_STOPPING; import static org.apache.flink.util.Preconditions.checkArgument; /** Builder for {@link BinlogOffset}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffsetKind.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffsetKind.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffsetKind.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffsetKind.java index ca62989dc..1517a4620 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffsetKind.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffsetKind.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.offset; +package org.apache.flink.cdc.connectors.mysql.source.offset; /** * Predefined kind of binlog offset. diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffsetSerializer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffsetSerializer.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffsetSerializer.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffsetSerializer.java index 524e8cbb0..84ace131f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffsetSerializer.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffsetSerializer.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.offset; +package org.apache.flink.cdc.connectors.mysql.source.offset; -import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.flink.cdc.common.annotation.Internal; -import com.ververica.cdc.common.annotation.Internal; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.util.Map; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffsetUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffsetUtils.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffsetUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffsetUtils.java index 402f6bdbb..ce82d6a1b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/offset/BinlogOffsetUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/offset/BinlogOffsetUtils.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.offset; +package org.apache.flink.cdc.connectors.mysql.source.offset; + +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.debezium.task.context.StatefulTaskContext; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.debezium.task.context.StatefulTaskContext; import io.debezium.connector.mysql.MySqlConnection; /** Utils for handling {@link BinlogOffset}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlRecordEmitter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlRecordEmitter.java similarity index 71% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlRecordEmitter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlRecordEmitter.java index 6179e7d92..cb05d85f5 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlRecordEmitter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlRecordEmitter.java @@ -15,18 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.reader; +package org.apache.flink.cdc.connectors.mysql.source.reader; import org.apache.flink.api.connector.source.SourceOutput; +import org.apache.flink.cdc.connectors.mysql.source.metrics.MySqlSourceReaderMetrics; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplitState; +import org.apache.flink.cdc.connectors.mysql.source.split.SourceRecords; +import org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.history.FlinkJsonTableChangeSerializer; import org.apache.flink.connector.base.source.reader.RecordEmitter; import org.apache.flink.util.Collector; -import com.ververica.cdc.connectors.mysql.source.metrics.MySqlSourceReaderMetrics; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplitState; -import com.ververica.cdc.connectors.mysql.source.split.SourceRecords; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.history.FlinkJsonTableChangeSerializer; import io.debezium.document.Array; import io.debezium.relational.history.HistoryRecord; import io.debezium.relational.history.TableChanges; @@ -36,17 +37,6 @@ import org.slf4j.LoggerFactory; import java.util.Iterator; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getBinlogPosition; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getFetchTimestamp; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getHistoryRecord; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getMessageTimestamp; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getWatermark; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isDataChangeRecord; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isHeartbeatEvent; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isHighWatermarkEvent; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isSchemaChangeEvent; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isWatermarkEvent; - /** * The {@link RecordEmitter} implementation for {@link MySqlSourceReader}. * @@ -87,13 +77,13 @@ public class MySqlRecordEmitter implements RecordEmitter output, MySqlSplitState splitState) throws Exception { - if (isWatermarkEvent(element)) { - BinlogOffset watermark = getWatermark(element); - if (isHighWatermarkEvent(element) && splitState.isSnapshotSplitState()) { + if (RecordUtils.isWatermarkEvent(element)) { + BinlogOffset watermark = RecordUtils.getWatermark(element); + if (RecordUtils.isHighWatermarkEvent(element) && splitState.isSnapshotSplitState()) { splitState.asSnapshotSplitState().setHighWatermark(watermark); } - } else if (isSchemaChangeEvent(element) && splitState.isBinlogSplitState()) { - HistoryRecord historyRecord = getHistoryRecord(element); + } else if (RecordUtils.isSchemaChangeEvent(element) && splitState.isBinlogSplitState()) { + HistoryRecord historyRecord = RecordUtils.getHistoryRecord(element); Array tableChanges = historyRecord.document().getArray(HistoryRecord.Fields.TABLE_CHANGES); TableChanges changes = TABLE_CHANGE_SERIALIZER.deserialize(tableChanges, true); @@ -101,15 +91,15 @@ public class MySqlRecordEmitter implements RecordEmitter implements RecordEmitter implements RecordEmitter 0L) { // report fetch delay - Long fetchTimestamp = getFetchTimestamp(element); + Long fetchTimestamp = RecordUtils.getFetchTimestamp(element); if (fetchTimestamp != null && fetchTimestamp >= messageTimestamp) { // report fetch delay sourceReaderMetrics.recordFetchDelay(fetchTimestamp - messageTimestamp); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSourceReader.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlSourceReader.java similarity index 89% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSourceReader.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlSourceReader.java index 4df627550..6df83a648 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSourceReader.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlSourceReader.java @@ -15,9 +15,33 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.reader; +package org.apache.flink.cdc.connectors.mysql.source.reader; import org.apache.flink.api.connector.source.SourceEvent; +import org.apache.flink.cdc.common.annotation.VisibleForTesting; +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.events.BinlogSplitAssignedEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.BinlogSplitMetaEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.BinlogSplitMetaRequestEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.BinlogSplitUpdateAckEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.BinlogSplitUpdateRequestEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.FinishedSnapshotSplitsAckEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.FinishedSnapshotSplitsReportEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.FinishedSnapshotSplitsRequestEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.LatestFinishedSplitsNumberEvent; +import org.apache.flink.cdc.connectors.mysql.source.events.LatestFinishedSplitsNumberRequestEvent; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplitState; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSnapshotSplitState; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplitState; +import org.apache.flink.cdc.connectors.mysql.source.split.SourceRecords; +import org.apache.flink.cdc.connectors.mysql.source.utils.ChunkUtils; +import org.apache.flink.cdc.connectors.mysql.source.utils.TableDiscoveryUtils; import org.apache.flink.configuration.Configuration; import org.apache.flink.connector.base.source.reader.RecordEmitter; import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds; @@ -27,29 +51,6 @@ import org.apache.flink.connector.base.source.reader.synchronization.FutureCompl import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.Preconditions; -import com.ververica.cdc.common.annotation.VisibleForTesting; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.events.BinlogSplitAssignedEvent; -import com.ververica.cdc.connectors.mysql.source.events.BinlogSplitMetaEvent; -import com.ververica.cdc.connectors.mysql.source.events.BinlogSplitMetaRequestEvent; -import com.ververica.cdc.connectors.mysql.source.events.BinlogSplitUpdateAckEvent; -import com.ververica.cdc.connectors.mysql.source.events.BinlogSplitUpdateRequestEvent; -import com.ververica.cdc.connectors.mysql.source.events.FinishedSnapshotSplitsAckEvent; -import com.ververica.cdc.connectors.mysql.source.events.FinishedSnapshotSplitsReportEvent; -import com.ververica.cdc.connectors.mysql.source.events.FinishedSnapshotSplitsRequestEvent; -import com.ververica.cdc.connectors.mysql.source.events.LatestFinishedSplitsNumberEvent; -import com.ververica.cdc.connectors.mysql.source.events.LatestFinishedSplitsNumberRequestEvent; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplitState; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSnapshotSplitState; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplitState; -import com.ververica.cdc.connectors.mysql.source.split.SourceRecords; -import com.ververica.cdc.connectors.mysql.source.utils.TableDiscoveryUtils; import io.debezium.connector.mysql.MySqlConnection; import io.debezium.connector.mysql.MySqlPartition; import io.debezium.relational.TableId; @@ -68,12 +69,7 @@ import java.util.Set; import java.util.function.Supplier; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mysql.source.assigners.MySqlBinlogSplitAssigner.BINLOG_SPLIT_ID; -import static com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit.filterOutdatedSplitInfos; -import static com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit.toNormalBinlogSplit; -import static com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit.toSuspendedBinlogSplit; -import static com.ververica.cdc.connectors.mysql.source.utils.ChunkUtils.getNextMetaGroupId; -import static com.ververica.cdc.connectors.mysql.source.utils.TableDiscoveryUtils.discoverSchemaForNewAddedTables; +import static org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlBinlogSplitAssigner.BINLOG_SPLIT_ID; /** The source reader for MySQL source splits. */ public class MySqlSourceReader @@ -187,7 +183,8 @@ public class MySqlSourceReader // 2. Binlog reader reaches the ending offset of the split. We need to do // nothing under this case. if (mySqlSourceReaderContext.isBinlogSplitReaderSuspended()) { - suspendedBinlogSplit = toSuspendedBinlogSplit(mySqlSplit.asBinlogSplit()); + suspendedBinlogSplit = + MySqlBinlogSplit.toSuspendedBinlogSplit(mySqlSplit.asBinlogSplit()); LOG.info( "Source reader {} suspended binlog split reader success after the newly added table process, current offset {}", subtaskId, @@ -259,7 +256,7 @@ public class MySqlSourceReader // infos. if (checkTableChangeForBinlogSplit) { binlogSplit = - filterOutdatedSplitInfos( + MySqlBinlogSplit.filterOutdatedSplitInfos( binlogSplit, sourceConfig .getMySqlConnectorConfig() @@ -344,7 +341,7 @@ public class MySqlSourceReader if (suspendedBinlogSplit != null) { final int finishedSplitsSize = sourceEvent.getLatestFinishedSplitsNumber(); final MySqlBinlogSplit binlogSplit = - toNormalBinlogSplit(suspendedBinlogSplit, finishedSplitsSize); + MySqlBinlogSplit.toNormalBinlogSplit(suspendedBinlogSplit, finishedSplitsSize); suspendedBinlogSplit = null; this.addSplits(Collections.singletonList(binlogSplit), false); @@ -382,7 +379,7 @@ public class MySqlSourceReader final String splitId = binlogSplit.splitId(); if (!binlogSplit.isCompletedSplit()) { final int nextMetaGroupId = - getNextMetaGroupId( + ChunkUtils.getNextMetaGroupId( binlogSplit.getFinishedSnapshotSplitInfos().size(), sourceConfig.getSplitMetaGroupSize()); BinlogSplitMetaRequestEvent splitMetaRequestEvent = @@ -399,7 +396,7 @@ public class MySqlSourceReader if (binlogSplit != null) { final int receivedMetaGroupId = metadataEvent.getMetaGroupId(); final int expectedMetaGroupId = - getNextMetaGroupId( + ChunkUtils.getNextMetaGroupId( binlogSplit.getFinishedSnapshotSplitInfos().size(), sourceConfig.getSplitMetaGroupSize()); if (receivedMetaGroupId == expectedMetaGroupId) { @@ -457,7 +454,7 @@ public class MySqlSourceReader } else { List existedTables = new ArrayList<>(split.getTableSchemas().keySet()); tableSchemas = - discoverSchemaForNewAddedTables( + TableDiscoveryUtils.discoverSchemaForNewAddedTables( partition, existedTables, sourceConfig, jdbc); LOG.info( "Source reader {} discovers table schema for new added tables of binlog split {} success", diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSourceReaderContext.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlSourceReaderContext.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSourceReaderContext.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlSourceReaderContext.java index b638796f1..83a1d5582 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSourceReaderContext.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlSourceReaderContext.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.reader; +package org.apache.flink.cdc.connectors.mysql.source.reader; import org.apache.flink.api.connector.source.SourceReaderContext; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSplitReader.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlSplitReader.java similarity index 87% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSplitReader.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlSplitReader.java index b3831e653..4a46b7dc3 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSplitReader.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlSplitReader.java @@ -15,26 +15,27 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.reader; +package org.apache.flink.cdc.connectors.mysql.source.reader; +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.debezium.reader.BinlogSplitReader; +import org.apache.flink.cdc.connectors.mysql.debezium.reader.DebeziumReader; +import org.apache.flink.cdc.connectors.mysql.debezium.reader.SnapshotSplitReader; +import org.apache.flink.cdc.connectors.mysql.debezium.task.context.StatefulTaskContext; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSource; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlRecords; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.SourceRecords; +import org.apache.flink.cdc.connectors.mysql.source.utils.hooks.SnapshotPhaseHooks; import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds; import org.apache.flink.connector.base.source.reader.splitreader.SplitReader; import org.apache.flink.connector.base.source.reader.splitreader.SplitsAddition; import org.apache.flink.connector.base.source.reader.splitreader.SplitsChange; import com.github.shyiko.mysql.binlog.BinaryLogClient; -import com.ververica.cdc.connectors.mysql.debezium.reader.BinlogSplitReader; -import com.ververica.cdc.connectors.mysql.debezium.reader.DebeziumReader; -import com.ververica.cdc.connectors.mysql.debezium.reader.SnapshotSplitReader; -import com.ververica.cdc.connectors.mysql.debezium.task.context.StatefulTaskContext; -import com.ververica.cdc.connectors.mysql.source.MySqlSource; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlRecords; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; -import com.ververica.cdc.connectors.mysql.source.split.SourceRecords; -import com.ververica.cdc.connectors.mysql.source.utils.hooks.SnapshotPhaseHooks; import io.debezium.connector.mysql.MySqlConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,9 +48,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import static com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils.createBinaryClient; -import static com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils.createMySqlConnection; -import static com.ververica.cdc.connectors.mysql.source.assigners.MySqlBinlogSplitAssigner.BINLOG_SPLIT_ID; +import static org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlBinlogSplitAssigner.BINLOG_SPLIT_ID; /** The {@link SplitReader} implementation for the {@link MySqlSource}. */ public class MySqlSplitReader implements SplitReader { @@ -234,9 +233,10 @@ public class MySqlSplitReader implements SplitReader private SnapshotSplitReader getSnapshotSplitReader() { if (reusedSnapshotReader == null) { - final MySqlConnection jdbcConnection = createMySqlConnection(sourceConfig); + final MySqlConnection jdbcConnection = + DebeziumUtils.createMySqlConnection(sourceConfig); final BinaryLogClient binaryLogClient = - createBinaryClient(sourceConfig.getDbzConfiguration()); + DebeziumUtils.createBinaryClient(sourceConfig.getDbzConfiguration()); final StatefulTaskContext statefulTaskContext = new StatefulTaskContext(sourceConfig, binaryLogClient, jdbcConnection); reusedSnapshotReader = @@ -247,9 +247,10 @@ public class MySqlSplitReader implements SplitReader private BinlogSplitReader getBinlogSplitReader() { if (reusedBinlogReader == null) { - final MySqlConnection jdbcConnection = createMySqlConnection(sourceConfig); + final MySqlConnection jdbcConnection = + DebeziumUtils.createMySqlConnection(sourceConfig); final BinaryLogClient binaryLogClient = - createBinaryClient(sourceConfig.getDbzConfiguration()); + DebeziumUtils.createBinaryClient(sourceConfig.getDbzConfiguration()); final StatefulTaskContext statefulTaskContext = new StatefulTaskContext(sourceConfig, binaryLogClient, jdbcConnection); reusedBinlogReader = new BinlogSplitReader(statefulTaskContext, subtaskId); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/FinishedSnapshotSplitInfo.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/FinishedSnapshotSplitInfo.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/FinishedSnapshotSplitInfo.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/FinishedSnapshotSplitInfo.java index 8c6020437..1ecb154a8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/FinishedSnapshotSplitInfo.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/FinishedSnapshotSplitInfo.java @@ -15,23 +15,23 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.split; +package org.apache.flink.cdc.connectors.mysql.source.split; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; import io.debezium.relational.TableId; import java.io.IOException; import java.util.Arrays; import java.util.Objects; -import static com.ververica.cdc.connectors.mysql.source.utils.SerializerUtils.readBinlogPosition; -import static com.ververica.cdc.connectors.mysql.source.utils.SerializerUtils.rowToSerializedString; -import static com.ververica.cdc.connectors.mysql.source.utils.SerializerUtils.serializedStringToRow; -import static com.ververica.cdc.connectors.mysql.source.utils.SerializerUtils.writeBinlogPosition; +import static org.apache.flink.cdc.connectors.mysql.source.utils.SerializerUtils.readBinlogPosition; +import static org.apache.flink.cdc.connectors.mysql.source.utils.SerializerUtils.rowToSerializedString; +import static org.apache.flink.cdc.connectors.mysql.source.utils.SerializerUtils.serializedStringToRow; +import static org.apache.flink.cdc.connectors.mysql.source.utils.SerializerUtils.writeBinlogPosition; /** The information used to describe a finished snapshot split. */ public class FinishedSnapshotSplitInfo { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlBinlogSplit.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlBinlogSplit.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlBinlogSplit.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlBinlogSplit.java index 4e95f761c..d67d1989f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlBinlogSplit.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlBinlogSplit.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.split; +package org.apache.flink.cdc.connectors.mysql.source.split; + +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; import io.debezium.relational.TableId; import io.debezium.relational.Tables; import io.debezium.relational.history.TableChanges.TableChange; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlBinlogSplitState.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlBinlogSplitState.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlBinlogSplitState.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlBinlogSplitState.java index 28962e760..a1d5af3dd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlBinlogSplitState.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlBinlogSplitState.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.split; +package org.apache.flink.cdc.connectors.mysql.source.split; + +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; import io.debezium.relational.TableId; import io.debezium.relational.history.TableChanges.TableChange; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlRecords.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlRecords.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlRecords.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlRecords.java index ac8fd2200..9d6192aa5 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlRecords.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlRecords.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.split; +package org.apache.flink.cdc.connectors.mysql.source.split; import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSchemalessSnapshotSplit.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSchemalessSnapshotSplit.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSchemalessSnapshotSplit.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSchemalessSnapshotSplit.java index b88080a2d..a4384f316 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSchemalessSnapshotSplit.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSchemalessSnapshotSplit.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.split; +package org.apache.flink.cdc.connectors.mysql.source.split; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; import io.debezium.relational.TableId; import io.debezium.relational.history.TableChanges.TableChange; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSnapshotSplit.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSnapshotSplit.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSnapshotSplit.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSnapshotSplit.java index 43ceaff38..68b32c04a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSnapshotSplit.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSnapshotSplit.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.split; +package org.apache.flink.cdc.connectors.mysql.source.split; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; import io.debezium.relational.TableId; import io.debezium.relational.history.TableChanges.TableChange; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSnapshotSplitState.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSnapshotSplitState.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSnapshotSplitState.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSnapshotSplitState.java index 272e30ec4..05c0adeed 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSnapshotSplitState.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSnapshotSplitState.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.split; +package org.apache.flink.cdc.connectors.mysql.source.split; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; import javax.annotation.Nullable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplit.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplit.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplit.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplit.java index 3da597cc9..3d5fde38e 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplit.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplit.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.split; +package org.apache.flink.cdc.connectors.mysql.source.split; import org.apache.flink.api.connector.source.SourceSplit; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplitSerializer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplitSerializer.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplitSerializer.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplitSerializer.java index c249da102..75f485ae6 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplitSerializer.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplitSerializer.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.split; +package org.apache.flink.cdc.connectors.mysql.source.split; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.debezium.history.FlinkJsonTableChangeSerializer; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.table.types.logical.utils.LogicalTypeParser; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.debezium.history.FlinkJsonTableChangeSerializer; import io.debezium.document.Document; import io.debezium.document.DocumentReader; import io.debezium.document.DocumentWriter; @@ -39,11 +39,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.mysql.source.utils.SerializerUtils.readBinlogPosition; -import static com.ververica.cdc.connectors.mysql.source.utils.SerializerUtils.rowToSerializedString; -import static com.ververica.cdc.connectors.mysql.source.utils.SerializerUtils.serializedStringToRow; -import static com.ververica.cdc.connectors.mysql.source.utils.SerializerUtils.writeBinlogPosition; -import static com.ververica.cdc.connectors.mysql.source.utils.StatementUtils.quote; +import static org.apache.flink.cdc.connectors.mysql.source.utils.SerializerUtils.readBinlogPosition; +import static org.apache.flink.cdc.connectors.mysql.source.utils.SerializerUtils.rowToSerializedString; +import static org.apache.flink.cdc.connectors.mysql.source.utils.SerializerUtils.serializedStringToRow; +import static org.apache.flink.cdc.connectors.mysql.source.utils.SerializerUtils.writeBinlogPosition; +import static org.apache.flink.cdc.connectors.mysql.source.utils.StatementUtils.quote; /** A serializer for the {@link MySqlSplit}. */ public final class MySqlSplitSerializer implements SimpleVersionedSerializer { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplitState.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplitState.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplitState.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplitState.java index e6a0ee8d1..464cba87b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplitState.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplitState.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.split; +package org.apache.flink.cdc.connectors.mysql.source.split; /** State of the reader, essentially a mutable version of the {@link MySqlSplit}. */ public abstract class MySqlSplitState { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/SourceRecords.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/SourceRecords.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/SourceRecords.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/SourceRecords.java index 8eb84befd..64bf7f431 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/split/SourceRecords.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/split/SourceRecords.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.split; +package org.apache.flink.cdc.connectors.mysql.source.split; import org.apache.kafka.connect.source.SourceRecord; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/ChunkUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/ChunkUtils.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/ChunkUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/ChunkUtils.java index b811a2520..2b40533bb 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/ChunkUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/ChunkUtils.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.utils; +package org.apache.flink.cdc.connectors.mysql.source.utils; +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.schema.MySqlTypeUtils; import org.apache.flink.table.api.ValidationException; import org.apache.flink.table.catalog.ObjectPath; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.Preconditions; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.schema.MySqlTypeUtils; import io.debezium.relational.Column; import io.debezium.relational.Table; import io.debezium.relational.TableId; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/EnvironmentUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/EnvironmentUtils.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/EnvironmentUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/EnvironmentUtils.java index b31fe17ba..1c40e02ee 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/EnvironmentUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/EnvironmentUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.utils; +package org.apache.flink.cdc.connectors.mysql.source.utils; import org.apache.flink.runtime.util.EnvironmentInformation; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/ObjectUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/ObjectUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/ObjectUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/ObjectUtils.java index 494acaf43..a3a7281a8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/ObjectUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/ObjectUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.utils; +package org.apache.flink.cdc.connectors.mysql.source.utils; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/RecordUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/RecordUtils.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/RecordUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/RecordUtils.java index 0adc66238..8a3a904f9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/RecordUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/RecordUtils.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.utils; - +package org.apache.flink.cdc.connectors.mysql.source.utils; + +import org.apache.flink.cdc.common.utils.StringUtils; +import org.apache.flink.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher.WatermarkKind; +import org.apache.flink.cdc.connectors.mysql.debezium.reader.DebeziumReader; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.common.utils.StringUtils; -import com.ververica.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher.WatermarkKind; -import com.ververica.cdc.connectors.mysql.debezium.reader.DebeziumReader; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; import io.debezium.data.Envelope; import io.debezium.document.DocumentReader; import io.debezium.relational.TableId; @@ -52,12 +52,12 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mysql.debezium.dispatcher.EventDispatcherImpl.HISTORY_RECORD_FIELD; -import static com.ververica.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher.SIGNAL_EVENT_VALUE_SCHEMA_NAME; -import static com.ververica.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher.SPLIT_ID_KEY; -import static com.ververica.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher.WATERMARK_KIND; import static io.debezium.connector.AbstractSourceInfo.DATABASE_NAME_KEY; import static io.debezium.connector.AbstractSourceInfo.TABLE_NAME_KEY; +import static org.apache.flink.cdc.connectors.mysql.debezium.dispatcher.EventDispatcherImpl.HISTORY_RECORD_FIELD; +import static org.apache.flink.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher.SIGNAL_EVENT_VALUE_SCHEMA_NAME; +import static org.apache.flink.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher.SPLIT_ID_KEY; +import static org.apache.flink.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher.WATERMARK_KIND; /** Utility class to deal record. */ public class RecordUtils { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/SerializerUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/SerializerUtils.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/SerializerUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/SerializerUtils.java index 7ddcb357e..b5d82aca1 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/SerializerUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/SerializerUtils.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.utils; +package org.apache.flink.cdc.connectors.mysql.source.utils; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffsetKind; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffsetSerializer; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetKind; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetSerializer; import io.debezium.DebeziumException; import io.debezium.util.HexConverter; import org.apache.commons.lang3.StringUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/StatementUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/StatementUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/StatementUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/StatementUtils.java index a625136b7..64787eb9a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/StatementUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/StatementUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.utils; +package org.apache.flink.cdc.connectors.mysql.source.utils; import org.apache.flink.table.types.logical.RowType; @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.Optional; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.rowToArray; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.rowToArray; /** Utils to prepare SQL statement. */ public class StatementUtils { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/TableDiscoveryUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/TableDiscoveryUtils.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/TableDiscoveryUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/TableDiscoveryUtils.java index c5f817404..c7b74b654 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/TableDiscoveryUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/TableDiscoveryUtils.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.utils; +package org.apache.flink.cdc.connectors.mysql.source.utils; +import org.apache.flink.cdc.connectors.mysql.schema.MySqlSchema; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.mysql.schema.MySqlSchema; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; import io.debezium.connector.mysql.MySqlConnection; import io.debezium.connector.mysql.MySqlPartition; import io.debezium.jdbc.JdbcConnection; @@ -37,8 +37,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mysql.source.utils.StatementUtils.quote; - /** Utilities to discovery matched tables. */ public class TableDiscoveryUtils { @@ -77,7 +75,9 @@ public class TableDiscoveryUtils { for (String dbName : databaseNames) { try { jdbc.query( - "SHOW FULL TABLES IN " + quote(dbName) + " where Table_Type = 'BASE TABLE'", + "SHOW FULL TABLES IN " + + StatementUtils.quote(dbName) + + " where Table_Type = 'BASE TABLE'", rs -> { while (rs.next()) { TableId tableId = new TableId(dbName, null, rs.getString(1)); diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/VersionComparable.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/VersionComparable.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/VersionComparable.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/VersionComparable.java index 540f1816f..673046110 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/VersionComparable.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/VersionComparable.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.utils; +package org.apache.flink.cdc.connectors.mysql.source.utils; /** Used to compare version numbers at runtime. */ public class VersionComparable implements Comparable { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHook.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHook.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHook.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHook.java index 020a1f349..44eab2e8e 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHook.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHook.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.utils.hooks; +package org.apache.flink.cdc.connectors.mysql.source.utils.hooks; import org.apache.flink.annotation.Internal; import org.apache.flink.api.connector.source.SourceSplit; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHooks.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHooks.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHooks.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHooks.java index cbdd2f71e..e67db30f2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHooks.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/source/utils/hooks/SnapshotPhaseHooks.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.utils.hooks; +package org.apache.flink.cdc.connectors.mysql.source.utils.hooks; import javax.annotation.Nullable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/MySqlDeserializationConverterFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/MySqlDeserializationConverterFactory.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/MySqlDeserializationConverterFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/MySqlDeserializationConverterFactory.java index ce076be56..ff5f69a06 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/MySqlDeserializationConverterFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/MySqlDeserializationConverterFactory.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.table; +package org.apache.flink.cdc.connectors.mysql.table; +import org.apache.flink.cdc.debezium.table.DeserializationRuntimeConverter; +import org.apache.flink.cdc.debezium.table.DeserializationRuntimeConverterFactory; import org.apache.flink.table.data.GenericArrayData; import org.apache.flink.table.data.StringData; import org.apache.flink.table.types.logical.ArrayType; @@ -27,8 +29,6 @@ import com.esri.core.geometry.ogc.OGCGeometry; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; -import com.ververica.cdc.debezium.table.DeserializationRuntimeConverter; -import com.ververica.cdc.debezium.table.DeserializationRuntimeConverterFactory; import io.debezium.data.EnumSet; import io.debezium.data.geometry.Geometry; import io.debezium.data.geometry.Point; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/MySqlReadableMetadata.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/MySqlReadableMetadata.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/MySqlReadableMetadata.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/MySqlReadableMetadata.java index 8ba91e959..68a3614c4 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/MySqlReadableMetadata.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/MySqlReadableMetadata.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.table; +package org.apache.flink.cdc.connectors.mysql.table; +import org.apache.flink.cdc.debezium.table.MetadataConverter; +import org.apache.flink.cdc.debezium.table.RowDataMetadataConverter; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.StringData; import org.apache.flink.table.data.TimestampData; import org.apache.flink.table.types.DataType; -import com.ververica.cdc.debezium.table.MetadataConverter; -import com.ververica.cdc.debezium.table.RowDataMetadataConverter; import io.debezium.connector.AbstractSourceInfo; import io.debezium.data.Envelope; import org.apache.kafka.connect.data.Struct; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/MySqlTableSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/MySqlTableSource.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/MySqlTableSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/MySqlTableSource.java index 6226fef88..b07ff073f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/MySqlTableSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/MySqlTableSource.java @@ -15,9 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.table; +package org.apache.flink.cdc.connectors.mysql.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSource; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.table.MetadataConverter; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.catalog.ObjectPath; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.connector.ChangelogMode; @@ -30,12 +35,6 @@ import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.mysql.source.MySqlSource; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.table.MetadataConverter; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; - import javax.annotation.Nullable; import java.time.Duration; @@ -209,8 +208,8 @@ public class MySqlTableSource implements ScanTableSource, SupportsReadingMetadat .build(); return SourceProvider.of(parallelSource); } else { - com.ververica.cdc.connectors.mysql.MySqlSource.Builder builder = - com.ververica.cdc.connectors.mysql.MySqlSource.builder() + org.apache.flink.cdc.connectors.mysql.MySqlSource.Builder builder = + org.apache.flink.cdc.connectors.mysql.MySqlSource.builder() .hostname(hostname) .port(port) .databaseList(database) diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/MySqlTableSourceFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/MySqlTableSourceFactory.java similarity index 55% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/MySqlTableSourceFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/MySqlTableSourceFactory.java index 71768262b..ae8caf285 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/MySqlTableSourceFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/MySqlTableSourceFactory.java @@ -15,8 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.table; - +package org.apache.flink.cdc.connectors.mysql.table; + +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions; +import org.apache.flink.cdc.connectors.mysql.source.config.ServerIdRange; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffsetBuilder; +import org.apache.flink.cdc.connectors.mysql.source.utils.ObjectUtils; +import org.apache.flink.cdc.connectors.mysql.utils.OptionUtils; +import org.apache.flink.cdc.debezium.table.DebeziumOptions; +import org.apache.flink.cdc.debezium.utils.JdbcUrlUtils; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.ReadableConfig; @@ -27,13 +35,6 @@ import org.apache.flink.table.connector.source.DynamicTableSource; import org.apache.flink.table.factories.DynamicTableSourceFactory; import org.apache.flink.table.factories.FactoryUtil; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions; -import com.ververica.cdc.connectors.mysql.source.config.ServerIdRange; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetBuilder; -import com.ververica.cdc.connectors.mysql.utils.OptionUtils; -import com.ververica.cdc.debezium.table.DebeziumOptions; -import com.ververica.cdc.debezium.utils.JdbcUrlUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,38 +47,8 @@ import java.util.Optional; import java.util.Set; import java.util.regex.Pattern; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CHUNK_META_GROUP_SIZE; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CONNECTION_POOL_SIZE; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CONNECT_MAX_RETRIES; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CONNECT_TIMEOUT; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.DATABASE_NAME; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.HEARTBEAT_INTERVAL; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.HOSTNAME; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.PASSWORD; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.PORT; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_NEWLY_ADDED_TABLE_ENABLED; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_SNAPSHOT_FETCH_SIZE; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_STARTUP_MODE; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_FILE; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_GTID_SET; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_POS; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_EVENTS; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_ROWS; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_STARTUP_TIMESTAMP_MILLIS; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SERVER_ID; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SERVER_TIME_ZONE; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.TABLE_NAME; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.USERNAME; -import static com.ververica.cdc.connectors.mysql.source.utils.ObjectUtils.doubleCompare; -import static com.ververica.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; -import static com.ververica.cdc.debezium.utils.ResolvedSchemaUtils.getPhysicalSchema; +import static org.apache.flink.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; +import static org.apache.flink.cdc.debezium.utils.ResolvedSchemaUtils.getPhysicalSchema; import static org.apache.flink.util.Preconditions.checkState; /** Factory for creating configured instance of {@link MySqlTableSource}. */ @@ -94,44 +65,52 @@ public class MySqlTableSourceFactory implements DynamicTableSourceFactory { DebeziumOptions.DEBEZIUM_OPTIONS_PREFIX, JdbcUrlUtils.PROPERTIES_PREFIX); final ReadableConfig config = helper.getOptions(); - String hostname = config.get(HOSTNAME); - String username = config.get(USERNAME); - String password = config.get(PASSWORD); - String databaseName = config.get(DATABASE_NAME); - validateRegex(DATABASE_NAME.key(), databaseName); - String tableName = config.get(TABLE_NAME); - validateRegex(TABLE_NAME.key(), tableName); - int port = config.get(PORT); - int splitSize = config.get(SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE); - int splitMetaGroupSize = config.get(CHUNK_META_GROUP_SIZE); - int fetchSize = config.get(SCAN_SNAPSHOT_FETCH_SIZE); + String hostname = config.get(MySqlSourceOptions.HOSTNAME); + String username = config.get(MySqlSourceOptions.USERNAME); + String password = config.get(MySqlSourceOptions.PASSWORD); + String databaseName = config.get(MySqlSourceOptions.DATABASE_NAME); + validateRegex(MySqlSourceOptions.DATABASE_NAME.key(), databaseName); + String tableName = config.get(MySqlSourceOptions.TABLE_NAME); + validateRegex(MySqlSourceOptions.TABLE_NAME.key(), tableName); + int port = config.get(MySqlSourceOptions.PORT); + int splitSize = config.get(MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE); + int splitMetaGroupSize = config.get(MySqlSourceOptions.CHUNK_META_GROUP_SIZE); + int fetchSize = config.get(MySqlSourceOptions.SCAN_SNAPSHOT_FETCH_SIZE); ZoneId serverTimeZone = getServerTimeZone(config); ResolvedSchema physicalSchema = getPhysicalSchema(context.getCatalogTable().getResolvedSchema()); String serverId = validateAndGetServerId(config); StartupOptions startupOptions = getStartupOptions(config); - Duration connectTimeout = config.get(CONNECT_TIMEOUT); - int connectMaxRetries = config.get(CONNECT_MAX_RETRIES); - int connectionPoolSize = config.get(CONNECTION_POOL_SIZE); - double distributionFactorUpper = config.get(CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND); - double distributionFactorLower = config.get(CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND); - boolean scanNewlyAddedTableEnabled = config.get(SCAN_NEWLY_ADDED_TABLE_ENABLED); - Duration heartbeatInterval = config.get(HEARTBEAT_INTERVAL); + Duration connectTimeout = config.get(MySqlSourceOptions.CONNECT_TIMEOUT); + int connectMaxRetries = config.get(MySqlSourceOptions.CONNECT_MAX_RETRIES); + int connectionPoolSize = config.get(MySqlSourceOptions.CONNECTION_POOL_SIZE); + double distributionFactorUpper = + config.get(MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND); + double distributionFactorLower = + config.get(MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND); + boolean scanNewlyAddedTableEnabled = + config.get(MySqlSourceOptions.SCAN_NEWLY_ADDED_TABLE_ENABLED); + Duration heartbeatInterval = config.get(MySqlSourceOptions.HEARTBEAT_INTERVAL); String chunkKeyColumn = - config.getOptional(SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN).orElse(null); + config.getOptional(MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN) + .orElse(null); - boolean enableParallelRead = config.get(SCAN_INCREMENTAL_SNAPSHOT_ENABLED); - boolean closeIdleReaders = config.get(SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED); - boolean skipSnapshotBackFill = config.get(SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP); + boolean enableParallelRead = + config.get(MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED); + boolean closeIdleReaders = + config.get(MySqlSourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED); + boolean skipSnapshotBackFill = + config.get(MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP); if (enableParallelRead) { validatePrimaryKeyIfEnableParallel(physicalSchema, chunkKeyColumn); - validateIntegerOption(SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE, splitSize, 1); - validateIntegerOption(CHUNK_META_GROUP_SIZE, splitMetaGroupSize, 1); - validateIntegerOption(SCAN_SNAPSHOT_FETCH_SIZE, fetchSize, 1); - validateIntegerOption(CONNECTION_POOL_SIZE, connectionPoolSize, 1); - validateIntegerOption(CONNECT_MAX_RETRIES, connectMaxRetries, 0); + validateIntegerOption( + MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE, splitSize, 1); + validateIntegerOption(MySqlSourceOptions.CHUNK_META_GROUP_SIZE, splitMetaGroupSize, 1); + validateIntegerOption(MySqlSourceOptions.SCAN_SNAPSHOT_FETCH_SIZE, fetchSize, 1); + validateIntegerOption(MySqlSourceOptions.CONNECTION_POOL_SIZE, connectionPoolSize, 1); + validateIntegerOption(MySqlSourceOptions.CONNECT_MAX_RETRIES, connectMaxRetries, 0); validateDistributionFactorUpper(distributionFactorUpper); validateDistributionFactorLower(distributionFactorLower); } @@ -175,41 +154,41 @@ public class MySqlTableSourceFactory implements DynamicTableSourceFactory { @Override public Set> requiredOptions() { Set> options = new HashSet<>(); - options.add(HOSTNAME); - options.add(USERNAME); - options.add(PASSWORD); - options.add(DATABASE_NAME); - options.add(TABLE_NAME); + options.add(MySqlSourceOptions.HOSTNAME); + options.add(MySqlSourceOptions.USERNAME); + options.add(MySqlSourceOptions.PASSWORD); + options.add(MySqlSourceOptions.DATABASE_NAME); + options.add(MySqlSourceOptions.TABLE_NAME); return options; } @Override public Set> optionalOptions() { Set> options = new HashSet<>(); - options.add(PORT); - options.add(SERVER_TIME_ZONE); - options.add(SERVER_ID); - options.add(SCAN_STARTUP_MODE); - options.add(SCAN_STARTUP_SPECIFIC_OFFSET_FILE); - options.add(SCAN_STARTUP_SPECIFIC_OFFSET_POS); - options.add(SCAN_STARTUP_SPECIFIC_OFFSET_GTID_SET); - options.add(SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_EVENTS); - options.add(SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_ROWS); - options.add(SCAN_STARTUP_TIMESTAMP_MILLIS); - options.add(SCAN_INCREMENTAL_SNAPSHOT_ENABLED); - options.add(SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE); - options.add(CHUNK_META_GROUP_SIZE); - options.add(SCAN_SNAPSHOT_FETCH_SIZE); - options.add(CONNECT_TIMEOUT); - options.add(CONNECTION_POOL_SIZE); - options.add(CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND); - options.add(CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND); - options.add(CONNECT_MAX_RETRIES); - options.add(SCAN_NEWLY_ADDED_TABLE_ENABLED); - options.add(SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED); - options.add(HEARTBEAT_INTERVAL); - options.add(SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN); - options.add(SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP); + options.add(MySqlSourceOptions.PORT); + options.add(MySqlSourceOptions.SERVER_TIME_ZONE); + options.add(MySqlSourceOptions.SERVER_ID); + options.add(MySqlSourceOptions.SCAN_STARTUP_MODE); + options.add(MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_FILE); + options.add(MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_POS); + options.add(MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_GTID_SET); + options.add(MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_EVENTS); + options.add(MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_ROWS); + options.add(MySqlSourceOptions.SCAN_STARTUP_TIMESTAMP_MILLIS); + options.add(MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED); + options.add(MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE); + options.add(MySqlSourceOptions.CHUNK_META_GROUP_SIZE); + options.add(MySqlSourceOptions.SCAN_SNAPSHOT_FETCH_SIZE); + options.add(MySqlSourceOptions.CONNECT_TIMEOUT); + options.add(MySqlSourceOptions.CONNECTION_POOL_SIZE); + options.add(MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND); + options.add(MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND); + options.add(MySqlSourceOptions.CONNECT_MAX_RETRIES); + options.add(MySqlSourceOptions.SCAN_NEWLY_ADDED_TABLE_ENABLED); + options.add(MySqlSourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED); + options.add(MySqlSourceOptions.HEARTBEAT_INTERVAL); + options.add(MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN); + options.add(MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP); return options; } @@ -221,7 +200,7 @@ public class MySqlTableSourceFactory implements DynamicTableSourceFactory { private static final String SCAN_STARTUP_MODE_VALUE_TIMESTAMP = "timestamp"; private static StartupOptions getStartupOptions(ReadableConfig config) { - String modeString = config.get(SCAN_STARTUP_MODE); + String modeString = config.get(MySqlSourceOptions.SCAN_STARTUP_MODE); switch (modeString.toLowerCase()) { case SCAN_STARTUP_MODE_VALUE_INITIAL: @@ -240,13 +219,14 @@ public class MySqlTableSourceFactory implements DynamicTableSourceFactory { return getSpecificOffset(config); case SCAN_STARTUP_MODE_VALUE_TIMESTAMP: - return StartupOptions.timestamp(config.get(SCAN_STARTUP_TIMESTAMP_MILLIS)); + return StartupOptions.timestamp( + config.get(MySqlSourceOptions.SCAN_STARTUP_TIMESTAMP_MILLIS)); default: throw new ValidationException( String.format( "Invalid value for option '%s'. Supported values are [%s, %s, %s, %s, %s, %s], but was: %s", - SCAN_STARTUP_MODE.key(), + MySqlSourceOptions.SCAN_STARTUP_MODE.key(), SCAN_STARTUP_MODE_VALUE_INITIAL, SCAN_STARTUP_MODE_VALUE_SNAPSHOT, SCAN_STARTUP_MODE_VALUE_LATEST, @@ -258,16 +238,19 @@ public class MySqlTableSourceFactory implements DynamicTableSourceFactory { } private static void validateSpecificOffset(ReadableConfig config) { - Optional gtidSet = config.getOptional(SCAN_STARTUP_SPECIFIC_OFFSET_GTID_SET); - Optional binlogFilename = config.getOptional(SCAN_STARTUP_SPECIFIC_OFFSET_FILE); - Optional binlogPosition = config.getOptional(SCAN_STARTUP_SPECIFIC_OFFSET_POS); + Optional gtidSet = + config.getOptional(MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_GTID_SET); + Optional binlogFilename = + config.getOptional(MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_FILE); + Optional binlogPosition = + config.getOptional(MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_POS); if (!gtidSet.isPresent() && !(binlogFilename.isPresent() && binlogPosition.isPresent())) { throw new ValidationException( String.format( "Unable to find a valid binlog offset. Either %s, or %s and %s are required.", - SCAN_STARTUP_SPECIFIC_OFFSET_GTID_SET.key(), - SCAN_STARTUP_SPECIFIC_OFFSET_FILE.key(), - SCAN_STARTUP_SPECIFIC_OFFSET_POS.key())); + MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_GTID_SET.key(), + MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_FILE.key(), + MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_POS.key())); } } @@ -275,21 +258,23 @@ public class MySqlTableSourceFactory implements DynamicTableSourceFactory { BinlogOffsetBuilder offsetBuilder = BinlogOffset.builder(); // GTID set - config.getOptional(SCAN_STARTUP_SPECIFIC_OFFSET_GTID_SET) + config.getOptional(MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_GTID_SET) .ifPresent(offsetBuilder::setGtidSet); // Binlog file + pos - Optional binlogFilename = config.getOptional(SCAN_STARTUP_SPECIFIC_OFFSET_FILE); - Optional binlogPosition = config.getOptional(SCAN_STARTUP_SPECIFIC_OFFSET_POS); + Optional binlogFilename = + config.getOptional(MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_FILE); + Optional binlogPosition = + config.getOptional(MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_POS); if (binlogFilename.isPresent() && binlogPosition.isPresent()) { offsetBuilder.setBinlogFilePosition(binlogFilename.get(), binlogPosition.get()); } else { offsetBuilder.setBinlogFilePosition("", 0); } - config.getOptional(SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_EVENTS) + config.getOptional(MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_EVENTS) .ifPresent(offsetBuilder::setSkipEvents); - config.getOptional(SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_ROWS) + config.getOptional(MySqlSourceOptions.SCAN_STARTUP_SPECIFIC_OFFSET_SKIP_ROWS) .ifPresent(offsetBuilder::setSkipRows); return StartupOptions.specificOffset(offsetBuilder.build()); } @@ -300,8 +285,8 @@ public class MySqlTableSourceFactory implements DynamicTableSourceFactory { throw new ValidationException( String.format( "'%s' is required for table without primary key when '%s' enabled.", - SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN.key(), - SCAN_INCREMENTAL_SNAPSHOT_ENABLED.key())); + MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN.key(), + MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED.key())); } } @@ -352,10 +337,10 @@ public class MySqlTableSourceFactory implements DynamicTableSourceFactory { /** Checks the value of given evenly distribution factor upper bound is valid. */ private void validateDistributionFactorUpper(double distributionFactorUpper) { checkState( - doubleCompare(distributionFactorUpper, 1.0d) >= 0, + ObjectUtils.doubleCompare(distributionFactorUpper, 1.0d) >= 0, String.format( "The value of option '%s' must larger than or equals %s, but is %s", - CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND.key(), + MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND.key(), 1.0d, distributionFactorUpper)); } @@ -363,11 +348,11 @@ public class MySqlTableSourceFactory implements DynamicTableSourceFactory { /** Checks the value of given evenly distribution factor lower bound is valid. */ private void validateDistributionFactorLower(double distributionFactorLower) { checkState( - doubleCompare(distributionFactorLower, 0.0d) >= 0 - && doubleCompare(distributionFactorLower, 1.0d) <= 0, + ObjectUtils.doubleCompare(distributionFactorLower, 0.0d) >= 0 + && ObjectUtils.doubleCompare(distributionFactorLower, 1.0d) <= 0, String.format( "The value of option '%s' must between %s and %s inclusively, but is %s", - CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND.key(), + MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND.key(), 0.0d, 1.0d, distributionFactorLower)); @@ -375,13 +360,13 @@ public class MySqlTableSourceFactory implements DynamicTableSourceFactory { /** Replaces the default timezone placeholder with session timezone, if applicable. */ private static ZoneId getServerTimeZone(ReadableConfig config) { - final String serverTimeZone = config.get(SERVER_TIME_ZONE); + final String serverTimeZone = config.get(MySqlSourceOptions.SERVER_TIME_ZONE); if (serverTimeZone != null) { return ZoneId.of(serverTimeZone); } else { LOGGER.warn( "{} is not set, which might cause data inconsistencies for time-related fields.", - SERVER_TIME_ZONE.key()); + MySqlSourceOptions.SERVER_TIME_ZONE.key()); final String sessionTimeZone = config.get(TableConfigOptions.LOCAL_TIME_ZONE); final ZoneId zoneId = TableConfigOptions.LOCAL_TIME_ZONE.defaultValue().equals(sessionTimeZone) diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/StartupMode.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/StartupMode.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/StartupMode.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/StartupMode.java index 265288847..2657fdbca 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/StartupMode.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/StartupMode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.table; +package org.apache.flink.cdc.connectors.mysql.table; /** * Startup modes for the MySQL CDC Consumer. diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/StartupOptions.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/StartupOptions.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/StartupOptions.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/StartupOptions.java index 7ec7f5c53..8f4557e21 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/table/StartupOptions.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/table/StartupOptions.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.table; +package org.apache.flink.cdc.connectors.mysql.table; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; import javax.annotation.Nullable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/utils/OptionUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/utils/OptionUtils.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/utils/OptionUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/utils/OptionUtils.java index 30579157d..94fada55d 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/utils/OptionUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/utils/OptionUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.utils; +package org.apache.flink.cdc.connectors.mysql.utils; import org.apache.flink.configuration.ConfigurationUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 3df5c2d91..8d73956cd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.ververica.cdc.connectors.mysql.table.MySqlTableSourceFactory +org.apache.flink.cdc.connectors.mysql.table.MySqlTableSourceFactory diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/LegacyMySqlSourceExampleTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlSourceExampleTest.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/LegacyMySqlSourceExampleTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlSourceExampleTest.java index d5a935043..3a3e091c2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/LegacyMySqlSourceExampleTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlSourceExampleTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql; +package org.apache.flink.cdc.connectors.mysql; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; +import org.apache.flink.cdc.debezium.StringDebeziumDeserializationSchema; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.source.SourceFunction; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; -import com.ververica.cdc.debezium.StringDebeziumDeserializationSchema; import org.junit.Ignore; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/LegacyMySqlSourceITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlSourceITCase.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/LegacyMySqlSourceITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlSourceITCase.java index 35223d083..de7acd86a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/LegacyMySqlSourceITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlSourceITCase.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql; +package org.apache.flink.cdc.connectors.mysql; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; import org.apache.flink.streaming.api.datastream.DataStreamSource; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.functions.source.SourceFunction; @@ -27,8 +29,6 @@ import org.apache.flink.types.Row; import org.apache.flink.util.CloseableIterator; import com.alibaba.fastjson.JSONObject; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; import org.apache.kafka.connect.json.JsonConverterConfig; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/LegacyMySqlSourceTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlSourceTest.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/LegacyMySqlSourceTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlSourceTest.java index bc1274617..817b96a90 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/LegacyMySqlSourceTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlSourceTest.java @@ -15,23 +15,23 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql; +package org.apache.flink.cdc.connectors.mysql; import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.cdc.connectors.mysql.MySqlTestUtils.TestingListState; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; +import org.apache.flink.cdc.connectors.utils.TestSourceContext; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.history.FlinkJsonTableChangeSerializer; +import org.apache.flink.cdc.debezium.internal.Handover; import org.apache.flink.core.testutils.CheckedThread; import org.apache.flink.runtime.state.StateSnapshotContextSynchronousImpl; import org.apache.flink.util.FlinkRuntimeException; import com.fasterxml.jackson.core.JsonParseException; import com.jayway.jsonpath.JsonPath; -import com.ververica.cdc.connectors.mysql.MySqlTestUtils.TestingListState; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; -import com.ververica.cdc.connectors.utils.TestSourceContext; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.history.FlinkJsonTableChangeSerializer; -import com.ververica.cdc.debezium.internal.Handover; import io.debezium.DebeziumException; import io.debezium.document.Document; import io.debezium.document.DocumentWriter; @@ -64,14 +64,14 @@ import java.util.concurrent.Executors; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import static com.ververica.cdc.connectors.mysql.MySqlTestUtils.basicSourceBuilder; -import static com.ververica.cdc.connectors.mysql.MySqlTestUtils.drain; -import static com.ververica.cdc.connectors.mysql.MySqlTestUtils.setupSource; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertDelete; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertInsert; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertRead; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertUpdate; -import static com.ververica.cdc.debezium.utils.DatabaseHistoryUtil.removeHistory; +import static org.apache.flink.cdc.connectors.mysql.MySqlTestUtils.basicSourceBuilder; +import static org.apache.flink.cdc.connectors.mysql.MySqlTestUtils.drain; +import static org.apache.flink.cdc.connectors.mysql.MySqlTestUtils.setupSource; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertDelete; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertInsert; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertRead; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertUpdate; +import static org.apache.flink.cdc.debezium.utils.DatabaseHistoryUtil.removeHistory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/LegacyMySqlTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlTestBase.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/LegacyMySqlTestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlTestBase.java index 97f2131c0..08377c1d7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/LegacyMySqlTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/LegacyMySqlTestBase.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql; +package org.apache.flink.cdc.connectors.mysql; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; import org.apache.flink.test.util.AbstractTestBase; -import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer; import org.junit.AfterClass; import org.junit.BeforeClass; import org.slf4j.Logger; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/MySqlTestUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/MySqlTestUtils.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/MySqlTestUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/MySqlTestUtils.java index d55b8ee7b..2da575e6c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/MySqlTestUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/MySqlTestUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql; +package org.apache.flink.cdc.connectors.mysql; import org.apache.flink.api.common.JobStatus; import org.apache.flink.api.common.state.BroadcastState; @@ -26,6 +26,10 @@ import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.OperatorStateStore; import org.apache.flink.api.common.time.Deadline; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; +import org.apache.flink.cdc.connectors.utils.TestSourceContext; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.execution.JobClient; import org.apache.flink.runtime.state.FunctionInitializationContext; @@ -35,10 +39,6 @@ import org.apache.flink.util.Collector; import org.apache.flink.util.Preconditions; import org.apache.flink.util.function.SupplierWithException; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; -import com.ververica.cdc.connectors.utils.TestSourceContext; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; import org.apache.kafka.connect.source.SourceRecord; import java.util.ArrayList; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/MySqlValidatorTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/MySqlValidatorTest.java similarity index 89% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/MySqlValidatorTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/MySqlValidatorTest.java index 213d45f6f..31f36560d 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/MySqlValidatorTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/MySqlValidatorTest.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql; +package org.apache.flink.cdc.connectors.mysql; import org.apache.flink.api.connector.source.SplitEnumerator; import org.apache.flink.api.connector.source.mocks.MockSplitEnumeratorContext; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSource; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.PendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlVersion; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; import org.apache.flink.table.api.ValidationException; -import com.ververica.cdc.connectors.mysql.source.MySqlSource; -import com.ververica.cdc.connectors.mysql.source.assigners.state.PendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; -import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer; -import com.ververica.cdc.connectors.mysql.testutils.MySqlVersion; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; -import com.ververica.cdc.debezium.DebeziumSourceFunction; import org.apache.kafka.connect.source.SourceRecord; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -53,11 +53,11 @@ import java.util.Objects; import java.util.UUID; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.mysql.MySqlTestUtils.basicSourceBuilder; -import static com.ververica.cdc.connectors.mysql.MySqlTestUtils.setupSource; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SERVER_TIME_ZONE; -import static com.ververica.cdc.connectors.mysql.testutils.MySqlVersion.V5_5; -import static com.ververica.cdc.connectors.mysql.testutils.MySqlVersion.V5_7; +import static org.apache.flink.cdc.connectors.mysql.MySqlTestUtils.basicSourceBuilder; +import static org.apache.flink.cdc.connectors.mysql.MySqlTestUtils.setupSource; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.SERVER_TIME_ZONE; +import static org.apache.flink.cdc.connectors.mysql.testutils.MySqlVersion.V5_5; +import static org.apache.flink.cdc.connectors.mysql.testutils.MySqlVersion.V5_7; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/DebeziumUtilsTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/debezium/DebeziumUtilsTest.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/DebeziumUtilsTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/debezium/DebeziumUtilsTest.java index 39dcbf3ec..ff093fccd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/DebeziumUtilsTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/debezium/DebeziumUtilsTest.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.debezium; +package org.apache.flink.cdc.connectors.mysql.debezium; + +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; import io.debezium.connector.mysql.MySqlConnection; import org.junit.jupiter.api.Test; @@ -30,7 +31,7 @@ import java.util.Properties; import static org.junit.jupiter.api.Assertions.assertArrayEquals; -/** Tests for {@link DebeziumUtils}. */ +/** Tests for {@link org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils}. */ public class DebeziumUtilsTest { @Test void testCreateMySqlConnection() { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReaderTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/debezium/reader/BinlogSplitReaderTest.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReaderTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/debezium/reader/BinlogSplitReaderTest.java index 0ff8da165..90b30d564 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/BinlogSplitReaderTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/debezium/reader/BinlogSplitReaderTest.java @@ -15,36 +15,36 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.debezium.reader; - +package org.apache.flink.cdc.connectors.mysql.debezium.reader; + +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher; +import org.apache.flink.cdc.connectors.mysql.debezium.task.context.StatefulTaskContext; +import org.apache.flink.cdc.connectors.mysql.debezium.task.context.exception.SchemaOutOfSyncException; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSourceTestBase; +import org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlBinlogSplitAssigner; +import org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlSnapshotSplitAssigner; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.SourceRecords; +import org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils; +import org.apache.flink.cdc.connectors.mysql.source.utils.TableDiscoveryUtils; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlVersion; +import org.apache.flink.cdc.connectors.mysql.testutils.RecordsFormatter; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; import org.apache.flink.core.testutils.CommonTestUtils; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; import org.apache.flink.util.ExceptionUtils; import com.github.shyiko.mysql.binlog.BinaryLogClient; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.debezium.dispatcher.SignalEventDispatcher; -import com.ververica.cdc.connectors.mysql.debezium.task.context.StatefulTaskContext; -import com.ververica.cdc.connectors.mysql.debezium.task.context.exception.SchemaOutOfSyncException; -import com.ververica.cdc.connectors.mysql.source.MySqlSourceTestBase; -import com.ververica.cdc.connectors.mysql.source.assigners.MySqlBinlogSplitAssigner; -import com.ververica.cdc.connectors.mysql.source.assigners.MySqlSnapshotSplitAssigner; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; -import com.ververica.cdc.connectors.mysql.source.split.SourceRecords; -import com.ververica.cdc.connectors.mysql.source.utils.RecordUtils; -import com.ververica.cdc.connectors.mysql.source.utils.TableDiscoveryUtils; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer; -import com.ververica.cdc.connectors.mysql.testutils.MySqlVersion; -import com.ververica.cdc.connectors.mysql.testutils.RecordsFormatter; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; import io.debezium.connector.mysql.MySqlConnection; import io.debezium.connector.mysql.MySqlConnectorConfig; import io.debezium.connector.mysql.MySqlOffsetContext; @@ -78,16 +78,16 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.mysql.MySqlTestUtils.assertContainsErrorMsg; -import static com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetUtils.initializeEffectiveOffset; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getSnapshotSplitInfo; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getStartingOffsetOfBinlogSplit; +import static org.apache.flink.cdc.connectors.mysql.MySqlTestUtils.assertContainsErrorMsg; +import static org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffsetUtils.initializeEffectiveOffset; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.getSnapshotSplitInfo; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.getStartingOffsetOfBinlogSplit; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; -/** Tests for {@link BinlogSplitReader}. */ +/** Tests for {@link org.apache.flink.cdc.connectors.mysql.debezium.reader.BinlogSplitReader}. */ public class BinlogSplitReaderTest extends MySqlSourceTestBase { private static final String TEST_USER = "mysqluser"; private static final String TEST_PASSWORD = "mysqlpw"; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/SnapshotSplitReaderTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/debezium/reader/SnapshotSplitReaderTest.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/SnapshotSplitReaderTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/debezium/reader/SnapshotSplitReaderTest.java index 584c2c001..147fe441a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/debezium/reader/SnapshotSplitReaderTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/debezium/reader/SnapshotSplitReaderTest.java @@ -15,25 +15,25 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.debezium.reader; - +package org.apache.flink.cdc.connectors.mysql.debezium.reader; + +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.debezium.task.context.StatefulTaskContext; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSourceTestBase; +import org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlSnapshotSplitAssigner; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.SourceRecords; +import org.apache.flink.cdc.connectors.mysql.source.utils.hooks.SnapshotPhaseHooks; +import org.apache.flink.cdc.connectors.mysql.testutils.RecordsFormatter; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.FlinkRuntimeException; import com.github.shyiko.mysql.binlog.BinaryLogClient; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.debezium.task.context.StatefulTaskContext; -import com.ververica.cdc.connectors.mysql.source.MySqlSourceTestBase; -import com.ververica.cdc.connectors.mysql.source.assigners.MySqlSnapshotSplitAssigner; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; -import com.ververica.cdc.connectors.mysql.source.split.SourceRecords; -import com.ververica.cdc.connectors.mysql.source.utils.hooks.SnapshotPhaseHooks; -import com.ververica.cdc.connectors.mysql.testutils.RecordsFormatter; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; import io.debezium.connector.mysql.MySqlConnection; import io.debezium.jdbc.JdbcConnection; import io.debezium.relational.TableId; @@ -54,7 +54,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -/** Tests for {@link SnapshotSplitReader}. */ +/** Tests for {@link org.apache.flink.cdc.connectors.mysql.debezium.reader.SnapshotSplitReader}. */ public class SnapshotSplitReaderTest extends MySqlSourceTestBase { private static final UniqueDatabase customerDatabase = diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlSourceExampleTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSourceExampleTest.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlSourceExampleTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSourceExampleTest.java index cf0a6d5f6..14699e3ce 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlSourceExampleTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSourceExampleTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; import org.apache.flink.api.common.eventtime.WatermarkStrategy; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; import org.junit.Ignore; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlSourceITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSourceITCase.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlSourceITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSourceITCase.java index c2533ffc7..adba04e2b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlSourceITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSourceITCase.java @@ -15,13 +15,24 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.restartstrategy.RestartStrategies; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.source.utils.hooks.SnapshotPhaseHook; +import org.apache.flink.cdc.connectors.mysql.source.utils.hooks.SnapshotPhaseHooks; +import org.apache.flink.cdc.connectors.mysql.table.MySqlDeserializationConverterFactory; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; +import org.apache.flink.cdc.connectors.mysql.testutils.TestTable; +import org.apache.flink.cdc.connectors.mysql.testutils.TestTableSchemas; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.table.MetadataConverter; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.core.execution.JobClient; import org.apache.flink.streaming.api.datastream.DataStreamSource; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -47,17 +58,6 @@ import org.apache.flink.types.RowUtils; import org.apache.flink.util.CloseableIterator; import org.apache.flink.util.Collector; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.source.utils.hooks.SnapshotPhaseHook; -import com.ververica.cdc.connectors.mysql.source.utils.hooks.SnapshotPhaseHooks; -import com.ververica.cdc.connectors.mysql.table.MySqlDeserializationConverterFactory; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.connectors.mysql.testutils.TestTable; -import com.ververica.cdc.connectors.mysql.testutils.TestTableSchemas; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.table.MetadataConverter; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import io.debezium.connector.mysql.MySqlConnection; import io.debezium.jdbc.JdbcConnection; import org.apache.commons.lang3.StringUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlSourceTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSourceTestBase.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlSourceTestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSourceTestBase.java index 584cdd9a7..8682e871a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/MySqlSourceTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/MySqlSourceTestBase.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; import org.apache.flink.api.common.JobID; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlVersion; import org.apache.flink.runtime.highavailability.nonha.embedded.HaLeadershipControl; import org.apache.flink.runtime.minicluster.MiniCluster; import org.apache.flink.runtime.minicluster.RpcServiceSharing; @@ -26,8 +28,6 @@ import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.test.util.MiniClusterWithClientResource; import org.apache.flink.util.TestLogger; -import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer; -import com.ververica.cdc.connectors.mysql.testutils.MySqlVersion; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/NewlyAddedTableITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/NewlyAddedTableITCase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/NewlyAddedTableITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/NewlyAddedTableITCase.java index 9756af3ab..2d78d733d 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/NewlyAddedTableITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/NewlyAddedTableITCase.java @@ -15,11 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.restartstrategy.RestartStrategies; import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.table.MySqlReadableMetadata; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; +import org.apache.flink.cdc.debezium.table.MetadataConverter; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.execution.JobClient; import org.apache.flink.runtime.checkpoint.CheckpointException; @@ -42,11 +47,6 @@ import org.apache.flink.table.types.utils.TypeConversions; import org.apache.flink.types.RowUtils; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.table.MySqlReadableMetadata; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; -import com.ververica.cdc.debezium.table.MetadataConverter; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import io.debezium.connector.mysql.MySqlConnection; import io.debezium.jdbc.JdbcConnection; import org.apache.commons.lang3.StringUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/SpecificStartingOffsetITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/SpecificStartingOffsetITCase.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/SpecificStartingOffsetITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/SpecificStartingOffsetITCase.java index d19161fdf..9761a6f38 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/SpecificStartingOffsetITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/SpecificStartingOffsetITCase.java @@ -15,10 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source; +package org.apache.flink.cdc.connectors.mysql.source; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; +import org.apache.flink.cdc.connectors.mysql.testutils.TestTable; +import org.apache.flink.cdc.connectors.mysql.testutils.TestTableSchemas; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.execution.JobClient; import org.apache.flink.core.execution.SavepointFormatType; @@ -35,13 +42,6 @@ import org.apache.flink.table.data.RowData; import org.apache.flink.test.junit5.MiniClusterExtension; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer; -import com.ververica.cdc.connectors.mysql.testutils.TestTable; -import com.ververica.cdc.connectors.mysql.testutils.TestTableSchemas; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; import io.debezium.connector.mysql.MySqlConnection; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssignerTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssignerTest.java similarity index 83% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssignerTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssignerTest.java index 447ff7f80..536dfbee5 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssignerTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlBinlogSplitAssignerTest.java @@ -15,14 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners; +package org.apache.flink.cdc.connectors.mysql.source.assigners; + +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; import org.junit.Test; import java.time.ZoneId; @@ -32,7 +33,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -/** Unit test for {@link MySqlBinlogSplitAssigner}. */ +/** + * Unit test for {@link + * org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlBinlogSplitAssigner}. + */ public class MySqlBinlogSplitAssignerTest { @Test diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlChunkSplitterTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlChunkSplitterTest.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlChunkSplitterTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlChunkSplitterTest.java index 2690e9509..af68042e1 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlChunkSplitterTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlChunkSplitterTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners; +package org.apache.flink.cdc.connectors.mysql.source.assigners; import io.debezium.relational.TableId; import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; -/** Tests for {@link MySqlChunkSplitter}. */ +/** Tests for {@link org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlChunkSplitter}. */ public class MySqlChunkSplitterTest { @Test diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssignerTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssignerTest.java similarity index 88% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssignerTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssignerTest.java index 320b64e96..134f426be 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssignerTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlHybridSplitAssignerTest.java @@ -15,27 +15,27 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners; - +package org.apache.flink.cdc.connectors.mysql.source.assigners; + +import org.apache.flink.cdc.connectors.mysql.source.MySqlSourceTestBase; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.ChunkSplitterState; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.HybridPendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.SnapshotPendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSchemalessSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; -import com.ververica.cdc.connectors.mysql.source.MySqlSourceTestBase; -import com.ververica.cdc.connectors.mysql.source.assigners.state.ChunkSplitterState; -import com.ververica.cdc.connectors.mysql.source.assigners.state.HybridPendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.assigners.state.SnapshotPendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.FinishedSnapshotSplitInfo; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSchemalessSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; import io.debezium.relational.TableId; import org.junit.BeforeClass; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssignerTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssignerTest.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssignerTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssignerTest.java index cf7d4f6ab..fe4ccd1a2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssignerTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/MySqlSnapshotSplitAssignerTest.java @@ -15,23 +15,23 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners; - +package org.apache.flink.cdc.connectors.mysql.source.assigners; + +import org.apache.flink.cdc.connectors.mysql.source.MySqlSourceTestBase; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.ChunkSplitterState; +import org.apache.flink.cdc.connectors.mysql.source.assigners.state.SnapshotPendingSplitsState; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSchemalessSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; +import org.apache.flink.cdc.connectors.mysql.source.utils.ChunkUtils; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; import org.apache.flink.table.catalog.ObjectPath; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.connectors.mysql.source.MySqlSourceTestBase; -import com.ververica.cdc.connectors.mysql.source.assigners.state.ChunkSplitterState; -import com.ververica.cdc.connectors.mysql.source.assigners.state.SnapshotPendingSplitsState; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSchemalessSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; -import com.ververica.cdc.connectors.mysql.source.utils.ChunkUtils; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; import io.debezium.relational.Column; import io.debezium.relational.TableId; import org.junit.BeforeClass; @@ -47,9 +47,9 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; -import static com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset.ofEarliest; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; +import static org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset.ofEarliest; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializerTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializerTest.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializerTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializerTest.java index 0fd786537..87527eb04 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializerTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/assigners/state/PendingSplitsStateSerializerTest.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.assigners.state; +package org.apache.flink.cdc.connectors.mysql.source.assigners.state; +import org.apache.flink.cdc.connectors.mysql.source.assigners.AssignerStatus; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSchemalessSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplitSerializer; import org.apache.flink.table.types.logical.BigIntType; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.mysql.source.assigners.AssignerStatus; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSchemalessSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplitSerializer; import io.debezium.relational.Column; import io.debezium.relational.Table; import io.debezium.relational.TableEditor; @@ -44,7 +44,10 @@ import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; -/** Tests for {@link PendingSplitsStateSerializer}. */ +/** + * Tests for {@link + * org.apache.flink.cdc.connectors.mysql.source.assigners.state.PendingSplitsStateSerializer}. + */ @RunWith(Parameterized.class) public class PendingSplitsStateSerializerTest { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlRecordEmitterTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlRecordEmitterTest.java similarity index 88% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlRecordEmitterTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlRecordEmitterTest.java index c7ad3148e..0c5c36593 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlRecordEmitterTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlRecordEmitterTest.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.reader; +package org.apache.flink.cdc.connectors.mysql.source.reader; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.mysql.source.metrics.MySqlSourceReaderMetrics; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplitState; +import org.apache.flink.cdc.connectors.mysql.source.split.SourceRecords; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; import org.apache.flink.connector.testutils.source.reader.TestingReaderOutput; import org.apache.flink.runtime.metrics.groups.UnregisteredMetricGroups; import org.apache.flink.util.Collector; -import com.ververica.cdc.connectors.mysql.source.metrics.MySqlSourceReaderMetrics; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplitState; -import com.ververica.cdc.connectors.mysql.source.split.SourceRecords; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; import io.debezium.config.Configuration; import io.debezium.connector.mysql.MySqlConnectorConfig; import io.debezium.heartbeat.Heartbeat; @@ -46,7 +46,7 @@ import static io.debezium.connector.mysql.MySqlConnectorConfig.SERVER_NAME; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -/** Unit test for {@link MySqlRecordEmitter}. */ +/** Unit test for {@link org.apache.flink.cdc.connectors.mysql.source.reader.MySqlRecordEmitter}. */ public class MySqlRecordEmitterTest { @Test diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSourceReaderTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlSourceReaderTest.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSourceReaderTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlSourceReaderTest.java index fc2319d92..3196609aa 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/reader/MySqlSourceReaderTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/reader/MySqlSourceReaderTest.java @@ -15,13 +15,33 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.reader; +package org.apache.flink.cdc.connectors.mysql.source.reader; import org.apache.flink.api.common.eventtime.Watermark; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.connector.source.ReaderOutput; import org.apache.flink.api.connector.source.SourceOutput; import org.apache.flink.api.connector.source.SourceReaderContext; +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSourceTestBase; +import org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlBinlogSplitAssigner; +import org.apache.flink.cdc.connectors.mysql.source.assigners.MySqlSnapshotSplitAssigner; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfig; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.source.metrics.MySqlSourceReaderMetrics; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplit; +import org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplitState; +import org.apache.flink.cdc.connectors.mysql.source.split.SourceRecords; +import org.apache.flink.cdc.connectors.mysql.source.utils.TableDiscoveryUtils; +import org.apache.flink.cdc.connectors.mysql.source.utils.hooks.SnapshotPhaseHooks; +import org.apache.flink.cdc.connectors.mysql.table.StartupOptions; +import org.apache.flink.cdc.connectors.mysql.testutils.RecordsFormatter; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.history.FlinkJsonTableChangeSerializer; import org.apache.flink.connector.base.source.reader.RecordEmitter; import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds; import org.apache.flink.connector.base.source.reader.synchronization.FutureCompletingBlockingQueue; @@ -36,26 +56,6 @@ import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.Collector; import org.apache.flink.util.Preconditions; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.source.MySqlSourceTestBase; -import com.ververica.cdc.connectors.mysql.source.assigners.MySqlBinlogSplitAssigner; -import com.ververica.cdc.connectors.mysql.source.assigners.MySqlSnapshotSplitAssigner; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfig; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.source.metrics.MySqlSourceReaderMetrics; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSnapshotSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplit; -import com.ververica.cdc.connectors.mysql.source.split.MySqlSplitState; -import com.ververica.cdc.connectors.mysql.source.split.SourceRecords; -import com.ververica.cdc.connectors.mysql.source.utils.TableDiscoveryUtils; -import com.ververica.cdc.connectors.mysql.source.utils.hooks.SnapshotPhaseHooks; -import com.ververica.cdc.connectors.mysql.table.StartupOptions; -import com.ververica.cdc.connectors.mysql.testutils.RecordsFormatter; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.history.FlinkJsonTableChangeSerializer; import io.debezium.connector.mysql.MySqlConnection; import io.debezium.connector.mysql.MySqlPartition; import io.debezium.document.Array; @@ -87,17 +87,17 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getBinlogPosition; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getFetchTimestamp; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getHistoryRecord; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getMessageTimestamp; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.getWatermark; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isDataChangeRecord; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isHeartbeatEvent; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isHighWatermarkEvent; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isSchemaChangeEvent; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.isWatermarkEvent; import static java.lang.String.format; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.getBinlogPosition; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.getFetchTimestamp; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.getHistoryRecord; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.getMessageTimestamp; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.getWatermark; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.isDataChangeRecord; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.isHeartbeatEvent; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.isHighWatermarkEvent; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.isSchemaChangeEvent; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.isWatermarkEvent; import static org.apache.flink.core.io.InputStatus.MORE_AVAILABLE; import static org.apache.flink.util.Preconditions.checkState; import static org.junit.Assert.assertEquals; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplitSerializerTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplitSerializerTest.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplitSerializerTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplitSerializerTest.java index 12dffa7cb..2e528094c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplitSerializerTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplitSerializerTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.split; +package org.apache.flink.cdc.connectors.mysql.source.split; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.debezium.history.FlinkJsonTableChangeSerializer; import org.apache.flink.table.types.logical.BigIntType; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.debezium.history.FlinkJsonTableChangeSerializer; import io.debezium.document.Document; import io.debezium.document.DocumentReader; import io.debezium.relational.TableId; @@ -34,11 +34,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.mysql.source.split.MySqlBinlogSplit.toSuspendedBinlogSplit; +import static org.apache.flink.cdc.connectors.mysql.source.split.MySqlBinlogSplit.toSuspendedBinlogSplit; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; -/** Tests for {@link MySqlSplitSerializer}. */ +/** Tests for {@link org.apache.flink.cdc.connectors.mysql.source.split.MySqlSplitSerializer}. */ public class MySqlSplitSerializerTest { @Test diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplitStateTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplitStateTest.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplitStateTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplitStateTest.java index a7c8a6f56..c0d222eaa 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/split/MySqlSplitStateTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/split/MySqlSplitStateTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.split; +package org.apache.flink.cdc.connectors.mysql.source.split; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; import org.apache.flink.table.types.logical.BigIntType; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; import io.debezium.relational.TableId; import io.debezium.relational.history.TableChanges.TableChange; import org.junit.Test; @@ -31,7 +31,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.mysql.source.split.MySqlSplitSerializerTest.getTestTableSchema; import static org.junit.Assert.assertEquals; /** Tests for {@link MySqlSplitState}. */ @@ -143,7 +142,7 @@ public class MySqlSplitStateTest { BinlogOffset.ofBinlogFilePosition("mysql-bin.000001", 800))); final Map tableSchemas = new HashMap<>(); - tableSchemas.put(tableId, getTestTableSchema()); + tableSchemas.put(tableId, MySqlSplitSerializerTest.getTestTableSchema()); return new MySqlBinlogSplit( "binlog-split", diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/utils/ObjectUtilsTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/utils/ObjectUtilsTest.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/utils/ObjectUtilsTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/utils/ObjectUtilsTest.java index 38b4348f1..8a735847b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/utils/ObjectUtilsTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/utils/ObjectUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.utils; +package org.apache.flink.cdc.connectors.mysql.source.utils; import org.junit.Test; @@ -23,7 +23,7 @@ import java.math.BigDecimal; import static org.junit.Assert.assertEquals; -/** Tests for {@link ObjectUtils}. */ +/** Tests for {@link org.apache.flink.cdc.connectors.mysql.source.utils.ObjectUtils}. */ public class ObjectUtilsTest { @Test diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/utils/RecordUtilsTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/utils/RecordUtilsTest.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/utils/RecordUtilsTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/utils/RecordUtilsTest.java index d5736c775..7383ef762 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/utils/RecordUtilsTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/utils/RecordUtilsTest.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.utils; +package org.apache.flink.cdc.connectors.mysql.source.utils; import org.junit.Test; import java.math.BigDecimal; import java.math.BigInteger; -import static com.ververica.cdc.connectors.mysql.source.utils.RecordUtils.splitKeyRangeContains; +import static org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils.splitKeyRangeContains; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -/** Tests for {@link RecordUtils}. */ +/** Tests for {@link org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils}. */ public class RecordUtilsTest { @Test diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/utils/SerializerUtilsTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/utils/SerializerUtilsTest.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/utils/SerializerUtilsTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/utils/SerializerUtilsTest.java index 0e203098b..5685cb2a0 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/source/utils/SerializerUtilsTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/source/utils/SerializerUtilsTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.source.utils; +package org.apache.flink.cdc.connectors.mysql.source.utils; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffsetKind; import org.apache.flink.core.memory.DataInputDeserializer; import org.apache.flink.core.memory.DataOutputSerializer; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffsetKind; import org.junit.Test; import java.io.IOException; @@ -32,7 +32,7 @@ import java.util.Map; import static org.junit.Assert.assertEquals; -/** Unit test for {@link SerializerUtils}. */ +/** Unit test for {@link org.apache.flink.cdc.connectors.mysql.source.utils.SerializerUtils}. */ public class SerializerUtilsTest { @Test diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlCompatibilityITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlCompatibilityITCase.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlCompatibilityITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlCompatibilityITCase.java index 4d9d5bfc8..23a4b25a8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlCompatibilityITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlCompatibilityITCase.java @@ -15,8 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.table; +package org.apache.flink.cdc.connectors.mysql.table; +import org.apache.flink.cdc.connectors.mysql.MySqlValidatorTest; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlVersion; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableResult; @@ -24,10 +28,6 @@ import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; import org.apache.flink.types.Row; import org.apache.flink.util.CloseableIterator; -import com.ververica.cdc.connectors.mysql.MySqlValidatorTest; -import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer; -import com.ververica.cdc.connectors.mysql.testutils.MySqlVersion; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; import org.junit.Before; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -54,8 +54,8 @@ import java.util.Random; import java.util.UUID; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.mysql.source.MySqlSourceTestBase.assertEqualsInAnyOrder; -import static com.ververica.cdc.connectors.mysql.source.MySqlSourceTestBase.assertEqualsInOrder; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlSourceTestBase.assertEqualsInAnyOrder; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlSourceTestBase.assertEqualsInOrder; /** Integration tests to check mysql-cdc works well with different MySQL server version. */ public class MySqlCompatibilityITCase { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlConnectorITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlConnectorITCase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlConnectorITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlConnectorITCase.java index 84ebee20d..c6f66de05 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlConnectorITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlConnectorITCase.java @@ -15,11 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.table; +package org.apache.flink.cdc.connectors.mysql.table; import org.apache.flink.api.common.restartstrategy.RestartStrategies; import org.apache.flink.api.common.time.Deadline; import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.cdc.connectors.mysql.debezium.DebeziumUtils; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSourceTestBase; +import org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; +import org.apache.flink.cdc.connectors.mysql.source.offset.BinlogOffset; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlVersion; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; import org.apache.flink.core.execution.JobClient; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; @@ -34,13 +41,6 @@ import org.apache.flink.util.ExceptionUtils; import org.apache.flink.shaded.guava31.com.google.common.collect.Lists; -import com.ververica.cdc.connectors.mysql.debezium.DebeziumUtils; -import com.ververica.cdc.connectors.mysql.source.MySqlSourceTestBase; -import com.ververica.cdc.connectors.mysql.source.config.MySqlSourceConfigFactory; -import com.ververica.cdc.connectors.mysql.source.offset.BinlogOffset; -import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer; -import com.ververica.cdc.connectors.mysql.testutils.MySqlVersion; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -64,10 +64,10 @@ import java.util.Random; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.mysql.LegacyMySqlSourceTest.currentMySqlLatestOffset; -import static com.ververica.cdc.connectors.mysql.MySqlTestUtils.assertContainsErrorMsg; -import static com.ververica.cdc.connectors.mysql.MySqlTestUtils.waitForJobStatus; import static org.apache.flink.api.common.JobStatus.RUNNING; +import static org.apache.flink.cdc.connectors.mysql.LegacyMySqlSourceTest.currentMySqlLatestOffset; +import static org.apache.flink.cdc.connectors.mysql.MySqlTestUtils.assertContainsErrorMsg; +import static org.apache.flink.cdc.connectors.mysql.MySqlTestUtils.waitForJobStatus; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlTableSourceFactoryTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlTableSourceFactoryTest.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlTableSourceFactoryTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlTableSourceFactoryTest.java index 0b62e836c..0f89a0b8d 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlTableSourceFactoryTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlTableSourceFactoryTest.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.table; +package org.apache.flink.cdc.connectors.mysql.table; +import org.apache.flink.cdc.debezium.utils.ResolvedSchemaUtils; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; import org.apache.flink.table.api.DataTypes; @@ -32,7 +33,6 @@ import org.apache.flink.table.factories.Factory; import org.apache.flink.table.factories.FactoryUtil; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.debezium.utils.ResolvedSchemaUtils; import org.junit.Test; import java.time.Duration; @@ -44,17 +44,17 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CHUNK_META_GROUP_SIZE; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CONNECTION_POOL_SIZE; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CONNECT_MAX_RETRIES; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.CONNECT_TIMEOUT; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.HEARTBEAT_INTERVAL; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED; -import static com.ververica.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_SNAPSHOT_FETCH_SIZE; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.CHUNK_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.CHUNK_META_GROUP_SIZE; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.CONNECTION_POOL_SIZE; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.CONNECT_MAX_RETRIES; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.CONNECT_TIMEOUT; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.HEARTBEAT_INTERVAL; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED; +import static org.apache.flink.cdc.connectors.mysql.source.config.MySqlSourceOptions.SCAN_SNAPSHOT_FETCH_SIZE; import static org.apache.flink.core.testutils.FlinkMatchers.containsMessage; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlTimezoneITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlTimezoneITCase.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlTimezoneITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlTimezoneITCase.java index c9f785530..7d994e800 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MySqlTimezoneITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MySqlTimezoneITCase.java @@ -15,8 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.table; +package org.apache.flink.cdc.connectors.mysql.table; +import org.apache.flink.cdc.connectors.mysql.MySqlValidatorTest; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableResult; @@ -24,9 +27,6 @@ import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; import org.apache.flink.types.Row; import org.apache.flink.util.CloseableIterator; -import com.ververica.cdc.connectors.mysql.MySqlValidatorTest; -import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; import org.junit.Before; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -55,8 +55,8 @@ import java.util.Random; import java.util.UUID; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.mysql.source.MySqlSourceTestBase.assertEqualsInAnyOrder; -import static com.ververica.cdc.connectors.mysql.source.MySqlSourceTestBase.assertEqualsInOrder; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlSourceTestBase.assertEqualsInAnyOrder; +import static org.apache.flink.cdc.connectors.mysql.source.MySqlSourceTestBase.assertEqualsInOrder; /** Integration tests to check mysql-cdc works well under different MySQL server timezone. */ @RunWith(Parameterized.class) diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MysqlConnectorCharsetITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MysqlConnectorCharsetITCase.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MysqlConnectorCharsetITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MysqlConnectorCharsetITCase.java index 85fd0d8f9..197452389 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/table/MysqlConnectorCharsetITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/table/MysqlConnectorCharsetITCase.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.table; +package org.apache.flink.cdc.connectors.mysql.table; +import org.apache.flink.cdc.connectors.mysql.source.MySqlSourceTestBase; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableResult; @@ -25,8 +27,6 @@ import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.types.Row; import org.apache.flink.util.CloseableIterator; -import com.ververica.cdc.connectors.mysql.source.MySqlSourceTestBase; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/MySqlContainer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/MySqlContainer.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/MySqlContainer.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/MySqlContainer.java index fd62a1d5e..64dfa94f0 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/MySqlContainer.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/MySqlContainer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.testutils; +package org.apache.flink.cdc.connectors.mysql.testutils; import org.testcontainers.containers.ContainerLaunchException; import org.testcontainers.containers.JdbcDatabaseContainer; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/MySqlVersion.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/MySqlVersion.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/MySqlVersion.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/MySqlVersion.java index 760f07a94..dbc8293bb 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/MySqlVersion.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/MySqlVersion.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.testutils; +package org.apache.flink.cdc.connectors.mysql.testutils; /** MySql version enum. */ public enum MySqlVersion { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/RecordsFormatter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/RecordsFormatter.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/RecordsFormatter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/RecordsFormatter.java index 5a47288f0..b4b7740fc 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/RecordsFormatter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/RecordsFormatter.java @@ -15,9 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.testutils; +package org.apache.flink.cdc.connectors.mysql.testutils; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.mysql.source.utils.RecordUtils; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.conversion.RowRowConverter; import org.apache.flink.table.types.DataType; @@ -26,9 +29,6 @@ import org.apache.flink.table.types.utils.TypeConversions; import org.apache.flink.types.Row; import org.apache.flink.util.Collector; -import com.ververica.cdc.connectors.mysql.source.utils.RecordUtils; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.kafka.connect.source.SourceRecord; import java.time.ZoneId; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/TestTable.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/TestTable.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/TestTable.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/TestTable.java index a42257604..cfd080a3a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/TestTable.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/TestTable.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.testutils; +package org.apache.flink.cdc.connectors.mysql.testutils; +import org.apache.flink.cdc.connectors.mysql.table.MySqlDeserializationConverterFactory; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.conversion.RowRowConverter; import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.mysql.table.MySqlDeserializationConverterFactory; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.kafka.connect.source.SourceRecord; import java.util.List; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/TestTableSchemas.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/TestTableSchemas.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/TestTableSchemas.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/TestTableSchemas.java index a60186e73..eee0160d7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/TestTableSchemas.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/TestTableSchemas.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.testutils; +package org.apache.flink.cdc.connectors.mysql.testutils; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.catalog.UniqueConstraint; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/UniqueDatabase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/UniqueDatabase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/UniqueDatabase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/UniqueDatabase.java index a14c56d69..d284d8022 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/mysql/testutils/UniqueDatabase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/mysql/testutils/UniqueDatabase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.testutils; +package org.apache.flink.cdc.connectors.mysql.testutils; import java.net.URL; import java.nio.file.Files; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/polardbx/PolardbxCharsetITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxCharsetITCase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/polardbx/PolardbxCharsetITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxCharsetITCase.java index 981dfcef5..d4ecb5d97 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/polardbx/PolardbxCharsetITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxCharsetITCase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.polardbx; +package org.apache.flink.cdc.connectors.polardbx; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/polardbx/PolardbxSourceITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceITCase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/polardbx/PolardbxSourceITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceITCase.java index 46ca1761c..eaa8f9def 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/polardbx/PolardbxSourceITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceITCase.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.polardbx; +package org.apache.flink.cdc.connectors.polardbx; import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.cdc.connectors.mysql.schema.MySqlSchema; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.TableResult; import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; @@ -25,7 +26,6 @@ import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.types.Row; import org.apache.flink.util.CloseableIterator; -import com.ververica.cdc.connectors.mysql.schema.MySqlSchema; import org.junit.BeforeClass; import org.junit.Test; @@ -170,7 +170,7 @@ public class PolardbxSourceITCase extends PolardbxSourceTestBase { env.setParallelism(parallelism); env.enableCheckpointing(200L); String sourceDDL = - String.format( + format( "CREATE TABLE polardbx_full_types (\n" + " `id` INT NOT NULL,\n" + " tiny_c TINYINT,\n" diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/polardbx/PolardbxSourceTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceTestBase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/polardbx/PolardbxSourceTestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceTestBase.java index ae699135a..1b49831a4 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/com/ververica/cdc/connectors/polardbx/PolardbxSourceTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/test/java/org/apache/flink/cdc/connectors/polardbx/PolardbxSourceTestBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.polardbx; +package org.apache.flink.cdc.connectors.polardbx; import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.test.util.AbstractTestBase; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/OceanBaseSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseSource.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/OceanBaseSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseSource.java index 929a137b5..2af7536c9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/OceanBaseSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseSource.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase; +package org.apache.flink.cdc.connectors.oceanbase; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.connectors.oceanbase.source.OceanBaseRichSourceFunction; +import org.apache.flink.cdc.connectors.oceanbase.table.OceanBaseDeserializationSchema; +import org.apache.flink.cdc.connectors.oceanbase.table.StartupMode; import org.apache.flink.streaming.api.functions.source.SourceFunction; import com.oceanbase.clogproxy.client.config.ClientConf; import com.oceanbase.clogproxy.client.config.ObReaderConfig; import com.oceanbase.clogproxy.client.util.ClientIdGenerator; -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.connectors.oceanbase.source.OceanBaseRichSourceFunction; -import com.ververica.cdc.connectors.oceanbase.table.OceanBaseDeserializationSchema; -import com.ververica.cdc.connectors.oceanbase.table.StartupMode; import org.apache.commons.lang3.StringUtils; import java.time.Duration; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseConnection.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/source/OceanBaseConnection.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseConnection.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/source/OceanBaseConnection.java index 476873a0a..89f538d62 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseConnection.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/source/OceanBaseConnection.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.source; +package org.apache.flink.cdc.connectors.oceanbase.source; import org.apache.flink.util.FlinkRuntimeException; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseDeserializationRuntimeConverter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/source/OceanBaseDeserializationRuntimeConverter.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseDeserializationRuntimeConverter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/source/OceanBaseDeserializationRuntimeConverter.java index f0d32b0a2..f11465705 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseDeserializationRuntimeConverter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/source/OceanBaseDeserializationRuntimeConverter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.source; +package org.apache.flink.cdc.connectors.oceanbase.source; import java.io.Serializable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseRichSourceFunction.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/source/OceanBaseRichSourceFunction.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseRichSourceFunction.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/source/OceanBaseRichSourceFunction.java index 057dc1ad6..92df4515f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/OceanBaseRichSourceFunction.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/source/OceanBaseRichSourceFunction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.source; +package org.apache.flink.cdc.connectors.oceanbase.source; import org.apache.flink.api.common.state.CheckpointListener; import org.apache.flink.api.common.state.ListState; @@ -23,6 +23,8 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.java.typeutils.ResultTypeQueryable; +import org.apache.flink.cdc.connectors.oceanbase.table.OceanBaseDeserializationSchema; +import org.apache.flink.cdc.connectors.oceanbase.table.OceanBaseRecord; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.state.FunctionInitializationContext; import org.apache.flink.runtime.state.FunctionSnapshotContext; @@ -37,8 +39,6 @@ import com.oceanbase.clogproxy.client.config.ObReaderConfig; import com.oceanbase.clogproxy.client.exception.LogProxyClientException; import com.oceanbase.clogproxy.client.listener.RecordListener; import com.oceanbase.oms.logmessage.LogMessage; -import com.ververica.cdc.connectors.oceanbase.table.OceanBaseDeserializationSchema; -import com.ververica.cdc.connectors.oceanbase.table.OceanBaseRecord; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/RowDataOceanBaseDeserializationSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/source/RowDataOceanBaseDeserializationSchema.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/RowDataOceanBaseDeserializationSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/source/RowDataOceanBaseDeserializationSchema.java index fc38ae035..9b36fce8c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/source/RowDataOceanBaseDeserializationSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/source/RowDataOceanBaseDeserializationSchema.java @@ -15,9 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.source; +package org.apache.flink.cdc.connectors.oceanbase.source; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.oceanbase.table.OceanBaseAppendMetadataCollector; +import org.apache.flink.cdc.connectors.oceanbase.table.OceanBaseDeserializationSchema; +import org.apache.flink.cdc.connectors.oceanbase.table.OceanBaseMetadataConverter; +import org.apache.flink.cdc.connectors.oceanbase.table.OceanBaseRecord; +import org.apache.flink.cdc.debezium.utils.TemporalConversions; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericArrayData; import org.apache.flink.table.data.GenericRowData; @@ -31,11 +36,6 @@ import org.apache.flink.types.RowKind; import org.apache.flink.util.Collector; import com.oceanbase.oms.logmessage.ByteString; -import com.ververica.cdc.connectors.oceanbase.table.OceanBaseAppendMetadataCollector; -import com.ververica.cdc.connectors.oceanbase.table.OceanBaseDeserializationSchema; -import com.ververica.cdc.connectors.oceanbase.table.OceanBaseMetadataConverter; -import com.ververica.cdc.connectors.oceanbase.table.OceanBaseRecord; -import com.ververica.cdc.debezium.utils.TemporalConversions; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseAppendMetadataCollector.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseAppendMetadataCollector.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseAppendMetadataCollector.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseAppendMetadataCollector.java index 853e0c968..72cc57943 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseAppendMetadataCollector.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseAppendMetadataCollector.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.table; +package org.apache.flink.cdc.connectors.oceanbase.table; +import org.apache.flink.cdc.common.annotation.Internal; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.utils.JoinedRowData; import org.apache.flink.util.Collector; -import com.ververica.cdc.common.annotation.Internal; - import java.io.Serializable; /** Emits a row with physical fields and metadata fields. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseDeserializationSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseDeserializationSchema.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseDeserializationSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseDeserializationSchema.java index 23ac5fefc..f87208c26 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseDeserializationSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseDeserializationSchema.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.table; +package org.apache.flink.cdc.connectors.oceanbase.table; import org.apache.flink.api.java.typeutils.ResultTypeQueryable; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import org.apache.flink.util.Collector; -import com.ververica.cdc.common.annotation.PublicEvolving; - import java.io.Serializable; /** diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseMetadataConverter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseMetadataConverter.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseMetadataConverter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseMetadataConverter.java index 40647dfb3..953f860c8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseMetadataConverter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseMetadataConverter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.table; +package org.apache.flink.cdc.connectors.oceanbase.table; -import com.ververica.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.annotation.Internal; import java.io.Serializable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseReadableMetadata.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseReadableMetadata.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseReadableMetadata.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseReadableMetadata.java index ea698b13e..021465a71 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseReadableMetadata.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseReadableMetadata.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.table; +package org.apache.flink.cdc.connectors.oceanbase.table; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.data.StringData; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseRecord.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseRecord.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseRecord.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseRecord.java index 745c203bc..716372c29 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseRecord.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseRecord.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.table; +package org.apache.flink.cdc.connectors.oceanbase.table; import com.oceanbase.oms.logmessage.DataMessage; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseTableSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseTableSource.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseTableSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseTableSource.java index 9b7114c65..0172e9e6b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseTableSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseTableSource.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.table; +package org.apache.flink.cdc.connectors.oceanbase.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.oceanbase.OceanBaseSource; +import org.apache.flink.cdc.connectors.oceanbase.source.RowDataOceanBaseDeserializationSchema; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.connector.ChangelogMode; import org.apache.flink.table.connector.source.DynamicTableSource; @@ -28,9 +30,6 @@ import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.oceanbase.OceanBaseSource; -import com.ververica.cdc.connectors.oceanbase.source.RowDataOceanBaseDeserializationSchema; - import java.time.Duration; import java.time.ZoneId; import java.util.Collections; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseTableSourceFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseTableSourceFactory.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseTableSourceFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseTableSourceFactory.java index cde1f282e..2de2a4b2c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseTableSourceFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseTableSourceFactory.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.table; +package org.apache.flink.cdc.connectors.oceanbase.table; +import org.apache.flink.cdc.connectors.oceanbase.utils.OptionUtils; +import org.apache.flink.cdc.debezium.utils.JdbcUrlUtils; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; import org.apache.flink.configuration.Configuration; @@ -26,9 +28,6 @@ import org.apache.flink.table.connector.source.DynamicTableSource; import org.apache.flink.table.factories.DynamicTableSourceFactory; import org.apache.flink.table.factories.FactoryUtil; -import com.ververica.cdc.connectors.oceanbase.utils.OptionUtils; -import com.ververica.cdc.debezium.utils.JdbcUrlUtils; - import java.time.Duration; import java.util.HashSet; import java.util.Map; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/StartupMode.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/StartupMode.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/StartupMode.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/StartupMode.java index ca0caaef5..a01246b3c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/table/StartupMode.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/table/StartupMode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.table; +package org.apache.flink.cdc.connectors.oceanbase.table; import org.apache.flink.table.api.ValidationException; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/utils/OptionUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/utils/OptionUtils.java new file mode 100644 index 000000000..a71dd26a6 --- /dev/null +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/utils/OptionUtils.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.cdc.connectors.oceanbase.utils; + +import org.apache.flink.configuration.ConfigurationUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Map; + +/** A utility class to print configuration of connectors. */ +public class OptionUtils { + + private static final Logger LOG = LoggerFactory.getLogger(OptionUtils.class); + + /** Utility class can not be instantiated. */ + private OptionUtils() {} + + public static void printOptions(String identifier, Map config) { + Map hideMap = ConfigurationUtils.hideSensitiveValues(config); + LOG.info("Print {} connector configuration:", identifier); + for (String key : hideMap.keySet()) { + LOG.info("{} = {}", key, hideMap.get(key)); + } + } +} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 5ed70e097..9eadc06c7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.ververica.cdc.connectors.oceanbase.table.OceanBaseTableSourceFactory +org.apache.flink.cdc.connectors.oceanbase.table.OceanBaseTableSourceFactory diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/com/ververica/cdc/connectors/oceanbase/OceanBaseTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseTestBase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/com/ververica/cdc/connectors/oceanbase/OceanBaseTestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseTestBase.java index 38a1e1fae..1aa962215 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/com/ververica/cdc/connectors/oceanbase/OceanBaseTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/OceanBaseTestBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase; +package org.apache.flink.cdc.connectors.oceanbase; import org.apache.flink.util.TestLogger; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseConnectorITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseConnectorITCase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseConnectorITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseConnectorITCase.java index f5586812b..8f6e0d9a2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseConnectorITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseConnectorITCase.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.table; +package org.apache.flink.cdc.connectors.oceanbase.table; +import org.apache.flink.cdc.connectors.oceanbase.OceanBaseTestBase; import org.apache.flink.runtime.minicluster.RpcServiceSharing; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; import org.apache.flink.streaming.api.CheckpointingMode; @@ -28,7 +29,6 @@ import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.table.utils.LegacyRowResource; import org.apache.flink.test.util.MiniClusterWithClientResource; -import com.ververica.cdc.connectors.oceanbase.OceanBaseTestBase; import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseTableFactoryTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseTableFactoryTest.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseTableFactoryTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseTableFactoryTest.java index 4c2cc287e..f759a902b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/com/ververica/cdc/connectors/oceanbase/table/OceanBaseTableFactoryTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/test/java/org/apache/flink/cdc/connectors/oceanbase/table/OceanBaseTableFactoryTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.table; +package org.apache.flink.cdc.connectors.oceanbase.table; import org.apache.flink.configuration.Configuration; import org.apache.flink.table.api.DataTypes; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/OracleSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/OracleSource.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/OracleSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/OracleSource.java index bf3b23ee1..cb56a5165 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/OracleSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/OracleSource.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle; +package org.apache.flink.cdc.connectors.oracle; + +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; import io.debezium.connector.oracle.OracleConnector; import javax.annotation.Nullable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/OracleValidator.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/OracleValidator.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/OracleValidator.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/OracleValidator.java index 778ccba59..05c3bee1b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/OracleValidator.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/OracleValidator.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle; +package org.apache.flink.cdc.connectors.oracle; +import org.apache.flink.cdc.connectors.oracle.util.OracleJdbcUrlUtils; +import org.apache.flink.cdc.debezium.Validator; import org.apache.flink.table.api.TableException; import org.apache.flink.table.api.ValidationException; -import com.ververica.cdc.connectors.oracle.util.OracleJdbcUrlUtils; -import com.ververica.cdc.debezium.Validator; - import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.DriverManager; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/OracleDialect.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/OracleDialect.java similarity index 78% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/OracleDialect.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/OracleDialect.java index f609fac19..2e1bd8fe8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/OracleDialect.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/OracleDialect.java @@ -15,25 +15,25 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source; - +package org.apache.flink.cdc.connectors.oracle.source; + +import org.apache.flink.cdc.common.annotation.Experimental; +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.dialect.JdbcDataSourceDialect; +import org.apache.flink.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; +import org.apache.flink.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.reader.external.FetchTask; +import org.apache.flink.cdc.connectors.oracle.source.assigner.splitter.OracleChunkSplitter; +import org.apache.flink.cdc.connectors.oracle.source.config.OracleSourceConfig; +import org.apache.flink.cdc.connectors.oracle.source.reader.fetch.OracleScanFetchTask; +import org.apache.flink.cdc.connectors.oracle.source.reader.fetch.OracleSourceFetchTaskContext; +import org.apache.flink.cdc.connectors.oracle.source.reader.fetch.OracleStreamFetchTask; +import org.apache.flink.cdc.connectors.oracle.source.utils.OracleConnectionUtils; +import org.apache.flink.cdc.connectors.oracle.source.utils.OracleSchema; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.common.annotation.Experimental; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.dialect.JdbcDataSourceDialect; -import com.ververica.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; -import com.ververica.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.reader.external.FetchTask; -import com.ververica.cdc.connectors.oracle.source.assigner.splitter.OracleChunkSplitter; -import com.ververica.cdc.connectors.oracle.source.config.OracleSourceConfig; -import com.ververica.cdc.connectors.oracle.source.reader.fetch.OracleScanFetchTask; -import com.ververica.cdc.connectors.oracle.source.reader.fetch.OracleSourceFetchTaskContext; -import com.ververica.cdc.connectors.oracle.source.reader.fetch.OracleStreamFetchTask; -import com.ververica.cdc.connectors.oracle.source.utils.OracleConnectionUtils; -import com.ververica.cdc.connectors.oracle.source.utils.OracleSchema; import io.debezium.connector.oracle.OracleConnection; import io.debezium.jdbc.JdbcConnection; import io.debezium.relational.TableId; @@ -45,8 +45,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.oracle.source.utils.OracleConnectionUtils.createOracleConnection; -import static com.ververica.cdc.connectors.oracle.source.utils.OracleConnectionUtils.currentRedoLogOffset; +import static org.apache.flink.cdc.connectors.oracle.source.utils.OracleConnectionUtils.createOracleConnection; +import static org.apache.flink.cdc.connectors.oracle.source.utils.OracleConnectionUtils.currentRedoLogOffset; /** The {@link JdbcDataSourceDialect} implementation for Oracle datasource. */ @Experimental diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/OraclePooledDataSourceFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/OraclePooledDataSourceFactory.java similarity index 84% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/OraclePooledDataSourceFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/OraclePooledDataSourceFactory.java index e155b2dae..fdd36b476 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/OraclePooledDataSourceFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/OraclePooledDataSourceFactory.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source; +package org.apache.flink.cdc.connectors.oracle.source; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; +import org.apache.flink.cdc.connectors.oracle.source.config.OracleSourceConfig; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; -import com.ververica.cdc.connectors.oracle.source.config.OracleSourceConfig; import org.apache.commons.lang3.StringUtils; /** A Oracle datasource factory. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/OracleSourceBuilder.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/OracleSourceBuilder.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/OracleSourceBuilder.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/OracleSourceBuilder.java index b76482b4b..9a740b15b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/OracleSourceBuilder.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/OracleSourceBuilder.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source; - -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; -import com.ververica.cdc.connectors.oracle.source.config.OracleSourceConfigFactory; -import com.ververica.cdc.connectors.oracle.source.meta.offset.RedoLogOffsetFactory; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; +package org.apache.flink.cdc.connectors.oracle.source; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; +import org.apache.flink.cdc.connectors.oracle.source.config.OracleSourceConfigFactory; +import org.apache.flink.cdc.connectors.oracle.source.meta.offset.RedoLogOffsetFactory; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; import javax.annotation.Nullable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/assigner/splitter/OracleChunkSplitter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/assigner/splitter/OracleChunkSplitter.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/assigner/splitter/OracleChunkSplitter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/assigner/splitter/OracleChunkSplitter.java index 32eb52d9c..a714205ff 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/assigner/splitter/OracleChunkSplitter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/assigner/splitter/OracleChunkSplitter.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.assigner.splitter; - +package org.apache.flink.cdc.connectors.oracle.source.assigner.splitter; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.dialect.JdbcDataSourceDialect; +import org.apache.flink.cdc.connectors.base.source.assigner.splitter.ChunkRange; +import org.apache.flink.cdc.connectors.base.source.assigner.splitter.JdbcSourceChunkSplitter; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.utils.ObjectUtils; +import org.apache.flink.cdc.connectors.oracle.source.utils.OracleTypeUtils; +import org.apache.flink.cdc.connectors.oracle.source.utils.OracleUtils; +import org.apache.flink.cdc.connectors.oracle.util.ChunkUtils; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.dialect.JdbcDataSourceDialect; -import com.ververica.cdc.connectors.base.source.assigner.splitter.ChunkRange; -import com.ververica.cdc.connectors.base.source.assigner.splitter.JdbcSourceChunkSplitter; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.utils.ObjectUtils; -import com.ververica.cdc.connectors.oracle.source.utils.OracleTypeUtils; -import com.ververica.cdc.connectors.oracle.source.utils.OracleUtils; -import com.ververica.cdc.connectors.oracle.util.ChunkUtils; import io.debezium.jdbc.JdbcConnection; import io.debezium.relational.Column; import io.debezium.relational.Table; @@ -49,8 +49,8 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import static com.ververica.cdc.connectors.base.utils.ObjectUtils.doubleCompare; import static java.math.BigDecimal.ROUND_CEILING; +import static org.apache.flink.cdc.connectors.base.utils.ObjectUtils.doubleCompare; /** * The {@code ChunkSplitter} used to split Oracle table into a set of chunks for JDBC data source. diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/config/OracleSourceConfig.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/config/OracleSourceConfig.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/config/OracleSourceConfig.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/config/OracleSourceConfig.java index d104a69b6..2c007fe54 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/config/OracleSourceConfig.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/config/OracleSourceConfig.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.config; +package org.apache.flink.cdc.connectors.oracle.source.config; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.options.StartupOptions; import io.debezium.config.Configuration; import io.debezium.connector.oracle.OracleConnectorConfig; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/config/OracleSourceConfigFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/config/OracleSourceConfigFactory.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/config/OracleSourceConfigFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/config/OracleSourceConfigFactory.java index ecdb69fd6..cf01b849e 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/config/OracleSourceConfigFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/config/OracleSourceConfigFactory.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.config; +package org.apache.flink.cdc.connectors.oracle.source.config; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfigFactory; +import org.apache.flink.cdc.connectors.base.source.EmbeddedFlinkDatabaseHistory; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfigFactory; -import com.ververica.cdc.connectors.base.source.EmbeddedFlinkDatabaseHistory; import io.debezium.config.Configuration; import io.debezium.connector.oracle.OracleConnector; @@ -29,7 +30,7 @@ import java.util.List; import java.util.Properties; import java.util.UUID; -import static com.ververica.cdc.connectors.base.utils.EnvironmentUtils.checkSupportCheckpointsAfterTasksFinished; +import static org.apache.flink.cdc.connectors.base.utils.EnvironmentUtils.checkSupportCheckpointsAfterTasksFinished; import static org.apache.flink.util.Preconditions.checkNotNull; /** A factory to initialize {@link OracleSourceConfig}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/config/OracleSourceOptions.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/config/OracleSourceOptions.java similarity index 88% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/config/OracleSourceOptions.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/config/OracleSourceOptions.java index 3133db832..4ff1b9d63 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/config/OracleSourceOptions.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/config/OracleSourceOptions.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.config; +package org.apache.flink.cdc.connectors.oracle.source.config; +import org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions; +import org.apache.flink.cdc.connectors.oracle.OracleSource; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; -import com.ververica.cdc.connectors.base.options.JdbcSourceOptions; -import com.ververica.cdc.connectors.oracle.OracleSource; - /** Configurations for {@link OracleSource}. */ public class OracleSourceOptions extends JdbcSourceOptions { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/handler/OracleSchemaChangeEventHandler.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/handler/OracleSchemaChangeEventHandler.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/handler/OracleSchemaChangeEventHandler.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/handler/OracleSchemaChangeEventHandler.java index 453dde0c7..5680d0177 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/handler/OracleSchemaChangeEventHandler.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/handler/OracleSchemaChangeEventHandler.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.handler; +package org.apache.flink.cdc.connectors.oracle.source.handler; + +import org.apache.flink.cdc.connectors.base.relational.handler.SchemaChangeEventHandler; -import com.ververica.cdc.connectors.base.relational.handler.SchemaChangeEventHandler; import io.debezium.schema.SchemaChangeEvent; import org.apache.kafka.connect.data.Struct; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/meta/offset/RedoLogOffset.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/meta/offset/RedoLogOffset.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/meta/offset/RedoLogOffset.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/meta/offset/RedoLogOffset.java index 22528de7e..e3004468a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/meta/offset/RedoLogOffset.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/meta/offset/RedoLogOffset.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.meta.offset; +package org.apache.flink.cdc.connectors.oracle.source.meta.offset; + +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; import io.debezium.connector.oracle.Scn; import org.apache.commons.lang3.StringUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/meta/offset/RedoLogOffsetFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/meta/offset/RedoLogOffsetFactory.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/meta/offset/RedoLogOffsetFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/meta/offset/RedoLogOffsetFactory.java index 2d8e139a9..f40afa9dd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/meta/offset/RedoLogOffsetFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/meta/offset/RedoLogOffsetFactory.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.meta.offset; +package org.apache.flink.cdc.connectors.oracle.source.meta.offset; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.OffsetFactory; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.offset.OffsetFactory; import java.util.Map; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/EventProcessorFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/EventProcessorFactory.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/EventProcessorFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/EventProcessorFactory.java index 62f1a9cc8..9676c8b0a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/EventProcessorFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/EventProcessorFactory.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.reader.fetch; +package org.apache.flink.cdc.connectors.oracle.source.reader.fetch; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.base.relational.JdbcSourceEventDispatcher; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplit; +import org.apache.flink.cdc.connectors.base.source.meta.wartermark.WatermarkKind; +import org.apache.flink.cdc.connectors.oracle.source.meta.offset.RedoLogOffset; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.base.relational.JdbcSourceEventDispatcher; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplit; -import com.ververica.cdc.connectors.base.source.meta.wartermark.WatermarkKind; -import com.ververica.cdc.connectors.oracle.source.meta.offset.RedoLogOffset; import io.debezium.DebeziumException; import io.debezium.connector.oracle.OracleConnection; import io.debezium.connector.oracle.OracleConnectorConfig; @@ -41,8 +42,6 @@ import org.slf4j.LoggerFactory; import java.sql.SQLException; -import static com.ververica.cdc.connectors.oracle.source.meta.offset.RedoLogOffset.NO_STOPPING_OFFSET; - /** * Factory to produce a LogMinerEventProcessor with enhanced processRow method to distinguish * whether is bounded. @@ -288,6 +287,6 @@ public class EventProcessorFactory { } private static boolean isBoundedRead(StreamSplit redoLogSplit) { - return !NO_STOPPING_OFFSET.equals(redoLogSplit.getEndingOffset()); + return !RedoLogOffset.NO_STOPPING_OFFSET.equals(redoLogSplit.getEndingOffset()); } } diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/OracleScanFetchTask.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/OracleScanFetchTask.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/OracleScanFetchTask.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/OracleScanFetchTask.java index 0f4d6f2ce..0fa72c616 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/OracleScanFetchTask.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/OracleScanFetchTask.java @@ -15,12 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.reader.fetch; +package org.apache.flink.cdc.connectors.oracle.source.reader.fetch; + +import org.apache.flink.cdc.connectors.base.relational.JdbcSourceEventDispatcher; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplit; +import org.apache.flink.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; -import com.ververica.cdc.connectors.base.relational.JdbcSourceEventDispatcher; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplit; -import com.ververica.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; import io.debezium.DebeziumException; import io.debezium.config.Configuration; import io.debezium.connector.oracle.OracleConnection; @@ -52,9 +53,9 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.time.Duration; -import static com.ververica.cdc.connectors.oracle.source.reader.fetch.OracleStreamFetchTask.RedoLogSplitReadTask; -import static com.ververica.cdc.connectors.oracle.source.utils.OracleUtils.buildSplitScanQuery; -import static com.ververica.cdc.connectors.oracle.source.utils.OracleUtils.readTableSplitDataStatement; +import static org.apache.flink.cdc.connectors.oracle.source.reader.fetch.OracleStreamFetchTask.RedoLogSplitReadTask; +import static org.apache.flink.cdc.connectors.oracle.source.utils.OracleUtils.buildSplitScanQuery; +import static org.apache.flink.cdc.connectors.oracle.source.utils.OracleUtils.readTableSplitDataStatement; /** The task to work for fetching data of Oracle table snapshot split. */ public class OracleScanFetchTask extends AbstractScanFetchTask { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/OracleSourceFetchTaskContext.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/OracleSourceFetchTaskContext.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/OracleSourceFetchTaskContext.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/OracleSourceFetchTaskContext.java index d7c86b6ed..9f13aee9a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/OracleSourceFetchTaskContext.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/OracleSourceFetchTaskContext.java @@ -15,23 +15,23 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.reader.fetch; - +package org.apache.flink.cdc.connectors.oracle.source.reader.fetch; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.dialect.JdbcDataSourceDialect; +import org.apache.flink.cdc.connectors.base.relational.JdbcSourceEventDispatcher; +import org.apache.flink.cdc.connectors.base.source.EmbeddedFlinkDatabaseHistory; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.reader.external.JdbcSourceFetchTaskContext; +import org.apache.flink.cdc.connectors.base.utils.SourceRecordUtils; +import org.apache.flink.cdc.connectors.oracle.source.config.OracleSourceConfig; +import org.apache.flink.cdc.connectors.oracle.source.handler.OracleSchemaChangeEventHandler; +import org.apache.flink.cdc.connectors.oracle.source.meta.offset.RedoLogOffset; +import org.apache.flink.cdc.connectors.oracle.source.utils.OracleUtils; +import org.apache.flink.cdc.connectors.oracle.util.ChunkUtils; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.dialect.JdbcDataSourceDialect; -import com.ververica.cdc.connectors.base.relational.JdbcSourceEventDispatcher; -import com.ververica.cdc.connectors.base.source.EmbeddedFlinkDatabaseHistory; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.reader.external.JdbcSourceFetchTaskContext; -import com.ververica.cdc.connectors.base.utils.SourceRecordUtils; -import com.ververica.cdc.connectors.oracle.source.config.OracleSourceConfig; -import com.ververica.cdc.connectors.oracle.source.handler.OracleSchemaChangeEventHandler; -import com.ververica.cdc.connectors.oracle.source.meta.offset.RedoLogOffset; -import com.ververica.cdc.connectors.oracle.source.utils.OracleUtils; -import com.ververica.cdc.connectors.oracle.util.ChunkUtils; import io.debezium.connector.base.ChangeEventQueue; import io.debezium.connector.oracle.OracleChangeEventSourceMetricsFactory; import io.debezium.connector.oracle.OracleConnection; @@ -69,8 +69,8 @@ import java.sql.SQLException; import java.time.Instant; import java.util.Map; -import static com.ververica.cdc.connectors.oracle.source.utils.OracleConnectionUtils.createOracleConnection; -import static com.ververica.cdc.connectors.oracle.util.ChunkUtils.getChunkKeyColumn; +import static org.apache.flink.cdc.connectors.oracle.source.utils.OracleConnectionUtils.createOracleConnection; +import static org.apache.flink.cdc.connectors.oracle.util.ChunkUtils.getChunkKeyColumn; /** The context for fetch task that fetching data of snapshot split from Oracle data source. */ public class OracleSourceFetchTaskContext extends JdbcSourceFetchTaskContext { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/OracleStreamFetchTask.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/OracleStreamFetchTask.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/OracleStreamFetchTask.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/OracleStreamFetchTask.java index 7e4db0c0f..19ecd7254 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/OracleStreamFetchTask.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/OracleStreamFetchTask.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.reader.fetch; +package org.apache.flink.cdc.connectors.oracle.source.reader.fetch; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.base.relational.JdbcSourceEventDispatcher; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplit; +import org.apache.flink.cdc.connectors.base.source.reader.external.FetchTask; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.base.relational.JdbcSourceEventDispatcher; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplit; -import com.ververica.cdc.connectors.base.source.reader.external.FetchTask; import io.debezium.config.Configuration; import io.debezium.connector.oracle.OracleConnection; import io.debezium.connector.oracle.OracleConnectorConfig; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/StoppableChangeEventSourceContext.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/StoppableChangeEventSourceContext.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/StoppableChangeEventSourceContext.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/StoppableChangeEventSourceContext.java index 01bd9ffd7..14bd8324a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/reader/fetch/StoppableChangeEventSourceContext.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/reader/fetch/StoppableChangeEventSourceContext.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.reader.fetch; +package org.apache.flink.cdc.connectors.oracle.source.reader.fetch; import io.debezium.pipeline.source.spi.ChangeEventSource; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/utils/OracleConnectionUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/utils/OracleConnectionUtils.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/utils/OracleConnectionUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/utils/OracleConnectionUtils.java index 7d080e280..d31342982 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/utils/OracleConnectionUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/utils/OracleConnectionUtils.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.utils; +package org.apache.flink.cdc.connectors.oracle.source.utils; +import org.apache.flink.cdc.connectors.oracle.source.meta.offset.RedoLogOffset; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.oracle.source.meta.offset.RedoLogOffset; import io.debezium.config.Configuration; import io.debezium.connector.oracle.OracleConnection; import io.debezium.connector.oracle.Scn; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/utils/OracleSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/utils/OracleSchema.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/utils/OracleSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/utils/OracleSchema.java index 2d17069cf..14830e28c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/utils/OracleSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/utils/OracleSchema.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.utils; +package org.apache.flink.cdc.connectors.oracle.source.utils; import org.apache.flink.util.FlinkRuntimeException; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/utils/OracleTypeUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/utils/OracleTypeUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/utils/OracleTypeUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/utils/OracleTypeUtils.java index 35466e9cf..0069b2bd1 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/utils/OracleTypeUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/utils/OracleTypeUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.utils; +package org.apache.flink.cdc.connectors.oracle.source.utils; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/utils/OracleUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/utils/OracleUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/utils/OracleUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/utils/OracleUtils.java index 2dc725950..b762a974b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/source/utils/OracleUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/utils/OracleUtils.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source.utils; +package org.apache.flink.cdc.connectors.oracle.source.utils; +import org.apache.flink.cdc.connectors.oracle.source.meta.offset.RedoLogOffset; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.oracle.source.meta.offset.RedoLogOffset; import io.debezium.connector.oracle.OracleConnection; import io.debezium.connector.oracle.OracleConnectorConfig; import io.debezium.connector.oracle.OracleDatabaseSchema; @@ -42,7 +42,7 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.base.utils.SourceRecordUtils.rowToArray; +import static org.apache.flink.cdc.connectors.base.utils.SourceRecordUtils.rowToArray; /** Utils to prepare Oracle SQL statement. */ public class OracleUtils { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleDeserializationConverterFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleDeserializationConverterFactory.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleDeserializationConverterFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleDeserializationConverterFactory.java index a0089fad6..a5374316b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleDeserializationConverterFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleDeserializationConverterFactory.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.table; +package org.apache.flink.cdc.connectors.oracle.table; +import org.apache.flink.cdc.debezium.table.DeserializationRuntimeConverter; +import org.apache.flink.cdc.debezium.table.DeserializationRuntimeConverterFactory; import org.apache.flink.table.data.TimestampData; import org.apache.flink.table.types.logical.LogicalType; -import com.ververica.cdc.debezium.table.DeserializationRuntimeConverter; -import com.ververica.cdc.debezium.table.DeserializationRuntimeConverterFactory; import io.debezium.data.SpecialValueDecimal; import io.debezium.data.VariableScaleDecimal; import org.apache.kafka.connect.data.Schema; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleReadableMetaData.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleReadableMetaData.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleReadableMetaData.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleReadableMetaData.java index 4b53882f7..c30fafd37 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleReadableMetaData.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleReadableMetaData.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.table; +package org.apache.flink.cdc.connectors.oracle.table; +import org.apache.flink.cdc.debezium.table.MetadataConverter; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.data.StringData; import org.apache.flink.table.data.TimestampData; import org.apache.flink.table.types.DataType; -import com.ververica.cdc.debezium.table.MetadataConverter; import io.debezium.connector.AbstractSourceInfo; import io.debezium.data.Envelope; import org.apache.kafka.connect.data.Struct; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleTableSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleTableSource.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleTableSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleTableSource.java index 064f78ba0..9487a0968 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleTableSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleTableSource.java @@ -15,9 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.table; +package org.apache.flink.cdc.connectors.oracle.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; +import org.apache.flink.cdc.connectors.oracle.OracleSource; +import org.apache.flink.cdc.connectors.oracle.source.OracleSourceBuilder; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.table.MetadataConverter; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.connector.ChangelogMode; import org.apache.flink.table.connector.source.DynamicTableSource; @@ -29,15 +37,6 @@ import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; -import com.ververica.cdc.connectors.oracle.OracleSource; -import com.ververica.cdc.connectors.oracle.source.OracleSourceBuilder; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.table.MetadataConverter; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; - import javax.annotation.Nullable; import java.time.Duration; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleTableSourceFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleTableSourceFactory.java similarity index 79% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleTableSourceFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleTableSourceFactory.java index 27e984b42..5f533d8f2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/table/OracleTableSourceFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleTableSourceFactory.java @@ -15,8 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.table; +package org.apache.flink.cdc.connectors.oracle.table; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.utils.OptionUtils; +import org.apache.flink.cdc.debezium.table.DebeziumOptions; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.ReadableConfig; @@ -26,37 +29,33 @@ import org.apache.flink.table.connector.source.DynamicTableSource; import org.apache.flink.table.factories.DynamicTableSourceFactory; import org.apache.flink.table.factories.FactoryUtil; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.utils.OptionUtils; -import com.ververica.cdc.debezium.table.DebeziumOptions; - import java.time.Duration; import java.util.HashSet; import java.util.Set; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.CONNECTION_POOL_SIZE; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.CONNECT_MAX_RETRIES; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.CONNECT_TIMEOUT; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.DATABASE_NAME; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.HOSTNAME; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.PASSWORD; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.TABLE_NAME; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.USERNAME; -import static com.ververica.cdc.connectors.base.options.SourceOptions.CHUNK_META_GROUP_SIZE; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_SNAPSHOT_FETCH_SIZE; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_STARTUP_MODE; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; -import static com.ververica.cdc.connectors.base.utils.ObjectUtils.doubleCompare; -import static com.ververica.cdc.connectors.oracle.source.config.OracleSourceOptions.PORT; -import static com.ververica.cdc.connectors.oracle.source.config.OracleSourceOptions.SCHEMA_NAME; -import static com.ververica.cdc.connectors.oracle.source.config.OracleSourceOptions.URL; -import static com.ververica.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.CONNECTION_POOL_SIZE; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.CONNECT_MAX_RETRIES; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.CONNECT_TIMEOUT; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.DATABASE_NAME; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.HOSTNAME; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.PASSWORD; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.TABLE_NAME; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.USERNAME; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.CHUNK_META_GROUP_SIZE; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_SNAPSHOT_FETCH_SIZE; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_STARTUP_MODE; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; +import static org.apache.flink.cdc.connectors.base.utils.ObjectUtils.doubleCompare; +import static org.apache.flink.cdc.connectors.oracle.source.config.OracleSourceOptions.PORT; +import static org.apache.flink.cdc.connectors.oracle.source.config.OracleSourceOptions.SCHEMA_NAME; +import static org.apache.flink.cdc.connectors.oracle.source.config.OracleSourceOptions.URL; +import static org.apache.flink.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; import static org.apache.flink.util.Preconditions.checkNotNull; import static org.apache.flink.util.Preconditions.checkState; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/util/ChunkUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/util/ChunkUtils.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/util/ChunkUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/util/ChunkUtils.java index 443e44b4e..2ccafc7ed 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/util/ChunkUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/util/ChunkUtils.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.util; +package org.apache.flink.cdc.connectors.oracle.util; +import org.apache.flink.cdc.connectors.oracle.source.utils.OracleTypeUtils; import org.apache.flink.table.api.ValidationException; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.oracle.source.utils.OracleTypeUtils; import io.debezium.relational.Column; import io.debezium.relational.Table; import oracle.sql.ROWID; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/util/OracleJdbcUrlUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/util/OracleJdbcUrlUtils.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/util/OracleJdbcUrlUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/util/OracleJdbcUrlUtils.java index cb15e62d2..03242340a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/util/OracleJdbcUrlUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/util/OracleJdbcUrlUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.util; +package org.apache.flink.cdc.connectors.oracle.util; import java.util.Properties; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 63fb1b194..5e9409880 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.ververica.cdc.connectors.oracle.table.OracleTableSourceFactory +org.apache.flink.cdc.connectors.oracle.table.OracleTableSourceFactory diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/OracleChangeEventSourceExampleTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/OracleChangeEventSourceExampleTest.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/OracleChangeEventSourceExampleTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/OracleChangeEventSourceExampleTest.java index e1a8346c0..0dbe940ac 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/OracleChangeEventSourceExampleTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/OracleChangeEventSourceExampleTest.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle; +package org.apache.flink.cdc.connectors.oracle; import org.apache.flink.api.common.eventtime.WatermarkStrategy; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; +import org.apache.flink.cdc.connectors.oracle.source.OracleSourceBuilder; +import org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.minicluster.RpcServiceSharing; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.test.util.MiniClusterWithClientResource; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; -import com.ververica.cdc.connectors.oracle.source.OracleSourceBuilder; -import com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/OracleSourceTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/OracleSourceTest.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/OracleSourceTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/OracleSourceTest.java index 0cd89d3e9..fadcfa6a0 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/OracleSourceTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/OracleSourceTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle; +package org.apache.flink.cdc.connectors.oracle; import org.apache.flink.api.common.state.BroadcastState; import org.apache.flink.api.common.state.KeyedStateStore; @@ -24,6 +24,10 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.OperatorStateStore; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase; +import org.apache.flink.cdc.connectors.utils.TestSourceContext; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.testutils.CheckedThread; import org.apache.flink.runtime.state.FunctionInitializationContext; @@ -34,10 +38,6 @@ import org.apache.flink.util.Collector; import org.apache.flink.util.Preconditions; import com.jayway.jsonpath.JsonPath; -import com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase; -import com.ververica.cdc.connectors.utils.TestSourceContext; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; import org.apache.kafka.connect.source.SourceRecord; import org.junit.Ignore; import org.junit.Test; @@ -60,10 +60,10 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertDelete; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertInsert; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertRead; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertUpdate; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertDelete; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertInsert; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertRead; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertUpdate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/source/OracleSourceITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/source/OracleSourceITCase.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/source/OracleSourceITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/source/OracleSourceITCase.java index 1ebe42aca..3c4a71590 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/source/OracleSourceITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/source/OracleSourceITCase.java @@ -15,11 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source; +package org.apache.flink.cdc.connectors.oracle.source; import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHook; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; +import org.apache.flink.cdc.connectors.oracle.source.utils.OracleConnectionUtils; +import org.apache.flink.cdc.connectors.oracle.testutils.TestTable; import org.apache.flink.runtime.highavailability.nonha.embedded.HaLeadershipControl; import org.apache.flink.runtime.minicluster.MiniCluster; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -32,12 +38,6 @@ import org.apache.flink.types.Row; import org.apache.flink.util.CloseableIterator; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHook; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; -import com.ververica.cdc.connectors.oracle.source.utils.OracleConnectionUtils; -import com.ververica.cdc.connectors.oracle.testutils.TestTable; import io.debezium.connector.oracle.OracleConnection; import io.debezium.jdbc.JdbcConfiguration; import org.apache.commons.lang3.StringUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/source/OracleSourceTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/source/OracleSourceTestBase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/source/OracleSourceTestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/source/OracleSourceTestBase.java index b40fe6595..8fb1157f4 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/source/OracleSourceTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/source/OracleSourceTestBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.source; +package org.apache.flink.cdc.connectors.oracle.source; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.minicluster.RpcServiceSharing; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/table/OracleConnectorITCase.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/table/OracleConnectorITCase.java index f5d514e87..4e2d38088 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleConnectorITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/table/OracleConnectorITCase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.table; +package org.apache.flink.cdc.connectors.oracle.table; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; @@ -53,13 +53,13 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase.CONNECTOR_PWD; -import static com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase.CONNECTOR_USER; -import static com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase.ORACLE_CONTAINER; -import static com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase.assertEqualsInAnyOrder; -import static com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase.createAndInitialize; -import static com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase.getJdbcConnection; -import static com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase.getJdbcConnectionAsDBA; +import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase.CONNECTOR_PWD; +import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase.CONNECTOR_USER; +import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase.ORACLE_CONTAINER; +import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase.assertEqualsInAnyOrder; +import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase.createAndInitialize; +import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase.getJdbcConnection; +import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase.getJdbcConnectionAsDBA; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java index 44f188dae..584c8c16b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/table/OracleTableSourceFactoryTest.java @@ -15,8 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.table; +package org.apache.flink.cdc.connectors.oracle.table; +import org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions; +import org.apache.flink.cdc.connectors.base.options.SourceOptions; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; import org.apache.flink.table.api.DataTypes; @@ -32,9 +35,6 @@ import org.apache.flink.table.factories.Factory; import org.apache.flink.table.factories.FactoryUtil; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.connectors.base.options.JdbcSourceOptions; -import com.ververica.cdc.connectors.base.options.SourceOptions; -import com.ververica.cdc.connectors.base.options.StartupOptions; import org.junit.Test; import java.time.Duration; @@ -49,10 +49,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -/** - * Test for {@link com.ververica.cdc.connectors.oracle.table.OracleTableSource} created by {@link - * com.ververica.cdc.connectors.oracle.table.OracleTableSourceFactory}. - */ +/** Test for {@link OracleTableSource} created by {@link OracleTableSourceFactory}. */ public class OracleTableSourceFactoryTest { private static final ResolvedSchema SCHEMA = new ResolvedSchema( diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/testutils/RecordsFormatter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/testutils/RecordsFormatter.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/testutils/RecordsFormatter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/testutils/RecordsFormatter.java index 1158c0eb2..3adecccbd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/testutils/RecordsFormatter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/testutils/RecordsFormatter.java @@ -15,9 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.testutils; +package org.apache.flink.cdc.connectors.oracle.testutils; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.base.utils.SourceRecordUtils; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.conversion.RowRowConverter; import org.apache.flink.table.types.DataType; @@ -26,9 +29,6 @@ import org.apache.flink.table.types.utils.TypeConversions; import org.apache.flink.types.Row; import org.apache.flink.util.Collector; -import com.ververica.cdc.connectors.base.utils.SourceRecordUtils; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.kafka.connect.source.SourceRecord; import java.time.ZoneId; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/testutils/TestTable.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/testutils/TestTable.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/testutils/TestTable.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/testutils/TestTable.java index 3e7e05387..dc39c4cfc 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/com/ververica/cdc/connectors/oracle/testutils/TestTable.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/testutils/TestTable.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle.testutils; +package org.apache.flink.cdc.connectors.oracle.testutils; +import org.apache.flink.cdc.connectors.oracle.table.OracleDeserializationConverterFactory; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.conversion.RowRowConverter; import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.oracle.table.OracleDeserializationConverterFactory; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.kafka.connect.source.SourceRecord; import java.util.List; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/utils/OptionUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/utils/OptionUtils.java deleted file mode 100644 index 578de384f..000000000 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/utils/OptionUtils.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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 com.ververica.cdc.connectors.postgres.utils; - -import org.apache.flink.configuration.ConfigurationUtils; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Map; - -/** A utility class to print configuration of connectors. */ -public class OptionUtils { - - private static final Logger LOG = LoggerFactory.getLogger(OptionUtils.class); - - /** Utility class can not be instantiated. */ - private OptionUtils() {} - - public static void printOptions(String identifier, Map config) { - Map hideMap = ConfigurationUtils.hideSensitiveValues(config); - LOG.info("Print {} connector configuration:", identifier); - for (String key : hideMap.keySet()) { - LOG.info("{} = {}", key, hideMap.get(key)); - } - } -} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/io/debezium/connector/postgresql/Utils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/io/debezium/connector/postgresql/Utils.java index f1f1a461e..3e780afaa 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/io/debezium/connector/postgresql/Utils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/io/debezium/connector/postgresql/Utils.java @@ -17,9 +17,9 @@ package io.debezium.connector.postgresql; +import org.apache.flink.cdc.connectors.postgres.source.offset.PostgresOffset; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.postgres.source.offset.PostgresOffset; import io.debezium.connector.postgresql.connection.Lsn; import io.debezium.connector.postgresql.connection.PostgresConnection; import io.debezium.time.Conversions; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/PostgreSQLSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/PostgreSQLSource.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/PostgreSQLSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/PostgreSQLSource.java index 2cdee548e..73938c450 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/PostgreSQLSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/PostgreSQLSource.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres; +package org.apache.flink.cdc.connectors.postgres; + +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.Validator; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.Validator; import io.debezium.connector.postgresql.PostgresConnector; import java.time.Duration; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/PostgresChunkSplitter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/PostgresChunkSplitter.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/PostgresChunkSplitter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/PostgresChunkSplitter.java index 760898939..871b0cb5b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/PostgresChunkSplitter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/PostgresChunkSplitter.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source; - +package org.apache.flink.cdc.connectors.postgres.source; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.source.assigner.splitter.ChunkRange; +import org.apache.flink.cdc.connectors.base.source.assigner.splitter.JdbcSourceChunkSplitter; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.utils.ObjectUtils; +import org.apache.flink.cdc.connectors.postgres.source.utils.ChunkUtils; +import org.apache.flink.cdc.connectors.postgres.source.utils.PostgresQueryUtils; +import org.apache.flink.cdc.connectors.postgres.source.utils.PostgresTypeUtils; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.source.assigner.splitter.ChunkRange; -import com.ververica.cdc.connectors.base.source.assigner.splitter.JdbcSourceChunkSplitter; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.utils.ObjectUtils; -import com.ververica.cdc.connectors.postgres.source.utils.ChunkUtils; -import com.ververica.cdc.connectors.postgres.source.utils.PostgresQueryUtils; -import com.ververica.cdc.connectors.postgres.source.utils.PostgresTypeUtils; import io.debezium.jdbc.JdbcConnection; import io.debezium.relational.Column; import io.debezium.relational.Table; @@ -47,8 +47,8 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import static com.ververica.cdc.connectors.base.utils.ObjectUtils.doubleCompare; import static java.math.BigDecimal.ROUND_CEILING; +import static org.apache.flink.cdc.connectors.base.utils.ObjectUtils.doubleCompare; /** * The splitter to split the table into chunks using primary-key (by default) or a given split key. diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/PostgresConnectionPoolFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/PostgresConnectionPoolFactory.java similarity index 86% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/PostgresConnectionPoolFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/PostgresConnectionPoolFactory.java index 8943d5eab..3c96622e5 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/PostgresConnectionPoolFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/PostgresConnectionPoolFactory.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source; +package org.apache.flink.cdc.connectors.postgres.source; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.relational.connection.ConnectionPoolId; +import org.apache.flink.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.relational.connection.ConnectionPoolId; -import com.ververica.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; import com.zaxxer.hikari.HikariDataSource; import io.debezium.jdbc.JdbcConfiguration; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/PostgresDialect.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/PostgresDialect.java similarity index 87% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/PostgresDialect.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/PostgresDialect.java index d77d1b232..5e83f6685 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/PostgresDialect.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/PostgresDialect.java @@ -15,25 +15,25 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source; - +package org.apache.flink.cdc.connectors.postgres.source; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.dialect.JdbcDataSourceDialect; +import org.apache.flink.cdc.connectors.base.relational.connection.JdbcConnectionFactory; +import org.apache.flink.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; +import org.apache.flink.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.reader.external.FetchTask; +import org.apache.flink.cdc.connectors.base.source.reader.external.JdbcSourceFetchTaskContext; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfig; +import org.apache.flink.cdc.connectors.postgres.source.fetch.PostgresScanFetchTask; +import org.apache.flink.cdc.connectors.postgres.source.fetch.PostgresSourceFetchTaskContext; +import org.apache.flink.cdc.connectors.postgres.source.fetch.PostgresStreamFetchTask; +import org.apache.flink.cdc.connectors.postgres.source.utils.CustomPostgresSchema; +import org.apache.flink.cdc.connectors.postgres.source.utils.TableDiscoveryUtils; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.dialect.JdbcDataSourceDialect; -import com.ververica.cdc.connectors.base.relational.connection.JdbcConnectionFactory; -import com.ververica.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; -import com.ververica.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.reader.external.FetchTask; -import com.ververica.cdc.connectors.base.source.reader.external.JdbcSourceFetchTaskContext; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfig; -import com.ververica.cdc.connectors.postgres.source.fetch.PostgresScanFetchTask; -import com.ververica.cdc.connectors.postgres.source.fetch.PostgresSourceFetchTaskContext; -import com.ververica.cdc.connectors.postgres.source.fetch.PostgresStreamFetchTask; -import com.ververica.cdc.connectors.postgres.source.utils.CustomPostgresSchema; -import com.ververica.cdc.connectors.postgres.source.utils.TableDiscoveryUtils; import io.debezium.connector.postgresql.PostgresConnectorConfig; import io.debezium.connector.postgresql.PostgresObjectUtils; import io.debezium.connector.postgresql.PostgresSchema; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/PostgresSourceBuilder.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/PostgresSourceBuilder.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/PostgresSourceBuilder.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/PostgresSourceBuilder.java index 8e6efb302..6fa882f56 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/PostgresSourceBuilder.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/PostgresSourceBuilder.java @@ -15,35 +15,35 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source; +package org.apache.flink.cdc.connectors.postgres.source; import org.apache.flink.api.connector.source.SourceReaderContext; import org.apache.flink.api.connector.source.SplitEnumeratorContext; +import org.apache.flink.cdc.common.annotation.Experimental; +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.assigner.HybridSplitAssigner; +import org.apache.flink.cdc.connectors.base.source.assigner.SplitAssigner; +import org.apache.flink.cdc.connectors.base.source.assigner.StreamSplitAssigner; +import org.apache.flink.cdc.connectors.base.source.assigner.state.HybridPendingSplitsState; +import org.apache.flink.cdc.connectors.base.source.assigner.state.PendingSplitsState; +import org.apache.flink.cdc.connectors.base.source.assigner.state.StreamPendingSplitsState; +import org.apache.flink.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceRecords; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.metrics.SourceReaderMetrics; +import org.apache.flink.cdc.connectors.base.source.reader.IncrementalSourceReaderContext; +import org.apache.flink.cdc.connectors.base.source.reader.IncrementalSourceSplitReader; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfig; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory; +import org.apache.flink.cdc.connectors.postgres.source.enumerator.PostgresSourceEnumerator; +import org.apache.flink.cdc.connectors.postgres.source.offset.PostgresOffsetFactory; +import org.apache.flink.cdc.connectors.postgres.source.reader.PostgresSourceReader; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds; import org.apache.flink.connector.base.source.reader.synchronization.FutureCompletingBlockingQueue; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.common.annotation.Experimental; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.assigner.HybridSplitAssigner; -import com.ververica.cdc.connectors.base.source.assigner.SplitAssigner; -import com.ververica.cdc.connectors.base.source.assigner.StreamSplitAssigner; -import com.ververica.cdc.connectors.base.source.assigner.state.HybridPendingSplitsState; -import com.ververica.cdc.connectors.base.source.assigner.state.PendingSplitsState; -import com.ververica.cdc.connectors.base.source.assigner.state.StreamPendingSplitsState; -import com.ververica.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; -import com.ververica.cdc.connectors.base.source.meta.split.SourceRecords; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.metrics.SourceReaderMetrics; -import com.ververica.cdc.connectors.base.source.reader.IncrementalSourceReaderContext; -import com.ververica.cdc.connectors.base.source.reader.IncrementalSourceSplitReader; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfig; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory; -import com.ververica.cdc.connectors.postgres.source.enumerator.PostgresSourceEnumerator; -import com.ververica.cdc.connectors.postgres.source.offset.PostgresOffsetFactory; -import com.ververica.cdc.connectors.postgres.source.reader.PostgresSourceReader; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; import io.debezium.relational.TableId; import java.time.Duration; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/config/PostgresSourceConfig.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/config/PostgresSourceConfig.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/config/PostgresSourceConfig.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/config/PostgresSourceConfig.java index c949dafc9..c20e57fab 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/config/PostgresSourceConfig.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/config/PostgresSourceConfig.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.config; +package org.apache.flink.cdc.connectors.postgres.source.config; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.options.StartupOptions; import io.debezium.config.Configuration; import io.debezium.connector.postgresql.PostgresConnectorConfig; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/config/PostgresSourceConfigFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/config/PostgresSourceConfigFactory.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/config/PostgresSourceConfigFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/config/PostgresSourceConfigFactory.java index 4e013208c..1490dd400 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/config/PostgresSourceConfigFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/config/PostgresSourceConfigFactory.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.config; +package org.apache.flink.cdc.connectors.postgres.source.config; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfigFactory; +import org.apache.flink.cdc.connectors.base.source.EmbeddedFlinkDatabaseHistory; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfigFactory; -import com.ververica.cdc.connectors.base.source.EmbeddedFlinkDatabaseHistory; import io.debezium.config.Configuration; import io.debezium.connector.postgresql.PostgresConnector; @@ -29,8 +30,7 @@ import java.util.List; import java.util.Properties; import java.util.UUID; -import static com.ververica.cdc.connectors.base.utils.EnvironmentUtils.checkSupportCheckpointsAfterTasksFinished; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.HEARTBEAT_INTERVAL; +import static org.apache.flink.cdc.connectors.base.utils.EnvironmentUtils.checkSupportCheckpointsAfterTasksFinished; import static org.apache.flink.util.Preconditions.checkNotNull; /** Factory to create Configuration for Postgres source. */ @@ -38,7 +38,7 @@ public class PostgresSourceConfigFactory extends JdbcSourceConfigFactory { private static final long serialVersionUID = 1L; - private Duration heartbeatInterval = HEARTBEAT_INTERVAL.defaultValue(); + private Duration heartbeatInterval = PostgresSourceOptions.HEARTBEAT_INTERVAL.defaultValue(); private static final String JDBC_DRIVER = "org.postgresql.Driver"; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/config/PostgresSourceOptions.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/config/PostgresSourceOptions.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/config/PostgresSourceOptions.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/config/PostgresSourceOptions.java index dbf4e96e6..391458ded 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/config/PostgresSourceOptions.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/config/PostgresSourceOptions.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.config; +package org.apache.flink.cdc.connectors.postgres.source.config; +import org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions; +import org.apache.flink.cdc.connectors.postgres.source.PostgresSourceBuilder; +import org.apache.flink.cdc.debezium.table.DebeziumChangelogMode; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; -import com.ververica.cdc.connectors.base.options.JdbcSourceOptions; -import com.ververica.cdc.connectors.postgres.source.PostgresSourceBuilder; -import com.ververica.cdc.debezium.table.DebeziumChangelogMode; - import java.time.Duration; /** Configurations for {@link PostgresSourceBuilder.PostgresIncrementalSource}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/enumerator/PostgresSourceEnumerator.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/enumerator/PostgresSourceEnumerator.java similarity index 84% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/enumerator/PostgresSourceEnumerator.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/enumerator/PostgresSourceEnumerator.java index 96f576552..be6cfa71f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/enumerator/PostgresSourceEnumerator.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/enumerator/PostgresSourceEnumerator.java @@ -15,28 +15,28 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.enumerator; +package org.apache.flink.cdc.connectors.postgres.source.enumerator; import org.apache.flink.api.connector.source.Boundedness; import org.apache.flink.api.connector.source.SourceEvent; import org.apache.flink.api.connector.source.SplitEnumeratorContext; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.connectors.base.source.assigner.AssignerStatus; +import org.apache.flink.cdc.connectors.base.source.assigner.SplitAssigner; +import org.apache.flink.cdc.connectors.base.source.enumerator.IncrementalSourceEnumerator; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.postgres.source.PostgresDialect; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfig; +import org.apache.flink.cdc.connectors.postgres.source.events.OffsetCommitAckEvent; +import org.apache.flink.cdc.connectors.postgres.source.events.OffsetCommitEvent; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.connectors.base.source.assigner.AssignerStatus; -import com.ververica.cdc.connectors.base.source.assigner.SplitAssigner; -import com.ververica.cdc.connectors.base.source.enumerator.IncrementalSourceEnumerator; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.postgres.source.PostgresDialect; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfig; -import com.ververica.cdc.connectors.postgres.source.events.OffsetCommitAckEvent; -import com.ververica.cdc.connectors.postgres.source.events.OffsetCommitEvent; import io.debezium.connector.postgresql.connection.PostgresConnection; import io.debezium.connector.postgresql.connection.PostgresReplicationConnection; import io.debezium.connector.postgresql.spi.SlotState; -import static com.ververica.cdc.connectors.base.source.assigner.AssignerStatus.isNewlyAddedAssigning; -import static com.ververica.cdc.connectors.base.source.assigner.AssignerStatus.isNewlyAddedAssigningSnapshotFinished; +import static org.apache.flink.cdc.connectors.base.source.assigner.AssignerStatus.isNewlyAddedAssigning; +import static org.apache.flink.cdc.connectors.base.source.assigner.AssignerStatus.isNewlyAddedAssigningSnapshotFinished; /** * The Postgres source enumerator that enumerates receive the split request and assign the split to diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/events/OffsetCommitAckEvent.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/events/OffsetCommitAckEvent.java similarity index 67% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/events/OffsetCommitAckEvent.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/events/OffsetCommitAckEvent.java index 3ca8b220d..634b02c6f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/events/OffsetCommitAckEvent.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/events/OffsetCommitAckEvent.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.events; +package org.apache.flink.cdc.connectors.postgres.source.events; import org.apache.flink.api.connector.source.SourceEvent; +import org.apache.flink.cdc.connectors.postgres.source.enumerator.PostgresSourceEnumerator; +import org.apache.flink.cdc.connectors.postgres.source.reader.PostgresSourceReader; /** - * The {@link SourceEvent} that {@link - * com.ververica.cdc.connectors.postgres.source.reader.PostgresSourceReader} broadcasts to {@link - * com.ververica.cdc.connectors.postgres.source.enumerator.PostgresSourceEnumerator} to tell the - * enumerator that offset commit is already suspend. Then the enumerator can assign new added - * table's snapshot splits. + * The {@link SourceEvent} that {@link PostgresSourceReader} broadcasts to {@link + * PostgresSourceEnumerator} to tell the enumerator that offset commit is already suspend. Then the + * enumerator can assign new added table's snapshot splits. */ public class OffsetCommitAckEvent implements SourceEvent { private static final long serialVersionUID = 1L; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/events/OffsetCommitEvent.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/events/OffsetCommitEvent.java similarity index 71% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/events/OffsetCommitEvent.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/events/OffsetCommitEvent.java index 83da6c3aa..d478b4499 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/events/OffsetCommitEvent.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/events/OffsetCommitEvent.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.events; +package org.apache.flink.cdc.connectors.postgres.source.events; import org.apache.flink.api.connector.source.SourceEvent; +import org.apache.flink.cdc.connectors.postgres.source.enumerator.PostgresSourceEnumerator; +import org.apache.flink.cdc.connectors.postgres.source.reader.PostgresSourceReader; /** - * The {@link SourceEvent} that {@link - * com.ververica.cdc.connectors.postgres.source.enumerator.PostgresSourceEnumerator} send to {@link - * com.ververica.cdc.connectors.postgres.source.reader.PostgresSourceReader}, which includes current - * assign status. PostgresSourceReader will suspend or restart offset commit depends on assign - * status. + * The {@link SourceEvent} that {@link PostgresSourceEnumerator} send to {@link + * PostgresSourceReader}, which includes current assign status. PostgresSourceReader will suspend or + * restart offset commit depends on assign status. */ public class OffsetCommitEvent implements SourceEvent { private static final long serialVersionUID = 1L; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresScanFetchTask.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresScanFetchTask.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresScanFetchTask.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresScanFetchTask.java index 220dcf393..8feb6d6dd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresScanFetchTask.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresScanFetchTask.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.fetch; - +package org.apache.flink.cdc.connectors.postgres.source.fetch; + +import org.apache.flink.cdc.connectors.base.relational.JdbcSourceEventDispatcher; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplit; +import org.apache.flink.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; +import org.apache.flink.cdc.connectors.base.source.reader.external.FetchTask; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfig; +import org.apache.flink.cdc.connectors.postgres.source.offset.PostgresOffsetUtils; +import org.apache.flink.cdc.connectors.postgres.source.utils.PostgresQueryUtils; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.base.relational.JdbcSourceEventDispatcher; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplit; -import com.ververica.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; -import com.ververica.cdc.connectors.base.source.reader.external.FetchTask; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfig; -import com.ververica.cdc.connectors.postgres.source.offset.PostgresOffsetUtils; -import com.ververica.cdc.connectors.postgres.source.utils.PostgresQueryUtils; import io.debezium.connector.postgresql.PostgresConnectorConfig; import io.debezium.connector.postgresql.PostgresOffsetContext; import io.debezium.connector.postgresql.PostgresPartition; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContext.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContext.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContext.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContext.java index fb8225ec5..13452cacb 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContext.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContext.java @@ -15,24 +15,24 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.fetch; - +package org.apache.flink.cdc.connectors.postgres.source.fetch; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.relational.JdbcSourceEventDispatcher; +import org.apache.flink.cdc.connectors.base.source.EmbeddedFlinkDatabaseHistory; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.reader.external.JdbcSourceFetchTaskContext; +import org.apache.flink.cdc.connectors.postgres.source.PostgresDialect; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfig; +import org.apache.flink.cdc.connectors.postgres.source.handler.PostgresSchemaChangeEventHandler; +import org.apache.flink.cdc.connectors.postgres.source.offset.PostgresOffset; +import org.apache.flink.cdc.connectors.postgres.source.offset.PostgresOffsetFactory; +import org.apache.flink.cdc.connectors.postgres.source.offset.PostgresOffsetUtils; +import org.apache.flink.cdc.connectors.postgres.source.utils.ChunkUtils; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.relational.JdbcSourceEventDispatcher; -import com.ververica.cdc.connectors.base.source.EmbeddedFlinkDatabaseHistory; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.reader.external.JdbcSourceFetchTaskContext; -import com.ververica.cdc.connectors.postgres.source.PostgresDialect; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfig; -import com.ververica.cdc.connectors.postgres.source.handler.PostgresSchemaChangeEventHandler; -import com.ververica.cdc.connectors.postgres.source.offset.PostgresOffset; -import com.ververica.cdc.connectors.postgres.source.offset.PostgresOffsetFactory; -import com.ververica.cdc.connectors.postgres.source.offset.PostgresOffsetUtils; -import com.ververica.cdc.connectors.postgres.source.utils.ChunkUtils; import io.debezium.connector.base.ChangeEventQueue; import io.debezium.connector.postgresql.PostgresConnectorConfig; import io.debezium.connector.postgresql.PostgresErrorHandler; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresStreamFetchTask.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresStreamFetchTask.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresStreamFetchTask.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresStreamFetchTask.java index 692dd16a2..f1c76f959 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresStreamFetchTask.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresStreamFetchTask.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.fetch; - +package org.apache.flink.cdc.connectors.postgres.source.fetch; + +import org.apache.flink.cdc.connectors.base.relational.JdbcSourceEventDispatcher; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplit; +import org.apache.flink.cdc.connectors.base.source.meta.wartermark.WatermarkKind; +import org.apache.flink.cdc.connectors.base.source.reader.external.FetchTask; +import org.apache.flink.cdc.connectors.postgres.source.offset.PostgresOffset; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.base.relational.JdbcSourceEventDispatcher; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplit; -import com.ververica.cdc.connectors.base.source.meta.wartermark.WatermarkKind; -import com.ververica.cdc.connectors.base.source.reader.external.FetchTask; -import com.ververica.cdc.connectors.postgres.source.offset.PostgresOffset; import io.debezium.connector.postgresql.PostgresConnectorConfig; import io.debezium.connector.postgresql.PostgresEventDispatcher; import io.debezium.connector.postgresql.PostgresOffsetContext; @@ -49,8 +49,6 @@ import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; -import static com.ververica.cdc.connectors.postgres.source.offset.PostgresOffset.NO_STOPPING_OFFSET; - /** A {@link FetchTask} implementation for Postgres to read streaming changes. */ public class PostgresStreamFetchTask implements FetchTask { private static final Logger LOG = LoggerFactory.getLogger(PostgresStreamFetchTask.class); @@ -240,7 +238,7 @@ public class PostgresStreamFetchTask implements FetchTask { } private boolean isBoundedRead() { - return !NO_STOPPING_OFFSET + return !PostgresOffset.NO_STOPPING_OFFSET .getLsn() .equals(((PostgresOffset) streamSplit.getEndingOffset()).getLsn()); } diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/StoppableChangeEventSourceContext.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/fetch/StoppableChangeEventSourceContext.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/StoppableChangeEventSourceContext.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/fetch/StoppableChangeEventSourceContext.java index 42bb0351b..79f9a8a44 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/debezium/reader/StoppableChangeEventSourceContext.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/fetch/StoppableChangeEventSourceContext.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql.debezium.reader; +package org.apache.flink.cdc.connectors.postgres.source.fetch; import io.debezium.pipeline.source.spi.ChangeEventSource; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/handler/PostgresSchemaChangeEventHandler.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/handler/PostgresSchemaChangeEventHandler.java similarity index 88% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/handler/PostgresSchemaChangeEventHandler.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/handler/PostgresSchemaChangeEventHandler.java index e18250ada..ccbfb3974 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/handler/PostgresSchemaChangeEventHandler.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/handler/PostgresSchemaChangeEventHandler.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.handler; +package org.apache.flink.cdc.connectors.postgres.source.handler; + +import org.apache.flink.cdc.connectors.base.relational.handler.SchemaChangeEventHandler; -import com.ververica.cdc.connectors.base.relational.handler.SchemaChangeEventHandler; import io.debezium.schema.SchemaChangeEvent; import java.util.HashMap; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/offset/PostgresOffset.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/offset/PostgresOffset.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/offset/PostgresOffset.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/offset/PostgresOffset.java index 863151061..852f0b60a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/offset/PostgresOffset.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/offset/PostgresOffset.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.offset; +package org.apache.flink.cdc.connectors.postgres.source.offset; + +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; import io.debezium.connector.postgresql.SourceInfo; import io.debezium.connector.postgresql.connection.Lsn; import io.debezium.time.Conversions; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/offset/PostgresOffsetFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/offset/PostgresOffsetFactory.java similarity index 89% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/offset/PostgresOffsetFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/offset/PostgresOffsetFactory.java index 2911c95e5..666f72e49 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/offset/PostgresOffsetFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/offset/PostgresOffsetFactory.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.offset; +package org.apache.flink.cdc.connectors.postgres.source.offset; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.offset.OffsetFactory; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.OffsetFactory; - import java.util.Map; /** The factory to create {@link PostgresOffset}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/offset/PostgresOffsetUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/offset/PostgresOffsetUtils.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/offset/PostgresOffsetUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/offset/PostgresOffsetUtils.java index e82e56e9b..b516388cd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/offset/PostgresOffsetUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/offset/PostgresOffsetUtils.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.offset; +package org.apache.flink.cdc.connectors.postgres.source.offset; + +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; import io.debezium.connector.postgresql.PostgresOffsetContext; import java.util.HashMap; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/reader/PostgresSourceReader.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/reader/PostgresSourceReader.java similarity index 80% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/reader/PostgresSourceReader.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/reader/PostgresSourceReader.java index 250e86306..f6d201005 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/reader/PostgresSourceReader.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/reader/PostgresSourceReader.java @@ -15,25 +15,25 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.reader; +package org.apache.flink.cdc.connectors.postgres.source.reader; import org.apache.flink.api.connector.source.SourceEvent; +import org.apache.flink.cdc.common.annotation.Experimental; +import org.apache.flink.cdc.connectors.base.config.SourceConfig; +import org.apache.flink.cdc.connectors.base.dialect.DataSourceDialect; +import org.apache.flink.cdc.connectors.base.source.meta.events.LatestFinishedSplitsNumberEvent; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitSerializer; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplit; +import org.apache.flink.cdc.connectors.base.source.reader.IncrementalSourceReaderContext; +import org.apache.flink.cdc.connectors.base.source.reader.IncrementalSourceReaderWithCommit; +import org.apache.flink.cdc.connectors.postgres.source.events.OffsetCommitAckEvent; +import org.apache.flink.cdc.connectors.postgres.source.events.OffsetCommitEvent; import org.apache.flink.configuration.Configuration; import org.apache.flink.connector.base.source.reader.RecordEmitter; import org.apache.flink.connector.base.source.reader.synchronization.FutureCompletingBlockingQueue; -import com.ververica.cdc.common.annotation.Experimental; -import com.ververica.cdc.connectors.base.config.SourceConfig; -import com.ververica.cdc.connectors.base.dialect.DataSourceDialect; -import com.ververica.cdc.connectors.base.source.meta.events.LatestFinishedSplitsNumberEvent; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitSerializer; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplit; -import com.ververica.cdc.connectors.base.source.reader.IncrementalSourceReaderContext; -import com.ververica.cdc.connectors.base.source.reader.IncrementalSourceReaderWithCommit; -import com.ververica.cdc.connectors.postgres.source.events.OffsetCommitAckEvent; -import com.ververica.cdc.connectors.postgres.source.events.OffsetCommitEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/ChunkUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/ChunkUtils.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/ChunkUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/ChunkUtils.java index 711bdace1..e912943c4 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/ChunkUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/ChunkUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.utils; +package org.apache.flink.cdc.connectors.postgres.source.utils; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.api.ValidationException; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/CustomPostgresSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/CustomPostgresSchema.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/CustomPostgresSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/CustomPostgresSchema.java index 68d9c0302..66936e704 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/CustomPostgresSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/CustomPostgresSchema.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.utils; +package org.apache.flink.cdc.connectors.postgres.source.utils; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfig; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfig; import io.debezium.connector.postgresql.PostgresConnectorConfig; import io.debezium.connector.postgresql.PostgresOffsetContext; import io.debezium.connector.postgresql.PostgresPartition; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/PostgresQueryUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/PostgresQueryUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/PostgresQueryUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/PostgresQueryUtils.java index 4ec6412f2..925532bcb 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/PostgresQueryUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/PostgresQueryUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.utils; +package org.apache.flink.cdc.connectors.postgres.source.utils; import org.apache.flink.table.types.logical.RowType; @@ -31,7 +31,7 @@ import java.util.Iterator; import java.util.Optional; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.base.utils.SourceRecordUtils.rowToArray; +import static org.apache.flink.cdc.connectors.base.utils.SourceRecordUtils.rowToArray; /** Query-related Utilities for Postgres CDC source. */ public class PostgresQueryUtils { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/PostgresTypeUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/PostgresTypeUtils.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/PostgresTypeUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/PostgresTypeUtils.java index 6ba614072..74d8f1c79 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/PostgresTypeUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/PostgresTypeUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.utils; +package org.apache.flink.cdc.connectors.postgres.source.utils; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/TableDiscoveryUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/TableDiscoveryUtils.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/TableDiscoveryUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/TableDiscoveryUtils.java index c4c4e1170..181c2cd0d 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/source/utils/TableDiscoveryUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/source/utils/TableDiscoveryUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.utils; +package org.apache.flink.cdc.connectors.postgres.source.utils; import io.debezium.jdbc.JdbcConnection; import io.debezium.relational.RelationalTableFilters; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLDeserializationConverterFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLDeserializationConverterFactory.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLDeserializationConverterFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLDeserializationConverterFactory.java index 3bf3d5c4a..74d183997 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLDeserializationConverterFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLDeserializationConverterFactory.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.table; +package org.apache.flink.cdc.connectors.postgres.table; +import org.apache.flink.cdc.debezium.table.DeserializationRuntimeConverter; +import org.apache.flink.cdc.debezium.table.DeserializationRuntimeConverterFactory; import org.apache.flink.table.data.StringData; import org.apache.flink.table.types.logical.LogicalType; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; -import com.ververica.cdc.debezium.table.DeserializationRuntimeConverter; -import com.ververica.cdc.debezium.table.DeserializationRuntimeConverterFactory; import io.debezium.data.geometry.Geography; import io.debezium.data.geometry.Geometry; import io.debezium.util.HexConverter; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLReadableMetadata.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLReadableMetadata.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLReadableMetadata.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLReadableMetadata.java index 25f2cea97..1d4c2b1b7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLReadableMetadata.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLReadableMetadata.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.table; +package org.apache.flink.cdc.connectors.postgres.table; +import org.apache.flink.cdc.debezium.table.MetadataConverter; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.data.StringData; import org.apache.flink.table.data.TimestampData; import org.apache.flink.table.types.DataType; -import com.ververica.cdc.debezium.table.MetadataConverter; import io.debezium.connector.AbstractSourceInfo; import io.debezium.data.Envelope; import org.apache.kafka.connect.data.Struct; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLTableFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLTableFactory.java similarity index 75% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLTableFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLTableFactory.java index 1b63b439d..e0e1b6b9b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLTableFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLTableFactory.java @@ -15,8 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.table; +package org.apache.flink.cdc.connectors.postgres.table; +import org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions; +import org.apache.flink.cdc.connectors.base.options.StartupMode; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.postgres.utils.OptionUtils; +import org.apache.flink.cdc.debezium.table.DebeziumChangelogMode; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.ReadableConfig; @@ -27,45 +32,39 @@ import org.apache.flink.table.factories.DynamicTableFactory; import org.apache.flink.table.factories.DynamicTableSourceFactory; import org.apache.flink.table.factories.FactoryUtil; -import com.ververica.cdc.connectors.base.options.JdbcSourceOptions; -import com.ververica.cdc.connectors.base.options.StartupMode; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.postgres.utils.OptionUtils; -import com.ververica.cdc.debezium.table.DebeziumChangelogMode; - import java.time.Duration; import java.util.HashSet; import java.util.Set; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.DATABASE_NAME; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.HOSTNAME; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.PASSWORD; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.SCHEMA_NAME; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.TABLE_NAME; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.USERNAME; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_NEWLY_ADDED_TABLE_ENABLED; -import static com.ververica.cdc.connectors.base.utils.ObjectUtils.doubleCompare; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.CHANGELOG_MODE; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.CHUNK_META_GROUP_SIZE; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.CONNECTION_POOL_SIZE; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.CONNECT_MAX_RETRIES; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.CONNECT_TIMEOUT; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.DECODING_PLUGIN_NAME; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.HEARTBEAT_INTERVAL; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.PG_PORT; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_SNAPSHOT_FETCH_SIZE; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_STARTUP_MODE; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.SLOT_NAME; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; -import static com.ververica.cdc.debezium.table.DebeziumOptions.DEBEZIUM_OPTIONS_PREFIX; -import static com.ververica.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; -import static com.ververica.cdc.debezium.utils.ResolvedSchemaUtils.getPhysicalSchema; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.DATABASE_NAME; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.HOSTNAME; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.PASSWORD; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.SCHEMA_NAME; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.TABLE_NAME; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.USERNAME; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_NEWLY_ADDED_TABLE_ENABLED; +import static org.apache.flink.cdc.connectors.base.utils.ObjectUtils.doubleCompare; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.CHANGELOG_MODE; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.CHUNK_META_GROUP_SIZE; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.CONNECTION_POOL_SIZE; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.CONNECT_MAX_RETRIES; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.CONNECT_TIMEOUT; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.DECODING_PLUGIN_NAME; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.HEARTBEAT_INTERVAL; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.PG_PORT; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_SNAPSHOT_FETCH_SIZE; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_STARTUP_MODE; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.SLOT_NAME; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; +import static org.apache.flink.cdc.debezium.table.DebeziumOptions.DEBEZIUM_OPTIONS_PREFIX; +import static org.apache.flink.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; +import static org.apache.flink.cdc.debezium.utils.ResolvedSchemaUtils.getPhysicalSchema; import static org.apache.flink.util.Preconditions.checkArgument; import static org.apache.flink.util.Preconditions.checkState; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLTableSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLTableSource.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLTableSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLTableSource.java index aa56a6d46..add3d8f3d 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLTableSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLTableSource.java @@ -15,9 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.table; +package org.apache.flink.cdc.connectors.postgres.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; +import org.apache.flink.cdc.connectors.postgres.PostgreSQLSource; +import org.apache.flink.cdc.connectors.postgres.source.PostgresSourceBuilder; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.table.DebeziumChangelogMode; +import org.apache.flink.cdc.debezium.table.MetadataConverter; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.connector.ChangelogMode; import org.apache.flink.table.connector.source.DynamicTableSource; @@ -29,16 +38,6 @@ import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; -import com.ververica.cdc.connectors.postgres.PostgreSQLSource; -import com.ververica.cdc.connectors.postgres.source.PostgresSourceBuilder; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.table.DebeziumChangelogMode; -import com.ververica.cdc.debezium.table.MetadataConverter; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; - import javax.annotation.Nullable; import java.time.Duration; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgresValueValidator.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgresValueValidator.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgresValueValidator.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgresValueValidator.java index 6bac3b6b3..32422486c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/table/PostgresValueValidator.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/table/PostgresValueValidator.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.table; +package org.apache.flink.cdc.connectors.postgres.table; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.types.RowKind; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; - /** The {@link RowDataDebeziumDeserializeSchema.ValueValidator} for Postgres connector. */ public final class PostgresValueValidator implements RowDataDebeziumDeserializeSchema.ValueValidator { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/utils/OptionUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/utils/OptionUtils.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/utils/OptionUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/utils/OptionUtils.java index 28cd0f084..072e536fe 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/utils/OptionUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/utils/OptionUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase.utils; +package org.apache.flink.cdc.connectors.postgres.utils; import org.apache.flink.configuration.ConfigurationUtils; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 71b8c8f69..50d9c06c4 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.ververica.cdc.connectors.postgres.table.PostgreSQLTableFactory +org.apache.flink.cdc.connectors.postgres.table.PostgreSQLTableFactory diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/PostgreSQLSourceTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgreSQLSourceTest.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/PostgreSQLSourceTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgreSQLSourceTest.java index db21febc7..cb071c6d2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/PostgreSQLSourceTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgreSQLSourceTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres; +package org.apache.flink.cdc.connectors.postgres; import org.apache.flink.api.common.state.BroadcastState; import org.apache.flink.api.common.state.KeyedStateStore; @@ -24,6 +24,9 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.OperatorStateStore; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.utils.TestSourceContext; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.testutils.CheckedThread; import org.apache.flink.runtime.state.FunctionInitializationContext; @@ -34,9 +37,6 @@ import org.apache.flink.util.Collector; import org.apache.flink.util.Preconditions; import com.jayway.jsonpath.JsonPath; -import com.ververica.cdc.connectors.utils.TestSourceContext; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; import org.apache.kafka.connect.source.SourceRecord; import org.junit.AfterClass; import org.junit.Before; @@ -68,10 +68,10 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertDelete; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertInsert; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertRead; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertUpdate; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertDelete; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertInsert; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertRead; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertUpdate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/PostgresTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgresTestBase.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/PostgresTestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgresTestBase.java index 857126926..10d64f226 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/PostgresTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/PostgresTestBase.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres; +package org.apache.flink.cdc.connectors.postgres; +import org.apache.flink.cdc.connectors.postgres.source.PostgresConnectionPoolFactory; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory; +import org.apache.flink.cdc.connectors.postgres.testutils.UniqueDatabase; import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.test.util.AbstractTestBase; import org.apache.flink.types.Row; -import com.ververica.cdc.connectors.postgres.source.PostgresConnectionPoolFactory; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory; -import com.ververica.cdc.connectors.postgres.testutils.UniqueDatabase; import io.debezium.config.Configuration; import io.debezium.connector.postgresql.connection.PostgresConnection; import io.debezium.jdbc.JdbcConfiguration; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/MockPostgresDialect.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/MockPostgresDialect.java similarity index 88% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/MockPostgresDialect.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/MockPostgresDialect.java index da9e42716..a751f48e0 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/MockPostgresDialect.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/MockPostgresDialect.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source; +package org.apache.flink.cdc.connectors.postgres.source; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfig; import org.apache.flink.util.Preconditions; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfig; - import java.util.function.Consumer; /** Mock postgres dialect used to test changelog when checkpoint. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/NewlyAddedTableITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/NewlyAddedTableITCase.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/NewlyAddedTableITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/NewlyAddedTableITCase.java index 5eaee1dbf..19e624f5f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/NewlyAddedTableITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/NewlyAddedTableITCase.java @@ -15,9 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source; +package org.apache.flink.cdc.connectors.postgres.source; import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.cdc.connectors.postgres.PostgresTestBase; +import org.apache.flink.cdc.connectors.postgres.testutils.PostgresTestUtils; +import org.apache.flink.cdc.connectors.postgres.testutils.UniqueDatabase; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.execution.JobClient; import org.apache.flink.runtime.checkpoint.CheckpointException; @@ -31,9 +34,6 @@ import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.test.util.MiniClusterWithClientResource; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.connectors.postgres.PostgresTestBase; -import com.ververica.cdc.connectors.postgres.testutils.PostgresTestUtils; -import com.ververica.cdc.connectors.postgres.testutils.UniqueDatabase; import io.debezium.connector.postgresql.connection.PostgresConnection; import io.debezium.jdbc.JdbcConnection; import org.junit.After; @@ -57,9 +57,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.postgres.testutils.PostgresTestUtils.getTableNameRegex; -import static com.ververica.cdc.connectors.postgres.testutils.PostgresTestUtils.triggerFailover; -import static com.ververica.cdc.connectors.postgres.testutils.PostgresTestUtils.waitForUpsertSinkSize; import static java.lang.String.format; /** @@ -518,7 +515,7 @@ public class NewlyAddedTableITCase extends PostgresTestBase { // trigger failover after some snapshot data read finished if (failoverPhase == PostgresTestUtils.FailoverPhase.SNAPSHOT) { - triggerFailover( + PostgresTestUtils.triggerFailover( failoverType, jobClient.getJobID(), miniClusterResource.getMiniCluster(), @@ -596,7 +593,7 @@ public class NewlyAddedTableITCase extends PostgresTestBase { if (failoverPhase == PostgresTestUtils.FailoverPhase.STREAM && TestValuesTableFactory.getRawResults("sink").size() > fetchedDataList.size()) { - triggerFailover( + PostgresTestUtils.triggerFailover( failoverType, jobClient.getJobID(), miniClusterResource.getMiniCluster(), @@ -712,20 +709,20 @@ public class NewlyAddedTableITCase extends PostgresTestBase { // trigger failover after some snapshot data read finished if (failoverPhase == PostgresTestUtils.FailoverPhase.SNAPSHOT) { - triggerFailover( + PostgresTestUtils.triggerFailover( failoverType, jobClient.getJobID(), miniClusterResource.getMiniCluster(), () -> sleepMs(100)); } fetchedDataList.addAll(expectedSnapshotDataThisRound); - waitForUpsertSinkSize("sink", fetchedDataList.size()); + PostgresTestUtils.waitForUpsertSinkSize("sink", fetchedDataList.size()); assertEqualsInAnyOrder(fetchedDataList, TestValuesTableFactory.getResults("sink")); // step 3: make some wal log data for this round makeFirstPartWalLogForAddressTable(getConnection(), newlyAddedTable); if (failoverPhase == PostgresTestUtils.FailoverPhase.STREAM) { - triggerFailover( + PostgresTestUtils.triggerFailover( failoverType, jobClient.getJobID(), miniClusterResource.getMiniCluster(), @@ -757,7 +754,7 @@ public class NewlyAddedTableITCase extends PostgresTestBase { // step 5: assert fetched wal log data in this round fetchedDataList.addAll(expectedWalLogUpsertDataThisRound); - waitForUpsertSinkSize("sink", fetchedDataList.size()); + PostgresTestUtils.waitForUpsertSinkSize("sink", fetchedDataList.size()); // the result size of sink may arrive fetchedDataList.size() with old data, wait one // checkpoint to wait retract old record and send new record Thread.sleep(1000); @@ -957,7 +954,7 @@ public class NewlyAddedTableITCase extends PostgresTestBase { customDatabase.getPassword(), customDatabase.getDatabaseName(), SCHEMA_NAME, - getTableNameRegex(captureTableNames), + PostgresTestUtils.getTableNameRegex(captureTableNames), slotName, otherOptions.isEmpty() ? "" diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/PostgresDialectTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/PostgresDialectTest.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/PostgresDialectTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/PostgresDialectTest.java index 6ed645f4b..304313ec3 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/PostgresDialectTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/PostgresDialectTest.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source; +package org.apache.flink.cdc.connectors.postgres.source; + +import org.apache.flink.cdc.connectors.postgres.PostgresTestBase; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory; +import org.apache.flink.cdc.connectors.postgres.testutils.UniqueDatabase; -import com.ververica.cdc.connectors.postgres.PostgresTestBase; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory; -import com.ververica.cdc.connectors.postgres.testutils.UniqueDatabase; import io.debezium.relational.TableId; import org.junit.Assert; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/PostgresSourceExampleTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/PostgresSourceExampleTest.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/PostgresSourceExampleTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/PostgresSourceExampleTest.java index f107fa890..f6f2b45d9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/PostgresSourceExampleTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/PostgresSourceExampleTest.java @@ -15,9 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source; +package org.apache.flink.cdc.connectors.postgres.source; import org.apache.flink.api.common.eventtime.WatermarkStrategy; +import org.apache.flink.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; +import org.apache.flink.cdc.connectors.postgres.PostgresTestBase; +import org.apache.flink.cdc.connectors.postgres.testutils.UniqueDatabase; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.runtime.minicluster.RpcServiceSharing; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -32,12 +38,6 @@ import org.apache.flink.table.types.utils.TypeConversions; import org.apache.flink.test.util.MiniClusterWithClientResource; import org.apache.flink.util.CloseableIterator; -import com.ververica.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; -import com.ververica.cdc.connectors.postgres.PostgresTestBase; -import com.ververica.cdc.connectors.postgres.testutils.UniqueDatabase; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import io.debezium.connector.postgresql.connection.PostgresConnection; import io.debezium.connector.postgresql.spi.SlotState; import org.junit.Ignore; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/PostgresSourceITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/PostgresSourceITCase.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/PostgresSourceITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/PostgresSourceITCase.java index 2a1151795..96fa103f9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/PostgresSourceITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/PostgresSourceITCase.java @@ -15,11 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source; +package org.apache.flink.cdc.connectors.postgres.source; import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHook; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; +import org.apache.flink.cdc.connectors.postgres.PostgresTestBase; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfig; +import org.apache.flink.cdc.connectors.postgres.testutils.PostgresTestUtils; +import org.apache.flink.cdc.connectors.postgres.testutils.TestTable; +import org.apache.flink.cdc.connectors.postgres.testutils.UniqueDatabase; import org.apache.flink.runtime.minicluster.RpcServiceSharing; import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -34,14 +42,6 @@ import org.apache.flink.util.CloseableIterator; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHook; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; -import com.ververica.cdc.connectors.postgres.PostgresTestBase; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfig; -import com.ververica.cdc.connectors.postgres.testutils.PostgresTestUtils; -import com.ververica.cdc.connectors.postgres.testutils.TestTable; -import com.ververica.cdc.connectors.postgres.testutils.UniqueDatabase; import io.debezium.connector.postgresql.connection.PostgresConnection; import io.debezium.jdbc.JdbcConnection; import org.apache.commons.lang3.StringUtils; @@ -66,10 +66,10 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Function; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.postgres.testutils.PostgresTestUtils.hasNextData; -import static com.ververica.cdc.connectors.postgres.testutils.PostgresTestUtils.triggerFailover; -import static com.ververica.cdc.connectors.postgres.testutils.PostgresTestUtils.waitUntilJobRunning; import static java.lang.String.format; +import static org.apache.flink.cdc.connectors.postgres.testutils.PostgresTestUtils.hasNextData; +import static org.apache.flink.cdc.connectors.postgres.testutils.PostgresTestUtils.triggerFailover; +import static org.apache.flink.cdc.connectors.postgres.testutils.PostgresTestUtils.waitUntilJobRunning; import static org.apache.flink.table.api.DataTypes.BIGINT; import static org.apache.flink.table.api.DataTypes.STRING; import static org.apache.flink.table.catalog.Column.physical; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresScanFetchTaskTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresScanFetchTaskTest.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresScanFetchTaskTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresScanFetchTaskTest.java index 9006bec3a..df26c14bc 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresScanFetchTaskTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresScanFetchTaskTest.java @@ -15,27 +15,27 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.fetch; - +package org.apache.flink.cdc.connectors.postgres.source.fetch; + +import org.apache.flink.cdc.connectors.base.dialect.JdbcDataSourceDialect; +import org.apache.flink.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceRecords; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; +import org.apache.flink.cdc.connectors.base.source.reader.external.FetchTask; +import org.apache.flink.cdc.connectors.base.source.reader.external.IncrementalSourceScanFetcher; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHook; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; +import org.apache.flink.cdc.connectors.postgres.PostgresTestBase; +import org.apache.flink.cdc.connectors.postgres.source.PostgresDialect; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfig; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory; +import org.apache.flink.cdc.connectors.postgres.testutils.RecordsFormatter; +import org.apache.flink.cdc.connectors.postgres.testutils.UniqueDatabase; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; -import com.ververica.cdc.connectors.base.dialect.JdbcDataSourceDialect; -import com.ververica.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.source.meta.split.SourceRecords; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; -import com.ververica.cdc.connectors.base.source.reader.external.FetchTask; -import com.ververica.cdc.connectors.base.source.reader.external.IncrementalSourceScanFetcher; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHook; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; -import com.ververica.cdc.connectors.postgres.PostgresTestBase; -import com.ververica.cdc.connectors.postgres.source.PostgresDialect; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfig; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory; -import com.ververica.cdc.connectors.postgres.testutils.RecordsFormatter; -import com.ververica.cdc.connectors.postgres.testutils.UniqueDatabase; import io.debezium.connector.postgresql.connection.PostgresConnection; import io.debezium.relational.TableId; import org.apache.kafka.connect.source.SourceRecord; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContextTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContextTest.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContextTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContextTest.java index 3e12e6ee0..4bc4b289c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContextTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/source/fetch/PostgresSourceFetchTaskContextTest.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.source.fetch; +package org.apache.flink.cdc.connectors.postgres.source.fetch; + +import org.apache.flink.cdc.connectors.postgres.testutils.TestHelper; -import com.ververica.cdc.connectors.postgres.testutils.TestHelper; import io.debezium.connector.postgresql.PostgresConnectorConfig; import io.debezium.connector.postgresql.PostgresOffsetContext; import io.debezium.connector.postgresql.SourceInfo; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/MockPostgreSQLTableFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/MockPostgreSQLTableFactory.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/MockPostgreSQLTableFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/MockPostgreSQLTableFactory.java index f230d2e67..4f088accd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/MockPostgreSQLTableFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/MockPostgreSQLTableFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.table; +package org.apache.flink.cdc.connectors.postgres.table; import org.apache.flink.table.connector.source.DynamicTableSource; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/MockPostgreSQLTableSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/MockPostgreSQLTableSource.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/MockPostgreSQLTableSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/MockPostgreSQLTableSource.java index 516075788..9fe55b18f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/MockPostgreSQLTableSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/MockPostgreSQLTableSource.java @@ -15,22 +15,21 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.table; +package org.apache.flink.cdc.connectors.postgres.table; import org.apache.flink.api.connector.source.Source; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.IncrementalSource; +import org.apache.flink.cdc.connectors.postgres.source.MockPostgresDialect; +import org.apache.flink.cdc.connectors.postgres.source.PostgresSourceBuilder; +import org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory; +import org.apache.flink.cdc.debezium.table.DebeziumChangelogMode; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.connector.source.SourceProvider; import org.apache.flink.table.data.RowData; import org.apache.flink.util.FlinkRuntimeException; import org.apache.flink.util.Preconditions; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.IncrementalSource; -import com.ververica.cdc.connectors.postgres.source.MockPostgresDialect; -import com.ververica.cdc.connectors.postgres.source.PostgresSourceBuilder; -import com.ververica.cdc.connectors.postgres.source.config.PostgresSourceConfigFactory; -import com.ververica.cdc.debezium.table.DebeziumChangelogMode; - import java.lang.reflect.Field; import java.time.Duration; import java.util.Properties; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLConnectorITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLConnectorITCase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLConnectorITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLConnectorITCase.java index cc4f66ef7..bff6e43f2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLConnectorITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLConnectorITCase.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.table; +package org.apache.flink.cdc.connectors.postgres.table; import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.cdc.connectors.postgres.PostgresTestBase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableResult; @@ -29,7 +30,6 @@ import org.apache.flink.types.RowUtils; import org.apache.flink.util.CloseableIterator; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.connectors.postgres.PostgresTestBase; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLSavepointITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLSavepointITCase.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLSavepointITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLSavepointITCase.java index 0313f666d..8a6e13cc0 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLSavepointITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLSavepointITCase.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.table; +package org.apache.flink.cdc.connectors.postgres.table; import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.cdc.connectors.postgres.PostgresTestBase; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.execution.JobClient; import org.apache.flink.runtime.checkpoint.CheckpointException; @@ -28,7 +29,6 @@ import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.connectors.postgres.PostgresTestBase; import org.junit.Before; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLTableFactoryTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLTableFactoryTest.java similarity index 91% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLTableFactoryTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLTableFactoryTest.java index fe44e6cf0..eb7360689 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/table/PostgreSQLTableFactoryTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/table/PostgreSQLTableFactoryTest.java @@ -15,8 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.table; +package org.apache.flink.cdc.connectors.postgres.table; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.table.DebeziumChangelogMode; +import org.apache.flink.cdc.debezium.utils.ResolvedSchemaUtils; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; import org.apache.flink.table.api.DataTypes; @@ -36,10 +40,6 @@ import org.apache.flink.table.factories.FactoryUtil; import org.apache.flink.table.runtime.connector.source.ScanRuntimeProviderContext; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.table.DebeziumChangelogMode; -import com.ververica.cdc.debezium.utils.ResolvedSchemaUtils; import org.junit.Test; import java.time.Duration; @@ -50,19 +50,19 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_NEWLY_ADDED_TABLE_ENABLED; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.CHUNK_META_GROUP_SIZE; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.CONNECTION_POOL_SIZE; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.CONNECT_MAX_RETRIES; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.CONNECT_TIMEOUT; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.HEARTBEAT_INTERVAL; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_SNAPSHOT_FETCH_SIZE; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; -import static com.ververica.cdc.connectors.postgres.source.config.PostgresSourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertProducedTypeOfSourceFunction; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_NEWLY_ADDED_TABLE_ENABLED; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.CHUNK_META_GROUP_SIZE; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.CONNECTION_POOL_SIZE; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.CONNECT_MAX_RETRIES; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.CONNECT_TIMEOUT; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.HEARTBEAT_INTERVAL; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.SCAN_SNAPSHOT_FETCH_SIZE; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; +import static org.apache.flink.cdc.connectors.postgres.source.config.PostgresSourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertProducedTypeOfSourceFunction; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/PostgresTestUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/PostgresTestUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/PostgresTestUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/PostgresTestUtils.java index 810366d72..0c3af2a74 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/PostgresTestUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/PostgresTestUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.testutils; +package org.apache.flink.cdc.connectors.postgres.testutils; import org.apache.flink.api.common.JobID; import org.apache.flink.runtime.highavailability.nonha.embedded.HaLeadershipControl; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/RecordsFormatter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/RecordsFormatter.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/RecordsFormatter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/RecordsFormatter.java index 147213762..7c1d9c001 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/RecordsFormatter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/RecordsFormatter.java @@ -15,9 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.testutils; +package org.apache.flink.cdc.connectors.postgres.testutils; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.base.utils.SourceRecordUtils; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.conversion.RowRowConverter; import org.apache.flink.table.types.DataType; @@ -26,9 +29,6 @@ import org.apache.flink.table.types.utils.TypeConversions; import org.apache.flink.types.Row; import org.apache.flink.util.Collector; -import com.ververica.cdc.connectors.base.utils.SourceRecordUtils; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.kafka.connect.source.SourceRecord; import java.time.ZoneId; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/TestHelper.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/TestHelper.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/TestHelper.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/TestHelper.java index 28af6f6e2..1e2f288eb 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/TestHelper.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/TestHelper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.testutils; +package org.apache.flink.cdc.connectors.postgres.testutils; import io.debezium.config.Configuration; import io.debezium.connector.postgresql.PostgresConnectorConfig; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/TestTable.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/TestTable.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/TestTable.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/TestTable.java index 4fd3d7295..d941bb7fa 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/TestTable.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/TestTable.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.testutils; +package org.apache.flink.cdc.connectors.postgres.testutils; +import org.apache.flink.cdc.connectors.postgres.table.PostgreSQLDeserializationConverterFactory; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.conversion.RowRowConverter; import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.postgres.table.PostgreSQLDeserializationConverterFactory; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.kafka.connect.source.SourceRecord; import java.util.List; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/UniqueDatabase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/UniqueDatabase.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/UniqueDatabase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/UniqueDatabase.java index ea31c2c3e..cbce1c770 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/com/ververica/cdc/connectors/postgres/testutils/UniqueDatabase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/java/org/apache/flink/cdc/connectors/postgres/testutils/UniqueDatabase.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.postgres.testutils; +package org.apache.flink.cdc.connectors.postgres.testutils; + +import org.apache.flink.cdc.connectors.postgres.PostgresTestBase; -import com.ververica.cdc.connectors.postgres.PostgresTestBase; import org.testcontainers.containers.PostgreSQLContainer; import java.net.URL; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory index 28359adfb..47e0dc11a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-postgres-cdc/src/test/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.ververica.cdc.connectors.postgres.table.MockPostgreSQLTableFactory +org.apache.flink.cdc.connectors.postgres.table.MockPostgreSQLTableFactory diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/SqlServerSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerSource.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/SqlServerSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerSource.java index 5611b1dab..4c357c43e 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/SqlServerSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerSource.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver; +package org.apache.flink.cdc.connectors.sqlserver; + +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; import io.debezium.connector.sqlserver.SqlServerConnector; import java.util.Properties; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/SqlServerValidator.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerValidator.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/SqlServerValidator.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerValidator.java index 05fd98419..e37310b68 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/SqlServerValidator.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerValidator.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver; +package org.apache.flink.cdc.connectors.sqlserver; +import org.apache.flink.cdc.debezium.Validator; import org.apache.flink.table.api.TableException; import org.apache.flink.table.api.ValidationException; import com.microsoft.sqlserver.jdbc.SQLServerDriver; -import com.ververica.cdc.debezium.Validator; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/SqlServerSourceBuilder.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/SqlServerSourceBuilder.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/SqlServerSourceBuilder.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/SqlServerSourceBuilder.java index 854d2a0a6..1cea42951 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/SqlServerSourceBuilder.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/SqlServerSourceBuilder.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source; - -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; -import com.ververica.cdc.connectors.sqlserver.source.config.SqlServerSourceConfigFactory; -import com.ververica.cdc.connectors.sqlserver.source.dialect.SqlServerDialect; -import com.ververica.cdc.connectors.sqlserver.source.offset.LsnFactory; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; +package org.apache.flink.cdc.connectors.sqlserver.source; + +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; +import org.apache.flink.cdc.connectors.sqlserver.source.config.SqlServerSourceConfigFactory; +import org.apache.flink.cdc.connectors.sqlserver.source.dialect.SqlServerDialect; +import org.apache.flink.cdc.connectors.sqlserver.source.offset.LsnFactory; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; import java.time.Duration; import java.util.Properties; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/config/SqlServerSourceConfig.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/config/SqlServerSourceConfig.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/config/SqlServerSourceConfig.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/config/SqlServerSourceConfig.java index 1d7943f68..5cb8d744c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/config/SqlServerSourceConfig.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/config/SqlServerSourceConfig.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.config; +package org.apache.flink.cdc.connectors.sqlserver.source.config; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.options.StartupOptions; import io.debezium.config.Configuration; import io.debezium.connector.sqlserver.SqlServerConnectorConfig; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/config/SqlServerSourceConfigFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/config/SqlServerSourceConfigFactory.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/config/SqlServerSourceConfigFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/config/SqlServerSourceConfigFactory.java index 9cc796623..d7857dff8 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/config/SqlServerSourceConfigFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/config/SqlServerSourceConfigFactory.java @@ -15,17 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.config; +package org.apache.flink.cdc.connectors.sqlserver.source.config; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfigFactory; +import org.apache.flink.cdc.connectors.base.source.EmbeddedFlinkDatabaseHistory; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfigFactory; -import com.ververica.cdc.connectors.base.source.EmbeddedFlinkDatabaseHistory; import io.debezium.config.Configuration; import io.debezium.connector.sqlserver.SqlServerConnector; import java.util.Properties; import java.util.UUID; -import static com.ververica.cdc.connectors.base.utils.EnvironmentUtils.checkSupportCheckpointsAfterTasksFinished; +import static org.apache.flink.cdc.connectors.base.utils.EnvironmentUtils.checkSupportCheckpointsAfterTasksFinished; import static org.apache.flink.util.Preconditions.checkNotNull; /** Factory for creating {@link SqlServerSourceConfig}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/dialect/SqlServerChunkSplitter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/dialect/SqlServerChunkSplitter.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/dialect/SqlServerChunkSplitter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/dialect/SqlServerChunkSplitter.java index 581181632..a3d7c0080 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/dialect/SqlServerChunkSplitter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/dialect/SqlServerChunkSplitter.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.dialect; - +package org.apache.flink.cdc.connectors.sqlserver.source.dialect; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.dialect.JdbcDataSourceDialect; +import org.apache.flink.cdc.connectors.base.source.assigner.splitter.ChunkRange; +import org.apache.flink.cdc.connectors.base.source.assigner.splitter.JdbcSourceChunkSplitter; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.utils.ObjectUtils; +import org.apache.flink.cdc.connectors.sqlserver.source.utils.SqlServerTypeUtils; +import org.apache.flink.cdc.connectors.sqlserver.source.utils.SqlServerUtils; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.dialect.JdbcDataSourceDialect; -import com.ververica.cdc.connectors.base.source.assigner.splitter.ChunkRange; -import com.ververica.cdc.connectors.base.source.assigner.splitter.JdbcSourceChunkSplitter; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.utils.ObjectUtils; -import com.ververica.cdc.connectors.sqlserver.source.utils.SqlServerTypeUtils; -import com.ververica.cdc.connectors.sqlserver.source.utils.SqlServerUtils; import io.debezium.jdbc.JdbcConnection; import io.debezium.relational.Column; import io.debezium.relational.Table; @@ -48,7 +48,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import static com.ververica.cdc.connectors.base.utils.ObjectUtils.doubleCompare; +import static org.apache.flink.cdc.connectors.base.utils.ObjectUtils.doubleCompare; /** * The {@code ChunkSplitter} used to split SqlServer table into a set of chunks for JDBC data diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/dialect/SqlServerDialect.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/dialect/SqlServerDialect.java similarity index 81% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/dialect/SqlServerDialect.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/dialect/SqlServerDialect.java index b5afa9f59..e8105fe71 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/dialect/SqlServerDialect.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/dialect/SqlServerDialect.java @@ -15,23 +15,23 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.dialect; - +package org.apache.flink.cdc.connectors.sqlserver.source.dialect; + +import org.apache.flink.cdc.common.annotation.Experimental; +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.dialect.JdbcDataSourceDialect; +import org.apache.flink.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; +import org.apache.flink.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.reader.external.FetchTask; +import org.apache.flink.cdc.connectors.sqlserver.source.config.SqlServerSourceConfig; +import org.apache.flink.cdc.connectors.sqlserver.source.reader.fetch.SqlServerScanFetchTask; +import org.apache.flink.cdc.connectors.sqlserver.source.reader.fetch.SqlServerSourceFetchTaskContext; +import org.apache.flink.cdc.connectors.sqlserver.source.reader.fetch.SqlServerStreamFetchTask; +import org.apache.flink.cdc.connectors.sqlserver.source.utils.SqlServerConnectionUtils; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.common.annotation.Experimental; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.dialect.JdbcDataSourceDialect; -import com.ververica.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; -import com.ververica.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.reader.external.FetchTask; -import com.ververica.cdc.connectors.sqlserver.source.config.SqlServerSourceConfig; -import com.ververica.cdc.connectors.sqlserver.source.reader.fetch.SqlServerScanFetchTask; -import com.ververica.cdc.connectors.sqlserver.source.reader.fetch.SqlServerSourceFetchTaskContext; -import com.ververica.cdc.connectors.sqlserver.source.reader.fetch.SqlServerStreamFetchTask; -import com.ververica.cdc.connectors.sqlserver.source.utils.SqlServerConnectionUtils; import io.debezium.connector.sqlserver.SqlServerConnection; import io.debezium.jdbc.JdbcConnection; import io.debezium.relational.TableId; @@ -43,8 +43,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.ververica.cdc.connectors.sqlserver.source.utils.SqlServerConnectionUtils.createSqlServerConnection; -import static com.ververica.cdc.connectors.sqlserver.source.utils.SqlServerUtils.currentLsn; +import static org.apache.flink.cdc.connectors.sqlserver.source.utils.SqlServerConnectionUtils.createSqlServerConnection; +import static org.apache.flink.cdc.connectors.sqlserver.source.utils.SqlServerUtils.currentLsn; /** The {@link JdbcDataSourceDialect} implementation for SqlServer datasource. */ @Experimental diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/dialect/SqlServerPooledDataSourceFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/dialect/SqlServerPooledDataSourceFactory.java similarity index 85% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/dialect/SqlServerPooledDataSourceFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/dialect/SqlServerPooledDataSourceFactory.java index b4b9093f8..d991a3285 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/dialect/SqlServerPooledDataSourceFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/dialect/SqlServerPooledDataSourceFactory.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.dialect; +package org.apache.flink.cdc.connectors.sqlserver.source.dialect; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.relational.connection.JdbcConnectionPoolFactory; /** Factory to create {@link JdbcConnectionPoolFactory} for SQL Server. */ public class SqlServerPooledDataSourceFactory extends JdbcConnectionPoolFactory { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/dialect/SqlServerSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/dialect/SqlServerSchema.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/dialect/SqlServerSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/dialect/SqlServerSchema.java index b1c7568dc..eead571c9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/dialect/SqlServerSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/dialect/SqlServerSchema.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.dialect; +package org.apache.flink.cdc.connectors.sqlserver.source.dialect; import org.apache.flink.util.FlinkRuntimeException; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/handler/SqlServerSchemaChangeEventHandler.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/handler/SqlServerSchemaChangeEventHandler.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/handler/SqlServerSchemaChangeEventHandler.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/handler/SqlServerSchemaChangeEventHandler.java index f00ce393b..c425cd5a2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/handler/SqlServerSchemaChangeEventHandler.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/handler/SqlServerSchemaChangeEventHandler.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.handler; +package org.apache.flink.cdc.connectors.sqlserver.source.handler; + +import org.apache.flink.cdc.connectors.base.relational.handler.SchemaChangeEventHandler; -import com.ververica.cdc.connectors.base.relational.handler.SchemaChangeEventHandler; import io.debezium.schema.SchemaChangeEvent; import org.apache.kafka.connect.data.Struct; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/offset/LsnFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/offset/LsnFactory.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/offset/LsnFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/offset/LsnFactory.java index 456064264..00bde8387 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/offset/LsnFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/offset/LsnFactory.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.offset; +package org.apache.flink.cdc.connectors.sqlserver.source.offset; + +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.offset.OffsetFactory; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.OffsetFactory; import io.debezium.connector.sqlserver.Lsn; import io.debezium.connector.sqlserver.SourceInfo; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/offset/LsnOffset.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/offset/LsnOffset.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/offset/LsnOffset.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/offset/LsnOffset.java index 0b355e329..9f0433e6c 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/offset/LsnOffset.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/offset/LsnOffset.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.offset; +package org.apache.flink.cdc.connectors.sqlserver.source.offset; + +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; import io.debezium.connector.sqlserver.Lsn; import io.debezium.connector.sqlserver.SourceInfo; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/reader/fetch/SqlServerScanFetchTask.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/reader/fetch/SqlServerScanFetchTask.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/reader/fetch/SqlServerScanFetchTask.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/reader/fetch/SqlServerScanFetchTask.java index 913ee4020..79576c65a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/reader/fetch/SqlServerScanFetchTask.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/reader/fetch/SqlServerScanFetchTask.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.reader.fetch; +package org.apache.flink.cdc.connectors.sqlserver.source.reader.fetch; + +import org.apache.flink.cdc.connectors.base.relational.JdbcSourceEventDispatcher; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplit; +import org.apache.flink.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; -import com.ververica.cdc.connectors.base.relational.JdbcSourceEventDispatcher; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplit; -import com.ververica.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; -import com.ververica.cdc.connectors.sqlserver.source.reader.fetch.SqlServerStreamFetchTask.StreamSplitReadTask; import io.debezium.DebeziumException; import io.debezium.config.Configuration; import io.debezium.connector.sqlserver.SqlServerConnection; @@ -53,8 +53,8 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.time.Duration; -import static com.ververica.cdc.connectors.sqlserver.source.utils.SqlServerUtils.buildSplitScanQuery; -import static com.ververica.cdc.connectors.sqlserver.source.utils.SqlServerUtils.readTableSplitDataStatement; +import static org.apache.flink.cdc.connectors.sqlserver.source.utils.SqlServerUtils.buildSplitScanQuery; +import static org.apache.flink.cdc.connectors.sqlserver.source.utils.SqlServerUtils.readTableSplitDataStatement; /** The task to work for fetching data of SqlServer table snapshot split. */ public class SqlServerScanFetchTask extends AbstractScanFetchTask { @@ -103,7 +103,7 @@ public class SqlServerScanFetchTask extends AbstractScanFetchTask { final SqlServerOffsetContext streamOffsetContext = loader.load(backfillStreamSplit.getStartingOffset().getOffset()); - final StreamSplitReadTask backfillBinlogReadTask = + final SqlServerStreamFetchTask.StreamSplitReadTask backfillBinlogReadTask = createBackFillLsnSplitReadTask(backfillStreamSplit, sourceFetchContext); backfillBinlogReadTask.execute( new SqlserverSnapshotSplitChangeEventSourceContext(), @@ -111,7 +111,7 @@ public class SqlServerScanFetchTask extends AbstractScanFetchTask { streamOffsetContext); } - private StreamSplitReadTask createBackFillLsnSplitReadTask( + private SqlServerStreamFetchTask.StreamSplitReadTask createBackFillLsnSplitReadTask( StreamSplit backfillBinlogSplit, SqlServerSourceFetchTaskContext context) { // we should only capture events for the current table, // otherwise, we may can't find corresponding schema @@ -130,7 +130,7 @@ public class SqlServerScanFetchTask extends AbstractScanFetchTask { .with(Heartbeat.HEARTBEAT_INTERVAL, 0) .build(); // task to read binlog and backfill for current split - return new StreamSplitReadTask( + return new SqlServerStreamFetchTask.StreamSplitReadTask( new SqlServerConnectorConfig(dezConf), context.getConnection(), context.getMetaDataConnection(), diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/reader/fetch/SqlServerSourceFetchTaskContext.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/reader/fetch/SqlServerSourceFetchTaskContext.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/reader/fetch/SqlServerSourceFetchTaskContext.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/reader/fetch/SqlServerSourceFetchTaskContext.java index e09fc3e63..55e7944f6 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/reader/fetch/SqlServerSourceFetchTaskContext.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/reader/fetch/SqlServerSourceFetchTaskContext.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.reader.fetch; - +package org.apache.flink.cdc.connectors.sqlserver.source.reader.fetch; + +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.relational.JdbcSourceEventDispatcher; +import org.apache.flink.cdc.connectors.base.source.EmbeddedFlinkDatabaseHistory; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.reader.external.JdbcSourceFetchTaskContext; +import org.apache.flink.cdc.connectors.sqlserver.source.config.SqlServerSourceConfig; +import org.apache.flink.cdc.connectors.sqlserver.source.dialect.SqlServerDialect; +import org.apache.flink.cdc.connectors.sqlserver.source.handler.SqlServerSchemaChangeEventHandler; +import org.apache.flink.cdc.connectors.sqlserver.source.offset.LsnOffset; +import org.apache.flink.cdc.connectors.sqlserver.source.utils.SqlServerUtils; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.relational.JdbcSourceEventDispatcher; -import com.ververica.cdc.connectors.base.source.EmbeddedFlinkDatabaseHistory; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.reader.external.JdbcSourceFetchTaskContext; -import com.ververica.cdc.connectors.sqlserver.source.config.SqlServerSourceConfig; -import com.ververica.cdc.connectors.sqlserver.source.dialect.SqlServerDialect; -import com.ververica.cdc.connectors.sqlserver.source.handler.SqlServerSchemaChangeEventHandler; -import com.ververica.cdc.connectors.sqlserver.source.offset.LsnOffset; -import com.ververica.cdc.connectors.sqlserver.source.utils.SqlServerUtils; import io.debezium.connector.base.ChangeEventQueue; import io.debezium.connector.base.ChangeEventQueue.Builder; import io.debezium.connector.sqlserver.SourceInfo; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/reader/fetch/SqlServerStreamFetchTask.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/reader/fetch/SqlServerStreamFetchTask.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/reader/fetch/SqlServerStreamFetchTask.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/reader/fetch/SqlServerStreamFetchTask.java index 89f28200a..460a04d24 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/reader/fetch/SqlServerStreamFetchTask.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/reader/fetch/SqlServerStreamFetchTask.java @@ -15,15 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.reader.fetch; - -import com.ververica.cdc.connectors.base.relational.JdbcSourceEventDispatcher; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.meta.split.StreamSplit; -import com.ververica.cdc.connectors.base.source.meta.wartermark.WatermarkKind; -import com.ververica.cdc.connectors.base.source.reader.external.FetchTask; -import com.ververica.cdc.connectors.sqlserver.source.offset.LsnOffset; +package org.apache.flink.cdc.connectors.sqlserver.source.reader.fetch; + +import org.apache.flink.cdc.connectors.base.relational.JdbcSourceEventDispatcher; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.meta.split.StreamSplit; +import org.apache.flink.cdc.connectors.base.source.meta.wartermark.WatermarkKind; +import org.apache.flink.cdc.connectors.base.source.reader.external.FetchTask; +import org.apache.flink.cdc.connectors.sqlserver.source.offset.LsnOffset; + import io.debezium.DebeziumException; import io.debezium.connector.sqlserver.Lsn; import io.debezium.connector.sqlserver.SqlServerConnection; @@ -38,7 +39,7 @@ import io.debezium.util.Clock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.ververica.cdc.connectors.sqlserver.source.offset.LsnOffset.NO_STOPPING_OFFSET; +import static org.apache.flink.cdc.connectors.sqlserver.source.offset.LsnOffset.NO_STOPPING_OFFSET; /** The task to work for fetching data of SqlServer table stream split . */ public class SqlServerStreamFetchTask implements FetchTask { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/utils/SqlServerConnectionUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/utils/SqlServerConnectionUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/utils/SqlServerConnectionUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/utils/SqlServerConnectionUtils.java index fe18601c8..44add4d68 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/utils/SqlServerConnectionUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/utils/SqlServerConnectionUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.utils; +package org.apache.flink.cdc.connectors.sqlserver.source.utils; import io.debezium.config.Configuration; import io.debezium.connector.sqlserver.SqlServerConnection; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/utils/SqlServerTypeUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/utils/SqlServerTypeUtils.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/utils/SqlServerTypeUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/utils/SqlServerTypeUtils.java index 99ee5aa6d..3d7163189 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/utils/SqlServerTypeUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/utils/SqlServerTypeUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.utils; +package org.apache.flink.cdc.connectors.sqlserver.source.utils; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/utils/SqlServerUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/utils/SqlServerUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/utils/SqlServerUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/utils/SqlServerUtils.java index 705ad5484..711f42f8a 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/source/utils/SqlServerUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/source/utils/SqlServerUtils.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.utils; +package org.apache.flink.cdc.connectors.sqlserver.source.utils; +import org.apache.flink.cdc.connectors.base.source.meta.offset.Offset; +import org.apache.flink.cdc.connectors.sqlserver.source.offset.LsnOffset; import org.apache.flink.table.api.ValidationException; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.base.source.meta.offset.Offset; -import com.ververica.cdc.connectors.sqlserver.source.offset.LsnOffset; import io.debezium.connector.sqlserver.Lsn; import io.debezium.connector.sqlserver.SourceInfo; import io.debezium.connector.sqlserver.SqlServerConnection; @@ -50,7 +50,7 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.base.utils.SourceRecordUtils.rowToArray; +import static org.apache.flink.cdc.connectors.base.utils.SourceRecordUtils.rowToArray; import static org.apache.flink.table.api.DataTypes.FIELD; import static org.apache.flink.table.api.DataTypes.ROW; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerDeserializationConverterFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerDeserializationConverterFactory.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerDeserializationConverterFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerDeserializationConverterFactory.java index fef8d8f37..7a1d18604 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerDeserializationConverterFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerDeserializationConverterFactory.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.table; +package org.apache.flink.cdc.connectors.sqlserver.table; +import org.apache.flink.cdc.debezium.table.DeserializationRuntimeConverter; +import org.apache.flink.cdc.debezium.table.DeserializationRuntimeConverterFactory; import org.apache.flink.table.data.TimestampData; import org.apache.flink.table.types.logical.LogicalType; -import com.ververica.cdc.debezium.table.DeserializationRuntimeConverter; -import com.ververica.cdc.debezium.table.DeserializationRuntimeConverterFactory; import org.apache.kafka.connect.data.Schema; import java.time.Instant; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerReadableMetadata.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerReadableMetadata.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerReadableMetadata.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerReadableMetadata.java index 16ee27f89..721a084aa 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerReadableMetadata.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerReadableMetadata.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.table; +package org.apache.flink.cdc.connectors.sqlserver.table; +import org.apache.flink.cdc.debezium.table.MetadataConverter; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.data.StringData; import org.apache.flink.table.data.TimestampData; import org.apache.flink.table.types.DataType; -import com.ververica.cdc.debezium.table.MetadataConverter; import io.debezium.connector.AbstractSourceInfo; import io.debezium.data.Envelope; import org.apache.kafka.connect.data.Struct; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerTableFactory.java similarity index 86% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerTableFactory.java index e5880b589..f675ccacd 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerTableFactory.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.table; +package org.apache.flink.cdc.connectors.sqlserver.table; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.utils.OptionUtils; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; import org.apache.flink.configuration.Configuration; @@ -27,30 +29,27 @@ import org.apache.flink.table.connector.source.DynamicTableSource; import org.apache.flink.table.factories.DynamicTableSourceFactory; import org.apache.flink.table.factories.FactoryUtil; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.utils.OptionUtils; - import java.time.Duration; import java.time.ZoneId; import java.util.HashSet; import java.util.Set; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.CONNECTION_POOL_SIZE; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.CONNECT_MAX_RETRIES; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.CONNECT_TIMEOUT; -import static com.ververica.cdc.connectors.base.options.JdbcSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN; -import static com.ververica.cdc.connectors.base.options.SourceOptions.CHUNK_META_GROUP_SIZE; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SCAN_SNAPSHOT_FETCH_SIZE; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; -import static com.ververica.cdc.connectors.base.options.SourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; -import static com.ververica.cdc.connectors.base.utils.ObjectUtils.doubleCompare; -import static com.ververica.cdc.debezium.table.DebeziumOptions.DEBEZIUM_OPTIONS_PREFIX; -import static com.ververica.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; -import static com.ververica.cdc.debezium.utils.ResolvedSchemaUtils.getPhysicalSchema; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.CONNECTION_POOL_SIZE; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.CONNECT_MAX_RETRIES; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.CONNECT_TIMEOUT; +import static org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.CHUNK_META_GROUP_SIZE; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_SNAPSHOT_FETCH_SIZE; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND; +import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_UPPER_BOUND; +import static org.apache.flink.cdc.connectors.base.utils.ObjectUtils.doubleCompare; +import static org.apache.flink.cdc.debezium.table.DebeziumOptions.DEBEZIUM_OPTIONS_PREFIX; +import static org.apache.flink.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; +import static org.apache.flink.cdc.debezium.utils.ResolvedSchemaUtils.getPhysicalSchema; import static org.apache.flink.util.Preconditions.checkState; /** Factory for creating configured instance of {@link SqlServerTableSource}. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerTableSource.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerTableSource.java index bd83014bb..ebdd02028 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerTableSource.java @@ -15,9 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.table; +package org.apache.flink.cdc.connectors.sqlserver.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; +import org.apache.flink.cdc.connectors.sqlserver.SqlServerSource; +import org.apache.flink.cdc.connectors.sqlserver.source.SqlServerSourceBuilder; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.table.MetadataConverter; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.connector.ChangelogMode; import org.apache.flink.table.connector.source.DynamicTableSource; @@ -29,15 +37,6 @@ import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.base.source.jdbc.JdbcIncrementalSource; -import com.ververica.cdc.connectors.sqlserver.SqlServerSource; -import com.ververica.cdc.connectors.sqlserver.source.SqlServerSourceBuilder; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.table.MetadataConverter; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; - import javax.annotation.Nullable; import java.time.Duration; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index ff85c080e..636f8c9fb 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.ververica.cdc.connectors.sqlserver.table.SqlServerTableFactory +org.apache.flink.cdc.connectors.sqlserver.table.SqlServerTableFactory diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/SqlServerParallelSourceExampleTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerParallelSourceExampleTest.java similarity index 85% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/SqlServerParallelSourceExampleTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerParallelSourceExampleTest.java index 5733365f9..df8d21b05 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/SqlServerParallelSourceExampleTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerParallelSourceExampleTest.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver; +package org.apache.flink.cdc.connectors.sqlserver; import org.apache.flink.api.common.eventtime.WatermarkStrategy; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.connectors.sqlserver.source.SqlServerSourceBuilder; +import org.apache.flink.cdc.connectors.sqlserver.source.SqlServerSourceBuilder.SqlServerIncrementalSource; +import org.apache.flink.cdc.connectors.sqlserver.source.SqlServerSourceTestBase; +import org.apache.flink.cdc.debezium.JsonDebeziumDeserializationSchema; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.connectors.sqlserver.source.SqlServerSourceBuilder; -import com.ververica.cdc.connectors.sqlserver.source.SqlServerSourceBuilder.SqlServerIncrementalSource; -import com.ververica.cdc.connectors.sqlserver.source.SqlServerSourceTestBase; -import com.ververica.cdc.debezium.JsonDebeziumDeserializationSchema; import org.junit.Ignore; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/SqlServerTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerTestBase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/SqlServerTestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerTestBase.java index 7062ad80d..93b736943 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/SqlServerTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/SqlServerTestBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver; +package org.apache.flink.cdc.connectors.sqlserver; import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.test.util.AbstractTestBase; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/source/SqlServerSourceITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/source/SqlServerSourceITCase.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/source/SqlServerSourceITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/source/SqlServerSourceITCase.java index fae747d42..e8b231aac 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/source/SqlServerSourceITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/source/SqlServerSourceITCase.java @@ -15,11 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source; +package org.apache.flink.cdc.connectors.sqlserver.source; import org.apache.flink.api.common.JobID; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.restartstrategy.RestartStrategies; +import org.apache.flink.cdc.connectors.base.config.JdbcSourceConfig; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHook; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; +import org.apache.flink.cdc.connectors.sqlserver.source.config.SqlServerSourceConfig; +import org.apache.flink.cdc.connectors.sqlserver.source.dialect.SqlServerDialect; +import org.apache.flink.cdc.connectors.sqlserver.testutils.TestTable; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.TableResult; import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; @@ -30,12 +36,6 @@ import org.apache.flink.types.Row; import org.apache.flink.util.CloseableIterator; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.connectors.base.config.JdbcSourceConfig; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHook; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; -import com.ververica.cdc.connectors.sqlserver.source.config.SqlServerSourceConfig; -import com.ververica.cdc.connectors.sqlserver.source.dialect.SqlServerDialect; -import com.ververica.cdc.connectors.sqlserver.testutils.TestTable; import io.debezium.jdbc.JdbcConnection; import org.apache.commons.lang3.StringUtils; import org.junit.Rule; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/source/SqlServerSourceTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/source/SqlServerSourceTestBase.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/source/SqlServerSourceTestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/source/SqlServerSourceTestBase.java index 52b1de004..8f6ea0e92 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/source/SqlServerSourceTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/source/SqlServerSourceTestBase.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source; +package org.apache.flink.cdc.connectors.sqlserver.source; import org.apache.flink.api.common.JobID; +import org.apache.flink.cdc.connectors.sqlserver.SqlServerSource; +import org.apache.flink.cdc.connectors.sqlserver.SqlServerTestBase; import org.apache.flink.runtime.highavailability.nonha.embedded.HaLeadershipControl; import org.apache.flink.runtime.minicluster.MiniCluster; import org.apache.flink.runtime.minicluster.RpcServiceSharing; @@ -26,8 +28,6 @@ import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.test.util.MiniClusterWithClientResource; import org.apache.flink.util.TestLogger; -import com.ververica.cdc.connectors.sqlserver.SqlServerSource; -import com.ververica.cdc.connectors.sqlserver.SqlServerTestBase; import org.awaitility.Awaitility; import org.awaitility.core.ConditionTimeoutException; import org.junit.AfterClass; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/source/read/fetch/SqlServerScanFetchTaskTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/source/read/fetch/SqlServerScanFetchTaskTest.java similarity index 90% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/source/read/fetch/SqlServerScanFetchTaskTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/source/read/fetch/SqlServerScanFetchTaskTest.java index 6a5cc6912..73b99ef31 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/source/read/fetch/SqlServerScanFetchTaskTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/source/read/fetch/SqlServerScanFetchTaskTest.java @@ -15,27 +15,27 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.source.read.fetch; - +package org.apache.flink.cdc.connectors.sqlserver.source.read.fetch; + +import org.apache.flink.cdc.connectors.base.dialect.JdbcDataSourceDialect; +import org.apache.flink.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; +import org.apache.flink.cdc.connectors.base.source.meta.split.SnapshotSplit; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceRecords; +import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase; +import org.apache.flink.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; +import org.apache.flink.cdc.connectors.base.source.reader.external.FetchTask; +import org.apache.flink.cdc.connectors.base.source.reader.external.IncrementalSourceScanFetcher; +import org.apache.flink.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; +import org.apache.flink.cdc.connectors.sqlserver.source.SqlServerSourceTestBase; +import org.apache.flink.cdc.connectors.sqlserver.source.config.SqlServerSourceConfig; +import org.apache.flink.cdc.connectors.sqlserver.source.config.SqlServerSourceConfigFactory; +import org.apache.flink.cdc.connectors.sqlserver.source.dialect.SqlServerDialect; +import org.apache.flink.cdc.connectors.sqlserver.source.reader.fetch.SqlServerScanFetchTask; +import org.apache.flink.cdc.connectors.sqlserver.source.reader.fetch.SqlServerSourceFetchTaskContext; +import org.apache.flink.cdc.connectors.sqlserver.testutils.RecordsFormatter; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; -import com.ververica.cdc.connectors.base.dialect.JdbcDataSourceDialect; -import com.ververica.cdc.connectors.base.source.assigner.splitter.ChunkSplitter; -import com.ververica.cdc.connectors.base.source.meta.split.SnapshotSplit; -import com.ververica.cdc.connectors.base.source.meta.split.SourceRecords; -import com.ververica.cdc.connectors.base.source.meta.split.SourceSplitBase; -import com.ververica.cdc.connectors.base.source.reader.external.AbstractScanFetchTask; -import com.ververica.cdc.connectors.base.source.reader.external.FetchTask; -import com.ververica.cdc.connectors.base.source.reader.external.IncrementalSourceScanFetcher; -import com.ververica.cdc.connectors.base.source.utils.hooks.SnapshotPhaseHooks; -import com.ververica.cdc.connectors.sqlserver.source.SqlServerSourceTestBase; -import com.ververica.cdc.connectors.sqlserver.source.config.SqlServerSourceConfig; -import com.ververica.cdc.connectors.sqlserver.source.config.SqlServerSourceConfigFactory; -import com.ververica.cdc.connectors.sqlserver.source.dialect.SqlServerDialect; -import com.ververica.cdc.connectors.sqlserver.source.reader.fetch.SqlServerScanFetchTask; -import com.ververica.cdc.connectors.sqlserver.source.reader.fetch.SqlServerSourceFetchTaskContext; -import com.ververica.cdc.connectors.sqlserver.testutils.RecordsFormatter; import io.debezium.jdbc.JdbcConnection; import io.debezium.relational.TableId; import org.apache.kafka.connect.source.SourceRecord; @@ -49,7 +49,7 @@ import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.sqlserver.source.utils.SqlServerConnectionUtils.createSqlServerConnection; +import static org.apache.flink.cdc.connectors.sqlserver.source.utils.SqlServerConnectionUtils.createSqlServerConnection; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.testcontainers.containers.MSSQLServerContainer.MS_SQL_SERVER_PORT; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerConnectorITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerConnectorITCase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerConnectorITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerConnectorITCase.java index 622b2401e..367e03f02 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerConnectorITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerConnectorITCase.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.table; +package org.apache.flink.cdc.connectors.sqlserver.table; +import org.apache.flink.cdc.connectors.sqlserver.SqlServerTestBase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableResult; @@ -24,7 +25,6 @@ import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.table.utils.LegacyRowResource; -import com.ververica.cdc.connectors.sqlserver.SqlServerTestBase; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactoryTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerTableFactoryTest.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactoryTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerTableFactoryTest.java index f34db5e32..cd85b86a3 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTableFactoryTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerTableFactoryTest.java @@ -15,8 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.table; +package org.apache.flink.cdc.connectors.sqlserver.table; +import org.apache.flink.cdc.connectors.base.options.JdbcSourceOptions; +import org.apache.flink.cdc.connectors.base.options.SourceOptions; +import org.apache.flink.cdc.connectors.base.options.StartupOptions; +import org.apache.flink.cdc.debezium.utils.ResolvedSchemaUtils; import org.apache.flink.configuration.Configuration; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.api.Schema; @@ -29,10 +33,6 @@ import org.apache.flink.table.catalog.UniqueConstraint; import org.apache.flink.table.connector.source.DynamicTableSource; import org.apache.flink.table.factories.FactoryUtil; -import com.ververica.cdc.connectors.base.options.JdbcSourceOptions; -import com.ververica.cdc.connectors.base.options.SourceOptions; -import com.ververica.cdc.connectors.base.options.StartupOptions; -import com.ververica.cdc.debezium.utils.ResolvedSchemaUtils; import org.junit.Test; import java.time.Duration; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTimezoneITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerTimezoneITCase.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTimezoneITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerTimezoneITCase.java index 97cdd0e07..561af86e6 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/table/SqlServerTimezoneITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/table/SqlServerTimezoneITCase.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.table; +package org.apache.flink.cdc.connectors.sqlserver.table; +import org.apache.flink.cdc.connectors.sqlserver.SqlServerTestBase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableResult; import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; import org.apache.flink.table.planner.factories.TestValuesTableFactory; -import com.ververica.cdc.connectors.sqlserver.SqlServerTestBase; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/testutils/RecordsFormatter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/testutils/RecordsFormatter.java similarity index 92% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/testutils/RecordsFormatter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/testutils/RecordsFormatter.java index 843914d2e..a2ec41897 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/testutils/RecordsFormatter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/testutils/RecordsFormatter.java @@ -15,9 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.testutils; +package org.apache.flink.cdc.connectors.sqlserver.testutils; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.base.utils.SourceRecordUtils; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.conversion.RowRowConverter; import org.apache.flink.table.types.DataType; @@ -26,9 +29,6 @@ import org.apache.flink.table.types.utils.TypeConversions; import org.apache.flink.types.Row; import org.apache.flink.util.Collector; -import com.ververica.cdc.connectors.base.utils.SourceRecordUtils; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.kafka.connect.source.SourceRecord; import java.time.ZoneId; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/testutils/TestTable.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/testutils/TestTable.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/testutils/TestTable.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/testutils/TestTable.java index 41691c9d7..bdb6ca2c7 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/com/ververica/cdc/connectors/sqlserver/testutils/TestTable.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-sqlserver-cdc/src/test/java/org/apache/flink/cdc/connectors/sqlserver/testutils/TestTable.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.sqlserver.testutils; +package org.apache.flink.cdc.connectors.sqlserver.testutils; +import org.apache.flink.cdc.connectors.sqlserver.table.SqlServerDeserializationConverterFactory; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.data.conversion.RowRowConverter; import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.sqlserver.table.SqlServerDeserializationConverterFactory; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.kafka.connect.source.SourceRecord; import java.util.List; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/com/ververica/cdc/connectors/utils/AssertUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/org/apache/flink/cdc/connectors/utils/AssertUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/com/ververica/cdc/connectors/utils/AssertUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/org/apache/flink/cdc/connectors/utils/AssertUtils.java index e69fc6b6e..d11befc52 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/com/ververica/cdc/connectors/utils/AssertUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/org/apache/flink/cdc/connectors/utils/AssertUtils.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.utils; +package org.apache.flink.cdc.connectors.utils; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; import org.apache.flink.table.types.DataType; -import com.ververica.cdc.debezium.DebeziumSourceFunction; import io.debezium.data.Envelope; import org.apache.kafka.connect.data.Struct; import org.apache.kafka.connect.source.SourceRecord; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/com/ververica/cdc/connectors/utils/TestSourceContext.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/org/apache/flink/cdc/connectors/utils/TestSourceContext.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/com/ververica/cdc/connectors/utils/TestSourceContext.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/org/apache/flink/cdc/connectors/utils/TestSourceContext.java index 88615ddfe..66350c701 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/com/ververica/cdc/connectors/utils/TestSourceContext.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-test-util/src/main/java/org/apache/flink/cdc/connectors/utils/TestSourceContext.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.utils; +package org.apache.flink.cdc.connectors.utils; import org.apache.flink.streaming.api.functions.source.SourceFunction; import org.apache.flink.streaming.api.watermark.Watermark; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/utils/OptionUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/utils/OptionUtils.java deleted file mode 100644 index e8f3bd6b6..000000000 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/utils/OptionUtils.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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 com.ververica.cdc.connectors.tidb.table.utils; - -import org.apache.flink.configuration.ConfigurationUtils; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Map; - -/** A utility class to print configuration of connectors. */ -public class OptionUtils { - - private static final Logger LOG = LoggerFactory.getLogger(OptionUtils.class); - - /** Utility class can not be instantiated. */ - private OptionUtils() {} - - public static void printOptions(String identifier, Map config) { - Map hideMap = ConfigurationUtils.hideSensitiveValues(config); - LOG.info("Print {} connector configuration:", identifier); - for (String key : hideMap.keySet()) { - LOG.info("{} = {}", key, hideMap.get(key)); - } - } -} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TDBSourceOptions.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TDBSourceOptions.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TDBSourceOptions.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TDBSourceOptions.java index d873a40a8..7e8fb6a80 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TDBSourceOptions.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TDBSourceOptions.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb; +package org.apache.flink.cdc.connectors.tidb; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiDBSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TiDBSource.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiDBSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TiDBSource.java index 79b60c095..fa74f69ba 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiDBSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TiDBSource.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb; +package org.apache.flink.cdc.connectors.tidb; +import org.apache.flink.cdc.connectors.tidb.table.StartupOptions; import org.apache.flink.streaming.api.functions.source.RichParallelSourceFunction; -import com.ververica.cdc.connectors.tidb.table.StartupOptions; import org.tikv.common.TiConfiguration; /** A builder to build a SourceFunction which can read snapshot and continue to read CDC events. */ diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVChangeEventDeserializationSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TiKVChangeEventDeserializationSchema.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVChangeEventDeserializationSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TiKVChangeEventDeserializationSchema.java index 4789ad815..bf652624f 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVChangeEventDeserializationSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TiKVChangeEventDeserializationSchema.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb; +package org.apache.flink.cdc.connectors.tidb; import org.apache.flink.api.java.typeutils.ResultTypeQueryable; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import org.apache.flink.util.Collector; -import com.ververica.cdc.common.annotation.PublicEvolving; import org.tikv.kvproto.Cdcpb.Event.Row; import java.io.Serializable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java index ec9c8f632..e93094327 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TiKVRichParallelSourceFunction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb; +package org.apache.flink.cdc.connectors.tidb; import org.apache.flink.api.common.state.CheckpointListener; import org.apache.flink.api.common.state.ListState; @@ -23,6 +23,8 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.base.LongSerializer; import org.apache.flink.api.java.typeutils.ResultTypeQueryable; +import org.apache.flink.cdc.connectors.tidb.table.StartupMode; +import org.apache.flink.cdc.connectors.tidb.table.utils.TableKeyRangeUtils; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.state.FunctionInitializationContext; import org.apache.flink.runtime.state.FunctionSnapshotContext; @@ -33,8 +35,6 @@ import org.apache.flink.util.Preconditions; import org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.ververica.cdc.connectors.tidb.table.StartupMode; -import com.ververica.cdc.connectors.tidb.table.utils.TableKeyRangeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tikv.cdc.CDCClient; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVSnapshotEventDeserializationSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TiKVSnapshotEventDeserializationSchema.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVSnapshotEventDeserializationSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TiKVSnapshotEventDeserializationSchema.java index a4d1a5147..a0a436581 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/TiKVSnapshotEventDeserializationSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/TiKVSnapshotEventDeserializationSchema.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb; +package org.apache.flink.cdc.connectors.tidb; import org.apache.flink.api.java.typeutils.ResultTypeQueryable; +import org.apache.flink.cdc.common.annotation.PublicEvolving; import org.apache.flink.util.Collector; -import com.ververica.cdc.common.annotation.PublicEvolving; import org.tikv.kvproto.Kvrpcpb.KvPair; import java.io.Serializable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/RowDataTiKVChangeEventDeserializationSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/RowDataTiKVChangeEventDeserializationSchema.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/RowDataTiKVChangeEventDeserializationSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/RowDataTiKVChangeEventDeserializationSchema.java index 9ea22b826..05f96e169 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/RowDataTiKVChangeEventDeserializationSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/RowDataTiKVChangeEventDeserializationSchema.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.tidb.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.tidb.TiKVChangeEventDeserializationSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.types.RowKind; import org.apache.flink.util.Collector; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.connectors.tidb.TiKVChangeEventDeserializationSchema; import org.tikv.common.TiConfiguration; import org.tikv.common.key.RowKey; import org.tikv.kvproto.Cdcpb.Event.Row; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/RowDataTiKVEventDeserializationSchemaBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/RowDataTiKVEventDeserializationSchemaBase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/RowDataTiKVEventDeserializationSchemaBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/RowDataTiKVEventDeserializationSchemaBase.java index 0ba441a91..6e9c7dcda 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/RowDataTiKVEventDeserializationSchemaBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/RowDataTiKVEventDeserializationSchemaBase.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.tidb.table; +import org.apache.flink.cdc.debezium.utils.TemporalConversions; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericArrayData; import org.apache.flink.table.data.GenericRowData; @@ -29,7 +30,6 @@ import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.Collector; import org.apache.flink.util.FlinkRuntimeException; -import com.ververica.cdc.debezium.utils.TemporalConversions; import org.tikv.common.TiConfiguration; import org.tikv.common.TiSession; import org.tikv.common.meta.TiColumnInfo; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/RowDataTiKVSnapshotEventDeserializationSchema.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/RowDataTiKVSnapshotEventDeserializationSchema.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/RowDataTiKVSnapshotEventDeserializationSchema.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/RowDataTiKVSnapshotEventDeserializationSchema.java index 943695cae..be66a7249 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/RowDataTiKVSnapshotEventDeserializationSchema.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/RowDataTiKVSnapshotEventDeserializationSchema.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.tidb.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.tidb.TiKVSnapshotEventDeserializationSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.util.Collector; -import com.ververica.cdc.connectors.tidb.TiKVSnapshotEventDeserializationSchema; import org.tikv.common.TiConfiguration; import org.tikv.common.key.RowKey; import org.tikv.kvproto.Kvrpcpb.KvPair; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/StartupMode.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/StartupMode.java similarity index 94% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/StartupMode.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/StartupMode.java index c46a84938..07a428421 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/StartupMode.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/StartupMode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.tidb.table; /** * Startup modes for the TiDB CDC Consumer. diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/StartupOptions.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/StartupOptions.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/StartupOptions.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/StartupOptions.java index 8223cb65e..e1dcfa634 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/StartupOptions.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/StartupOptions.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.tidb.table; import java.util.Objects; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiDBTableSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiDBTableSource.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiDBTableSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiDBTableSource.java index 27f507d7c..8bd14223d 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiDBTableSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiDBTableSource.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.tidb.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.tidb.TDBSourceOptions; +import org.apache.flink.cdc.connectors.tidb.TiDBSource; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.connector.ChangelogMode; import org.apache.flink.table.connector.source.DynamicTableSource; @@ -29,8 +31,6 @@ import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.types.RowKind; -import com.ververica.cdc.connectors.tidb.TDBSourceOptions; -import com.ververica.cdc.connectors.tidb.TiDBSource; import org.tikv.common.TiConfiguration; import java.util.Collections; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiDBTableSourceFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiDBTableSourceFactory.java similarity index 85% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiDBTableSourceFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiDBTableSourceFactory.java index 98521cee0..4cf3e4dbe 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiDBTableSourceFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiDBTableSourceFactory.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.tidb.table; +import org.apache.flink.cdc.connectors.tidb.table.utils.OptionUtils; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.ReadableConfig; @@ -26,22 +27,20 @@ import org.apache.flink.table.connector.source.DynamicTableSource; import org.apache.flink.table.factories.DynamicTableSourceFactory; import org.apache.flink.table.factories.FactoryUtil; -import com.ververica.cdc.connectors.tidb.table.utils.OptionUtils; - import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import static com.ververica.cdc.connectors.tidb.TDBSourceOptions.DATABASE_NAME; -import static com.ververica.cdc.connectors.tidb.TDBSourceOptions.PD_ADDRESSES; -import static com.ververica.cdc.connectors.tidb.TDBSourceOptions.SCAN_STARTUP_MODE; -import static com.ververica.cdc.connectors.tidb.TDBSourceOptions.TABLE_NAME; -import static com.ververica.cdc.connectors.tidb.TDBSourceOptions.TIKV_BATCH_GET_CONCURRENCY; -import static com.ververica.cdc.connectors.tidb.TDBSourceOptions.TIKV_BATCH_SCAN_CONCURRENCY; -import static com.ververica.cdc.connectors.tidb.TDBSourceOptions.TIKV_GRPC_SCAN_TIMEOUT; -import static com.ververica.cdc.connectors.tidb.TDBSourceOptions.TIKV_GRPC_TIMEOUT; -import static com.ververica.cdc.debezium.utils.ResolvedSchemaUtils.getPhysicalSchema; +import static org.apache.flink.cdc.connectors.tidb.TDBSourceOptions.DATABASE_NAME; +import static org.apache.flink.cdc.connectors.tidb.TDBSourceOptions.PD_ADDRESSES; +import static org.apache.flink.cdc.connectors.tidb.TDBSourceOptions.SCAN_STARTUP_MODE; +import static org.apache.flink.cdc.connectors.tidb.TDBSourceOptions.TABLE_NAME; +import static org.apache.flink.cdc.connectors.tidb.TDBSourceOptions.TIKV_BATCH_GET_CONCURRENCY; +import static org.apache.flink.cdc.connectors.tidb.TDBSourceOptions.TIKV_BATCH_SCAN_CONCURRENCY; +import static org.apache.flink.cdc.connectors.tidb.TDBSourceOptions.TIKV_GRPC_SCAN_TIMEOUT; +import static org.apache.flink.cdc.connectors.tidb.TDBSourceOptions.TIKV_GRPC_TIMEOUT; +import static org.apache.flink.cdc.debezium.utils.ResolvedSchemaUtils.getPhysicalSchema; /** Factory for creating configured instance of {@link TiDBTableSource}. */ public class TiDBTableSourceFactory implements DynamicTableSourceFactory { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiKVAppendMetadataCollector.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiKVAppendMetadataCollector.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiKVAppendMetadataCollector.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiKVAppendMetadataCollector.java index 5bccfecab..43904f3aa 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiKVAppendMetadataCollector.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiKVAppendMetadataCollector.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.tidb.table; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiKVDeserializationRuntimeConverter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiKVDeserializationRuntimeConverter.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiKVDeserializationRuntimeConverter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiKVDeserializationRuntimeConverter.java index 37de66a70..b688c8248 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiKVDeserializationRuntimeConverter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiKVDeserializationRuntimeConverter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.tidb.table; import org.tikv.common.meta.TiTableInfo; import org.tikv.common.types.DataType; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiKVMetadataConverter.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiKVMetadataConverter.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiKVMetadataConverter.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiKVMetadataConverter.java index bfa2e4a49..891fffb29 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiKVMetadataConverter.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiKVMetadataConverter.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.tidb.table; + +import org.apache.flink.cdc.common.annotation.Internal; -import com.ververica.cdc.common.annotation.Internal; import org.tikv.kvproto.Cdcpb; import org.tikv.kvproto.Kvrpcpb; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiKVReadableMetadata.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiKVReadableMetadata.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiKVReadableMetadata.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiKVReadableMetadata.java index 79a290aaf..a617347e2 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/TiKVReadableMetadata.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/TiKVReadableMetadata.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.tidb.table; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.data.StringData; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/utils/OptionUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/utils/OptionUtils.java new file mode 100644 index 000000000..1b2be59b1 --- /dev/null +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/utils/OptionUtils.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.cdc.connectors.tidb.table.utils; + +import org.apache.flink.configuration.ConfigurationUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Map; + +/** A utility class to print configuration of connectors. */ +public class OptionUtils { + + private static final Logger LOG = LoggerFactory.getLogger(OptionUtils.class); + + /** Utility class can not be instantiated. */ + private OptionUtils() {} + + public static void printOptions(String identifier, Map config) { + Map hideMap = ConfigurationUtils.hideSensitiveValues(config); + LOG.info("Print {} connector configuration:", identifier); + for (String key : hideMap.keySet()) { + LOG.info("{} = {}", key, hideMap.get(key)); + } + } +} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/utils/TableKeyRangeUtils.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/utils/TableKeyRangeUtils.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/utils/TableKeyRangeUtils.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/utils/TableKeyRangeUtils.java index 33cc5860b..a76b787b9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/com/ververica/cdc/connectors/tidb/table/utils/TableKeyRangeUtils.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/table/utils/TableKeyRangeUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table.utils; +package org.apache.flink.cdc.connectors.tidb.table.utils; import org.apache.flink.util.Preconditions; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index f21eb8b62..606391e69 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.ververica.cdc.connectors.tidb.table.TiDBTableSourceFactory \ No newline at end of file +org.apache.flink.cdc.connectors.tidb.table.TiDBTableSourceFactory \ No newline at end of file diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/TiDBTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/TiDBTestBase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/TiDBTestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/TiDBTestBase.java index 75fd8c595..d9266757b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/TiDBTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/TiDBTestBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb; +package org.apache.flink.cdc.connectors; import org.apache.flink.test.util.AbstractTestBase; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/table/TiDBConnectorITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/table/TiDBConnectorITCase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/table/TiDBConnectorITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/table/TiDBConnectorITCase.java index fbb764508..3f7e73cf0 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/table/TiDBConnectorITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/table/TiDBConnectorITCase.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.table; +import org.apache.flink.cdc.connectors.TiDBTestBase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableResult; @@ -24,7 +25,6 @@ import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.table.utils.LegacyRowResource; -import com.ververica.cdc.connectors.tidb.TiDBTestBase; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/table/TiDBConnectorRegionITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/table/TiDBConnectorRegionITCase.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/table/TiDBConnectorRegionITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/table/TiDBConnectorRegionITCase.java index a6d065cba..373224640 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/table/TiDBConnectorRegionITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/table/TiDBConnectorRegionITCase.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.table; +import org.apache.flink.cdc.connectors.TiDBTestBase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableResult; @@ -24,7 +25,6 @@ import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.table.utils.LegacyRowResource; -import com.ververica.cdc.connectors.tidb.TiDBTestBase; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/table/TiDBTableSourceFactoryTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/table/TiDBTableSourceFactoryTest.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/table/TiDBTableSourceFactoryTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/table/TiDBTableSourceFactoryTest.java index 6bc79fe40..2b3428f1b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/com/ververica/cdc/connectors/tidb/table/TiDBTableSourceFactoryTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-tidb-cdc/src/test/java/org/apache/flink/cdc/connectors/table/TiDBTableSourceFactoryTest.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tidb.table; +package org.apache.flink.cdc.connectors.table; +import org.apache.flink.cdc.connectors.tidb.table.StartupOptions; +import org.apache.flink.cdc.connectors.tidb.table.TiDBTableSource; import org.apache.flink.configuration.Configuration; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.api.Schema; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/VitessSource.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/VitessSource.java index dff46d92b..7730d3fcb 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/VitessSource.java @@ -15,12 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.vitess; +package org.apache.flink.cdc.connectors.vitess; + +import org.apache.flink.cdc.connectors.vitess.config.SchemaAdjustmentMode; +import org.apache.flink.cdc.connectors.vitess.config.TabletType; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.connectors.vitess.config.SchemaAdjustmentMode; -import com.ververica.cdc.connectors.vitess.config.TabletType; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; import io.debezium.connector.vitess.VitessConnector; import java.util.Properties; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessValidator.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/VitessValidator.java similarity index 93% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessValidator.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/VitessValidator.java index fe933434d..2820f4816 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessValidator.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/VitessValidator.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.vitess; +package org.apache.flink.cdc.connectors.vitess; + +import org.apache.flink.cdc.debezium.Validator; import org.apache.flink.shaded.guava31.com.google.common.collect.Maps; -import com.ververica.cdc.debezium.Validator; import io.debezium.connector.vitess.VitessConnector; import java.io.Serializable; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/config/SchemaAdjustmentMode.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/config/SchemaAdjustmentMode.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/config/SchemaAdjustmentMode.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/config/SchemaAdjustmentMode.java index e3d30cef6..5b884ae4e 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/config/SchemaAdjustmentMode.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/config/SchemaAdjustmentMode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.vitess.config; +package org.apache.flink.cdc.connectors.vitess.config; /** * Specifies how schema names should be adjusted for compatibility with the message converter used diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/config/TabletType.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/config/TabletType.java similarity index 96% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/config/TabletType.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/config/TabletType.java index 10bb63744..bc7204cfc 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/config/TabletType.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/config/TabletType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.vitess.config; +package org.apache.flink.cdc.connectors.vitess.config; /** The type of Tablet (hence MySQL) from which to stream the changes. */ public enum TabletType { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/table/VitessTableFactory.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/table/VitessTableFactory.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/table/VitessTableFactory.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/table/VitessTableFactory.java index 103d90fa5..3e46191cb 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/table/VitessTableFactory.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/table/VitessTableFactory.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.vitess.table; +package org.apache.flink.cdc.connectors.vitess.table; +import org.apache.flink.cdc.connectors.vitess.config.SchemaAdjustmentMode; +import org.apache.flink.cdc.connectors.vitess.config.TabletType; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; import org.apache.flink.configuration.ReadableConfig; @@ -26,14 +28,11 @@ import org.apache.flink.table.factories.DynamicTableFactory; import org.apache.flink.table.factories.DynamicTableSourceFactory; import org.apache.flink.table.factories.FactoryUtil; -import com.ververica.cdc.connectors.vitess.config.SchemaAdjustmentMode; -import com.ververica.cdc.connectors.vitess.config.TabletType; - import java.util.HashSet; import java.util.Set; -import static com.ververica.cdc.debezium.table.DebeziumOptions.DEBEZIUM_OPTIONS_PREFIX; -import static com.ververica.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; +import static org.apache.flink.cdc.debezium.table.DebeziumOptions.DEBEZIUM_OPTIONS_PREFIX; +import static org.apache.flink.cdc.debezium.table.DebeziumOptions.getDebeziumProperties; /** Factory for creating configured instance of {@link VitessTableSource}. */ public class VitessTableFactory implements DynamicTableSourceFactory { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/table/VitessTableSource.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/table/VitessTableSource.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/table/VitessTableSource.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/table/VitessTableSource.java index f8c5468ad..202c417ed 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/table/VitessTableSource.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/table/VitessTableSource.java @@ -15,9 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.vitess.table; +package org.apache.flink.cdc.connectors.vitess.table; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.vitess.VitessSource; +import org.apache.flink.cdc.connectors.vitess.config.SchemaAdjustmentMode; +import org.apache.flink.cdc.connectors.vitess.config.TabletType; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; +import org.apache.flink.cdc.debezium.table.RowDataDebeziumDeserializeSchema; import org.apache.flink.table.catalog.ResolvedSchema; import org.apache.flink.table.connector.ChangelogMode; import org.apache.flink.table.connector.source.DynamicTableSource; @@ -26,13 +32,6 @@ import org.apache.flink.table.connector.source.SourceFunctionProvider; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.RowType; -import com.ververica.cdc.connectors.vitess.VitessSource; -import com.ververica.cdc.connectors.vitess.config.SchemaAdjustmentMode; -import com.ververica.cdc.connectors.vitess.config.TabletType; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; -import com.ververica.cdc.debezium.table.RowDataDebeziumDeserializeSchema; - import javax.annotation.Nullable; import java.time.ZoneId; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 699a57bcd..42155001b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.ververica.cdc.connectors.vitess.table.VitessTableFactory \ No newline at end of file +org.apache.flink.cdc.connectors.vitess.table.VitessTableFactory \ No newline at end of file diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/VitessSourceTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessSourceTest.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/VitessSourceTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessSourceTest.java index 0a87c0285..199b1fe75 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/VitessSourceTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessSourceTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.vitess; +package org.apache.flink.cdc.connectors.vitess; import org.apache.flink.api.common.state.BroadcastState; import org.apache.flink.api.common.state.KeyedStateStore; @@ -24,6 +24,10 @@ import org.apache.flink.api.common.state.ListStateDescriptor; import org.apache.flink.api.common.state.MapStateDescriptor; import org.apache.flink.api.common.state.OperatorStateStore; import org.apache.flink.api.common.typeinfo.TypeInformation; +import org.apache.flink.cdc.connectors.utils.TestSourceContext; +import org.apache.flink.cdc.connectors.vitess.config.TabletType; +import org.apache.flink.cdc.debezium.DebeziumDeserializationSchema; +import org.apache.flink.cdc.debezium.DebeziumSourceFunction; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.testutils.CheckedThread; import org.apache.flink.runtime.state.FunctionInitializationContext; @@ -31,10 +35,6 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.streaming.util.MockStreamingRuntimeContext; import org.apache.flink.util.Collector; -import com.ververica.cdc.connectors.utils.TestSourceContext; -import com.ververica.cdc.connectors.vitess.config.TabletType; -import com.ververica.cdc.debezium.DebeziumDeserializationSchema; -import com.ververica.cdc.debezium.DebeziumSourceFunction; import org.apache.kafka.connect.source.SourceRecord; import org.junit.Before; import org.junit.Test; @@ -50,9 +50,9 @@ import java.util.Set; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertDelete; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertInsert; -import static com.ververica.cdc.connectors.utils.AssertUtils.assertUpdate; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertDelete; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertInsert; +import static org.apache.flink.cdc.connectors.utils.AssertUtils.assertUpdate; /** Tests for {@link VitessSource} which also heavily tests {@link DebeziumSourceFunction}. */ public class VitessSourceTest extends VitessTestBase { diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/VitessTestBase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessTestBase.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/VitessTestBase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessTestBase.java index e46062a25..494c77987 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/VitessTestBase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/VitessTestBase.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.vitess; +package org.apache.flink.cdc.connectors.vitess; +import org.apache.flink.cdc.connectors.vitess.container.VitessContainer; import org.apache.flink.test.util.AbstractTestBase; -import com.ververica.cdc.connectors.vitess.container.VitessContainer; import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/container/VitessContainer.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/container/VitessContainer.java similarity index 98% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/container/VitessContainer.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/container/VitessContainer.java index 67b9ea63b..a6a75e8f9 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/container/VitessContainer.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/container/VitessContainer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.vitess.container; +package org.apache.flink.cdc.connectors.vitess.container; import org.testcontainers.containers.JdbcDatabaseContainer; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/table/VitessConnectorITCase.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/table/VitessConnectorITCase.java similarity index 99% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/table/VitessConnectorITCase.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/table/VitessConnectorITCase.java index 5599e0871..4ddd5c1bc 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/table/VitessConnectorITCase.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/table/VitessConnectorITCase.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.vitess.table; +package org.apache.flink.cdc.connectors.vitess.table; +import org.apache.flink.cdc.connectors.vitess.VitessTestBase; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableResult; @@ -25,7 +26,6 @@ import org.apache.flink.table.planner.factories.TestValuesTableFactory; import org.apache.flink.types.Row; import org.apache.flink.util.CloseableIterator; -import com.ververica.cdc.connectors.vitess.VitessTestBase; import org.junit.Before; import org.junit.Test; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/table/VitessTableFactoryTest.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/table/VitessTableFactoryTest.java similarity index 97% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/table/VitessTableFactoryTest.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/table/VitessTableFactoryTest.java index 2db5fdb0d..641b91813 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/com/ververica/cdc/connectors/vitess/table/VitessTableFactoryTest.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-connector-vitess-cdc/src/test/java/org/apache/flink/cdc/connectors/vitess/table/VitessTableFactoryTest.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.vitess.table; +package org.apache.flink.cdc.connectors.vitess.table; +import org.apache.flink.cdc.connectors.vitess.config.SchemaAdjustmentMode; +import org.apache.flink.cdc.connectors.vitess.config.TabletType; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; import org.apache.flink.table.api.DataTypes; @@ -31,8 +33,6 @@ import org.apache.flink.table.factories.Factory; import org.apache.flink.table.factories.FactoryUtil; import org.apache.flink.util.ExceptionUtils; -import com.ververica.cdc.connectors.vitess.config.SchemaAdjustmentMode; -import com.ververica.cdc.connectors.vitess.config.TabletType; import org.junit.Test; import java.util.ArrayList; diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/DummyDocs.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/DummyDocs.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/DummyDocs.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/DummyDocs.java index 959dbe2ec..4a5552709 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oracle-cdc/src/main/java/com/ververica/cdc/connectors/oracle/DummyDocs.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/src/main/java/org/apache/flink/cdc/connectors/db2/DummyDocs.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oracle; +package org.apache.flink.cdc.connectors.db2; /** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ public class DummyDocs {} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/DummyDocs.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/DummyDocs.java new file mode 100644 index 000000000..da8daf678 --- /dev/null +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mongodb-cdc/src/main/java/org/apache/flink/cdc/connectors/mongodb/DummyDocs.java @@ -0,0 +1,21 @@ +/* + * 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.cdc.connectors.mongodb; + +/** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ +public class DummyDocs {} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/DummyDocs.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/DummyDocs.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/DummyDocs.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/DummyDocs.java index 969d197be..9608b9d96 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mysql-cdc/src/main/java/com/ververica/cdc/connectors/mysql/DummyDocs.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mysql-cdc/src/main/java/org/apache/flink/cdc/connectors/mysql/DummyDocs.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mysql; +package org.apache.flink.cdc.connectors.mysql; /** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ public class DummyDocs {} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/DummyDocs.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/DummyDocs.java new file mode 100644 index 000000000..2b87d94c8 --- /dev/null +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oceanbase-cdc/src/main/java/org/apache/flink/cdc/connectors/oceanbase/DummyDocs.java @@ -0,0 +1,21 @@ +/* + * 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.cdc.connectors.oceanbase; + +/** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ +public class DummyDocs {} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/DummyDocs.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/DummyDocs.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/DummyDocs.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/DummyDocs.java index 3553e932a..4d3aa5f84 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oceanbase-cdc/src/main/java/com/ververica/cdc/connectors/oceanbase/DummyDocs.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-oracle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/DummyDocs.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.oceanbase; +package org.apache.flink.cdc.connectors.oracle; /** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ public class DummyDocs {} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/DummyDocs.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/DummyDocs.java deleted file mode 100644 index 05a2df957..000000000 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-postgres-cdc/src/main/java/com/ververica/cdc/connectors/postgres/DummyDocs.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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 com.ververica.cdc.connectors.postgres; - -/** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ -public class DummyDocs {} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/DummyDocs.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/DummyDocs.java new file mode 100644 index 000000000..ec0d69114 --- /dev/null +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-postgres-cdc/src/main/java/org/apache/flink/cdc/connectors/postgres/DummyDocs.java @@ -0,0 +1,21 @@ +/* + * 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.cdc.connectors.postgres; + +/** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ +public class DummyDocs {} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/DummyDocs.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/DummyDocs.java deleted file mode 100644 index 95398bb31..000000000 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-sqlserver-cdc/src/main/java/com/ververica/cdc/connectors/sqlserver/DummyDocs.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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 com.ververica.cdc.connectors.sqlserver; - -/** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ -public class DummyDocs {} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/DummyDocs.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/DummyDocs.java new file mode 100644 index 000000000..4bfe24e1f --- /dev/null +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-sqlserver-cdc/src/main/java/org/apache/flink/cdc/connectors/sqlserver/DummyDocs.java @@ -0,0 +1,21 @@ +/* + * 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.cdc.connectors.sqlserver; + +/** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ +public class DummyDocs {} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-tidb-cdc/src/main/java/DummyDocs.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-tidb-cdc/src/main/java/DummyDocs.java deleted file mode 100644 index 1e7ef38ca..000000000 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-tidb-cdc/src/main/java/DummyDocs.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - */ - -/** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ -public class DummyDocs {} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/DummyDocs.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/DummyDocs.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/DummyDocs.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/DummyDocs.java index 5e99cc79a..7e5a7414b 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-db2-cdc/src/main/java/com/ververica/cdc/connectors/db2/DummyDocs.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-tidb-cdc/src/main/java/org/apache/flink/cdc/connectors/tidb/DummyDocs.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.db2; +package org.apache.flink.cdc.connectors.tidb; /** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ public class DummyDocs {} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/DummyDocs.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/DummyDocs.java deleted file mode 100644 index 3ac96adfe..000000000 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/DummyDocs.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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 com.ververica.cdc.connectors.vitess; - -/** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ -public class DummyDocs {} diff --git a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/DummyDocs.java b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/DummyDocs.java similarity index 95% rename from flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/DummyDocs.java rename to flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/DummyDocs.java index c13ab9515..f2592a4d5 100644 --- a/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-mongodb-cdc/src/main/java/com/ververica/cdc/connectors/mongodb/DummyDocs.java +++ b/flink-cdc-connect/flink-cdc-source-connectors/flink-sql-connector-vitess-cdc/src/main/java/org/apache/flink/cdc/connectors/vitess/DummyDocs.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.mongodb; +package org.apache.flink.cdc.connectors.vitess; /** This is used to generate a dummy docs jar for this module to pass OSS repository rule. */ public class DummyDocs {} diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/Db2E2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/Db2E2eITCase.java similarity index 97% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/Db2E2eITCase.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/Db2E2eITCase.java index 1c7420159..54cde8e61 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/Db2E2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/Db2E2eITCase.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests; +package org.apache.flink.cdc.connectors.tests; + +import org.apache.flink.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; +import org.apache.flink.cdc.connectors.tests.utils.JdbcProxy; +import org.apache.flink.cdc.connectors.tests.utils.TestUtils; -import com.ververica.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; -import com.ververica.cdc.connectors.tests.utils.JdbcProxy; -import com.ververica.cdc.connectors.tests.utils.TestUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/MongoE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/MongoE2eITCase.java similarity index 93% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/MongoE2eITCase.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/MongoE2eITCase.java index 604320be8..610897171 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/MongoE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/MongoE2eITCase.java @@ -15,7 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests; +package org.apache.flink.cdc.connectors.tests; + +import org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer; +import org.apache.flink.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; +import org.apache.flink.cdc.connectors.tests.utils.JdbcProxy; +import org.apache.flink.cdc.connectors.tests.utils.TestUtils; import com.mongodb.ConnectionString; import com.mongodb.MongoClientSettings; @@ -24,10 +29,6 @@ import com.mongodb.client.MongoClients; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Updates; -import com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer; -import com.ververica.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; -import com.ververica.cdc.connectors.tests.utils.JdbcProxy; -import com.ververica.cdc.connectors.tests.utils.TestUtils; import org.bson.Document; import org.bson.types.ObjectId; import org.junit.After; @@ -47,10 +48,10 @@ import java.util.List; import java.util.Random; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.base.utils.EnvironmentUtils.supportCheckpointsAfterTasksFinished; -import static com.ververica.cdc.connectors.mongodb.LegacyMongoDBContainer.FLINK_USER; -import static com.ververica.cdc.connectors.mongodb.LegacyMongoDBContainer.FLINK_USER_PASSWORD; -import static com.ververica.cdc.connectors.mongodb.utils.MongoDBContainer.MONGODB_PORT; +import static org.apache.flink.cdc.connectors.base.utils.EnvironmentUtils.supportCheckpointsAfterTasksFinished; +import static org.apache.flink.cdc.connectors.mongodb.LegacyMongoDBContainer.FLINK_USER; +import static org.apache.flink.cdc.connectors.mongodb.LegacyMongoDBContainer.FLINK_USER_PASSWORD; +import static org.apache.flink.cdc.connectors.mongodb.utils.MongoDBContainer.MONGODB_PORT; /** End-to-end tests for mongodb-cdc connector uber jar. */ public class MongoE2eITCase extends FlinkContainerTestEnvironment { diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/MySqlE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/MySqlE2eITCase.java similarity index 95% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/MySqlE2eITCase.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/MySqlE2eITCase.java index 0c2beb74d..85a3517bb 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/MySqlE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/MySqlE2eITCase.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests; +package org.apache.flink.cdc.connectors.tests; + +import org.apache.flink.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; +import org.apache.flink.cdc.connectors.tests.utils.JdbcProxy; +import org.apache.flink.cdc.connectors.tests.utils.TestUtils; -import com.ververica.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; -import com.ververica.cdc.connectors.tests.utils.JdbcProxy; -import com.ververica.cdc.connectors.tests.utils.TestUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +34,7 @@ import java.time.Duration; import java.util.Arrays; import java.util.List; -import static com.ververica.cdc.connectors.base.utils.EnvironmentUtils.supportCheckpointsAfterTasksFinished; +import static org.apache.flink.cdc.connectors.base.utils.EnvironmentUtils.supportCheckpointsAfterTasksFinished; /** End-to-end tests for mysql-cdc connector uber jar. */ public class MySqlE2eITCase extends FlinkContainerTestEnvironment { diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/OceanBaseE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/OceanBaseE2eITCase.java similarity index 97% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/OceanBaseE2eITCase.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/OceanBaseE2eITCase.java index 53180df63..e3d329882 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/OceanBaseE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/OceanBaseE2eITCase.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests; +package org.apache.flink.cdc.connectors.tests; + +import org.apache.flink.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; +import org.apache.flink.cdc.connectors.tests.utils.JdbcProxy; +import org.apache.flink.cdc.connectors.tests.utils.TestUtils; -import com.ververica.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; -import com.ververica.cdc.connectors.tests.utils.JdbcProxy; -import com.ververica.cdc.connectors.tests.utils.TestUtils; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/OracleE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/OracleE2eITCase.java similarity index 92% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/OracleE2eITCase.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/OracleE2eITCase.java index f35f808e2..c53e010b2 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/OracleE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/OracleE2eITCase.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests; +package org.apache.flink.cdc.connectors.tests; + +import org.apache.flink.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; +import org.apache.flink.cdc.connectors.tests.utils.JdbcProxy; +import org.apache.flink.cdc.connectors.tests.utils.TestUtils; -import com.ververica.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; -import com.ververica.cdc.connectors.tests.utils.JdbcProxy; -import com.ververica.cdc.connectors.tests.utils.TestUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -40,11 +41,11 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -import static com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase.CONNECTOR_PWD; -import static com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase.CONNECTOR_USER; -import static com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase.ORACLE_DATABASE; -import static com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase.TEST_PWD; -import static com.ververica.cdc.connectors.oracle.source.OracleSourceTestBase.TEST_USER; +import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase.CONNECTOR_PWD; +import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase.CONNECTOR_USER; +import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase.ORACLE_DATABASE; +import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase.TEST_PWD; +import static org.apache.flink.cdc.connectors.oracle.source.OracleSourceTestBase.TEST_USER; /** End-to-end tests for oracle-cdc connector uber jar. */ public class OracleE2eITCase extends FlinkContainerTestEnvironment { diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/PostgresE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/PostgresE2eITCase.java similarity index 98% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/PostgresE2eITCase.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/PostgresE2eITCase.java index 3d22aa3d0..aa4f3daf1 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/PostgresE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/PostgresE2eITCase.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests; +package org.apache.flink.cdc.connectors.tests; + +import org.apache.flink.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; +import org.apache.flink.cdc.connectors.tests.utils.JdbcProxy; +import org.apache.flink.cdc.connectors.tests.utils.TestUtils; -import com.ververica.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; -import com.ververica.cdc.connectors.tests.utils.JdbcProxy; -import com.ververica.cdc.connectors.tests.utils.TestUtils; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/SqlServerE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/SqlServerE2eITCase.java similarity index 97% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/SqlServerE2eITCase.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/SqlServerE2eITCase.java index 7ab27a080..ad9bc6acb 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/SqlServerE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/SqlServerE2eITCase.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests; +package org.apache.flink.cdc.connectors.tests; + +import org.apache.flink.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; +import org.apache.flink.cdc.connectors.tests.utils.JdbcProxy; +import org.apache.flink.cdc.connectors.tests.utils.TestUtils; -import com.ververica.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; -import com.ververica.cdc.connectors.tests.utils.JdbcProxy; -import com.ververica.cdc.connectors.tests.utils.TestUtils; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/TiDBE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/TiDBE2eITCase.java similarity index 98% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/TiDBE2eITCase.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/TiDBE2eITCase.java index 030d39eb2..f64d33ea1 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/TiDBE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/TiDBE2eITCase.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests; +package org.apache.flink.cdc.connectors.tests; + +import org.apache.flink.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; +import org.apache.flink.cdc.connectors.tests.utils.JdbcProxy; +import org.apache.flink.cdc.connectors.tests.utils.TestUtils; -import com.ververica.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; -import com.ververica.cdc.connectors.tests.utils.JdbcProxy; -import com.ververica.cdc.connectors.tests.utils.TestUtils; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/VitessE2eITCase.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/VitessE2eITCase.java similarity index 95% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/VitessE2eITCase.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/VitessE2eITCase.java index 9adfa5193..b2e94622c 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/VitessE2eITCase.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/VitessE2eITCase.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests; +package org.apache.flink.cdc.connectors.tests; + +import org.apache.flink.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; +import org.apache.flink.cdc.connectors.tests.utils.JdbcProxy; +import org.apache.flink.cdc.connectors.tests.utils.TestUtils; +import org.apache.flink.cdc.connectors.vitess.VitessTestBase; +import org.apache.flink.cdc.connectors.vitess.container.VitessContainer; -import com.ververica.cdc.connectors.tests.utils.FlinkContainerTestEnvironment; -import com.ververica.cdc.connectors.tests.utils.JdbcProxy; -import com.ververica.cdc.connectors.tests.utils.TestUtils; -import com.ververica.cdc.connectors.vitess.VitessTestBase; -import com.ververica.cdc.connectors.vitess.container.VitessContainer; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,8 +45,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import static com.ververica.cdc.connectors.vitess.container.VitessContainer.GRPC_PORT; -import static com.ververica.cdc.connectors.vitess.container.VitessContainer.MYSQL_PORT; +import static org.apache.flink.cdc.connectors.vitess.container.VitessContainer.GRPC_PORT; +import static org.apache.flink.cdc.connectors.vitess.container.VitessContainer.MYSQL_PORT; import static org.junit.Assert.assertNotNull; /** End-to-end test for Vitess CDC connector. */ diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java similarity index 98% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java index 90dbb7122..bef68a676 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/FlinkContainerTestEnvironment.java @@ -15,10 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests.utils; +package org.apache.flink.cdc.connectors.tests.utils; import org.apache.flink.api.common.JobStatus; import org.apache.flink.api.common.time.Deadline; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlContainer; +import org.apache.flink.cdc.connectors.mysql.testutils.MySqlVersion; +import org.apache.flink.cdc.connectors.mysql.testutils.UniqueDatabase; import org.apache.flink.client.deployment.StandaloneClusterId; import org.apache.flink.client.program.rest.RestClusterClient; import org.apache.flink.configuration.Configuration; @@ -28,9 +31,6 @@ import org.apache.flink.table.api.ValidationException; import org.apache.flink.util.TestLogger; import com.github.dockerjava.api.DockerClient; -import com.ververica.cdc.connectors.mysql.testutils.MySqlContainer; -import com.ververica.cdc.connectors.mysql.testutils.MySqlVersion; -import com.ververica.cdc.connectors.mysql.testutils.UniqueDatabase; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/JdbcProxy.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/JdbcProxy.java similarity index 98% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/JdbcProxy.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/JdbcProxy.java index f336d76ad..c0f0167ae 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/JdbcProxy.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/JdbcProxy.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests.utils; +package org.apache.flink.cdc.connectors.tests.utils; import org.apache.commons.lang3.StringUtils; diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/ParameterProperty.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/ParameterProperty.java similarity index 96% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/ParameterProperty.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/ParameterProperty.java index ca49cf0c4..ac13e9519 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/ParameterProperty.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/ParameterProperty.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests.utils; +package org.apache.flink.cdc.connectors.tests.utils; import java.util.function.Function; diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/SQLJobSubmission.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/SQLJobSubmission.java similarity index 97% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/SQLJobSubmission.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/SQLJobSubmission.java index 7a908eb6b..28441f99d 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/SQLJobSubmission.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/SQLJobSubmission.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests.utils; +package org.apache.flink.cdc.connectors.tests.utils; import java.nio.file.Path; import java.util.ArrayList; diff --git a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/TestUtils.java b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/TestUtils.java similarity index 98% rename from flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/TestUtils.java rename to flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/TestUtils.java index a0a46f280..bb6492eee 100644 --- a/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/com/ververica/cdc/connectors/tests/utils/TestUtils.java +++ b/flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/utils/TestUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.connectors.tests.utils; +package org.apache.flink.cdc.connectors.tests.utils; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/route/RouteFunction.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/route/RouteFunction.java similarity index 90% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/route/RouteFunction.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/route/RouteFunction.java index c17978ef9..cc40796c3 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/route/RouteFunction.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/route/RouteFunction.java @@ -15,29 +15,28 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.route; +package org.apache.flink.cdc.runtime.operators.route; import org.apache.flink.api.common.functions.RichMapFunction; import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.ChangeEvent; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Selectors; import org.apache.flink.configuration.Configuration; -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.ChangeEvent; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Selectors; - import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import static com.ververica.cdc.common.utils.Preconditions.checkState; +import static org.apache.flink.cdc.common.utils.Preconditions.checkState; /** A map function that applies user-defined routing logics. */ public class RouteFunction extends RichMapFunction { diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/SchemaOperator.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/SchemaOperator.java similarity index 86% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/SchemaOperator.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/SchemaOperator.java index 31464da68..ee1055278 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/SchemaOperator.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/SchemaOperator.java @@ -15,8 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema; - +package org.apache.flink.cdc.runtime.operators.schema; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.FlushEvent; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistry; +import org.apache.flink.cdc.runtime.operators.schema.event.CoordinationResponseUtils; +import org.apache.flink.cdc.runtime.operators.schema.event.ReleaseUpstreamRequest; +import org.apache.flink.cdc.runtime.operators.schema.event.ReleaseUpstreamResponse; +import org.apache.flink.cdc.runtime.operators.schema.event.SchemaChangeRequest; +import org.apache.flink.cdc.runtime.operators.schema.event.SchemaChangeResponse; import org.apache.flink.runtime.jobgraph.tasks.TaskOperatorEventGateway; import org.apache.flink.runtime.operators.coordination.CoordinationRequest; import org.apache.flink.runtime.operators.coordination.CoordinationResponse; @@ -29,17 +40,6 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.streaming.runtime.tasks.StreamTask; import org.apache.flink.util.SerializedValue; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.FlushEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistry; -import com.ververica.cdc.runtime.operators.schema.event.CoordinationResponseUtils; -import com.ververica.cdc.runtime.operators.schema.event.ReleaseUpstreamRequest; -import com.ververica.cdc.runtime.operators.schema.event.ReleaseUpstreamResponse; -import com.ververica.cdc.runtime.operators.schema.event.SchemaChangeRequest; -import com.ververica.cdc.runtime.operators.schema.event.SchemaChangeResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/SchemaOperatorFactory.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/SchemaOperatorFactory.java similarity index 86% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/SchemaOperatorFactory.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/SchemaOperatorFactory.java index 7180dcf7e..7e691019a 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/SchemaOperatorFactory.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/SchemaOperatorFactory.java @@ -15,19 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema; +package org.apache.flink.cdc.runtime.operators.schema; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.sink.MetadataApplier; +import org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistryProvider; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.runtime.operators.coordination.OperatorCoordinator; import org.apache.flink.streaming.api.operators.CoordinatedOperatorFactory; import org.apache.flink.streaming.api.operators.OneInputStreamOperatorFactory; import org.apache.flink.streaming.api.operators.SimpleOperatorFactory; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.sink.MetadataApplier; -import com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistryProvider; - /** Factory to create {@link SchemaOperator}. */ @Internal public class SchemaOperatorFactory extends SimpleOperatorFactory diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaManager.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaManager.java similarity index 93% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaManager.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaManager.java index 7c58ced4a..5b71e1c4e 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaManager.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaManager.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.coordinator; - +package org.apache.flink.cdc.runtime.operators.schema.coordinator; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.utils.SchemaUtils; +import org.apache.flink.cdc.runtime.serializer.TableIdSerializer; +import org.apache.flink.cdc.runtime.serializer.schema.SchemaSerializer; import org.apache.flink.core.io.SimpleVersionedSerializer; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.utils.SchemaUtils; -import com.ververica.cdc.runtime.serializer.TableIdSerializer; -import com.ververica.cdc.runtime.serializer.schema.SchemaSerializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +45,7 @@ import java.util.Optional; import java.util.SortedMap; import java.util.TreeMap; -import static com.ververica.cdc.common.utils.Preconditions.checkArgument; +import static org.apache.flink.cdc.common.utils.Preconditions.checkArgument; /** * Schema manager handles handles schema changes for tables, and manages historical schema versions diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaRegistry.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaRegistry.java similarity index 91% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaRegistry.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaRegistry.java index 93769fe21..57a82b603 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaRegistry.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaRegistry.java @@ -15,8 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.coordinator; - +package org.apache.flink.cdc.runtime.operators.schema.coordinator; + +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.sink.MetadataApplier; +import org.apache.flink.cdc.runtime.operators.schema.SchemaOperator; +import org.apache.flink.cdc.runtime.operators.schema.event.FlushSuccessEvent; +import org.apache.flink.cdc.runtime.operators.schema.event.GetSchemaRequest; +import org.apache.flink.cdc.runtime.operators.schema.event.GetSchemaResponse; +import org.apache.flink.cdc.runtime.operators.schema.event.ReleaseUpstreamRequest; +import org.apache.flink.cdc.runtime.operators.schema.event.SchemaChangeRequest; +import org.apache.flink.cdc.runtime.operators.schema.event.SinkWriterRegisterEvent; import org.apache.flink.runtime.operators.coordination.CoordinationRequest; import org.apache.flink.runtime.operators.coordination.CoordinationRequestHandler; import org.apache.flink.runtime.operators.coordination.CoordinationResponse; @@ -24,15 +33,6 @@ import org.apache.flink.runtime.operators.coordination.OperatorCoordinator; import org.apache.flink.runtime.operators.coordination.OperatorEvent; import org.apache.flink.util.FlinkException; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.sink.MetadataApplier; -import com.ververica.cdc.runtime.operators.schema.SchemaOperator; -import com.ververica.cdc.runtime.operators.schema.event.FlushSuccessEvent; -import com.ververica.cdc.runtime.operators.schema.event.GetSchemaRequest; -import com.ververica.cdc.runtime.operators.schema.event.GetSchemaResponse; -import com.ververica.cdc.runtime.operators.schema.event.ReleaseUpstreamRequest; -import com.ververica.cdc.runtime.operators.schema.event.SchemaChangeRequest; -import com.ververica.cdc.runtime.operators.schema.event.SinkWriterRegisterEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +46,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletableFuture; -import static com.ververica.cdc.runtime.operators.schema.event.CoordinationResponseUtils.wrap; +import static org.apache.flink.cdc.runtime.operators.schema.event.CoordinationResponseUtils.wrap; /** * The implementation of the {@link OperatorCoordinator} for the {@link SchemaOperator}. diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaRegistryProvider.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaRegistryProvider.java similarity index 90% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaRegistryProvider.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaRegistryProvider.java index f38911137..1536f8a82 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaRegistryProvider.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaRegistryProvider.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.coordinator; +package org.apache.flink.cdc.runtime.operators.schema.coordinator; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.sink.MetadataApplier; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.runtime.operators.coordination.OperatorCoordinator; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.sink.MetadataApplier; - /** Provider of {@link SchemaRegistry}. */ @Internal public class SchemaRegistryProvider implements OperatorCoordinator.Provider { diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaRegistryRequestHandler.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaRegistryRequestHandler.java similarity index 90% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaRegistryRequestHandler.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaRegistryRequestHandler.java index 56f1fcb0a..8b11e9509 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaRegistryRequestHandler.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaRegistryRequestHandler.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.coordinator; - +package org.apache.flink.cdc.runtime.operators.schema.coordinator; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.sink.MetadataApplier; +import org.apache.flink.cdc.runtime.operators.schema.event.ReleaseUpstreamRequest; +import org.apache.flink.cdc.runtime.operators.schema.event.ReleaseUpstreamResponse; +import org.apache.flink.cdc.runtime.operators.schema.event.SchemaChangeRequest; +import org.apache.flink.cdc.runtime.operators.schema.event.SchemaChangeResponse; import org.apache.flink.runtime.operators.coordination.CoordinationResponse; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.sink.MetadataApplier; -import com.ververica.cdc.runtime.operators.schema.event.ReleaseUpstreamRequest; -import com.ververica.cdc.runtime.operators.schema.event.ReleaseUpstreamResponse; -import com.ververica.cdc.runtime.operators.schema.event.SchemaChangeRequest; -import com.ververica.cdc.runtime.operators.schema.event.SchemaChangeResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,8 +39,8 @@ import java.util.List; import java.util.Set; import java.util.concurrent.CompletableFuture; -import static com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistryRequestHandler.RequestStatus.RECEIVED_RELEASE_REQUEST; -import static com.ververica.cdc.runtime.operators.schema.event.CoordinationResponseUtils.wrap; +import static org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistryRequestHandler.RequestStatus.RECEIVED_RELEASE_REQUEST; +import static org.apache.flink.cdc.runtime.operators.schema.event.CoordinationResponseUtils.wrap; /** A handler to deal with all requests and events for {@link SchemaRegistry}. */ @Internal diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/CoordinationResponseUtils.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/CoordinationResponseUtils.java similarity index 97% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/CoordinationResponseUtils.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/CoordinationResponseUtils.java index 2270c14e2..4f13e928e 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/CoordinationResponseUtils.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/CoordinationResponseUtils.java @@ -15,20 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.event; +package org.apache.flink.cdc.runtime.operators.schema.event; 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.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.utils.InstantiationUtil; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.runtime.operators.coordination.CoordinationResponse; import org.apache.flink.streaming.api.operators.collect.CollectCoordinationResponse; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.utils.InstantiationUtil; - import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/FlushSuccessEvent.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/FlushSuccessEvent.java similarity index 91% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/FlushSuccessEvent.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/FlushSuccessEvent.java index cfaa83b2d..729514464 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/FlushSuccessEvent.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/FlushSuccessEvent.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.event; +package org.apache.flink.cdc.runtime.operators.schema.event; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistry; import org.apache.flink.runtime.operators.coordination.OperatorEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistry; - import java.util.Objects; /** diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/GetSchemaRequest.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/GetSchemaRequest.java similarity index 84% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/GetSchemaRequest.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/GetSchemaRequest.java index fef68cff4..aac440ba5 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/GetSchemaRequest.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/GetSchemaRequest.java @@ -15,17 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.event; +package org.apache.flink.cdc.runtime.operators.schema.event; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistry; import org.apache.flink.runtime.operators.coordination.CoordinationRequest; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.TableId; - -/** - * Request to {@link com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistry} for - * getting schema of a table. - */ +/** Request to {@link SchemaRegistry} for getting schema of a table. */ @Internal public class GetSchemaRequest implements CoordinationRequest { public static final int LATEST_SCHEMA_VERSION = -1; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/GetSchemaResponse.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/GetSchemaResponse.java similarity index 78% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/GetSchemaResponse.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/GetSchemaResponse.java index 7d9294990..aec9fd4de 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/GetSchemaResponse.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/GetSchemaResponse.java @@ -15,22 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.event; +package org.apache.flink.cdc.runtime.operators.schema.event; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistry; import org.apache.flink.runtime.operators.coordination.CoordinationResponse; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.schema.Schema; - import javax.annotation.Nullable; import java.util.Optional; -/** - * Coordination response from {@link - * com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistry} for {@link - * GetSchemaRequest}. - */ +/** Coordination response from {@link SchemaRegistry} for {@link GetSchemaRequest}. */ @Internal public class GetSchemaResponse implements CoordinationResponse { @Nullable private final Schema schema; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/ReleaseUpstreamRequest.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/ReleaseUpstreamRequest.java similarity index 81% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/ReleaseUpstreamRequest.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/ReleaseUpstreamRequest.java index f7f6d40f6..3da85c184 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/ReleaseUpstreamRequest.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/ReleaseUpstreamRequest.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.event; +package org.apache.flink.cdc.runtime.operators.schema.event; +import org.apache.flink.cdc.common.event.FlushEvent; +import org.apache.flink.cdc.runtime.operators.schema.SchemaOperator; +import org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistry; import org.apache.flink.runtime.operators.coordination.CoordinationRequest; -import com.ververica.cdc.common.event.FlushEvent; -import com.ververica.cdc.runtime.operators.schema.SchemaOperator; -import com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistry; - /** * The request from {@link SchemaOperator} to {@link SchemaRegistry} to request to release upstream * after sending {@link FlushEvent}. diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/ReleaseUpstreamResponse.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/ReleaseUpstreamResponse.java similarity index 84% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/ReleaseUpstreamResponse.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/ReleaseUpstreamResponse.java index 0d47122a4..0b0043235 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/ReleaseUpstreamResponse.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/ReleaseUpstreamResponse.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.event; +package org.apache.flink.cdc.runtime.operators.schema.event; +import org.apache.flink.cdc.runtime.operators.schema.SchemaOperator; +import org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistry; import org.apache.flink.runtime.operators.coordination.CoordinationResponse; -import com.ververica.cdc.runtime.operators.schema.SchemaOperator; -import com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistry; - /** * The response for {@link ReleaseUpstreamRequest} from {@link SchemaRegistry} to {@link * SchemaOperator}. diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/SchemaChangeRequest.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/SchemaChangeRequest.java similarity index 86% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/SchemaChangeRequest.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/SchemaChangeRequest.java index 17f846962..fda6b02f1 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/SchemaChangeRequest.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/SchemaChangeRequest.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.event; +package org.apache.flink.cdc.runtime.operators.schema.event; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.runtime.operators.schema.SchemaOperator; +import org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistry; import org.apache.flink.runtime.operators.coordination.CoordinationRequest; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.runtime.operators.schema.SchemaOperator; -import com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistry; - import java.util.Objects; /** diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/SchemaChangeResponse.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/SchemaChangeResponse.java similarity index 90% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/SchemaChangeResponse.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/SchemaChangeResponse.java index bc2884a39..1e609fc70 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/SchemaChangeResponse.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/SchemaChangeResponse.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.event; +package org.apache.flink.cdc.runtime.operators.schema.event; +import org.apache.flink.cdc.runtime.operators.schema.SchemaOperator; +import org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistry; import org.apache.flink.runtime.operators.coordination.CoordinationResponse; -import com.ververica.cdc.runtime.operators.schema.SchemaOperator; -import com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistry; - import java.util.Objects; /** diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/SinkWriterRegisterEvent.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/SinkWriterRegisterEvent.java similarity index 92% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/SinkWriterRegisterEvent.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/SinkWriterRegisterEvent.java index 86e2807a8..190dbafc2 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/schema/event/SinkWriterRegisterEvent.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/schema/event/SinkWriterRegisterEvent.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.event; +package org.apache.flink.cdc.runtime.operators.schema.event; +import org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistry; import org.apache.flink.runtime.operators.coordination.OperatorEvent; -import com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistry; - import java.util.Objects; /** A {@link OperatorEvent} that register sink writer to {@link SchemaRegistry}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/sink/DataSinkWriterOperator.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/sink/DataSinkWriterOperator.java similarity index 95% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/sink/DataSinkWriterOperator.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/sink/DataSinkWriterOperator.java index c994d4624..c8056cc7a 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/sink/DataSinkWriterOperator.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/sink/DataSinkWriterOperator.java @@ -15,11 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.sink; +package org.apache.flink.cdc.runtime.operators.sink; import org.apache.flink.api.common.operators.MailboxExecutor; import org.apache.flink.api.connector.sink2.Sink; import org.apache.flink.api.connector.sink2.SinkWriter; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.ChangeEvent; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.FlushEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Schema; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.runtime.state.StateInitializationContext; import org.apache.flink.streaming.api.connector.sink2.CommittableMessage; @@ -33,14 +40,6 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.streaming.runtime.tasks.ProcessingTimeService; import org.apache.flink.streaming.runtime.tasks.StreamTask; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.ChangeEvent; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.FlushEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Schema; - import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.util.HashSet; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/sink/DataSinkWriterOperatorFactory.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/sink/DataSinkWriterOperatorFactory.java similarity index 94% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/sink/DataSinkWriterOperatorFactory.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/sink/DataSinkWriterOperatorFactory.java index c9c3e2317..fce15cc5b 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/sink/DataSinkWriterOperatorFactory.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/sink/DataSinkWriterOperatorFactory.java @@ -15,9 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.sink; +package org.apache.flink.cdc.runtime.operators.sink; import org.apache.flink.api.connector.sink2.Sink; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.Event; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.streaming.api.connector.sink2.CommittableMessage; import org.apache.flink.streaming.api.operators.AbstractStreamOperatorFactory; @@ -26,9 +28,6 @@ import org.apache.flink.streaming.api.operators.StreamOperator; import org.apache.flink.streaming.api.operators.StreamOperatorParameters; import org.apache.flink.streaming.api.operators.YieldingOperatorFactory; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.Event; - /** Operator factory for {@link DataSinkWriterOperator}. */ @Internal public class DataSinkWriterOperatorFactory diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/sink/SchemaEvolutionClient.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/sink/SchemaEvolutionClient.java similarity index 79% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/sink/SchemaEvolutionClient.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/sink/SchemaEvolutionClient.java index 044b312cb..4ef5a4dea 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/operators/sink/SchemaEvolutionClient.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/operators/sink/SchemaEvolutionClient.java @@ -15,25 +15,24 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.sink; +package org.apache.flink.cdc.runtime.operators.sink; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.runtime.operators.schema.SchemaOperator; +import org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistry; +import org.apache.flink.cdc.runtime.operators.schema.event.FlushSuccessEvent; +import org.apache.flink.cdc.runtime.operators.schema.event.GetSchemaRequest; +import org.apache.flink.cdc.runtime.operators.schema.event.GetSchemaResponse; +import org.apache.flink.cdc.runtime.operators.schema.event.SinkWriterRegisterEvent; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.runtime.jobgraph.tasks.TaskOperatorEventGateway; import org.apache.flink.util.SerializedValue; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.runtime.operators.schema.SchemaOperator; -import com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistry; -import com.ververica.cdc.runtime.operators.schema.event.FlushSuccessEvent; -import com.ververica.cdc.runtime.operators.schema.event.GetSchemaRequest; -import com.ververica.cdc.runtime.operators.schema.event.GetSchemaResponse; -import com.ververica.cdc.runtime.operators.schema.event.SinkWriterRegisterEvent; - import java.io.IOException; import java.util.Optional; -import static com.ververica.cdc.runtime.operators.schema.event.CoordinationResponseUtils.unwrap; +import static org.apache.flink.cdc.runtime.operators.schema.event.CoordinationResponseUtils.unwrap; /** * Client for {@link DataSinkWriterOperator} interact with {@link SchemaRegistry} when table schema diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/EventPartitioner.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/EventPartitioner.java similarity index 92% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/EventPartitioner.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/EventPartitioner.java index ad60f1239..207353247 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/EventPartitioner.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/EventPartitioner.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.partitioning; +package org.apache.flink.cdc.runtime.partitioning; import org.apache.flink.api.common.functions.Partitioner; - -import com.ververica.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.annotation.Internal; /** Partitioner that send {@link PartitioningEvent} to its target partition. */ @Internal diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/PartitioningEvent.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/PartitioningEvent.java similarity index 93% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/PartitioningEvent.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/PartitioningEvent.java index 8c58783e6..076a84392 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/PartitioningEvent.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/PartitioningEvent.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.partitioning; +package org.apache.flink.cdc.runtime.partitioning; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.Event; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.Event; import java.util.Objects; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/PartitioningEventKeySelector.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/PartitioningEventKeySelector.java similarity index 91% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/PartitioningEventKeySelector.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/PartitioningEventKeySelector.java index 2918e4b1e..2c5dc26f5 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/PartitioningEventKeySelector.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/PartitioningEventKeySelector.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.partitioning; +package org.apache.flink.cdc.runtime.partitioning; import org.apache.flink.api.java.functions.KeySelector; - -import com.ververica.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.annotation.Internal; /** Key selector for {@link PartitioningEvent}. */ @Internal diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/PostPartitionProcessor.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/PostPartitionProcessor.java similarity index 88% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/PostPartitionProcessor.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/PostPartitionProcessor.java index 0cfc1dfe2..27f068fdb 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/PostPartitionProcessor.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/PostPartitionProcessor.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.partitioning; +package org.apache.flink.cdc.runtime.partitioning; import org.apache.flink.api.common.functions.RichMapFunction; - -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.Event; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.Event; /** * Function for unloading {@link Event} from internal {@link PartitioningEvent} after {@link diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/PrePartitionOperator.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/PrePartitionOperator.java similarity index 90% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/PrePartitionOperator.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/PrePartitionOperator.java index d5054a40c..4097abe73 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/partitioning/PrePartitionOperator.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/partitioning/PrePartitionOperator.java @@ -15,8 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.partitioning; - +package org.apache.flink.cdc.runtime.partitioning; + +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.annotation.VisibleForTesting; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.FlushEvent; +import org.apache.flink.cdc.common.event.OperationType; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.runtime.operators.schema.SchemaOperator; +import org.apache.flink.cdc.runtime.operators.sink.SchemaEvolutionClient; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.runtime.jobgraph.tasks.TaskOperatorEventGateway; import org.apache.flink.streaming.api.operators.AbstractStreamOperator; @@ -28,18 +40,6 @@ import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder; import org.apache.flink.shaded.guava31.com.google.common.cache.CacheLoader; import org.apache.flink.shaded.guava31.com.google.common.cache.LoadingCache; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.annotation.VisibleForTesting; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.FlushEvent; -import com.ververica.cdc.common.event.OperationType; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.runtime.operators.sink.SchemaEvolutionClient; - import java.time.Duration; import java.util.ArrayList; import java.util.List; @@ -47,10 +47,7 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Function; -/** - * Operator for processing events from {@link - * com.ververica.cdc.runtime.operators.schema.SchemaOperator} before {@link EventPartitioner}. - */ +/** Operator for processing events from {@link SchemaOperator} before {@link EventPartitioner}. */ @Internal public class PrePartitionOperator extends AbstractStreamOperator implements OneInputStreamOperator { diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/BooleanSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/BooleanSerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/BooleanSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/BooleanSerializer.java index 96afec717..36cb096af 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/BooleanSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/BooleanSerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/BytePrimitiveArraySerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/BytePrimitiveArraySerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/BytePrimitiveArraySerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/BytePrimitiveArraySerializer.java index b3af0f77b..de749414a 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/BytePrimitiveArraySerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/BytePrimitiveArraySerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ByteSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/ByteSerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ByteSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/ByteSerializer.java index cb16878a5..240fc32df 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ByteSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/ByteSerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/DoubleSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/DoubleSerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/DoubleSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/DoubleSerializer.java index 111f67251..339900d05 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/DoubleSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/DoubleSerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/EnumSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/EnumSerializer.java similarity index 96% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/EnumSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/EnumSerializer.java index 96992e2a6..5b93c320d 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/EnumSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/EnumSerializer.java @@ -15,17 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; 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.cdc.common.annotation.VisibleForTesting; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.util.InstantiationUtil; -import com.ververica.cdc.common.annotation.VisibleForTesting; - import java.io.IOException; import java.io.ObjectInputStream; import java.lang.reflect.Array; @@ -35,9 +34,9 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import static com.ververica.cdc.common.utils.Preconditions.checkArgument; -import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; -import static com.ververica.cdc.common.utils.Preconditions.checkState; +import static org.apache.flink.cdc.common.utils.Preconditions.checkArgument; +import static org.apache.flink.cdc.common.utils.Preconditions.checkNotNull; +import static org.apache.flink.cdc.common.utils.Preconditions.checkState; /** {@link TypeSerializer} for Java enums. */ public final class EnumSerializer> extends TypeSerializer { diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/FloatSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/FloatSerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/FloatSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/FloatSerializer.java index c83e84814..f0598a85c 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/FloatSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/FloatSerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/IntSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/IntSerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/IntSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/IntSerializer.java index f125228f0..316376940 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/IntSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/IntSerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/InternalSerializers.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/InternalSerializers.java similarity index 79% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/InternalSerializers.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/InternalSerializers.java index beebb6d81..cdf903059 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/InternalSerializers.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/InternalSerializers.java @@ -15,22 +15,21 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.cdc.common.types.ArrayType; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.runtime.serializer.data.ArrayDataSerializer; +import org.apache.flink.cdc.runtime.serializer.data.DecimalDataSerializer; +import org.apache.flink.cdc.runtime.serializer.data.LocalZonedTimestampDataSerializer; +import org.apache.flink.cdc.runtime.serializer.data.RecordDataSerializer; +import org.apache.flink.cdc.runtime.serializer.data.StringDataSerializer; +import org.apache.flink.cdc.runtime.serializer.data.TimestampDataSerializer; +import org.apache.flink.cdc.runtime.serializer.data.ZonedTimestampDataSerializer; -import com.ververica.cdc.common.types.ArrayType; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.runtime.serializer.data.ArrayDataSerializer; -import com.ververica.cdc.runtime.serializer.data.DecimalDataSerializer; -import com.ververica.cdc.runtime.serializer.data.LocalZonedTimestampDataSerializer; -import com.ververica.cdc.runtime.serializer.data.RecordDataSerializer; -import com.ververica.cdc.runtime.serializer.data.StringDataSerializer; -import com.ververica.cdc.runtime.serializer.data.TimestampDataSerializer; -import com.ververica.cdc.runtime.serializer.data.ZonedTimestampDataSerializer; - -import static com.ververica.cdc.common.types.DataTypeChecks.getPrecision; -import static com.ververica.cdc.common.types.DataTypeChecks.getScale; +import static org.apache.flink.cdc.common.types.DataTypeChecks.getPrecision; +import static org.apache.flink.cdc.common.types.DataTypeChecks.getScale; /** {@link TypeSerializer} of {@link DataType} for internal data structures. */ public class InternalSerializers { diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/LinkedListSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/LinkedListSerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/LinkedListSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/LinkedListSerializer.java index f83f4c90f..4701e8ee5 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/LinkedListSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/LinkedListSerializer.java @@ -15,21 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; 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.java.typeutils.runtime.MaskUtils; +import org.apache.flink.cdc.common.annotation.Internal; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.annotation.Internal; - import java.io.IOException; import java.util.LinkedList; -import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; +import static org.apache.flink.cdc.common.utils.Preconditions.checkNotNull; /** * A serializer for {@link LinkedList}. The serializer relies on an element serializer for the diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ListSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/ListSerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ListSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/ListSerializer.java index d4ef9ec20..1c941518a 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ListSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/ListSerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializer; @@ -27,7 +27,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; +import static org.apache.flink.cdc.common.utils.Preconditions.checkNotNull; /** * A serializer for {@link List Lists}. The serializer relies on an element serializer for the diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/LongSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/LongSerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/LongSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/LongSerializer.java index 3b87ee2bd..95e4ec389 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/LongSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/LongSerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/MapSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/MapSerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/MapSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/MapSerializer.java index e0445e6af..cbdbe1269 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/MapSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/MapSerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializer; @@ -27,7 +27,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; +import static org.apache.flink.cdc.common.utils.Preconditions.checkNotNull; /** * A serializer for {@link Map}. The serializer relies on a key serializer and a value serializer diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/NestedSerializersSnapshotDelegate.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/NestedSerializersSnapshotDelegate.java similarity index 97% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/NestedSerializersSnapshotDelegate.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/NestedSerializersSnapshotDelegate.java index 07a2cd3ad..66c62630d 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/NestedSerializersSnapshotDelegate.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/NestedSerializersSnapshotDelegate.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializer; @@ -28,8 +28,8 @@ import org.apache.flink.core.memory.DataOutputView; import java.io.IOException; import java.util.Arrays; -import static com.ververica.cdc.common.utils.Preconditions.checkArgument; -import static com.ververica.cdc.common.utils.Preconditions.checkNotNull; +import static org.apache.flink.cdc.common.utils.Preconditions.checkArgument; +import static org.apache.flink.cdc.common.utils.Preconditions.checkNotNull; /** * A NestedSerializersSnapshotDelegate represents the snapshots of multiple serializers that are diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/NullableSerializerWrapper.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/NullableSerializerWrapper.java similarity index 95% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/NullableSerializerWrapper.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/NullableSerializerWrapper.java index 01d603b2f..9ace5ba20 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/NullableSerializerWrapper.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/NullableSerializerWrapper.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; 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.cdc.common.types.utils.runtime.DataInputViewStream; +import org.apache.flink.cdc.common.types.utils.runtime.DataOutputViewStream; +import org.apache.flink.cdc.common.utils.InstantiationUtil; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.types.utils.runtime.DataInputViewStream; -import com.ververica.cdc.common.types.utils.runtime.DataOutputViewStream; -import com.ververica.cdc.common.utils.InstantiationUtil; - import java.io.IOException; /** Type serializer for nullable object. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ShortSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/ShortSerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ShortSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/ShortSerializer.java index 07a0a2716..6795ab574 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/ShortSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/ShortSerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/StringSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/StringSerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/StringSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/StringSerializer.java index 8dee84033..7cfa9d5b0 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/StringSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/StringSerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/TableIdSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/TableIdSerializer.java similarity index 97% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/TableIdSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/TableIdSerializer.java index b1ac247ab..d3cf4633a 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/TableIdSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/TableIdSerializer.java @@ -15,16 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; 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.cdc.common.event.TableId; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.event.TableId; - import java.io.IOException; /** A {@link TypeSerializer} for {@link TableId}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/TypeSerializerSingleton.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/TypeSerializerSingleton.java similarity index 96% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/TypeSerializerSingleton.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/TypeSerializerSingleton.java index 053d83d46..026f13fac 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/TypeSerializerSingleton.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/TypeSerializerSingleton.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/ArrayDataSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/ArrayDataSerializer.java similarity index 94% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/ArrayDataSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/ArrayDataSerializer.java index 373261a1d..570df8c3c 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/ArrayDataSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/ArrayDataSerializer.java @@ -15,25 +15,24 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; 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.java.typeutils.runtime.DataInputViewStream; import org.apache.flink.api.java.typeutils.runtime.DataOutputViewStream; +import org.apache.flink.cdc.common.annotation.VisibleForTesting; +import org.apache.flink.cdc.common.data.ArrayData; +import org.apache.flink.cdc.common.data.GenericArrayData; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.utils.DataTypeUtils; +import org.apache.flink.cdc.common.utils.InstantiationUtil; +import org.apache.flink.cdc.runtime.serializer.InternalSerializers; +import org.apache.flink.cdc.runtime.serializer.NullableSerializerWrapper; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.annotation.VisibleForTesting; -import com.ververica.cdc.common.data.ArrayData; -import com.ververica.cdc.common.data.GenericArrayData; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.utils.DataTypeUtils; -import com.ververica.cdc.common.utils.InstantiationUtil; -import com.ververica.cdc.runtime.serializer.InternalSerializers; -import com.ververica.cdc.runtime.serializer.NullableSerializerWrapper; - import java.io.IOException; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/DecimalDataSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/DecimalDataSerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/DecimalDataSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/DecimalDataSerializer.java index 9b28ea2cd..4872330f3 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/DecimalDataSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/DecimalDataSerializer.java @@ -15,16 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; 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.cdc.common.data.DecimalData; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.data.DecimalData; - import java.io.IOException; /** Serializer for {@link DecimalData}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializer.java similarity index 97% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializer.java index 1b787d41f..c3622db23 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializer.java @@ -15,17 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; 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.cdc.common.data.LocalZonedTimestampData; +import org.apache.flink.cdc.common.data.TimestampData; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.data.LocalZonedTimestampData; -import com.ververica.cdc.common.data.TimestampData; - import java.io.IOException; /** diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/RecordDataSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/RecordDataSerializer.java similarity index 91% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/RecordDataSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/RecordDataSerializer.java index 59f54bfc6..6348c5c29 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/RecordDataSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/RecordDataSerializer.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.data.binary.BinaryRecordData; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; +import org.apache.flink.cdc.runtime.serializer.data.binary.BinaryRecordDataSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.data.binary.BinaryRecordData; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; -import com.ververica.cdc.runtime.serializer.data.binary.BinaryRecordDataSerializer; - import java.io.IOException; /** Serializer for {@link RecordData}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/StringDataSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/StringDataSerializer.java similarity index 92% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/StringDataSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/StringDataSerializer.java index cd9f024b7..327745c0c 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/StringDataSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/StringDataSerializer.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.cdc.common.data.StringData; +import org.apache.flink.cdc.common.data.binary.BinarySegmentUtils; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.data.StringData; -import com.ververica.cdc.common.data.binary.BinarySegmentUtils; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; /** Serializer for {@link StringData}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/TimestampDataSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/TimestampDataSerializer.java similarity index 98% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/TimestampDataSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/TimestampDataSerializer.java index 4cd794d42..babc6345b 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/TimestampDataSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/TimestampDataSerializer.java @@ -15,16 +15,15 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; 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.cdc.common.data.TimestampData; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.data.TimestampData; - import java.io.IOException; /** diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/ZonedTimestampDataSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/ZonedTimestampDataSerializer.java similarity index 96% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/ZonedTimestampDataSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/ZonedTimestampDataSerializer.java index ce36af1df..ca9861761 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/ZonedTimestampDataSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/ZonedTimestampDataSerializer.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; 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.cdc.common.data.TimestampData; +import org.apache.flink.cdc.common.data.ZonedTimestampData; +import org.apache.flink.cdc.runtime.serializer.StringSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.data.TimestampData; -import com.ververica.cdc.common.data.ZonedTimestampData; -import com.ververica.cdc.runtime.serializer.StringSerializer; - import java.io.IOException; /** diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/binary/BinaryRecordDataSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/binary/BinaryRecordDataSerializer.java similarity index 93% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/binary/BinaryRecordDataSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/binary/BinaryRecordDataSerializer.java index 286c5396e..479914ca0 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/binary/BinaryRecordDataSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/binary/BinaryRecordDataSerializer.java @@ -15,24 +15,23 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data.binary; +package org.apache.flink.cdc.runtime.serializer.data.binary; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.data.binary.BinaryRecordData; +import org.apache.flink.cdc.common.data.binary.BinarySegmentUtils; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; import org.apache.flink.core.memory.MemorySegmentWritable; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.data.binary.BinaryRecordData; -import com.ververica.cdc.common.data.binary.BinarySegmentUtils; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; -import static com.ververica.cdc.common.utils.Preconditions.checkArgument; +import static org.apache.flink.cdc.common.utils.Preconditions.checkArgument; /** Serializer for {@link BinaryRecordData}. */ @Internal diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/writer/AbstractBinaryWriter.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/writer/AbstractBinaryWriter.java similarity index 93% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/writer/AbstractBinaryWriter.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/writer/AbstractBinaryWriter.java index 2347f831e..acf3dac62 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/writer/AbstractBinaryWriter.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/writer/AbstractBinaryWriter.java @@ -15,34 +15,33 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data.writer; +package org.apache.flink.cdc.runtime.serializer.data.writer; import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.data.ArrayData; +import org.apache.flink.cdc.common.data.DecimalData; +import org.apache.flink.cdc.common.data.LocalZonedTimestampData; +import org.apache.flink.cdc.common.data.MapData; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.data.StringData; +import org.apache.flink.cdc.common.data.TimestampData; +import org.apache.flink.cdc.common.data.ZonedTimestampData; +import org.apache.flink.cdc.common.data.binary.BinaryFormat; +import org.apache.flink.cdc.common.data.binary.BinaryRecordData; +import org.apache.flink.cdc.common.data.binary.BinarySegmentUtils; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.runtime.serializer.data.ArrayDataSerializer; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.core.memory.MemorySegmentFactory; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.data.ArrayData; -import com.ververica.cdc.common.data.DecimalData; -import com.ververica.cdc.common.data.LocalZonedTimestampData; -import com.ververica.cdc.common.data.MapData; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.data.StringData; -import com.ververica.cdc.common.data.TimestampData; -import com.ververica.cdc.common.data.ZonedTimestampData; -import com.ververica.cdc.common.data.binary.BinaryFormat; -import com.ververica.cdc.common.data.binary.BinaryRecordData; -import com.ververica.cdc.common.data.binary.BinarySegmentUtils; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.runtime.serializer.data.ArrayDataSerializer; - import java.io.IOException; import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import static com.ververica.cdc.common.data.binary.BinaryRecordData.TIMESTAMP_DELIMITER; +import static org.apache.flink.cdc.common.data.binary.BinaryRecordData.TIMESTAMP_DELIMITER; /** * Use the special format to write data to a {@link MemorySegment} (its capacity grows diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/writer/BinaryRecordDataWriter.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/writer/BinaryRecordDataWriter.java similarity index 93% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/writer/BinaryRecordDataWriter.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/writer/BinaryRecordDataWriter.java index 1ab78e299..555cc3bac 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/writer/BinaryRecordDataWriter.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/writer/BinaryRecordDataWriter.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data.writer; +package org.apache.flink.cdc.runtime.serializer.data.writer; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.data.binary.BinaryRecordData; +import org.apache.flink.cdc.common.data.binary.BinarySegmentUtils; import org.apache.flink.core.memory.MemorySegmentFactory; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.data.binary.BinaryRecordData; -import com.ververica.cdc.common.data.binary.BinarySegmentUtils; - /** Writer for {@link BinaryRecordData}. */ @Internal public final class BinaryRecordDataWriter extends AbstractBinaryWriter { diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/writer/BinaryWriter.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/writer/BinaryWriter.java similarity index 84% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/writer/BinaryWriter.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/writer/BinaryWriter.java index a6715a81a..ebd6c4ed2 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/data/writer/BinaryWriter.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/data/writer/BinaryWriter.java @@ -15,25 +15,24 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data.writer; +package org.apache.flink.cdc.runtime.serializer.data.writer; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.data.ArrayData; -import com.ververica.cdc.common.data.DecimalData; -import com.ververica.cdc.common.data.LocalZonedTimestampData; -import com.ververica.cdc.common.data.MapData; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.data.StringData; -import com.ververica.cdc.common.data.TimestampData; -import com.ververica.cdc.common.data.ZonedTimestampData; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DecimalType; -import com.ververica.cdc.common.types.LocalZonedTimestampType; -import com.ververica.cdc.common.types.TimestampType; -import com.ververica.cdc.common.types.ZonedTimestampType; -import com.ververica.cdc.runtime.serializer.data.ArrayDataSerializer; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.data.ArrayData; +import org.apache.flink.cdc.common.data.DecimalData; +import org.apache.flink.cdc.common.data.LocalZonedTimestampData; +import org.apache.flink.cdc.common.data.MapData; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.data.StringData; +import org.apache.flink.cdc.common.data.TimestampData; +import org.apache.flink.cdc.common.data.ZonedTimestampData; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DecimalType; +import org.apache.flink.cdc.common.types.LocalZonedTimestampType; +import org.apache.flink.cdc.common.types.TimestampType; +import org.apache.flink.cdc.common.types.ZonedTimestampType; +import org.apache.flink.cdc.runtime.serializer.data.ArrayDataSerializer; /** * Writer to write a composite data format, like row, array. 1. Invoke {@link #reset()}. 2. Write diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/AddColumnEventSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/AddColumnEventSerializer.java similarity index 89% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/AddColumnEventSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/AddColumnEventSerializer.java index 55e16d5cb..1ad7fc833 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/AddColumnEventSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/AddColumnEventSerializer.java @@ -15,21 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; 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.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.runtime.serializer.ListSerializer; +import org.apache.flink.cdc.runtime.serializer.TableIdSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; +import org.apache.flink.cdc.runtime.serializer.schema.ColumnWithPositionSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.runtime.serializer.ListSerializer; -import com.ververica.cdc.runtime.serializer.TableIdSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; -import com.ververica.cdc.runtime.serializer.schema.ColumnWithPositionSerializer; - import java.io.IOException; import java.util.Collections; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/AlterColumnTypeEventSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/AlterColumnTypeEventSerializer.java similarity index 87% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/AlterColumnTypeEventSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/AlterColumnTypeEventSerializer.java index 81da4ec22..ab228e4d6 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/AlterColumnTypeEventSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/AlterColumnTypeEventSerializer.java @@ -15,23 +15,22 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; 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.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.runtime.serializer.MapSerializer; +import org.apache.flink.cdc.runtime.serializer.StringSerializer; +import org.apache.flink.cdc.runtime.serializer.TableIdSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; +import org.apache.flink.cdc.runtime.serializer.schema.DataTypeSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.runtime.serializer.MapSerializer; -import com.ververica.cdc.runtime.serializer.StringSerializer; -import com.ververica.cdc.runtime.serializer.TableIdSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; -import com.ververica.cdc.runtime.serializer.schema.DataTypeSerializer; - import java.io.IOException; import java.util.Collections; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/CreateTableEventSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/CreateTableEventSerializer.java similarity index 89% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/CreateTableEventSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/CreateTableEventSerializer.java index 6a7b6d6ce..f0db9d769 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/CreateTableEventSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/CreateTableEventSerializer.java @@ -15,21 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; 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.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.runtime.serializer.TableIdSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; +import org.apache.flink.cdc.runtime.serializer.schema.SchemaSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.runtime.serializer.TableIdSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; -import com.ververica.cdc.runtime.serializer.schema.SchemaSerializer; - import java.io.IOException; /** A {@link TypeSerializer} for {@link CreateTableEvent}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/DataChangeEventSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/DataChangeEventSerializer.java similarity index 90% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/DataChangeEventSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/DataChangeEventSerializer.java index 7ef63fd82..182650c3a 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/DataChangeEventSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/DataChangeEventSerializer.java @@ -15,25 +15,24 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; 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.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.OperationType; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.runtime.serializer.EnumSerializer; +import org.apache.flink.cdc.runtime.serializer.MapSerializer; +import org.apache.flink.cdc.runtime.serializer.NullableSerializerWrapper; +import org.apache.flink.cdc.runtime.serializer.StringSerializer; +import org.apache.flink.cdc.runtime.serializer.TableIdSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; +import org.apache.flink.cdc.runtime.serializer.data.RecordDataSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.OperationType; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.runtime.serializer.EnumSerializer; -import com.ververica.cdc.runtime.serializer.MapSerializer; -import com.ververica.cdc.runtime.serializer.NullableSerializerWrapper; -import com.ververica.cdc.runtime.serializer.StringSerializer; -import com.ververica.cdc.runtime.serializer.TableIdSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; -import com.ververica.cdc.runtime.serializer.data.RecordDataSerializer; - import java.io.IOException; import java.util.Map; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/DropColumnEventSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/DropColumnEventSerializer.java similarity index 89% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/DropColumnEventSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/DropColumnEventSerializer.java index f41b32258..4ba9ad3cd 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/DropColumnEventSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/DropColumnEventSerializer.java @@ -15,21 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; 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.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.runtime.serializer.ListSerializer; +import org.apache.flink.cdc.runtime.serializer.StringSerializer; +import org.apache.flink.cdc.runtime.serializer.TableIdSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.runtime.serializer.ListSerializer; -import com.ververica.cdc.runtime.serializer.StringSerializer; -import com.ververica.cdc.runtime.serializer.TableIdSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; import java.util.Collections; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/EventSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/EventSerializer.java similarity index 91% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/EventSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/EventSerializer.java index ef24abf6f..c8f34020d 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/EventSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/EventSerializer.java @@ -15,22 +15,21 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; 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.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.FlushEvent; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.runtime.serializer.EnumSerializer; +import org.apache.flink.cdc.runtime.serializer.TableIdSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.FlushEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.runtime.serializer.EnumSerializer; -import com.ververica.cdc.runtime.serializer.TableIdSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; /** A {@link TypeSerializer} for {@link Event}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/PartitioningEventSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/PartitioningEventSerializer.java similarity index 92% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/PartitioningEventSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/PartitioningEventSerializer.java index 529cd9acd..0cce884af 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/PartitioningEventSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/PartitioningEventSerializer.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; import org.apache.flink.api.common.typeutils.SimpleTypeSerializerSnapshot; import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.runtime.partitioning.PartitioningEvent; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.runtime.partitioning.PartitioningEvent; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; /** A {@link org.apache.flink.api.common.typeutils.TypeSerializer} for {@link PartitioningEvent}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/RenameColumnEventSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/RenameColumnEventSerializer.java similarity index 89% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/RenameColumnEventSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/RenameColumnEventSerializer.java index 0bfe09408..1ffb78f1b 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/RenameColumnEventSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/RenameColumnEventSerializer.java @@ -15,21 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; 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.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.runtime.serializer.MapSerializer; +import org.apache.flink.cdc.runtime.serializer.StringSerializer; +import org.apache.flink.cdc.runtime.serializer.TableIdSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.runtime.serializer.MapSerializer; -import com.ververica.cdc.runtime.serializer.StringSerializer; -import com.ververica.cdc.runtime.serializer.TableIdSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; import java.util.Collections; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/SchemaChangeEventSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/SchemaChangeEventSerializer.java similarity index 91% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/SchemaChangeEventSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/SchemaChangeEventSerializer.java index a24f18f0a..b2a9f0643 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/event/SchemaChangeEventSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/event/SchemaChangeEventSerializer.java @@ -15,24 +15,23 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; 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.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.runtime.serializer.EnumSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.runtime.serializer.EnumSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; /** A {@link TypeSerializer} for {@link SchemaChangeEvent}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/ColumnSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/ColumnSerializer.java similarity index 91% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/ColumnSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/ColumnSerializer.java index 92f730c80..d6c80eadd 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/ColumnSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/ColumnSerializer.java @@ -15,21 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; 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.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.MetadataColumn; +import org.apache.flink.cdc.common.schema.PhysicalColumn; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.EnumSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.MetadataColumn; -import com.ververica.cdc.common.schema.PhysicalColumn; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.EnumSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; /** A {@link TypeSerializer} for {@link Column}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/ColumnWithPositionSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/ColumnWithPositionSerializer.java similarity index 90% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/ColumnWithPositionSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/ColumnWithPositionSerializer.java index f2a82ebc3..a0034c8d6 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/ColumnWithPositionSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/ColumnWithPositionSerializer.java @@ -15,22 +15,21 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; 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.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.EnumSerializer; +import org.apache.flink.cdc.runtime.serializer.NullableSerializerWrapper; +import org.apache.flink.cdc.runtime.serializer.StringSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.EnumSerializer; -import com.ververica.cdc.runtime.serializer.NullableSerializerWrapper; -import com.ververica.cdc.runtime.serializer.StringSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; /** A {@link TypeSerializer} for {@link AddColumnEvent.ColumnWithPosition}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/DataFieldSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/DataFieldSerializer.java similarity index 91% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/DataFieldSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/DataFieldSerializer.java index ecc9aef66..a709dcb72 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/DataFieldSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/DataFieldSerializer.java @@ -15,20 +15,19 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; 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.cdc.common.types.DataField; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.StringSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.types.DataField; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.StringSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; /** A {@link TypeSerializer} for {@link DataField}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/DataTypeSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/DataTypeSerializer.java similarity index 89% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/DataTypeSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/DataTypeSerializer.java index 940e1ca4d..d977ef276 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/DataTypeSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/DataTypeSerializer.java @@ -15,37 +15,36 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; 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.cdc.common.types.ArrayType; +import org.apache.flink.cdc.common.types.BigIntType; +import org.apache.flink.cdc.common.types.BinaryType; +import org.apache.flink.cdc.common.types.BooleanType; +import org.apache.flink.cdc.common.types.CharType; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DateType; +import org.apache.flink.cdc.common.types.DecimalType; +import org.apache.flink.cdc.common.types.DoubleType; +import org.apache.flink.cdc.common.types.FloatType; +import org.apache.flink.cdc.common.types.IntType; +import org.apache.flink.cdc.common.types.LocalZonedTimestampType; +import org.apache.flink.cdc.common.types.MapType; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.common.types.SmallIntType; +import org.apache.flink.cdc.common.types.TimeType; +import org.apache.flink.cdc.common.types.TimestampType; +import org.apache.flink.cdc.common.types.TinyIntType; +import org.apache.flink.cdc.common.types.VarBinaryType; +import org.apache.flink.cdc.common.types.VarCharType; +import org.apache.flink.cdc.common.types.ZonedTimestampType; +import org.apache.flink.cdc.runtime.serializer.EnumSerializer; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.types.ArrayType; -import com.ververica.cdc.common.types.BigIntType; -import com.ververica.cdc.common.types.BinaryType; -import com.ververica.cdc.common.types.BooleanType; -import com.ververica.cdc.common.types.CharType; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DateType; -import com.ververica.cdc.common.types.DecimalType; -import com.ververica.cdc.common.types.DoubleType; -import com.ververica.cdc.common.types.FloatType; -import com.ververica.cdc.common.types.IntType; -import com.ververica.cdc.common.types.LocalZonedTimestampType; -import com.ververica.cdc.common.types.MapType; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.common.types.SmallIntType; -import com.ververica.cdc.common.types.TimeType; -import com.ververica.cdc.common.types.TimestampType; -import com.ververica.cdc.common.types.TinyIntType; -import com.ververica.cdc.common.types.VarBinaryType; -import com.ververica.cdc.common.types.VarCharType; -import com.ververica.cdc.common.types.ZonedTimestampType; -import com.ververica.cdc.runtime.serializer.EnumSerializer; - import java.io.IOException; import java.util.Objects; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/MetadataColumnSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/MetadataColumnSerializer.java similarity index 90% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/MetadataColumnSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/MetadataColumnSerializer.java index 87364c81b..593843e2f 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/MetadataColumnSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/MetadataColumnSerializer.java @@ -15,21 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; 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.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.MetadataColumn; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.StringSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.MetadataColumn; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.StringSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; /** A {@link TypeSerializer} for {@link MetadataColumn}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/PhysicalColumnSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/PhysicalColumnSerializer.java similarity index 90% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/PhysicalColumnSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/PhysicalColumnSerializer.java index 30db5c422..e163d39ad 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/PhysicalColumnSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/PhysicalColumnSerializer.java @@ -15,21 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; 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.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.PhysicalColumn; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.StringSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.PhysicalColumn; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.StringSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; /** A {@link TypeSerializer} for {@link PhysicalColumn}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/RowTypeSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/RowTypeSerializer.java similarity index 91% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/RowTypeSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/RowTypeSerializer.java index feab61b42..f2aa2aa5d 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/RowTypeSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/RowTypeSerializer.java @@ -15,19 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; 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.cdc.common.types.DataField; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.runtime.serializer.ListSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.types.DataField; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.runtime.serializer.ListSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; import java.util.Collections; diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/SchemaSerializer.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/SchemaSerializer.java similarity index 91% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/SchemaSerializer.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/SchemaSerializer.java index 27f4c312e..c73db76e9 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/serializer/schema/SchemaSerializer.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/serializer/schema/SchemaSerializer.java @@ -15,21 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; 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.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.runtime.serializer.ListSerializer; +import org.apache.flink.cdc.runtime.serializer.MapSerializer; +import org.apache.flink.cdc.runtime.serializer.StringSerializer; +import org.apache.flink.cdc.runtime.serializer.TypeSerializerSingleton; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.runtime.serializer.ListSerializer; -import com.ververica.cdc.runtime.serializer.MapSerializer; -import com.ververica.cdc.runtime.serializer.StringSerializer; -import com.ververica.cdc.runtime.serializer.TypeSerializerSingleton; - import java.io.IOException; /** A {@link TypeSerializer} for {@link Schema}. */ diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/typeutils/BinaryRecordDataGenerator.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/typeutils/BinaryRecordDataGenerator.java similarity index 82% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/typeutils/BinaryRecordDataGenerator.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/typeutils/BinaryRecordDataGenerator.java index 71fb492e4..bb7559109 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/typeutils/BinaryRecordDataGenerator.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/typeutils/BinaryRecordDataGenerator.java @@ -15,23 +15,22 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.typeutils; +package org.apache.flink.cdc.runtime.typeutils; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.annotation.PublicEvolving; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.data.binary.BinaryRecordData; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.runtime.serializer.InternalSerializers; -import com.ververica.cdc.runtime.serializer.NullableSerializerWrapper; -import com.ververica.cdc.runtime.serializer.data.writer.BinaryRecordDataWriter; -import com.ververica.cdc.runtime.serializer.data.writer.BinaryWriter; +import org.apache.flink.cdc.common.annotation.PublicEvolving; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.data.binary.BinaryRecordData; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.runtime.serializer.InternalSerializers; +import org.apache.flink.cdc.runtime.serializer.NullableSerializerWrapper; +import org.apache.flink.cdc.runtime.serializer.data.writer.BinaryRecordDataWriter; +import org.apache.flink.cdc.runtime.serializer.data.writer.BinaryWriter; import java.util.Arrays; -import static com.ververica.cdc.common.utils.Preconditions.checkArgument; +import static org.apache.flink.cdc.common.utils.Preconditions.checkArgument; /** This class is used to create {@link BinaryRecordData}. */ @PublicEvolving diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/typeutils/EventTypeInfo.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/typeutils/EventTypeInfo.java similarity index 92% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/typeutils/EventTypeInfo.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/typeutils/EventTypeInfo.java index 656d5c069..8087746cd 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/typeutils/EventTypeInfo.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/typeutils/EventTypeInfo.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.typeutils; +package org.apache.flink.cdc.runtime.typeutils; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.runtime.serializer.event.EventSerializer; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.runtime.serializer.event.EventSerializer; /** A {@link TypeInformation} for {@link Event}. */ public class EventTypeInfo extends TypeInformation { diff --git a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/typeutils/PartitioningEventTypeInfo.java b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/typeutils/PartitioningEventTypeInfo.java similarity index 89% rename from flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/typeutils/PartitioningEventTypeInfo.java rename to flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/typeutils/PartitioningEventTypeInfo.java index 0d8e89dbe..4a3018fb9 100644 --- a/flink-cdc-runtime/src/main/java/com/ververica/cdc/runtime/typeutils/PartitioningEventTypeInfo.java +++ b/flink-cdc-runtime/src/main/java/org/apache/flink/cdc/runtime/typeutils/PartitioningEventTypeInfo.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.typeutils; +package org.apache.flink.cdc.runtime.typeutils; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.annotation.Internal; -import com.ververica.cdc.runtime.partitioning.PartitioningEvent; -import com.ververica.cdc.runtime.serializer.event.PartitioningEventSerializer; +import org.apache.flink.cdc.common.annotation.Internal; +import org.apache.flink.cdc.runtime.partitioning.PartitioningEvent; +import org.apache.flink.cdc.runtime.serializer.event.PartitioningEventSerializer; /** Type information for {@link PartitioningEvent}. */ @Internal diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/operators/route/RouteFunctionTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/operators/route/RouteFunctionTest.java similarity index 88% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/operators/route/RouteFunctionTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/operators/route/RouteFunctionTest.java index 1bfaa95fc..1f3652a50 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/operators/route/RouteFunctionTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/operators/route/RouteFunctionTest.java @@ -15,35 +15,35 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.route; - +package org.apache.flink.cdc.runtime.operators.route; + +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.OperationType; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.PhysicalColumn; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.runtime.typeutils.BinaryRecordDataGenerator; import org.apache.flink.configuration.Configuration; import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.OperationType; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.PhysicalColumn; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.runtime.typeutils.BinaryRecordDataGenerator; import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; import java.util.Map; -import static com.ververica.cdc.common.testutils.assertions.EventAssertions.assertThat; +import static org.apache.flink.cdc.common.testutils.assertions.EventAssertions.assertThat; class RouteFunctionTest { private static final TableId CUSTOMERS = diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/operators/schema/SchemaOperatorTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/operators/schema/SchemaOperatorTest.java similarity index 89% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/operators/schema/SchemaOperatorTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/operators/schema/SchemaOperatorTest.java index 3f9d8fb22..ad8c8b39b 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/operators/schema/SchemaOperatorTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/operators/schema/SchemaOperatorTest.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema; +package org.apache.flink.cdc.runtime.operators.schema; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.runtime.serializer.event.EventSerializer; +import org.apache.flink.cdc.runtime.typeutils.BinaryRecordDataGenerator; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.runtime.serializer.event.EventSerializer; -import com.ververica.cdc.runtime.typeutils.BinaryRecordDataGenerator; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaManagerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaManagerTest.java similarity index 94% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaManagerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaManagerTest.java index e0c38c265..2b1df7102 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/operators/schema/coordinator/SchemaManagerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/operators/schema/coordinator/SchemaManagerTest.java @@ -15,17 +15,18 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.operators.schema.coordinator; - -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.types.DataTypes; +package org.apache.flink.cdc.runtime.operators.schema.coordinator; + +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.types.DataTypes; + import org.junit.jupiter.api.Test; import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/partitioning/PrePartitionOperatorTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/partitioning/PrePartitionOperatorTest.java similarity index 89% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/partitioning/PrePartitionOperatorTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/partitioning/PrePartitionOperatorTest.java index d0223d7bb..34ff01caf 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/partitioning/PrePartitionOperatorTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/partitioning/PrePartitionOperatorTest.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.partitioning; +package org.apache.flink.cdc.runtime.partitioning; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.FlushEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.runtime.testutils.operators.EventOperatorTestHarness; +import org.apache.flink.cdc.runtime.testutils.schema.TestingSchemaRegistryGateway; +import org.apache.flink.cdc.runtime.typeutils.BinaryRecordDataGenerator; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.FlushEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.runtime.testutils.operators.EventOperatorTestHarness; -import com.ververica.cdc.runtime.testutils.schema.TestingSchemaRegistryGateway; -import com.ververica.cdc.runtime.typeutils.BinaryRecordDataGenerator; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/BooleanSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/BooleanSerializerTest.java similarity index 96% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/BooleanSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/BooleanSerializerTest.java index 724895a33..540f4fde9 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/BooleanSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/BooleanSerializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/BytePrimitiveArraySerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/BytePrimitiveArraySerializerTest.java similarity index 97% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/BytePrimitiveArraySerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/BytePrimitiveArraySerializerTest.java index 2763bd234..cd69aa5b0 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/BytePrimitiveArraySerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/BytePrimitiveArraySerializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/ByteSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/ByteSerializerTest.java similarity index 97% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/ByteSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/ByteSerializerTest.java index db912cb37..794520c6a 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/ByteSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/ByteSerializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/DoubleSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/DoubleSerializerTest.java similarity index 97% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/DoubleSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/DoubleSerializerTest.java index d16b7fc57..0607b7923 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/DoubleSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/DoubleSerializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/EnumSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/EnumSerializerTest.java similarity index 99% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/EnumSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/EnumSerializerTest.java index b96a5df5e..c75c64aa0 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/EnumSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/EnumSerializerTest.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; 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.typeutils.TypeSerializerSnapshotSerializationUtil; +import org.apache.flink.cdc.common.utils.InstantiationUtil; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; import org.apache.flink.util.TestLogger; -import com.ververica.cdc.common.utils.InstantiationUtil; import org.junit.Test; import java.io.ByteArrayInputStream; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/FloatSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/FloatSerializerTest.java similarity index 97% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/FloatSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/FloatSerializerTest.java index c0bad9e46..6d92205e3 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/FloatSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/FloatSerializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/IntSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/IntSerializerTest.java similarity index 96% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/IntSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/IntSerializerTest.java index 3bf5a22cb..f687a177a 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/IntSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/IntSerializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/LinkedListSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/LinkedListSerializerTest.java similarity index 98% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/LinkedListSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/LinkedListSerializerTest.java index 1a6d6b0fd..d0d886c16 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/LinkedListSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/LinkedListSerializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/ListSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/ListSerializerTest.java similarity index 98% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/ListSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/ListSerializerTest.java index a4e8c5a6f..ec8e2a196 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/ListSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/ListSerializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/LongSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/LongSerializerTest.java similarity index 96% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/LongSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/LongSerializerTest.java index b71cc59a2..ba7483781 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/LongSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/LongSerializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/MapSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/MapSerializerTest.java similarity index 98% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/MapSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/MapSerializerTest.java index c34f58755..53af631a5 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/MapSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/MapSerializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/NullableSerializerWrapperTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/NullableSerializerWrapperTest.java similarity index 96% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/NullableSerializerWrapperTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/NullableSerializerWrapperTest.java index f1cef6982..6f5ba64a1 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/NullableSerializerWrapperTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/NullableSerializerWrapperTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/SerializerTestBase.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/SerializerTestBase.java similarity index 99% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/SerializerTestBase.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/SerializerTestBase.java index a8364c6b4..ea224d2ac 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/SerializerTestBase.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/SerializerTestBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/ShortSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/ShortSerializerTest.java similarity index 97% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/ShortSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/ShortSerializerTest.java index 3db34965d..10a614b30 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/ShortSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/ShortSerializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/StringSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/StringSerializerTest.java similarity index 96% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/StringSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/StringSerializerTest.java index 1c6003823..4c731fc76 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/StringSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/StringSerializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/TableIdSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/TableIdSerializerTest.java similarity index 93% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/TableIdSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/TableIdSerializerTest.java index 4b68ebed3..2062b7c4e 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/TableIdSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/TableIdSerializerTest.java @@ -15,11 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer; +package org.apache.flink.cdc.runtime.serializer; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.event.TableId; +import org.apache.flink.cdc.common.event.TableId; /** A test for the {@link TableIdSerializer}. */ public class TableIdSerializerTest extends SerializerTestBase { diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/ArrayDataSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/ArrayDataSerializerTest.java similarity index 88% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/ArrayDataSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/ArrayDataSerializerTest.java index 66e705aa7..61bcb6ccf 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/ArrayDataSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/ArrayDataSerializerTest.java @@ -15,17 +15,16 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; +import org.apache.flink.cdc.common.data.ArrayData; +import org.apache.flink.cdc.common.data.GenericArrayData; +import org.apache.flink.cdc.common.data.StringData; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import org.apache.flink.testutils.DeeplyEqualsChecker; -import com.ververica.cdc.common.data.ArrayData; -import com.ververica.cdc.common.data.GenericArrayData; -import com.ververica.cdc.common.data.StringData; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; - /** A test for the {@link ArrayDataSerializer}. */ class ArrayDataSerializerTest extends SerializerTestBase { diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/DecimalDataSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/DecimalDataSerializerTest.java similarity index 89% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/DecimalDataSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/DecimalDataSerializerTest.java index 6c7961087..078567a70 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/DecimalDataSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/DecimalDataSerializerTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; -import com.ververica.cdc.common.data.DecimalData; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.data.DecimalData; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; /** A test for the {@link DecimalDataSerializer}. */ class DecimalDataSerializerTest extends SerializerTestBase { diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializerTest.java similarity index 94% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializerTest.java index cce6ae117..a0f4b2266 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/LocalZonedTimestampDataSerializerTest.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.data.LocalZonedTimestampData; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.data.LocalZonedTimestampData; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; /** A test for the {@link LocalZonedTimestampDataSerializer}. */ abstract class LocalZonedTimestampDataSerializerTest diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/RecordDataSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/RecordDataSerializerTest.java similarity index 80% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/RecordDataSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/RecordDataSerializerTest.java index f6672587a..60a560199 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/RecordDataSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/RecordDataSerializerTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; -import com.ververica.cdc.runtime.typeutils.BinaryRecordDataGenerator; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.runtime.typeutils.BinaryRecordDataGenerator; /** A test for the {@link StringDataSerializer}. */ public class RecordDataSerializerTest extends SerializerTestBase { diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/StringDataSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/StringDataSerializerTest.java similarity index 87% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/StringDataSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/StringDataSerializerTest.java index 09c1a7091..10f2ace38 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/StringDataSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/StringDataSerializerTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; -import com.ververica.cdc.common.data.StringData; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.data.StringData; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import java.util.Arrays; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/TimestampDataSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/TimestampDataSerializerTest.java similarity index 94% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/TimestampDataSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/TimestampDataSerializerTest.java index ed933fdf8..7b0afe01e 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/TimestampDataSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/TimestampDataSerializerTest.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.data.TimestampData; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.data.TimestampData; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; /** A test for the {@link TimestampDataSerializer}. */ abstract class TimestampDataSerializerTest extends SerializerTestBase { diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/ZonedTimestampDataSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/ZonedTimestampDataSerializerTest.java similarity index 94% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/ZonedTimestampDataSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/ZonedTimestampDataSerializerTest.java index 352d8c912..1ee44be84 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/data/ZonedTimestampDataSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/data/ZonedTimestampDataSerializerTest.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.data; +package org.apache.flink.cdc.runtime.serializer.data; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.data.ZonedTimestampData; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.data.ZonedTimestampData; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/AddColumnEventSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/AddColumnEventSerializerTest.java similarity index 91% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/AddColumnEventSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/AddColumnEventSerializerTest.java index 08f9b806c..f691fdec3 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/AddColumnEventSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/AddColumnEventSerializerTest.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import java.util.Arrays; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/AlterColumnTypeEventSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/AlterColumnTypeEventSerializerTest.java similarity index 85% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/AlterColumnTypeEventSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/AlterColumnTypeEventSerializerTest.java index 5ecc0320e..baddd0bf2 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/AlterColumnTypeEventSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/AlterColumnTypeEventSerializerTest.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import java.util.HashMap; import java.util.Map; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/CreateTableEventSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/CreateTableEventSerializerTest.java similarity index 87% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/CreateTableEventSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/CreateTableEventSerializerTest.java index 7d4e95cc6..0b357bfa4 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/CreateTableEventSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/CreateTableEventSerializerTest.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import java.util.Collections; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/DataChangeEventSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/DataChangeEventSerializerTest.java similarity index 85% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/DataChangeEventSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/DataChangeEventSerializerTest.java index ef223e5d3..eb83778e5 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/DataChangeEventSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/DataChangeEventSerializerTest.java @@ -15,18 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.data.RecordData; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.common.event.DataChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; -import com.ververica.cdc.runtime.typeutils.BinaryRecordDataGenerator; +import org.apache.flink.cdc.common.data.RecordData; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.common.event.DataChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.runtime.typeutils.BinaryRecordDataGenerator; import java.util.HashMap; import java.util.Map; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/DropColumnEventSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/DropColumnEventSerializerTest.java similarity index 88% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/DropColumnEventSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/DropColumnEventSerializerTest.java index 78063047e..2ebcfaf15 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/DropColumnEventSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/DropColumnEventSerializerTest.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import java.util.Arrays; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/EventSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/EventSerializerTest.java similarity index 88% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/EventSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/EventSerializerTest.java index 51bf99cb3..a34447155 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/EventSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/EventSerializerTest.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.FlushEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.FlushEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import java.util.Arrays; import java.util.stream.Stream; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/PartitioningEventSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/PartitioningEventSerializerTest.java similarity index 89% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/PartitioningEventSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/PartitioningEventSerializerTest.java index f0644d0b5..db93ec683 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/PartitioningEventSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/PartitioningEventSerializerTest.java @@ -15,15 +15,14 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.FlushEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.runtime.partitioning.PartitioningEvent; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.FlushEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.runtime.partitioning.PartitioningEvent; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import java.util.ArrayList; import java.util.Arrays; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/RenameColumnEventSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/RenameColumnEventSerializerTest.java similarity index 88% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/RenameColumnEventSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/RenameColumnEventSerializerTest.java index 2c8c4f23d..46ad4f65f 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/RenameColumnEventSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/RenameColumnEventSerializerTest.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import java.util.HashMap; import java.util.Map; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/SchemaChangeEventSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/SchemaChangeEventSerializerTest.java similarity index 82% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/SchemaChangeEventSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/SchemaChangeEventSerializerTest.java index b517d1737..5df3d2feb 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/event/SchemaChangeEventSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/event/SchemaChangeEventSerializerTest.java @@ -15,22 +15,21 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.event; +package org.apache.flink.cdc.runtime.serializer.event; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.event.AlterColumnTypeEvent; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.DropColumnEvent; -import com.ververica.cdc.common.event.RenameColumnEvent; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.event.AlterColumnTypeEvent; +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.DropColumnEvent; +import org.apache.flink.cdc.common.event.RenameColumnEvent; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import java.util.Arrays; import java.util.Collections; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/ColumnSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/ColumnSerializerTest.java similarity index 88% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/ColumnSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/ColumnSerializerTest.java index 0f8ccd2f1..e1502f6b2 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/ColumnSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/ColumnSerializerTest.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; /** A test for the {@link ColumnSerializer}. */ public class ColumnSerializerTest extends SerializerTestBase { diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/ColumnWithPositionSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/ColumnWithPositionSerializerTest.java similarity index 89% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/ColumnWithPositionSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/ColumnWithPositionSerializerTest.java index 4f1d3afa2..7209232df 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/ColumnWithPositionSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/ColumnWithPositionSerializerTest.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.event.AddColumnEvent; -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.event.AddColumnEvent; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; /** A test for the {@link ColumnWithPositionSerializer}. */ public class ColumnWithPositionSerializerTest diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/DataFieldSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/DataFieldSerializerTest.java similarity index 87% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/DataFieldSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/DataFieldSerializerTest.java index cfa56dbd2..2fbb975a7 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/DataFieldSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/DataFieldSerializerTest.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.types.DataField; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.types.DataField; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; /** A test for the {@link DataFieldSerializer}. */ public class DataFieldSerializerTest extends SerializerTestBase { diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/DataTypeSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/DataTypeSerializerTest.java similarity index 93% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/DataTypeSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/DataTypeSerializerTest.java index 00dda7dfc..3e6a2b91f 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/DataTypeSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/DataTypeSerializerTest.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.types.DataType; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.types.DataType; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import java.util.Arrays; import java.util.stream.Stream; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/MetadataColumnSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/MetadataColumnSerializerTest.java similarity index 85% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/MetadataColumnSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/MetadataColumnSerializerTest.java index 2b0db68c8..11b9710b8 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/MetadataColumnSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/MetadataColumnSerializerTest.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.MetadataColumn; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.MetadataColumn; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; /** A test for the {@link MetadataColumnSerializer}. */ public class MetadataColumnSerializerTest extends SerializerTestBase { diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/PhysicalColumnSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/PhysicalColumnSerializerTest.java similarity index 84% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/PhysicalColumnSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/PhysicalColumnSerializerTest.java index 28c36307e..48efb536e 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/PhysicalColumnSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/PhysicalColumnSerializerTest.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.schema.Column; -import com.ververica.cdc.common.schema.PhysicalColumn; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.schema.Column; +import org.apache.flink.cdc.common.schema.PhysicalColumn; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; /** A test for the {@link PhysicalColumnSerializer}. */ public class PhysicalColumnSerializerTest extends SerializerTestBase { diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/RowTypeSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/RowTypeSerializerTest.java similarity index 85% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/RowTypeSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/RowTypeSerializerTest.java index 61825b383..583339cd1 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/RowTypeSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/RowTypeSerializerTest.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.types.DataField; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.types.DataField; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import java.util.Arrays; import java.util.List; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/SchemaSerializerTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/SchemaSerializerTest.java similarity index 91% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/SchemaSerializerTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/SchemaSerializerTest.java index 57f54a8d3..267f29c9e 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/serializer/schema/SchemaSerializerTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/serializer/schema/SchemaSerializerTest.java @@ -15,13 +15,12 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.serializer.schema; +package org.apache.flink.cdc.runtime.serializer.schema; import org.apache.flink.api.common.typeutils.TypeSerializer; - -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.runtime.serializer.SerializerTestBase; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.runtime.serializer.SerializerTestBase; import java.util.Collections; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/testutils/operators/EventOperatorTestHarness.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/testutils/operators/EventOperatorTestHarness.java similarity index 88% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/testutils/operators/EventOperatorTestHarness.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/testutils/operators/EventOperatorTestHarness.java index ad3f57919..25c7ed9e5 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/testutils/operators/EventOperatorTestHarness.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/testutils/operators/EventOperatorTestHarness.java @@ -15,8 +15,17 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.testutils.operators; - +package org.apache.flink.cdc.runtime.testutils.operators; + +import org.apache.flink.cdc.common.event.CreateTableEvent; +import org.apache.flink.cdc.common.event.Event; +import org.apache.flink.cdc.common.event.TableId; +import org.apache.flink.cdc.common.schema.Schema; +import org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistry; +import org.apache.flink.cdc.runtime.operators.schema.event.SchemaChangeRequest; +import org.apache.flink.cdc.runtime.operators.sink.SchemaEvolutionClient; +import org.apache.flink.cdc.runtime.testutils.schema.CollectingMetadataApplier; +import org.apache.flink.cdc.runtime.testutils.schema.TestingSchemaRegistryGateway; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.runtime.jobgraph.tasks.TaskOperatorEventGateway; @@ -32,15 +41,6 @@ import org.apache.flink.streaming.runtime.watermarkstatus.WatermarkStatus; import org.apache.flink.streaming.util.MockStreamConfig; import org.apache.flink.util.OutputTag; -import com.ververica.cdc.common.event.CreateTableEvent; -import com.ververica.cdc.common.event.Event; -import com.ververica.cdc.common.event.TableId; -import com.ververica.cdc.common.schema.Schema; -import com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistry; -import com.ververica.cdc.runtime.operators.schema.event.SchemaChangeRequest; -import com.ververica.cdc.runtime.testutils.schema.CollectingMetadataApplier; -import com.ververica.cdc.runtime.testutils.schema.TestingSchemaRegistryGateway; - import java.util.LinkedList; /** @@ -48,9 +48,8 @@ import java.util.LinkedList; * *

In addition to regular operator context and lifecycle management, this test harness also wraps * {@link TestingSchemaRegistryGateway} into the context of tested operator, in order to support - * testing operators that have interaction with {@link - * com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistry} via {@link - * com.ververica.cdc.runtime.operators.sink.SchemaEvolutionClient}. + * testing operators that have interaction with {@link SchemaRegistry} via {@link + * SchemaEvolutionClient}. * * @param Type of the operator * @param Type of the event emitted by the operator diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/testutils/schema/CollectingMetadataApplier.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/testutils/schema/CollectingMetadataApplier.java similarity index 88% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/testutils/schema/CollectingMetadataApplier.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/testutils/schema/CollectingMetadataApplier.java index 8a1f25e85..7b403e130 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/testutils/schema/CollectingMetadataApplier.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/testutils/schema/CollectingMetadataApplier.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.testutils.schema; +package org.apache.flink.cdc.runtime.testutils.schema; -import com.ververica.cdc.common.event.SchemaChangeEvent; -import com.ververica.cdc.common.sink.MetadataApplier; +import org.apache.flink.cdc.common.event.SchemaChangeEvent; +import org.apache.flink.cdc.common.sink.MetadataApplier; import java.util.ArrayList; import java.util.List; diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/testutils/schema/TestingSchemaRegistryGateway.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/testutils/schema/TestingSchemaRegistryGateway.java similarity index 95% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/testutils/schema/TestingSchemaRegistryGateway.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/testutils/schema/TestingSchemaRegistryGateway.java index bb6d8e4ab..1859d0e44 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/testutils/schema/TestingSchemaRegistryGateway.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/testutils/schema/TestingSchemaRegistryGateway.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.testutils.schema; +package org.apache.flink.cdc.runtime.testutils.schema; +import org.apache.flink.cdc.runtime.operators.schema.coordinator.SchemaRegistry; import org.apache.flink.runtime.jobgraph.OperatorID; import org.apache.flink.runtime.jobgraph.tasks.TaskOperatorEventGateway; import org.apache.flink.runtime.operators.coordination.CoordinationRequest; @@ -24,8 +25,6 @@ import org.apache.flink.runtime.operators.coordination.CoordinationResponse; import org.apache.flink.runtime.operators.coordination.OperatorEvent; import org.apache.flink.util.SerializedValue; -import com.ververica.cdc.runtime.operators.schema.coordinator.SchemaRegistry; - import java.util.concurrent.CompletableFuture; /** diff --git a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/typeutils/BinaryRecordDataGeneratorTest.java b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/typeutils/BinaryRecordDataGeneratorTest.java similarity index 89% rename from flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/typeutils/BinaryRecordDataGeneratorTest.java rename to flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/typeutils/BinaryRecordDataGeneratorTest.java index cb0156b52..1a5c51deb 100644 --- a/flink-cdc-runtime/src/test/java/com/ververica/cdc/runtime/typeutils/BinaryRecordDataGeneratorTest.java +++ b/flink-cdc-runtime/src/test/java/org/apache/flink/cdc/runtime/typeutils/BinaryRecordDataGeneratorTest.java @@ -15,19 +15,20 @@ * limitations under the License. */ -package com.ververica.cdc.runtime.typeutils; +package org.apache.flink.cdc.runtime.typeutils; + +import org.apache.flink.cdc.common.data.DecimalData; +import org.apache.flink.cdc.common.data.LocalZonedTimestampData; +import org.apache.flink.cdc.common.data.TimestampData; +import org.apache.flink.cdc.common.data.ZonedTimestampData; +import org.apache.flink.cdc.common.data.binary.BinaryRecordData; +import org.apache.flink.cdc.common.data.binary.BinaryStringData; +import org.apache.flink.cdc.common.types.DataTypes; +import org.apache.flink.cdc.common.types.LocalZonedTimestampType; +import org.apache.flink.cdc.common.types.RowType; +import org.apache.flink.cdc.common.types.TimestampType; +import org.apache.flink.cdc.common.types.ZonedTimestampType; -import com.ververica.cdc.common.data.DecimalData; -import com.ververica.cdc.common.data.LocalZonedTimestampData; -import com.ververica.cdc.common.data.TimestampData; -import com.ververica.cdc.common.data.ZonedTimestampData; -import com.ververica.cdc.common.data.binary.BinaryRecordData; -import com.ververica.cdc.common.data.binary.BinaryStringData; -import com.ververica.cdc.common.types.DataTypes; -import com.ververica.cdc.common.types.LocalZonedTimestampType; -import com.ververica.cdc.common.types.RowType; -import com.ververica.cdc.common.types.TimestampType; -import com.ververica.cdc.common.types.ZonedTimestampType; import org.junit.jupiter.api.Test; import java.math.BigDecimal;