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-postgres] Fix final state message on state #38171

Merged
merged 8 commits into from
May 13, 2024
Merged

[source-postgres] Fix final state message on state #38171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
11af4fc
fix - incremental iterator should exclude views
xiaohansong May 10, 2024
a5c166b
format
xiaohansong May 10, 2024
7a93901
version and doc
xiaohansong May 10, 2024
33328f2
fix a bug on final state message
xiaohansong May 13, 2024
49ae4cf
Merge branch 'master' into xiaohan/postgres-bug
xiaohansong May 13, 2024
b1d65e0
format
xiaohansong May 13, 2024
4a15998
bump cdk
xiaohansong May 13, 2024
2cb0d23
bump connector version
xiaohansong May 13, 2024
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: 1 addition & 1 deletion airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=0.35.0
version=0.35.1
15 changes: 13 additions & 2 deletions .../db-sources/src/testFixtures/kotlin/io/airbyte/cdk/integrations/debezium/CdcSourceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,15 @@ abstract class CdcSourceTest<S : Source, T : TestDatabase<*, T, *>> {
// Do nothing.
}

private fun assertStateDoNotHaveDuplicateStreams(stateMessage: AirbyteStateMessage) {
val dedupedStreamStates =
stateMessage.global.streamStates
.stream()
.map { streamState: AirbyteStreamState -> streamState.streamDescriptor }
.collect(Collectors.toSet())
Assertions.assertEquals(dedupedStreamStates.size, stateMessage.global.streamStates.size)
}

@BeforeEach
protected open fun setup() {
testdb = createTestDatabase()
Expand Down Expand Up @@ -616,6 +625,7 @@ abstract class CdcSourceTest<S : Source, T : TestDatabase<*, T, *>> {

val recordMessages1 = extractRecordMessages(actualRecords1)
val stateMessages1 = extractStateMessages(actualRecords1)
stateMessages1.map { state -> assertStateDoNotHaveDuplicateStreams(state) }
val names = HashSet(STREAM_NAMES)
names.add(MODELS_STREAM_NAME_2)

Expand Down Expand Up @@ -657,7 +667,7 @@ abstract class CdcSourceTest<S : Source, T : TestDatabase<*, T, *>> {
} else {
assertExpectedStateMessageCountMatches(
stateMessages1,
MODEL_RECORDS.size.toLong() + MODEL_RECORDS_2.size.toLong()
MODEL_RECORDS.size.toLong() + MODEL_RECORDS_2.size.toLong(),
)
assertExpectedRecords(
Streams.concat(MODEL_RECORDS_2.stream(), MODEL_RECORDS.stream())
Expand Down Expand Up @@ -1236,8 +1246,9 @@ abstract class CdcSourceTest<S : Source, T : TestDatabase<*, T, *>> {

assertExpectedStateMessageCountMatches(
stateAfterFirstBatch,
MODEL_RECORDS.size.toLong() + MODEL_RECORDS_2.size.toLong()
MODEL_RECORDS.size.toLong() + MODEL_RECORDS_2.size.toLong(),
)
stateAfterFirstBatch.map { state -> assertStateDoNotHaveDuplicateStreams(state) }
}

protected open fun assertStateMessagesForNewTableSnapshotTest(
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-postgres/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ java {
}

airbyteJavaConnector {
cdkVersionRequired = '0.34.2'
cdkVersionRequired = '0.35.1'
features = ['db-sources', 'datastore-postgres']
useLocalCdk = false
}
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-postgres/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ data:
connectorSubtype: database
connectorType: source
definitionId: decd338e-5647-4c0b-adf4-da0e75f5a750
dockerImageTag: 3.4.1
dockerImageTag: 3.4.2
dockerRepository: airbyte/source-postgres
documentationUrl: https://docs.airbyte.com/integrations/sources/postgres
githubIssueLabel: source-postgres
Expand Down
2 changes: 1 addition & 1 deletion ...es/src/main/java/io/airbyte/integrations/source/postgres/ctid/CtidGlobalStateManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public AirbyteStateMessage createFinalStateMessage(final AirbyteStreamNameNamesp

resumableFullRefreshStreams.forEach(stream -> {
final CtidStatus ctidStatusForFullRefreshStream = generateCtidStatusForState(pair);
streamStates.add(getAirbyteStreamState(pair, Jsons.jsonNode(ctidStatusForFullRefreshStream)));
streamStates.add(getAirbyteStreamState(stream, Jsons.jsonNode(ctidStatusForFullRefreshStream)));
});

return new AirbyteStateMessage()
Expand Down
5 changes: 5 additions & 0 deletions ...postgres/src/test/java/io/airbyte/integrations/source/postgres/CdcPostgresSourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,11 @@ private void assertStateTypes(final List<? extends AirbyteStateMessage> stateMes
}
}

@Override
protected void validateStreamStateInResumableFullRefresh(final JsonNode streamStateToBeTested) {
assertEquals("ctid", streamStateToBeTested.get("state_type").asText());
}

@Override
@Test
protected void testCdcAndNonResumableFullRefreshInSameSync() throws Exception {}
Expand Down
Loading
Loading