Skip to content

[DCP Ingestion] Replace c/g/Root by dc/g/Root in Seeding. #2021

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
gmechali merged 2 commits into from
May 20, 2026
Merged

[DCP Ingestion] Replace c/g/Root by dc/g/Root in Seeding. #2021

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
67ef178
Replace c/g/Root by d/c/g/Root in Seeding.
gmechali May 20, 2026
22d1ed8
New tests for spanner seed
gmechali May 20, 2026
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
2 changes: 1 addition & 1 deletion import-automation/workflow/ingestion-helper/spanner_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ def _seed(transaction: Transaction):
"StatVarGroup": ["StatVarGroup", "StatVarGroup", "StatVarGroup", ["Class"], spanner.COMMIT_TIMESTAMP],
"StatVarObservation": ["StatVarObservation", "StatVarObservation", "StatVarObservation", ["Class"], spanner.COMMIT_TIMESTAMP],
"Topic": ["Topic", "Topic", "Topic", ["Class"], spanner.COMMIT_TIMESTAMP],
"c/g/Root": ["c/g/Root", "c/g/Root", "c/g/Root", ["StatVarGroup"], spanner.COMMIT_TIMESTAMP],
"dc/g/Root": ["dc/g/Root", "Data Commons Variables", "Data Commons Variables", ["StatVarGroup"], spanner.COMMIT_TIMESTAMP],
}
subjects = list(candidates.keys())
sql = "SELECT subject_id FROM Node WHERE subject_id IN UNNEST(@subjects)"
Expand Down
9 changes: 5 additions & 4 deletions import-automation/workflow/ingestion-helper/spanner_client_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,14 @@ def run_in_transaction_side_effect(callback, *args, **kwargs):
self.assertEqual(kwargs['table'], 'Node')
self.assertEqual(kwargs['columns'], ["subject_id", "name", "value", "types", "last_update_timestamp"])
self.assertEqual(len(kwargs['values']), 5)
expected_subjects = ["StatisticalVariable", "StatVarGroup", "StatVarObservation", "Topic", "c/g/Root"]
expected_subjects = ["StatisticalVariable", "StatVarGroup", "StatVarObservation", "Topic", "dc/g/Root"]
expected_names = ["StatisticalVariable", "StatVarGroup", "StatVarObservation", "Topic", "Data Commons Variables"]
actual_subjects = [val[0] for val in kwargs['values']]
actual_names = [val[1] for val in kwargs['values']]
actual_values = [val[2] for val in kwargs['values']]
self.assertEqual(actual_subjects, expected_subjects)
self.assertEqual(actual_names, expected_subjects)
self.assertEqual(actual_values, expected_subjects)
self.assertEqual(actual_names, expected_names)
self.assertEqual(actual_values, expected_names)

@patch('google.cloud.spanner.Client')
def test_seed_database_already_exists(self, mock_spanner_client):
Expand All @@ -265,7 +266,7 @@ def test_seed_database_already_exists(self, mock_spanner_client):
mock_instance.database.return_value = mock_db

mock_transaction = MagicMock()
mock_transaction.execute_sql.return_value = [["StatisticalVariable"], ["StatVarGroup"], ["StatVarObservation"], ["Topic"], ["c/g/Root"]]
mock_transaction.execute_sql.return_value = [["StatisticalVariable"], ["StatVarGroup"], ["StatVarObservation"], ["Topic"], ["dc/g/Root"]]
def run_in_transaction_side_effect(callback, *args, **kwargs):
return callback(mock_transaction, *args, **kwargs)
mock_db.run_in_transaction.side_effect = run_in_transaction_side_effect
Expand Down
Loading