Skip to content

Commit

Permalink
changed naming and versioning scheme
Browse files Browse the repository at this point in the history
  • Loading branch information
vaibhav-yb committed Jul 8, 2024
1 parent 0af0d7d commit 5033e31
Show file tree
Hide file tree
Showing 88 changed files with 290 additions and 290 deletions.
2 changes: 1 addition & 1 deletion debezium-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.debezium</groupId>
<artifactId>debezium-parent</artifactId>
<version>2.5.2.ybpg.20241-SNAPSHOT.1</version>
<version>dz.2.5.2.yb.2024.1-SNAPSHOT</version>
<relativePath>../debezium-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion debezium-assembly-descriptors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.debezium</groupId>
<artifactId>debezium-parent</artifactId>
<version>2.5.2.ybpg.20241-SNAPSHOT.1</version>
<version>dz.2.5.2.yb.2024.1-SNAPSHOT</version>
<relativePath>../debezium-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion debezium-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.debezium</groupId>
<artifactId>debezium-build-parent</artifactId>
<version>2.5.2.ybpg.20241-SNAPSHOT.1</version>
<version>dz.2.5.2.yb.2024.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion debezium-connect-rest-extension/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.debezium</groupId>
<artifactId>debezium-parent</artifactId>
<version>2.5.2.ybpg.20241-SNAPSHOT.1</version>
<version>dz.2.5.2.yb.2024.1-SNAPSHOT</version>
<relativePath>../debezium-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion debezium-connector-mongodb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.debezium</groupId>
<artifactId>debezium-parent</artifactId>
<version>2.5.2.ybpg.20241-SNAPSHOT.1</version>
<version>dz.2.5.2.yb.2024.1-SNAPSHOT</version>
<relativePath>../debezium-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion debezium-connector-mysql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.debezium</groupId>
<artifactId>debezium-parent</artifactId>
<version>2.5.2.ybpg.20241-SNAPSHOT.1</version>
<version>dz.2.5.2.yb.2024.1-SNAPSHOT</version>
<relativePath>../debezium-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion debezium-connector-oracle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.debezium</groupId>
<artifactId>debezium-parent</artifactId>
<version>2.5.2.ybpg.20241-SNAPSHOT.1</version>
<version>dz.2.5.2.yb.2024.1-SNAPSHOT</version>
<relativePath>../debezium-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion debezium-connector-postgres/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>io.debezium</groupId>
<artifactId>debezium-parent</artifactId>
<version>2.5.2.ybpg.20241-SNAPSHOT.1</version>
<version>dz.2.5.2.yb.2024.1-SNAPSHOT</version>
<relativePath>../debezium-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
import io.debezium.util.Strings;

