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

Add connector version in RECORD_METADATA #766

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add connector version in RECORD_METADATA #766

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
09c0bd6
Add connector version to RECORD_METADATA
cchandurkar Dec 11, 2023
f345bfa
Rename metadata SF connector version config
cchandurkar Jan 19, 2024
81b39c8
Set SNOWFLAKE_METADATA_SF_CONNECTOR_VERSION_DEFAULT to false
cchandurkar Jan 19, 2024
055bf1b
Format
cchandurkar Jan 19, 2024
1270dc6
Fix test
cchandurkar Jan 22, 2024
41967cb
flip the versionFlag to true
cchandurkar Jan 22, 2024
a2209be
Test version config value to be explicitly True
cchandurkar Jan 22, 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
4 changes: 2 additions & 2 deletions src/main/java/com/snowflake/kafka/connector/records/SnowflakeMetadataConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ public SnowflakeMetadataConfig(Map<String, String> config) {
topic = false;
}
if (config.containsKey(SnowflakeSinkConnectorConfig.SNOWFLAKE_METADATA_SF_CONNECTOR_VERSION)
&& !config
&& config
.get(SnowflakeSinkConnectorConfig.SNOWFLAKE_METADATA_SF_CONNECTOR_VERSION)
.equals(SnowflakeSinkConnectorConfig.SNOWFLAKE_METADATA_SF_CONNECTOR_VERSION_DEFAULT)) {
.equals(SnowflakeSinkConnectorConfig.SNOWFLAKE_METADATA_DEFAULT)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

set this to true only when SNOWFLAKE_METADATA_SF_CONNECTOR_VERSION is true right? default is false now!

version = true;
}
if (config.containsKey(SnowflakeSinkConnectorConfig.SNOWFLAKE_METADATA_OFFSET_AND_PARTITION)
Expand Down
43 changes: 40 additions & 3 deletions src/test/java/com/snowflake/kafka/connector/records/MetaColumnTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.HashMap;
import net.snowflake.client.jdbc.internal.fasterxml.jackson.core.JsonProcessingException;
import net.snowflake.client.jdbc.internal.fasterxml.jackson.databind.JsonNode;
import net.snowflake.client.jdbc.internal.fasterxml.jackson.databind.ObjectMapper;
import org.apache.kafka.common.record.TimestampType;
Expand Down Expand Up @@ -41,7 +42,7 @@ public class MetaColumnTest {
private HashMap<String, String> versionConfig =
new HashMap<String, String>() {
{
put(SnowflakeSinkConnectorConfig.SNOWFLAKE_METADATA_SF_CONNECTOR_VERSION, "true");
put(SnowflakeSinkConnectorConfig.SNOWFLAKE_METADATA_SF_CONNECTOR_VERSION, "false");
}
};
private HashMap<String, String> offsetAndPartitionConfig =
Expand Down Expand Up @@ -121,12 +122,12 @@ public void testConfig() throws IOException {
assert result.get(META).has(record.timestampType().name);
assert !result.get(META).has(RecordService.SF_CONNECTOR_VERSION);

// test metadata configuration -- remove version
// test metadata configuration -- add version
metadataConfig = new SnowflakeMetadataConfig(versionConfig);
service.setMetadataConfig(metadataConfig);
result = mapper.readTree(service.getProcessedRecordForSnowpipe(record));
assert result.has(META);
assert result.get(META).has(RecordService.SF_CONNECTOR_VERSION);
assert !result.get(META).has(RecordService.SF_CONNECTOR_VERSION);
assert result.get(META).has(RecordService.OFFSET);
assert result.get(META).has(RecordService.PARTITION);
assert result.get(META).has(record.timestampType().name);
Expand Down Expand Up @@ -163,6 +164,42 @@ public void testConfig() throws IOException {
System.out.println("Config test success");
}

@Test
public void testSfConnectorVersion() throws JsonProcessingException {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this test is failing


SnowflakeConverter converter = new SnowflakeJsonConverter();
RecordService service = new RecordService();
SchemaAndValue input =
converter.toConnectData(
topic, ("{\"name\":\"test" + "\"}").getBytes(StandardCharsets.UTF_8));
long timestamp = System.currentTimeMillis();

SinkRecord record =
new SinkRecord(
topic,
partition,
Schema.STRING_SCHEMA,
"test",
input.schema(),
input.value(),
0,
timestamp,
TimestampType.CREATE_TIME);

SnowflakeMetadataConfig metadataConfig = new SnowflakeMetadataConfig(topicConfig);
service.setMetadataConfig(metadataConfig);

metadataConfig = new SnowflakeMetadataConfig(versionConfig);
service.setMetadataConfig(metadataConfig);
JsonNode result = mapper.readTree(service.getProcessedRecordForSnowpipe(record));
assert result.has(META);
assert result.get(META).has(RecordService.SF_CONNECTOR_VERSION);
assert result.get(META).has(RecordService.OFFSET);
assert result.get(META).has(RecordService.PARTITION);
assert result.get(META).has(record.timestampType().name);
assert result.get(META).has(RecordService.TOPIC);
}

@Test
public void testTimeStamp() throws IOException {
SnowflakeConverter converter = new SnowflakeJsonConverter();
Expand Down