Skip to content

[BEAM-11884] Pass destination as str rather than TableReference within BigQueryBatchFileLoads #14112

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
pabloem merged 1 commit into from
Mar 8, 2021
Merged

[BEAM-11884] Pass destination as str rather than TableReference within BigQueryBatchFileLoads #14112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 7 additions & 10 deletions sdks/python/apache_beam/io/gcp/bigquery_file_loads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

import hashlib
import logging
import pickle
import random
import time
import uuid
Expand Down Expand Up @@ -256,7 +255,7 @@ def process(self, element, file_prefix, *schema_side_inputs):
self._destination_to_file_writer.pop(destination)
yield pvalue.TaggedOutput(
WriteRecordsToFile.WRITTEN_FILE_TAG,
(element[0], (file_path, file_size)))
(destination, (file_path, file_size)))

def finish_bundle(self):
for destination, file_path_writer in \
Expand Down Expand Up @@ -287,7 +286,7 @@ def __init__(
self.file_format = file_format or bigquery_tools.FileFormat.JSON

def process(self, element, file_prefix, *schema_side_inputs):
destination = element[0]
destination = bigquery_tools.get_hashable_destination(element[0])
rows = element[1]

file_path, writer = None, None
Expand Down Expand Up @@ -509,7 +508,9 @@ def process(self, element, load_job_name_prefix, *schema_side_inputs):
create_disposition = 'CREATE_IF_NEEDED'
# For temporary tables, we create a new table with the name with JobId.
table_reference.tableId = job_name
yield pvalue.TaggedOutput(TriggerLoadJobs.TEMP_TABLES, table_reference)
yield pvalue.TaggedOutput(
TriggerLoadJobs.TEMP_TABLES,
bigquery_tools.get_hashable_destination(table_reference))

_LOGGER.info(
'Triggering job %s to load data to BigQuery table %s.'
Expand Down Expand Up @@ -904,13 +905,9 @@ def _load_data(
lambda x,
deleting_tables: deleting_tables,
pvalue.AsIter(temp_tables_pc))
# TableReference has no deterministic coder, but as this de-duplication
# is best-effort, pickling should be good enough.
| "RemoveTempTables/AddUselessValue" >>
beam.Map(lambda x: (pickle.dumps(x), None))
| "RemoveTempTables/AddUselessValue" >> beam.Map(lambda x: (x, None))
| "RemoveTempTables/DeduplicateTables" >> beam.GroupByKey()
| "RemoveTempTables/GetTableNames" >>
beam.MapTuple(lambda k, nones: pickle.loads(k))
| "RemoveTempTables/GetTableNames" >> beam.Keys()
| "RemoveTempTables/Delete" >> beam.ParDo(
DeleteTablesFn(self.test_client)))

Expand Down