destination-snowflake: bump CDK version

airbytehq · May 22, 2024 · d3bc50d · d3bc50d
1 parent af42c24
commit d3bc50d
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 17 deletions.
diff --git a/airbyte-integrations/connectors/destination-snowflake/build.gradle b/airbyte-integrations/connectors/destination-snowflake/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 airbyteJavaConnector {
-    cdkVersionRequired = '0.34.4'
+    cdkVersionRequired = '0.35.7'
     features = ['db-destinations', 's3-destinations', 'typing-deduping']
     useLocalCdk = false
 }

diff --git a/airbyte-integrations/connectors/destination-snowflake/metadata.yaml b/airbyte-integrations/connectors/destination-snowflake/metadata.yaml
@@ -5,7 +5,7 @@ data:
   connectorSubtype: database
   connectorType: destination
   definitionId: 424892c4-daac-4491-b35d-c6688ba547ba
-  dockerImageTag: 3.8.0
+  dockerImageTag: 3.8.1
   dockerRepository: airbyte/destination-snowflake
   documentationUrl: https://docs.airbyte.com/integrations/destinations/snowflake
   githubIssueLabel: destination-snowflake

diff --git a/...rbyte/integrations/destination/snowflake/typing_deduping/SnowflakeDestinationHandler.java b/...rbyte/integrations/destination/snowflake/typing_deduping/SnowflakeDestinationHandler.java
@@ -361,4 +361,8 @@ private String toJdbcTypeName(final AirbyteProtocolType airbyteProtocolType) {
     };
   }
 
+  public void createNamespaces(Set<String> schemas) {
+    // do nothing?
+  }
+
 }
diff --git a/.../io/airbyte/integrations/destination/snowflake/typing_deduping/SnowflakeSqlGenerator.java b/.../io/airbyte/integrations/destination/snowflake/typing_deduping/SnowflakeSqlGenerator.java
@@ -6,7 +6,7 @@
 
 import static io.airbyte.integrations.base.destination.typing_deduping.Sql.concat;
 import static io.airbyte.integrations.base.destination.typing_deduping.Sql.transactionally;
-import static io.airbyte.integrations.base.destination.typing_deduping.TypeAndDedupeTransaction.SOFT_RESET_SUFFIX;
+import static io.airbyte.integrations.base.destination.typing_deduping.TyperDeduperUtil.SOFT_RESET_SUFFIX;
 import static java.util.stream.Collectors.joining;
 
 import com.google.common.annotations.VisibleForTesting;

diff --git a/.../airbyte/integrations/destination/snowflake/typing_deduping/SnowflakeV2TableMigrator.java b/.../airbyte/integrations/destination/snowflake/typing_deduping/SnowflakeV2TableMigrator.java
@@ -12,7 +12,7 @@
 import io.airbyte.cdk.integrations.destination.jdbc.TableDefinition;
 import io.airbyte.integrations.base.destination.typing_deduping.StreamConfig;
 import io.airbyte.integrations.base.destination.typing_deduping.StreamId;
-import io.airbyte.integrations.base.destination.typing_deduping.TypeAndDedupeTransaction;
+import io.airbyte.integrations.base.destination.typing_deduping.TyperDeduperUtil;
 import io.airbyte.integrations.base.destination.typing_deduping.V2TableMigrator;
 import io.airbyte.protocol.models.v0.DestinationSyncMode;
 import java.sql.SQLException;
@@ -64,7 +64,7 @@ public void migrateIfNecessary(final StreamConfig streamConfig) throws Exception
           "Executing upcasing migration for {}.{}",
           streamConfig.getId().getOriginalNamespace(),
           streamConfig.getId().getOriginalName());
-      TypeAndDedupeTransaction.executeSoftReset(generator, handler, streamConfig);
+      TyperDeduperUtil.executeSoftReset(generator, handler, streamConfig);
     }
   }
 

diff --git a/...egrations/destination/snowflake/typing_deduping/SnowflakeSqlGeneratorIntegrationTest.java b/...egrations/destination/snowflake/typing_deduping/SnowflakeSqlGeneratorIntegrationTest.java
@@ -25,7 +25,7 @@
 import io.airbyte.integrations.base.destination.typing_deduping.DestinationInitialStatus;
 import io.airbyte.integrations.base.destination.typing_deduping.Sql;
 import io.airbyte.integrations.base.destination.typing_deduping.StreamId;
-import io.airbyte.integrations.base.destination.typing_deduping.TypeAndDedupeTransaction;
+import io.airbyte.integrations.base.destination.typing_deduping.TyperDeduperUtil;
 import io.airbyte.integrations.destination.snowflake.OssCloudEnvVarConsts;
 import io.airbyte.integrations.destination.snowflake.SnowflakeDatabase;
 import io.airbyte.integrations.destination.snowflake.SnowflakeSourceOperations;
@@ -570,7 +570,7 @@ public void dst_test_oldSyncRunsThroughTransition_thenNewSyncRuns_dedup() throws
                           }
                           """)));
 
-    TypeAndDedupeTransaction.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalDedupStream(),
+    TyperDeduperUtil.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalDedupStream(),
         initialState.initialRawTableStatus().getMaxProcessedTimestamp(), "");
 
     getDIFFER().diffFinalTableRecords(
@@ -664,7 +664,7 @@ public void dst_test_oldSyncRunsBeforeTransition_thenNewSyncRunsThroughTransitio
                           }
                           """)));
 
