Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Source MSSQL: Add CDC Change LSN to CDC Metadata #25831

Closed
wants to merge 3 commits into from
+12 −0
Closed

Source MSSQL: Add CDC Change LSN to CDC Metadata #25831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abd69dd
add cdc change lsn to sql server source
plenti-jacob-roe May 5, 2023
8a5b354
fix misreferenced var
plenti-jacob-roe May 5, 2023
4a1d775
Merge branch 'master' of github.com:airbytehq/airbyte
plenti-jacob-roe May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...-test/src/main/java/io/airbyte/integrations/standardtest/source/SourceAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public abstract class SourceAcceptanceTest extends AbstractSourceConnectorTest {
public static final String CDC_LOG_FILE = "_ab_cdc_log_file";
public static final String CDC_LOG_POS = "_ab_cdc_log_pos";
public static final String CDC_EVENT_SERIAL_NO = "_ab_cdc_event_serial_no";
public static final String CDC_CHANGE_LSN = "_ab_cdc_change_lsn";

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

Expand Down Expand Up @@ -359,6 +360,7 @@ private AirbyteRecordMessage pruneCdcMetadata(final AirbyteRecordMessage m) {
((ObjectNode) clone.getData()).remove(CDC_UPDATED_AT);
((ObjectNode) clone.getData()).remove(CDC_DELETED_AT);
((ObjectNode) clone.getData()).remove(CDC_EVENT_SERIAL_NO);
((ObjectNode) clone.getData()).remove(CDC_CHANGE_LSN);
return clone;
}

Expand Down
3 changes: 3 additions & 0 deletions ...src/main/java/io/airbyte/integrations/source/mssql/MssqlCdcConnectorMetadataInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import static io.airbyte.integrations.source.mssql.MssqlSource.CDC_EVENT_SERIAL_NO;
import static io.airbyte.integrations.source.mssql.MssqlSource.CDC_LSN;
import static io.airbyte.integrations.source.mssql.MssqlSource.CDC_CHANGE_LSN;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
Expand All @@ -16,8 +17,10 @@ public class MssqlCdcConnectorMetadataInjector implements CdcMetadataInjector {
@Override
public void addMetaData(final ObjectNode event, final JsonNode source) {
final String commitLsn = source.get("commit_lsn").asText();
final String change_lsn = source.get("change_lsn").asText();
final String eventSerialNo = source.get("event_serial_no").asText();
event.put(CDC_LSN, commitLsn);
event.put(CDC_CHANGE_LSN, change_lsn);
event.put(CDC_EVENT_SERIAL_NO, eventSerialNo);
}

Expand Down
2 changes: 2 additions & 0 deletions ...nnectors/source-mssql/src/main/java/io/airbyte/integrations/source/mssql/MssqlSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ SELECT CAST(IIF(EXISTS(SELECT TOP 1 1 FROM "%s"."%s" WHERE "%s" IS NULL), 1, 0)
public static final String MSSQL_CDC_OFFSET = "mssql_cdc_offset";
public static final String MSSQL_DB_HISTORY = "mssql_db_history";
public static final String CDC_LSN = "_ab_cdc_lsn";
public static final String CDC_CHANGE_LSN = "_ab_cdc_change_lsn";
public static final String CDC_EVENT_SERIAL_NO = "_ab_cdc_event_serial_no";
private static final String HIERARCHYID = "hierarchyid";
private static final int INTERMEDIATE_STATE_EMISSION_FREQUENCY = 10_000;
Expand Down Expand Up @@ -498,6 +499,7 @@ private static AirbyteStream addCdcMetadataColumns(final AirbyteStream stream) {

final JsonNode stringType = Jsons.jsonNode(ImmutableMap.of("type", "string"));
properties.set(CDC_LSN, stringType);
properties.set(CDC_CHANGE_LSN, stringType);
properties.set(CDC_UPDATED_AT, stringType);
properties.set(CDC_DELETED_AT, stringType);
properties.set(CDC_EVENT_SERIAL_NO, stringType);
Expand Down
5 changes: 5 additions & 0 deletions ...s/source-mssql/src/test/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import static io.airbyte.integrations.debezium.internals.DebeziumEventUtils.CDC_UPDATED_AT;
import static io.airbyte.integrations.source.mssql.MssqlSource.CDC_EVENT_SERIAL_NO;
import static io.airbyte.integrations.source.mssql.MssqlSource.CDC_LSN;
import static io.airbyte.integrations.source.mssql.MssqlSource.CDC_CHANGE_LSN;
import static io.airbyte.integrations.source.mssql.MssqlSource.DRIVER_CLASS;
import static io.airbyte.integrations.source.mssql.MssqlSource.MSSQL_CDC_OFFSET;
import static io.airbyte.integrations.source.mssql.MssqlSource.MSSQL_DB_HISTORY;
Expand Down Expand Up @@ -372,6 +373,7 @@ void testGetTargetPosition() throws InterruptedException {
@Override
protected void removeCDCColumns(final ObjectNode data) {
data.remove(CDC_LSN);
data.remove(CDC_CHANGE_LSN);
data.remove(CDC_UPDATED_AT);
data.remove(CDC_DELETED_AT);
data.remove(CDC_EVENT_SERIAL_NO);
Expand Down Expand Up @@ -407,6 +409,7 @@ protected MssqlCdcTargetPosition extractPosition(final JsonNode record) {
@Override
protected void assertNullCdcMetaData(final JsonNode data) {
assertNull(data.get(CDC_LSN));
assertNull(data.get(CDC_CHANGE_LSN));
assertNull(data.get(CDC_UPDATED_AT));
assertNull(data.get(CDC_DELETED_AT));
assertNull(data.get(CDC_EVENT_SERIAL_NO));
Expand All @@ -415,6 +418,7 @@ protected void assertNullCdcMetaData(final JsonNode data) {
@Override
protected void assertCdcMetaData(final JsonNode data, final boolean deletedAtNull) {
assertNotNull(data.get(CDC_LSN));
assertNotNull(data.get(CDC_CHANGE_LSN));
assertNotNull(data.get(CDC_EVENT_SERIAL_NO));
assertNotNull(data.get(CDC_UPDATED_AT));
if (deletedAtNull) {
Expand All @@ -431,6 +435,7 @@ protected void addCdcMetadataColumns(final AirbyteStream stream) {

final JsonNode stringType = Jsons.jsonNode(ImmutableMap.of("type", "string"));
properties.set(CDC_LSN, stringType);
properties.set(CDC_CHANGE_LSN, stringType);
properties.set(CDC_UPDATED_AT, stringType);
properties.set(CDC_DELETED_AT, stringType);
properties.set(CDC_EVENT_SERIAL_NO, stringType);
Expand Down