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

Jump to bottom

[SNOW-916052] Use python None instead of empty string for tombstone e2e tests #709

Merged
merged 5 commits into from
Sep 28, 2023
Merged

[SNOW-916052] Use python None instead of empty string for tombstone e2e tests #709

merged 5 commits into from
Sep 28, 2023

Conversation

sfc-gh-rcheng
Copy link
Collaborator

@sfc-gh-rcheng sfc-gh-rcheng commented Sep 25, 2023 •
edited
Loading

Snowflake converters and community converters convert empty string records different. Snowflake converters treat "" as a valid record, community converters treat "" as a tombstone record. Use python None (null) instead of empty string to accurately test tombstone ingestion

Discussed offline with @sfc-gh-tzhang to use None instead

sfc-gh-rcheng
sfc-gh-rcheng commented Sep 25, 2023
View reviewed changes
src/main/java/com/snowflake/kafka/connector/records/RecordService.java
@@ -566,7 +566,6 @@ public boolean shouldSkipNullValue(
// get valueSchema
Schema valueSchema = record.valueSchema();
if (valueSchema instanceof SnowflakeJsonSchema) {
// TODO SNOW-916052: will not skip if record.value() == null
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

valueschema will never be null because snowflake json converter always returns a value schema

sfc-gh-rcheng
sfc-gh-rcheng commented Sep 25, 2023
View reviewed changes
test/rest_request_template/test_string_json_ignore_tombstone.json
@@ -10,8 +10,7 @@
"snowflake.database.name":"SNOWFLAKE_DATABASE",
"snowflake.schema.name":"SNOWFLAKE_SCHEMA",
"key.converter":"org.apache.kafka.connect.storage.StringConverter",
"value.converter": "org.apache.kafka.connect.json.JsonConverter",
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

the corresponding default tombstone e2e ingestion test uses SnowflakeJsonConverter

Copy link
Collaborator

Choose a reason for hiding this comment

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

what will be the behavior if it is org.apache.kafka.connect.json.JsonConverter? Do we have a test for that?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

JsonConverter treats empty string as a tombstone record whereas SnowflakeJsonConverter treats it as a normal record.

We don't have snowpipe e2e tests with JsonConverter, but we do have IT tests that test all converters with snowpipe

Copy link
Collaborator

Choose a reason for hiding this comment

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

Please double confirm that we dont have any behavior changes in snowpipe. Thanks

@sfc-gh-rcheng sfc-gh-rcheng changed the title Use python None instead of empty string for tombstone e2e tests [SNOW-916052] Use python None instead of empty string for tombstone e2e tests Sep 26, 2023
@sfc-gh-rcheng sfc-gh-rcheng marked this pull request as ready for review September 26, 2023 00:51
sfc-gh-tzhang
sfc-gh-tzhang approved these changes Sep 27, 2023
View reviewed changes
Copy link
Contributor

@sfc-gh-tzhang sfc-gh-tzhang left a comment

Choose a reason for hiding this comment

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

Left one comment, otherwise LGTM!

test/test_suit/test_string_json.py
@@ -24,7 +24,7 @@ def send(self):
{'numbernumbernumbernumbernumbernumbernumbernumbernumbernumbernumbernumber': str(100)}
).encode('utf-8'))
else:
value.append('')
Copy link
Contributor

Choose a reason for hiding this comment

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

I understand we need use None for the tombstone tests, but should we have a test to test the empty string behavior instead of updating everything to None?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

added empty string test and comment to explain the differences between community vs custom converter record behavior

sfc-gh-japatel
sfc-gh-japatel approved these changes Sep 27, 2023
View reviewed changes
Copy link
Collaborator

@sfc-gh-japatel sfc-gh-japatel left a comment

Choose a reason for hiding this comment

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

thanks for fixing and improving test! Left a comment about being cautious in snowpipe code path.

@sfc-gh-rcheng sfc-gh-rcheng merged commit 501ced5 into master Sep 28, 2023
32 checks passed
@sfc-gh-rcheng sfc-gh-rcheng deleted the rcheng-fixtbtest branch September 28, 2023 16:11
khsoneji pushed a commit to confluentinc/snowflake-kafka-connector that referenced this pull request Oct 12, 2023
@sfc-gh-rcheng @khsoneji
[SNOW-916052] Use python None instead of empty string for tombstone e…
4f874e8 
…2e tests (snowflakedb#709)
khsoneji pushed a commit to confluentinc/snowflake-kafka-connector that referenced this pull request Oct 12, 2023
@sfc-gh-rcheng @khsoneji
[SNOW-916052] Use python None instead of empty string for tombstone e…
738fb8c 
…2e tests (snowflakedb#709)
khsoneji pushed a commit to confluentinc/snowflake-kafka-connector that referenced this pull request Oct 12, 2023
@sfc-gh-rcheng @khsoneji
[SNOW-916052] Use python None instead of empty string for tombstone e…
a64e744 
…2e tests (snowflakedb#709)
khsoneji pushed a commit to confluentinc/snowflake-kafka-connector that referenced this pull request Oct 12, 2023
@sfc-gh-rcheng @khsoneji
[SNOW-916052] Use python None instead of empty string for tombstone e…
977c07e 
…2e tests (snowflakedb#709)
khsoneji added a commit to confluentinc/snowflake-kafka-connector that referenced this pull request Oct 12, 2023
@khsoneji
Revert "[SNOW-916052] Use python None instead of empty string for tom…
df793c8 
…bstone e2e tests (snowflakedb#709)"

This reverts commit 977c07e.
khsoneji added a commit to confluentinc/snowflake-kafka-connector that referenced this pull request Oct 12, 2023
@khsoneji
Revert commits (#46)
bd64a92 
* Revert "[Snyk] Security upgrade org.apache.avro:avro from 1.11.1 to 1.11.3 (snowflakedb#713)"

This reverts commit e5fb0d2.

* Revert "[SNOW-916052] Use python None instead of empty string for tombstone e2e tests (snowflakedb#709)"

This reverts commit 977c07e.
EduardHantig pushed a commit to streamkap-com/snowflake-kafka-connector that referenced this pull request Feb 1, 2024
@sfc-gh-rcheng @EduardHantig
[SNOW-916052] Use python None instead of empty string for tombstone e…
f33a142 
…2e tests (snowflakedb#709)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sfc-gh-japatel sfc-gh-japatel sfc-gh-japatel approved these changes

@sfc-gh-tjones sfc-gh-tjones Awaiting requested review from sfc-gh-tjones

@sfc-gh-tzhang sfc-gh-tzhang Awaiting requested review from sfc-gh-tzhang

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sfc-gh-rcheng @sfc-gh-japatel @sfc-gh-tzhang