Skip to content

ref: STR-3825/MultiSchema Support #30

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

Merged
merged 2 commits into from
Mar 19, 2025
Merged

ref: STR-3825/MultiSchema Support #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d1b434
ref: STR-3825/MultiSchema Support
wrehman-skap Mar 13, 2025
f146db8
ref: STR-3825/Multischema support - removing unused import
wrehman-skap Mar 19, 2025
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
7 changes: 1 addition & 6 deletions src/main/java/com/snowflake/kafka/connector/internal/SnowflakeConnectionServiceV1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,12 +1081,7 @@ public ChannelMigrateOffsetTokenResponseDTO migrateStreamingChannelOffsetToken(
InternalUtils.assertNotEmpty("tableName", tableName);
InternalUtils.assertNotEmpty("sourceChannelName", sourceChannelName);
InternalUtils.assertNotEmpty("destinationChannelName", destinationChannelName);
String fullyQualifiedTableName =
jdbcProperties.getProperty(InternalUtils.JDBC_DATABASE)
+ "."
+ jdbcProperties.getProperty(InternalUtils.JDBC_SCHEMA)
+ "."
+ tableName;
String fullyQualifiedTableName = getFullyQualifiedTableName(tableName);
String query = "select SYSTEM$SNOWPIPE_STREAMING_MIGRATE_CHANNEL_OFFSET_TOKEN((?), (?), (?));";

try {
Expand Down
15 changes: 12 additions & 3 deletions .../java/com/snowflake/kafka/connector/internal/streaming/BufferedTopicPartitionChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ public InsertRowsResponse get() throws Throwable {
extraColNames == null ? "null" : String.join(",", extraColNames));
SchematizationUtils.evolveSchemaIfNeeded(
this.conn,
this.channel.getTableName(),
String.join(".", this.channel.getSchemaName(), this.channel.getTableName()),
new ArrayList<>(nonNullableColumns),
extraColNames,
this.insertRowsStreamingBuffer.getSinkRecord(originalSinkRecordIdx),
Expand Down Expand Up @@ -1019,11 +1019,20 @@ private long fetchLatestOffsetFromChannel(SnowflakeStreamingIngestChannel channe
* @return new channel which was fetched after open/reopen
*/
private SnowflakeStreamingIngestChannel openChannelForTable() {
String sName=this.sfConnectorConfig.get(Utils.SF_SCHEMA);
String tName=this.tableName;
if(this.tableName.contains(".")){
String[] parts = this.tableName.split("\\.");
if(parts.length>=2){
sName = parts[parts.length-2];
tName = parts[parts.length-1];
}
}
OpenChannelRequest channelRequest =
OpenChannelRequest.builder(this.channelNameFormatV1)
.setDBName(this.sfConnectorConfig.get(Utils.SF_DATABASE))
.setSchemaName(this.sfConnectorConfig.get(Utils.SF_SCHEMA))
.setTableName(this.tableName)
.setSchemaName(sName)
.setTableName(tName)
.setOnErrorOption(OpenChannelRequest.OnErrorOption.CONTINUE)
.setOffsetTokenVerificationFunction(StreamingUtils.offsetTokenVerificationFunction)
.build();
Expand Down
15 changes: 12 additions & 3 deletions ...in/java/com/snowflake/kafka/connector/internal/streaming/DirectTopicPartitionChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ private void handleInsertRowFailure(
|| nullValueForNotNullColNames != null) {
SchematizationUtils.evolveSchemaIfNeeded(
this.conn,
this.channel.getTableName(),
String.join(".",this.channel.getSchemaName(), this.channel.getTableName()),
join(nonNullableColumns, nullValueForNotNullColNames),
extraColNames,
kafkaSinkRecord,
Expand Down Expand Up @@ -809,11 +809,20 @@ private long fetchLatestOffsetFromChannel(SnowflakeStreamingIngestChannel channe
* @return new channel which was fetched after open/reopen
*/
private SnowflakeStreamingIngestChannel openChannelForTable() {
String sName=this.sfConnectorConfig.get(Utils.SF_SCHEMA);
String tName=this.tableName;
if(this.tableName.contains(".")){
String[] parts = this.tableName.split("\\.");
if(parts.length>=2){
sName = parts[parts.length-2];
tName = parts[parts.length-1];
}
}
OpenChannelRequest channelRequest =
OpenChannelRequest.builder(this.channelNameFormatV1)
.setDBName(this.sfConnectorConfig.get(Utils.SF_DATABASE))
.setSchemaName(this.sfConnectorConfig.get(Utils.SF_SCHEMA))
.setTableName(this.tableName)
.setSchemaName(sName)
.setTableName(tName)
.setOnErrorOption(OpenChannelRequest.OnErrorOption.CONTINUE)
.setOffsetTokenVerificationFunction(StreamingUtils.offsetTokenVerificationFunction)
.build();
Expand Down
Loading