-    TypeAndDedupeTransaction.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalDedupStream(),
+    TyperDeduperUtil.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalDedupStream(),
         initialState.initialRawTableStatus().getMaxProcessedTimestamp(), "");
 
     getDIFFER().diffFinalTableRecords(
@@ -739,7 +739,7 @@ public void dst_test_oldSyncRunsBeforeTransition_thenNewSyncRunsBeforeTransition
                           }
                           """)));
 
-    TypeAndDedupeTransaction.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalDedupStream(),
+    TyperDeduperUtil.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalDedupStream(),
         initialState.initialRawTableStatus().getMaxProcessedTimestamp(), "");
 
     getDIFFER().diffFinalTableRecords(
@@ -794,7 +794,7 @@ public void dst_test_oldSyncRunsBeforeTransition_thenNewSyncRunsBeforeTransition
                           }
                           """)));
 
-    TypeAndDedupeTransaction.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalDedupStream(),
+    TyperDeduperUtil.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalDedupStream(),
         initialState2.initialRawTableStatus().getMaxProcessedTimestamp(), "");
 
     getDIFFER().diffFinalTableRecords(
@@ -946,7 +946,7 @@ public void dst_test_oldSyncRunsThroughTransition_thenNewSyncRuns_append() throw
                           }
                           """)));
 
-    TypeAndDedupeTransaction.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalAppendStream(),
+    TyperDeduperUtil.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalAppendStream(),
         initialState.initialRawTableStatus().getMaxProcessedTimestamp(), "");
 
     getDIFFER().diffFinalTableRecords(
@@ -1085,7 +1085,7 @@ public void dst_test_oldSyncRunsBeforeTransition_thenNewSyncRunsThroughTransitio
                           }
                           """)));
 
-    TypeAndDedupeTransaction.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalAppendStream(),
+    TyperDeduperUtil.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalAppendStream(),
         initialState.initialRawTableStatus().getMaxProcessedTimestamp(), "");
 
     getDIFFER().diffFinalTableRecords(
@@ -1182,7 +1182,7 @@ public void dst_test_oldSyncRunsBeforeTransition_thenNewSyncRunsBeforeTransition
                           }
                           """)));
 
-    TypeAndDedupeTransaction.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalAppendStream(),
+    TyperDeduperUtil.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalAppendStream(),
         initialState.initialRawTableStatus().getMaxProcessedTimestamp(), "");
 
     getDIFFER().diffFinalTableRecords(
@@ -1259,7 +1259,7 @@ public void dst_test_oldSyncRunsBeforeTransition_thenNewSyncRunsBeforeTransition
                           }
                           """)));
 
-    TypeAndDedupeTransaction.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalAppendStream(),
+    TyperDeduperUtil.executeTypeAndDedupe(this.getGenerator(), this.getDestinationHandler(), this.getIncrementalAppendStream(),
         initialState2.initialRawTableStatus().getMaxProcessedTimestamp(), "");
 
     getDIFFER().diffFinalTableRecords(

diff --git a/...airbyte/integrations/destination/snowflake/typing_deduping/SnowflakeSqlGeneratorTest.java b/...airbyte/integrations/destination/snowflake/typing_deduping/SnowflakeSqlGeneratorTest.java
@@ -77,7 +77,6 @@ void columnCollision() {
     assertEquals(
         new StreamConfig(
             new StreamId("BAR", "FOO", "airbyte_internal", "bar_raw__stream_foo", "bar", "foo"),
-            SyncMode.INCREMENTAL,
             DestinationSyncMode.APPEND,
             emptyList(),
             Optional.empty(),
@@ -88,7 +87,10 @@ void columnCollision() {
                 put(new ColumnId("_CURRENT_DATE_1", "current_date", "_CURRENT_DATE_1"), AirbyteProtocolType.INTEGER);
               }
 
-            }),
+            },
+            0,
+            0,
+            0),
         parser.toStreamConfig(new ConfiguredAirbyteStream()
             .withSyncMode(SyncMode.INCREMENTAL)
             .withDestinationSyncMode(DestinationSyncMode.APPEND)

diff --git a/docs/integrations/destinations/snowflake.md b/docs/integrations/destinations/snowflake.md
@@ -275,7 +275,8 @@ desired namespace.
 ## Changelog
 
 | Version         | Date       | Pull Request                                               | Subject                                                                                                                                                          |
-| :-------------- | :--------- | :--------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+|:----------------|:-----------| :--------------------------------------------------------- |:-----------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 3.8.1           | 2024-05-22 | [\#38568](https://github.com/airbytehq/airbyte/pull/38568) | Adopt latest CDK                                                                                                                                                 |
 | 3.8.0           | 2024-05-08 | [\#37715](https://github.com/airbytehq/airbyte/pull/37715) | Remove option for incremental typing and deduping                                                                                                                |
 | 3.7.4           | 2024-05-07 | [\#38052](https://github.com/airbytehq/airbyte/pull/38052) | Revert problematic optimization                                                                                                                                  |
 | 3.7.3           | 2024-05-07 | [\#34612](https://github.com/airbytehq/airbyte/pull/34612) | Adopt CDK 0.33.2                                                                                                                                                 |
-Original file line number
+Diff line change
@@ Expand Up @@
         };
       }
+      public void createNamespaces(Set<String> schemas) {
+        // do nothing?
+      }
     }