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

Add location property to BigQuery data source settings #2513

Merged
merged 2 commits into from
Jul 31, 2018
Merged

Add location property to BigQuery data source settings #2513

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd1c5fa
Add location property to BigQuery data source settings
kyoshidajp May 4, 2018
5ca59a5
Change the way to get the default location
kyoshidajp Jul 25, 2018
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
33 changes: 27 additions & 6 deletions redash/query_runner/big_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,15 @@ def _load_key(filename):
f.close()


def _get_query_results(jobs, project_id, job_id, start_index):
query_reply = jobs.getQueryResults(projectId=project_id, jobId=job_id, startIndex=start_index).execute()
def _get_query_results(jobs, project_id, location, job_id, start_index):
query_reply = jobs.getQueryResults(projectId=project_id,
location=location,
jobId=job_id,
startIndex=start_index).execute()
logging.debug('query_reply %s', query_reply)
if not query_reply['jobComplete']:
time.sleep(10)
return _get_query_results(jobs, project_id, job_id, start_index)
return _get_query_results(jobs, project_id, location, job_id, start_index)

return query_reply

Expand Down Expand Up @@ -110,6 +113,10 @@ def configuration_schema(cls):
"type": "boolean",
'title': "Use Standard SQL (Beta)",
},
'location': {
"type": "string",
'title': 'Processing Location (default: US)',
Copy link
Member

Choose a reason for hiding this comment

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

For default values we have the default property of the configuration item.

},
'loadSchema': {
"type": "boolean",
"title": "Load Schema"
Expand All @@ -120,7 +127,7 @@ def configuration_schema(cls):
}
},
'required': ['jsonKeyFile', 'projectId'],
"order": ['projectId', 'jsonKeyFile', 'loadSchema', 'useStandardSql', 'totalMBytesProcessedLimit', 'maximumBillingTier', 'userDefinedFunctionResourceUri'],
"order": ['projectId', 'jsonKeyFile', 'loadSchema', 'useStandardSql', 'location', 'totalMBytesProcessedLimit', 'maximumBillingTier', 'userDefinedFunctionResourceUri'],
'secret': ['jsonKeyFile']
}

Expand Down Expand Up @@ -148,10 +155,15 @@ def _get_bigquery_service(self):
def _get_project_id(self):
return self.configuration["projectId"]

def _get_location(self):
location = self.configuration.get("location", "")
return "US" if location == "" else location
Copy link
Member

Choose a reason for hiding this comment

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

I think you can simplify this into:

def _get_location(self):
    return self.configuration.get("location", "US")

No?


def _get_total_bytes_processed(self, jobs, query):
job_data = {
"query": query,
"dryRun": True,
'location': self._get_location()
}

if self.configuration.get('useStandardSql', False):
Expand All @@ -169,6 +181,9 @@ def _get_query_result(self, jobs, query):
}
}
}
job_data['jobReference'] = {
'location': self._get_location()
}

if self.configuration.get('useStandardSql', False):
job_data['configuration']['query']['useLegacySql'] = False
Expand All @@ -183,7 +198,7 @@ def _get_query_result(self, jobs, query):

insert_response = jobs.insert(projectId=project_id, body=job_data).execute()
current_row = 0
query_reply = _get_query_results(jobs, project_id=project_id,
query_reply = _get_query_results(jobs, project_id=project_id, location=self._get_location(),
job_id=insert_response['jobReference']['jobId'], start_index=current_row)

logger.debug("bigquery replied: %s", query_reply)
Expand All @@ -195,7 +210,9 @@ def _get_query_result(self, jobs, query):
rows.append(transform_row(row, query_reply["schema"]["fields"]))

current_row += len(query_reply['rows'])
query_reply = jobs.getQueryResults(projectId=project_id, jobId=query_reply['jobReference']['jobId'],
query_reply = jobs.getQueryResults(projectId=project_id,
location=self._get_location(),
jobId=query_reply['jobReference']['jobId'],
startIndex=current_row).execute()

columns = [{'name': f["name"],
Expand Down Expand Up @@ -299,6 +316,10 @@ def configuration_schema(cls):
"type": "boolean",
'title': "Use Standard SQL (Beta)",
},
'location': {
"type": "string",
'title': 'Processing Location (default: US)',
},
'loadSchema': {
"type": "boolean",
"title": "Load Schema"
Expand Down