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

fix: Ensure hard-delete mode doesn't delete data it shouldn't when ACTIVATE_VERSION messages are processed #391

Merged
merged 3 commits into from
Jul 30, 2024
Merged

fix: Ensure hard-delete mode doesn't delete data it shouldn't when ACTIVATE_VERSION messages are processed #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
305e001
get tests to fail
sebastianswms Jul 19, 2024
4021c44
get tests to pass
sebastianswms Jul 19, 2024
25e857d
Merge branch 'main' into fix-hard-delete
edgarrmondragon Jul 29, 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
11 changes: 10 additions & 1 deletion target_postgres/sinks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,15 @@ def activate_version(self, new_version: int) -> None:
)
return

if self._pending_batch:
self.logger.info(
"An activate version message for '%s' was received. Draining...",
self.stream_name,
)
draining_status = self.start_drain()
self.process_batch(draining_status)
self.mark_drained()
Comment on lines +327 to +334
Copy link
Member

Choose a reason for hiding this comment

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

I'm taking a note to make sure we do this upstream: meltano/sdk#2576


# There's nothing to do if the table doesn't exist yet
# (which it won't the first time the stream is processed)
if not self.connector.table_exists(self.full_table_name):
Expand Down Expand Up @@ -370,7 +379,7 @@ def activate_version(self, new_version: int) -> None:
delete_stmt = sa.delete(target_table).where(
sa.or_(
target_table.c[self.version_column_name].is_(None),
target_table.c[self.version_column_name] <= new_version,
target_table.c[self.version_column_name] < new_version,
)
)
connection.execute(delete_stmt)
Expand Down
1 change: 1 addition & 0 deletions target_postgres/tests/data_files/test_activate_version_hard.singer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
{"type": "RECORD", "stream": "test_activate_version_hard", "record": {"code": "NA", "name": "North America"}, "version": 1674486431563, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_hard", "record": {"code": "OC", "name": "Oceania"}, "version": 1674486431563, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_hard", "record": {"code": "SA", "name": "South America"}, "version": 1674486431563, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_hard", "record": {"code": "XX", "name": "This record should be deleted"}, "version": 1674486431562, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "ACTIVATE_VERSION", "stream": "test_activate_version_hard", "version": 1674486431563}
12 changes: 6 additions & 6 deletions target_postgres/tests/data_files/test_activate_version_soft_with_delete.singer
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{"type": "SCHEMA", "stream": "test_activate_version_soft", "schema": {"type": "object", "properties": {"code": {"type": ["string"]}, "name": {"type": ["null", "string"]}}}, "key_properties": ["code"], "bookmark_properties": []}
{"type": "ACTIVATE_VERSION", "stream": "test_activate_version_soft", "version": 1674486431564}
{"type": "RECORD", "stream": "test_activate_version_soft", "record": {"code": "AF", "name": "Africa"}, "version": 1674486431563, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_soft", "record": {"code": "AN", "name": "Antarctica"}, "version": 1674486431563, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_soft", "record": {"code": "AS", "name": "Asia"}, "version": 1674486431563, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_soft", "record": {"code": "EU", "name": "Europe"}, "version": 1674486431563, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_soft", "record": {"code": "NA", "name": "North America"}, "version": 1674486431563, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_soft", "record": {"code": "OC", "name": "Oceania"}, "version": 1674486431563, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_soft", "record": {"code": "AF", "name": "Africa"}, "version": 1674486431564, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_soft", "record": {"code": "AN", "name": "Antarctica"}, "version": 1674486431564, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_soft", "record": {"code": "AS", "name": "Asia"}, "version": 1674486431564, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_soft", "record": {"code": "EU", "name": "Europe"}, "version": 1674486431564, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_soft", "record": {"code": "NA", "name": "North America"}, "version": 1674486431564, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "RECORD", "stream": "test_activate_version_soft", "record": {"code": "OC", "name": "Oceania"}, "version": 1674486431564, "time_extracted": "2023-01-23T15:07:11.563063Z"}
{"type": "ACTIVATE_VERSION", "stream": "test_activate_version_soft", "version": 1674486431564}
6 changes: 3 additions & 3 deletions target_postgres/tests/test_target_postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,9 +633,9 @@ def test_activate_version_soft_delete(postgres_config_no_ssl):
table_name = "test_activate_version_soft"
file_name = f"{table_name}.singer"
full_table_name = postgres_config_no_ssl["default_target_schema"] + "." + table_name
postgres_config_hard_delete_true = copy.deepcopy(postgres_config_no_ssl)
postgres_config_hard_delete_true["hard_delete"] = False
pg_soft_delete = TargetPostgres(config=postgres_config_hard_delete_true)
postgres_config_hard_delete_false = copy.deepcopy(postgres_config_no_ssl)
postgres_config_hard_delete_false["hard_delete"] = False
pg_soft_delete = TargetPostgres(config=postgres_config_hard_delete_false)
engine = create_engine(pg_soft_delete)
singer_file_to_target(file_name, pg_soft_delete)
with engine.connect() as connection:
Expand Down
Loading