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

Support job priority in BigQuery #1673

Merged
merged 2 commits into from
Aug 9, 2019
Merged

Support job priority in BigQuery #1673

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
65c3bf6
Support job priority in BigQuery
sjwhitworth Aug 8, 2019
be53b67
Add unit test for priority
sjwhitworth Aug 9, 2019
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: 11 additions & 0 deletions plugins/bigquery/dbt/adapters/bigquery/connections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
'location': {
'type': 'string',
},
'priority': {
'enum': ['interactive', 'batch'],
},
},
'required': ['method', 'database', 'schema'],
}
Expand Down Expand Up @@ -192,6 +195,14 @@ def raw_execute(self, sql, fetch=False):

job_config = google.cloud.bigquery.QueryJobConfig()
job_config.use_legacy_sql = False

priority = conn.credentials.get('priority', 'interactive')
if priority == "batch":
job_config.priority = google.cloud.bigquery.QueryPriority.BATCH
else:
job_config.priority = \
google.cloud.bigquery.QueryPriority.INTERACTIVE

query_job = client.query(sql, job_config)

# this blocks until the query has completed
Expand Down
17 changes: 17 additions & 0 deletions test/unit/test_bigquery_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ def setUp(self):
'schema': 'dummy_schema',
'threads': 1,
'location': 'Luna Station',
'priority': 'batch',
},
},
'target': 'oauth',
Expand Down Expand Up @@ -104,6 +105,22 @@ def test_acquire_connection_service_account_validations(self, mock_open_connecti

mock_open_connection.assert_called_once()

@patch('dbt.adapters.bigquery.BigQueryConnectionManager.open', return_value=_bq_conn())
def test_acquire_connection_priority(self, mock_open_connection):
adapter = self.get_adapter('loc')
try:
connection = adapter.acquire_connection('dummy')
self.assertEqual(connection.get('type'), 'bigquery')
self.assertEqual(connection.credentials.get('priority'), 'batch')

except dbt.exceptions.ValidationException as e:
self.fail('got ValidationException: {}'.format(str(e)))

except BaseException as e:
raise

mock_open_connection.assert_called_once()

def test_cancel_open_connections_empty(self):
adapter = self.get_adapter('oauth')
self.assertEqual(adapter.cancel_open_connections(), None)
Expand Down