/**
* The configuration properties for the {@link YBPostgresConnector}
* The configuration properties for the {@link YugabyteDBConnector}
*
* @author Horia Chiorean
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public ChangeEventSourceCoordinator<PostgresPartition, PostgresOffsetContext> st
final PostgresEventMetadataProvider metadataProvider = new PostgresEventMetadataProvider();

SignalProcessor<PostgresPartition, PostgresOffsetContext> signalProcessor = new SignalProcessor<>(
YBPostgresConnector.class, connectorConfig, Map.of(),
YugabyteDBConnector.class, connectorConfig, Map.of(),
getAvailableSignalChannels(),
DocumentReader.defaultReader(),
previousOffsets);
Expand Down Expand Up @@ -235,7 +235,7 @@ public ChangeEventSourceCoordinator<PostgresPartition, PostgresOffsetContext> st
ChangeEventSourceCoordinator<PostgresPartition, PostgresOffsetContext> coordinator = new PostgresChangeEventSourceCoordinator(
previousOffsets,
errorHandler,
YBPostgresConnector.class,
YugabyteDBConnector.class,
connectorConfig,
new PostgresChangeEventSourceFactory(
connectorConfig,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
public class PostgresErrorHandler extends ErrorHandler {

public PostgresErrorHandler(PostgresConnectorConfig connectorConfig, ChangeEventQueue<?> queue, ErrorHandler replacedErrorHandler) {
super(YBPostgresConnector.class, connectorConfig, queue, replacedErrorHandler);
super(YugabyteDBConnector.class, connectorConfig, queue, replacedErrorHandler);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import io.debezium.spi.topic.TopicNamingStrategy;

/**
* Component that records the schema information for the {@link YBPostgresConnector}. The schema information contains
* Component that records the schema information for the {@link YugabyteDBConnector}. The schema information contains
* the {@link Tables table definitions} and the Kafka Connect {@link #schemaFor(TableId) Schema}s for each table, where the
* {@link Schema} excludes any columns that have been {@link PostgresConnectorConfig#COLUMN_EXCLUDE_LIST specified} in the
* configuration.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public void execute(ChangeEventSourceContext context, PostgresPartition partitio
// such that the connection times out. We must enable keep
// alive to ensure that it doesn't time out
ReplicationStream stream = this.replicationStream.get();
stream.startKeepAlive(Threads.newSingleThreadExecutor(YBPostgresConnector.class, connectorConfig.getLogicalName(), KEEP_ALIVE_THREAD_NAME));
stream.startKeepAlive(Threads.newSingleThreadExecutor(YugabyteDBConnector.class, connectorConfig.getLogicalName(), KEEP_ALIVE_THREAD_NAME));

initSchema();

Expand Down Expand Up @@ -200,7 +200,7 @@ public void execute(ChangeEventSourceContext context, PostgresPartition partitio

replicationStream.set(replicationConnection.startStreaming(walPosition.getLastEventStoredLsn(), walPosition));
stream = this.replicationStream.get();
stream.startKeepAlive(Threads.newSingleThreadExecutor(YBPostgresConnector.class, connectorConfig.getLogicalName(), KEEP_ALIVE_THREAD_NAME));
stream.startKeepAlive(Threads.newSingleThreadExecutor(YugabyteDBConnector.class, connectorConfig.getLogicalName(), KEEP_ALIVE_THREAD_NAME));
}
} else {
LOGGER.info("Connector config provide.transaction.metadata is set to true. Therefore, skip records filtering in order to ship entire transactions.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import io.debezium.relational.TableId;

/**
* Class that records Replica Identity information for the {@link YBPostgresConnector}
* Class that records Replica Identity information for the {@link YugabyteDBConnector}
* @author Ben White, Miguel Sotomayor
*/
@Immutable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
*
* @author Horia Chiorean
*/
public class YBPostgresConnector extends RelationalBaseSourceConnector {
public class YugabyteDBConnector extends RelationalBaseSourceConnector {

private static final Logger LOGGER = LoggerFactory.getLogger(YBPostgresConnector.class);
private static final Logger LOGGER = LoggerFactory.getLogger(YugabyteDBConnector.class);
private Map<String, String> props;

public YBPostgresConnector() {
public YugabyteDBConnector() {
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import io.debezium.config.Field;
import io.debezium.connector.postgresql.Module;
import io.debezium.connector.postgresql.YBPostgresConnector;
import io.debezium.connector.postgresql.YugabyteDBConnector;
import io.debezium.connector.postgresql.PostgresConnectorConfig;
import io.debezium.metadata.ConnectorDescriptor;
import io.debezium.metadata.ConnectorMetadata;
Expand All @@ -16,7 +16,7 @@ public class PostgresConnectorMetadata implements ConnectorMetadata {

@Override
public ConnectorDescriptor getConnectorDescriptor() {
return new ConnectorDescriptor("postgres", "Debezium PostgreSQL Connector", YBPostgresConnector.class.getName(), Module.version());
return new ConnectorDescriptor("postgres", "Debezium PostgreSQL Connector", YugabyteDBConnector.class.getName(), Module.version());
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

import io.debezium.connector.postgresql.YBPostgresConnector;
import io.debezium.connector.postgresql.YugabyteDBConnector;
import org.apache.kafka.connect.health.ConnectClusterState;

import io.debezium.config.Configuration;
Expand All @@ -36,7 +36,7 @@
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public class DebeziumPostgresConnectorResource
implements SchemaResource, ConnectionValidationResource<YBPostgresConnector>, FilterValidationResource<YBPostgresConnector>, MetricsResource {
implements SchemaResource, ConnectionValidationResource<YugabyteDBConnector>, FilterValidationResource<YugabyteDBConnector>, MetricsResource {

public static final String BASE_PATH = "/debezium/postgres";
public static final String VERSION_ENDPOINT = "/version";
Expand All @@ -53,8 +53,8 @@ public String getConnectorVersion() {
}

@Override
public YBPostgresConnector getConnector() {
return new YBPostgresConnector();
public YugabyteDBConnector getConnector() {
return new YugabyteDBConnector();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
io.debezium.connector.postgresql.YBPostgresConnector
io.debezium.connector.postgresql.YugabyteDBConnector
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ protected Configuration.Builder mutableConfig(boolean signalTableOnly, boolean s
}

@Override
protected Class<YBPostgresConnector> connectorClass() {
return YBPostgresConnector.class;
protected Class<YugabyteDBConnector> connectorClass() {
return YugabyteDBConnector.class;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
import io.debezium.jdbc.JdbcConnection;

/**
* Integration test for {@link io.debezium.converters.CloudEventsConverter} with {@link YBPostgresConnector}
* Integration test for {@link io.debezium.converters.CloudEventsConverter} with {@link YugabyteDBConnector}
*
* @author Roman Kudryashov
*/
public class CloudEventsConverterIT extends AbstractCloudEventsConverterTest<YBPostgresConnector> {
public class CloudEventsConverterIT extends AbstractCloudEventsConverterTest<YugabyteDBConnector> {

private static final String SETUP_SCHEMA = "DROP SCHEMA IF EXISTS s1 CASCADE;" +
"CREATE SCHEMA s1;";
Expand Down Expand Up @@ -51,8 +51,8 @@ public void beforeEach() throws Exception {
}

@Override
protected Class<YBPostgresConnector> getConnectorClass() {
return YBPostgresConnector.class;
protected Class<YugabyteDBConnector> getConnectorClass() {
return YugabyteDBConnector.class;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import io.debezium.relational.TableId;

/**
* This is a small class used in YBPostgresConnectorIT to test a custom snapshot
* This is a small class used in YugabyteDBConnectorIT to test a custom snapshot
*
* It is tightly coupled to the test there, but needs to be placed here in order
* to allow for class loading to work
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void shouldSerializeToJson() throws Exception {
final Properties props = new Properties();
props.putAll(TestHelper.defaultConfig().build().asMap());
props.setProperty("name", "debezium-engine");
props.setProperty("connector.class", "io.debezium.connector.postgresql.YBPostgresConnector");
props.setProperty("connector.class", "io.debezium.connector.postgresql.YugabyteDBConnector");
props.setProperty(StandaloneConfig.OFFSET_STORAGE_FILE_FILENAME_CONFIG,
OFFSET_STORE_PATH.toAbsolutePath().toString());
props.setProperty("offset.flush.interval.ms", "0");
Expand Down Expand Up @@ -129,7 +129,7 @@ public void shouldSerializeToAvro() throws Exception {
final Properties props = new Properties();
props.putAll(TestHelper.defaultConfig().build().asMap());
props.setProperty("name", "debezium-engine");
props.setProperty("connector.class", "io.debezium.connector.postgresql.YBPostgresConnector");
props.setProperty("connector.class", "io.debezium.connector.postgresql.YugabyteDBConnector");
props.setProperty(StandaloneConfig.OFFSET_STORAGE_FILE_FILENAME_CONFIG,
OFFSET_STORE_PATH.toAbsolutePath().toString());
props.setProperty("offset.flush.interval.ms", "0");
Expand Down Expand Up @@ -169,7 +169,7 @@ public void shouldSerializeToCloudEvents() throws Exception {
final Properties props = new Properties();
props.putAll(TestHelper.defaultConfig().build().asMap());
props.setProperty("name", "debezium-engine");
props.setProperty("connector.class", "io.debezium.connector.postgresql.YBPostgresConnector");
props.setProperty("connector.class", "io.debezium.connector.postgresql.YugabyteDBConnector");
props.setProperty(StandaloneConfig.OFFSET_STORAGE_FILE_FILENAME_CONFIG,
OFFSET_STORE_PATH.toAbsolutePath().toString());
props.setProperty("offset.flush.interval.ms", "0");
Expand Down Expand Up @@ -244,7 +244,7 @@ public void testOffsetsCommitAfterStop() throws Exception {
final Properties props = new Properties();
props.putAll(TestHelper.defaultConfig().build().asMap());
props.setProperty("name", "debezium-engine");
props.setProperty("connector.class", "io.debezium.connector.postgresql.YBPostgresConnector");
props.setProperty("connector.class", "io.debezium.connector.postgresql.YugabyteDBConnector");
props.setProperty(StandaloneConfig.OFFSET_STORAGE_FILE_FILENAME_CONFIG,
OFFSET_STORE_PATH.toAbsolutePath().toString());
props.setProperty("offset.flush.interval.ms", "3000");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void before() throws SQLException {
@Test
@FixFor("DBZ-3657")
public void shouldNotChokeOnDomainTypeInArray() throws Exception {
start(YBPostgresConnector.class, TestHelper.defaultConfig()
start(YugabyteDBConnector.class, TestHelper.defaultConfig()
.with(PostgresConnectorConfig.SNAPSHOT_MODE, SnapshotMode.NEVER)
.with(PostgresConnectorConfig.SCHEMA_INCLUDE_LIST, "domaintypes")
.build());
Expand All @@ -63,7 +63,7 @@ public void shouldNotChokeOnDomainTypeInArray() throws Exception {
@Test
@FixFor("DBZ-3657")
public void shouldExportDomainTypeInArrayAsUnknown() throws Exception {
start(YBPostgresConnector.class, TestHelper.defaultConfig()
start(YugabyteDBConnector.class, TestHelper.defaultConfig()
.with(PostgresConnectorConfig.SNAPSHOT_MODE, SnapshotMode.NEVER)
.with(PostgresConnectorConfig.SCHEMA_INCLUDE_LIST, "domaintypes")
.with(PostgresConnectorConfig.INCLUDE_UNKNOWN_DATATYPES, true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import io.debezium.util.Collect;
import io.debezium.util.Testing;

public class IncrementalSnapshotIT extends AbstractIncrementalSnapshotTest<YBPostgresConnector> {
public class IncrementalSnapshotIT extends AbstractIncrementalSnapshotTest<YugabyteDBConnector> {

private static final Logger LOGGER = LoggerFactory.getLogger(IncrementalSnapshotIT.class);

Expand Down Expand Up @@ -134,8 +134,8 @@ protected Configuration.Builder mutableConfig(boolean signalTableOnly, boolean s
}

@Override
protected Class<YBPostgresConnector> connectorClass() {
return YBPostgresConnector.class;
protected Class<YugabyteDBConnector> connectorClass() {
return YugabyteDBConnector.class;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void shouldNotConsumeLogicalDecodingMessagesWhenAllPrefixesAreInTheExclud
TestHelper.execute(SETUP_TABLES_STMT);
Configuration.Builder configBuilder = TestHelper.defaultConfig()
.with(PostgresConnectorConfig.LOGICAL_DECODING_MESSAGE_PREFIX_EXCLUDE_LIST, ".*");
start(YBPostgresConnector.class, configBuilder.build());
start(YugabyteDBConnector.class, configBuilder.build());
assertConnectorIsRunning();
waitForSnapshotToBeCompleted();

Expand All @@ -99,7 +99,7 @@ public void shouldConsumeNonTransactionalLogicalDecodingMessages() throws Except
TestHelper.execute(SETUP_TABLES_STMT);
Configuration.Builder configBuilder = TestHelper.defaultConfig();

start(YBPostgresConnector.class, configBuilder.build());
start(YugabyteDBConnector.class, configBuilder.build());
assertConnectorIsRunning();
waitForSnapshotToBeCompleted();

Expand Down Expand Up @@ -138,7 +138,7 @@ public void shouldConsumeTransactionalLogicalDecodingMessages() throws Exception
TestHelper.execute(SETUP_TABLES_STMT);
Configuration.Builder configBuilder = TestHelper.defaultConfig();

start(YBPostgresConnector.class, configBuilder.build());
start(YugabyteDBConnector.class, configBuilder.build());
assertConnectorIsRunning();
waitForSnapshotToBeCompleted();

Expand Down Expand Up @@ -180,7 +180,7 @@ public void shouldApplyBinaryHandlingMode() throws Exception {
Configuration.Builder configBuilder = TestHelper.defaultConfig()
.with(PostgresConnectorConfig.BINARY_HANDLING_MODE, "base64");

start(YBPostgresConnector.class, configBuilder.build());
start(YugabyteDBConnector.class, configBuilder.build());
assertConnectorIsRunning();
waitForSnapshotToBeCompleted();

Expand All @@ -206,7 +206,7 @@ public void shouldNotConsumeLogicalDecodingMessagesWithExcludedPrefixes() throws
TestHelper.execute(SETUP_TABLES_STMT);
Configuration.Builder configBuilder = TestHelper.defaultConfig()
.with(PostgresConnectorConfig.LOGICAL_DECODING_MESSAGE_PREFIX_EXCLUDE_LIST, "excluded_prefix, prefix:excluded");
start(YBPostgresConnector.class, configBuilder.build());
start(YugabyteDBConnector.class, configBuilder.build());
assertConnectorIsRunning();
waitForSnapshotToBeCompleted();

Expand All @@ -232,7 +232,7 @@ public void shouldOnlyConsumeLogicalDecodingMessagesWithIncludedPrefixes() throw
TestHelper.execute(SETUP_TABLES_STMT);
Configuration.Builder configBuilder = TestHelper.defaultConfig()
.with(PostgresConnectorConfig.LOGICAL_DECODING_MESSAGE_PREFIX_INCLUDE_LIST, "included_prefix, prefix:included, ano.*er_included");
start(YBPostgresConnector.class, configBuilder.build());
start(YugabyteDBConnector.class, configBuilder.build());
assertConnectorIsRunning();
waitForSnapshotToBeCompleted();

Expand Down
Loading

0 comments on commit 5033e31

Please sign in to comment.