db-sources-java-cdk: fix logic to calculate the state stats count in …

…db sources iterator (#34948)
airbytehq · Feb 7, 2024 · 6e4ed76 · 6e4ed76
1 parent fccc1d0
commit 6e4ed76
Show file tree

Hide file tree

Showing 7 changed files with 113 additions and 57 deletions.
diff --git a/airbyte-cdk/java/airbyte-cdk/README.md b/airbyte-cdk/java/airbyte-cdk/README.md
@@ -166,6 +166,7 @@ MavenLocal debugging steps:
 
 | Version | Date       | Pull Request                                               | Subject                                                                                                                                                        |
 |:--------|:-----------|:-----------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 0.16.5  | 2024-02-07 | [\#34948](https://github.com/airbytehq/airbyte/pull/34948) | Fix source state stats counting logic                                                                                                                          |
 | 0.16.4  | 2024-02-01 | [\#34727](https://github.com/airbytehq/airbyte/pull/34727) | Add future based stdout consumer in BaseTypingDedupingTest                                                                                                     |
 | 0.16.3  | 2024-01-30 | [\#34669](https://github.com/airbytehq/airbyte/pull/34669) | Fix org.apache.logging.log4j:log4j-slf4j-impl version conflicts.                                                                                               |
 | 0.16.2  | 2024-01-29 | [\#34630](https://github.com/airbytehq/airbyte/pull/34630) | expose NamingTransformer to sub-classes in destinations JdbcSqlGenerator.                                                                                      |

diff --git a/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties b/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties
@@ -1 +1 @@
-version=0.16.4
+version=0.16.5
diff --git a/...rc/main/java/io/airbyte/cdk/integrations/source/relationaldb/StateDecoratingIterator.java b/...rc/main/java/io/airbyte/cdk/integrations/source/relationaldb/StateDecoratingIterator.java
@@ -188,6 +188,10 @@ protected AirbyteMessage computeNext() {
   protected final Optional<AirbyteMessage> getIntermediateMessage() {
     if (emitIntermediateState && intermediateStateMessage != null) {
       final AirbyteMessage message = intermediateStateMessage;
+      if (message.getState() != null) {
+        message.getState().setSourceStats(new AirbyteStateStats().withRecordCount((double) recordCountInStateMessage));
+      }
+
       intermediateStateMessage = null;
       recordCountInStateMessage = 0;
       emitIntermediateState = false;

diff --git a/...est/java/io/airbyte/cdk/integrations/source/relationaldb/StateDecoratingIteratorTest.java b/...est/java/io/airbyte/cdk/integrations/source/relationaldb/StateDecoratingIteratorTest.java
diff --git a/airbyte-integrations/connectors/source-postgres/build.gradle b/airbyte-integrations/connectors/source-postgres/build.gradle
@@ -13,7 +13,7 @@ java {
 }
 
 airbyteJavaConnector {
-    cdkVersionRequired = '0.16.3'
+    cdkVersionRequired = '0.16.5'
     features = ['db-sources']
     useLocalCdk = false
 }

diff --git a/airbyte-integrations/connectors/source-postgres/metadata.yaml b/airbyte-integrations/connectors/source-postgres/metadata.yaml
@@ -9,7 +9,7 @@ data:
   connectorSubtype: database
   connectorType: source
   definitionId: decd338e-5647-4c0b-adf4-da0e75f5a750
-  dockerImageTag: 3.3.4
+  dockerImageTag: 3.3.5
   dockerRepository: airbyte/source-postgres
   documentationUrl: https://docs.airbyte.com/integrations/sources/postgres
   githubIssueLabel: source-postgres

diff --git a/docs/integrations/sources/postgres.md b/docs/integrations/sources/postgres.md
@@ -292,6 +292,7 @@ According to Postgres [documentation](https://www.postgresql.org/docs/14/datatyp
 
 | Version | Date       | Pull Request                                             | Subject                                                                                                                                                                    |
 |---------|------------|----------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 3.3.5   | 2024-02-07 | [34948](https://github.com/airbytehq/airbyte/pull/34948) | Adopt CDK v0.16.5                                                                                                                                                          |
 | 3.3.4   | 2024-01-31 | [34723](https://github.com/airbytehq/airbyte/pull/34723) | Adopt CDK v0.16.3                                                                                                                                                          |
 | 3.3.3   | 2024-01-26 | [34573](https://github.com/airbytehq/airbyte/pull/34573) | Adopt CDK v0.16.0                                                                                                                                                          |
 | 3.3.2   | 2024-01-24 | [34465](https://github.com/airbytehq/airbyte/pull/34465) | Check xmin only if user selects xmin sync mode.                                                                                                                            |