WIP: [AIRFLOW-1894] Google cloud bigquery#4607

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

Closed
jmcarp wants to merge 1 commit into from
Closed

WIP: [AIRFLOW-1894] Google cloud bigquery #4607

Show file tree
Hide file tree
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
1,433 changes: 363 additions & 1,070 deletions airflow/contrib/hooks/bigquery_hook.py
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions airflow/contrib/operators/bigquery_check_operator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class BigQueryCheckOperator(CheckOperator):
def __init__(self,
sql,
bigquery_conn_id='bigquery_default',
use_legacy_sql=True,
use_legacy_sql=False,

@kaxilkaxilFeb 12, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We shouldn't change this behaviour

*args, **kwargs):
super(BigQueryCheckOperator, self).__init__(sql=sql, *args, **kwargs)
self.bigquery_conn_id = bigquery_conn_id
Expand DownExpand Up@@ -92,7 +92,7 @@ def __init__(self, sql,
pass_value,
tolerance=None,
bigquery_conn_id='bigquery_default',
use_legacy_sql=True,
use_legacy_sql=False,
*args, **kwargs):
super(BigQueryValueCheckOperator, self).__init__(
sql=sql, pass_value=pass_value, tolerance=tolerance,
Expand DownExpand Up@@ -132,7 +132,7 @@ class BigQueryIntervalCheckOperator(IntervalCheckOperator):
@apply_defaults
def __init__(self, table, metrics_thresholds, date_filter_column='ds',
days_back=-7, bigquery_conn_id='bigquery_default',
use_legacy_sql=True, *args, **kwargs):
use_legacy_sql=False, *args, **kwargs):
super(BigQueryIntervalCheckOperator, self).__init__(
table=table, metrics_thresholds=metrics_thresholds,
date_filter_column=date_filter_column, days_back=days_back,
Expand Down
25 changes: 7 additions & 18 deletions airflow/contrib/operators/bigquery_get_data.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,21 +96,10 @@ def execute(self, context):
hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
delegate_to=self.delegate_to)

conn = hook.get_conn()
cursor = conn.cursor()
response = cursor.get_tabledata(dataset_id=self.dataset_id,
table_id=self.table_id,
max_results=self.max_results,
selected_fields=self.selected_fields)

self.log.info('Total Extracted rows: %s', response['totalRows'])
rows = response['rows']

table_data = []
for dict_row in rows:
single_row = []
for fields in dict_row['f']:
single_row.append(fields['v'])
table_data.append(single_row)

return table_data
rows = hook.get_tabledata(dataset_id=self.dataset_id,
table_id=self.table_id,
max_results=self.max_results,
selected_fields=self.selected_fields)
rows = list(rows)
self.log.info('Total Extracted rows: %s', len(rows))
return rows
59 changes: 19 additions & 40 deletions airflow/contrib/operators/bigquery_operator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ def __init__(self,
bigquery_conn_id='bigquery_default',
delegate_to=None,
udf_config=None,
use_legacy_sql=True,
use_legacy_sql=False,
maximum_billing_tier=None,
maximum_bytes_billed=None,
create_disposition='CREATE_IF_NEEDED',
Expand DownExpand Up@@ -147,25 +147,21 @@ def __init__(self,
self.schema_update_options = schema_update_options
self.query_params = query_params
self.labels = labels
self.bq_cursor = None
self.priority = priority
self.time_partitioning = time_partitioning
self.api_resource_configs = api_resource_configs
self.cluster_fields = cluster_fields
self.location = location

def execute(self, context):
if self.bq_cursor is None:
self.log.info('Executing: %s', self.sql)
hook = BigQueryHook(
bigquery_conn_id=self.bigquery_conn_id,
use_legacy_sql=self.use_legacy_sql,
delegate_to=self.delegate_to,
location=self.location,
)
conn = hook.get_conn()
self.bq_cursor = conn.cursor()
self.bq_cursor.run_query(
self.log.info('Executing: %s', self.sql)
hook = BigQueryHook(
bigquery_conn_id=self.bigquery_conn_id,
use_legacy_sql=self.use_legacy_sql,
delegate_to=self.delegate_to,
location=self.location,
)
hook.run_query(
sql=self.sql,
destination_dataset_table=self.destination_dataset_table,
write_disposition=self.write_disposition,
Expand All@@ -184,12 +180,6 @@ def execute(self, context):
cluster_fields=self.cluster_fields,
)

def on_kill(self):
super(BigQueryOperator, self).on_kill()
if self.bq_cursor is not None:
self.log.info('Cancelling running query')
self.bq_cursor.cancel_query()


class BigQueryCreateEmptyTableOperator(BaseOperator):
"""
Expand DownExpand Up@@ -328,10 +318,7 @@ def execute(self, context):
else:
schema_fields = self.schema_fields

conn = bq_hook.get_conn()
cursor = conn.cursor()

cursor.create_empty_table(
bq_hook.create_empty_table(
project_id=self.project_id,
dataset_id=self.dataset_id,
table_id=self.table_id,
Expand DownExpand Up@@ -408,8 +395,8 @@ class BigQueryCreateExternalTableOperator(BaseOperator):
work, the service account making the request must have domain-wide
delegation enabled.
:type delegate_to: str
:param src_fmt_configs: configure optional fields specific to the source format
:type src_fmt_configs: dict
:param external_config_options: configure optional fields specific to the source format
:type external_config_options: dict
:param labels: a dictionary containing labels for the table, passed to BigQuery
:type labels: dict
"""
Expand All@@ -435,7 +422,7 @@ def __init__(self,
bigquery_conn_id='bigquery_default',
google_cloud_storage_conn_id='google_cloud_default',
delegate_to=None,
src_fmt_configs={},
external_config_options=None,
labels=None,
*args, **kwargs):

Expand All@@ -462,7 +449,7 @@ def __init__(self,
self.google_cloud_storage_conn_id = google_cloud_storage_conn_id
self.delegate_to = delegate_to

self.src_fmt_configs = src_fmt_configs
self.external_config_options = external_config_options
self.labels = labels

def execute(self, context):
Expand All@@ -482,10 +469,8 @@ def execute(self, context):

source_uris = ['gs://{}/{}'.format(self.bucket, source_object)
for source_object in self.source_objects]
conn = bq_hook.get_conn()
cursor = conn.cursor()

cursor.create_external_table(
bq_hook.create_external_table(
external_project_dataset_table=self.destination_project_dataset_table,
schema_fields=schema_fields,
source_uris=source_uris,
Expand All@@ -497,8 +482,8 @@ def execute(self, context):
quote_character=self.quote_character,
allow_quoted_newlines=self.allow_quoted_newlines,
allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs,
labels=self.labels
external_config_options=self.external_config_options,

@kaxilkaxilFeb 12, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This will have to be for 2.0 as it will break things. Also, it needs to be backward-compatible to make updation smooth from 1.X to 2.0

@kaxilkaxilFeb 12, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Haven't yet reviewed the entire PR but schemed through it. Will try to find some time to look at it more thoroughly

labels=self.labels,
)


Expand DownExpand Up@@ -545,10 +530,7 @@ def execute(self, context):
bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
delegate_to=self.delegate_to)

conn = bq_hook.get_conn()
cursor = conn.cursor()

cursor.delete_dataset(
bq_hook.delete_dataset(
project_id=self.project_id,
dataset_id=self.dataset_id
)
Expand DownExpand Up@@ -608,10 +590,7 @@ def execute(self, context):
bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
delegate_to=self.delegate_to)

conn = bq_hook.get_conn()
cursor = conn.cursor()

cursor.create_empty_dataset(
bq_hook.create_empty_dataset(
project_id=self.project_id,
dataset_id=self.dataset_id,
dataset_reference=self.dataset_reference)
4 changes: 1 addition & 3 deletions airflow/contrib/operators/bigquery_table_delete_operator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,4 @@ def execute(self, context):
self.log.info('Deleting: %s', self.deletion_dataset_table)
hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
delegate_to=self.delegate_to)
conn = hook.get_conn()
cursor = conn.cursor()
cursor.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)
hook.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)
4 changes: 1 addition & 3 deletions airflow/contrib/operators/bigquery_to_bigquery.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,9 +85,7 @@ def execute(self, context):
)
hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
delegate_to=self.delegate_to)
conn = hook.get_conn()
cursor = conn.cursor()
cursor.run_copy(
hook.run_copy(
self.source_project_dataset_tables,
self.destination_project_dataset_table,
self.write_disposition,
Expand Down
4 changes: 1 addition & 3 deletions airflow/contrib/operators/bigquery_to_gcs.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ def execute(self, context):
self.destination_cloud_storage_uris)
hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
delegate_to=self.delegate_to)
conn = hook.get_conn()
cursor = conn.cursor()
cursor.run_extract(
hook.run_extract(
self.source_project_dataset_table,
self.destination_cloud_storage_uris,
self.compression,
Expand Down
14 changes: 5 additions & 9 deletions airflow/contrib/operators/gcs_to_bq.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ def __init__(self,
google_cloud_storage_conn_id='google_cloud_default',
delegate_to=None,
schema_update_options=(),
src_fmt_configs=None,
external_config_options=None,
external_table=False,
time_partitioning=None,
cluster_fields=None,
Expand All@@ -158,10 +158,6 @@ def __init__(self,
super(GoogleCloudStorageToBigQueryOperator, self).__init__(*args, **kwargs)

# GCS config
if src_fmt_configs is None:
src_fmt_configs = {}
if time_partitioning is None:
time_partitioning = {}
self.bucket = bucket
self.source_objects = source_objects
self.schema_object = schema_object
Expand All@@ -188,7 +184,7 @@ def __init__(self,
self.delegate_to = delegate_to

self.schema_update_options = schema_update_options
self.src_fmt_configs = src_fmt_configs
self.external_config_options, = external_config_options,
self.time_partitioning = time_partitioning
self.cluster_fields = cluster_fields
self.autodetect = autodetect
Expand DownExpand Up@@ -220,7 +216,7 @@ def execute(self, context):
cursor = conn.cursor()

if self.external_table:
cursor.create_external_table(
bq_hook.create_external_table(
external_project_dataset_table=self.destination_project_dataset_table,
schema_fields=schema_fields,
source_uris=source_uris,
Expand All@@ -233,10 +229,10 @@ def execute(self, context):
ignore_unknown_values=self.ignore_unknown_values,
allow_quoted_newlines=self.allow_quoted_newlines,
allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs
external_config_options=self.external_config_options,
)
else:
cursor.run_load(
bq_hook.run_load(
destination_project_dataset_table=self.destination_project_dataset_table,
schema_fields=schema_fields,
source_uris=source_uris,
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ def write_version(filename=os.path.join(*['airflow',
'google-auth-httplib2>=0.0.1',
'google-cloud-container>=0.1.1',
'google-cloud-bigtable==0.31.0',
'google-cloud-bigquery>=1.8.1',
'google-cloud-spanner>=1.7.1',
'grpcio-gcp>=0.2.2',
'PyOpenSSL',
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
WIP: [AIRFLOW-1894] Google cloud bigquery#4607

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

 Closed

jmcarp
wants to merge
1
commit into

from

 Closed


WIP: [AIRFLOW-1894] Google cloud bigquery
#4607
Show file tree
Hide file tree
 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


1,433 changes: 363 additions & 1,070 deletions
airflow/contrib/hooks/bigquery_hook.py

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 3 additions & 3 deletions
airflow/contrib/operators/bigquery_check_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class BigQueryCheckOperator(CheckOperator):
 def __init__(self,
 sql,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We shouldn't change this behaviour
 *args, **kwargs):
 super(BigQueryCheckOperator, self).__init__(sql=sql, *args, **kwargs)
 self.bigquery_conn_id = bigquery_conn_id
Expand DownExpand Up@@ -92,7 +92,7 @@ def __init__(self, sql,
 pass_value,
 tolerance=None,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
 *args, **kwargs):
 super(BigQueryValueCheckOperator, self).__init__(
 sql=sql, pass_value=pass_value, tolerance=tolerance,
Expand DownExpand Up@@ -132,7 +132,7 @@ class BigQueryIntervalCheckOperator(IntervalCheckOperator):
 @apply_defaults
 def __init__(self, table, metrics_thresholds, date_filter_column='ds',
 days_back=-7, bigquery_conn_id='bigquery_default',
 use_legacy_sql=True, *args, **kwargs):
 use_legacy_sql=False, *args, **kwargs):
 super(BigQueryIntervalCheckOperator, self).__init__(
 table=table, metrics_thresholds=metrics_thresholds,
 date_filter_column=date_filter_column, days_back=days_back,
Expand Down

25 changes: 7 additions & 18 deletions
airflow/contrib/operators/bigquery_get_data.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,21 +96,10 @@ def execute(self, context):
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = hook.get_conn()
 cursor = conn.cursor()
 response = cursor.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)

 self.log.info('Total Extracted rows: %s', response['totalRows'])
 rows = response['rows']

 table_data = []
 for dict_row in rows:
 single_row = []
 for fields in dict_row['f']:
 single_row.append(fields['v'])
 table_data.append(single_row)

 return table_data
 rows = hook.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)
 rows = list(rows)
 self.log.info('Total Extracted rows: %s', len(rows))
 return rows

59 changes: 19 additions & 40 deletions
airflow/contrib/operators/bigquery_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 delegate_to=None,
 udf_config=None,
 use_legacy_sql=True,
 use_legacy_sql=False,
 maximum_billing_tier=None,
 maximum_bytes_billed=None,
 create_disposition='CREATE_IF_NEEDED',
Expand DownExpand Up@@ -147,25 +147,21 @@ def __init__(self,
 self.schema_update_options = schema_update_options
 self.query_params = query_params
 self.labels = labels
 self.bq_cursor = None
 self.priority = priority
 self.time_partitioning = time_partitioning
 self.api_resource_configs = api_resource_configs
 self.cluster_fields = cluster_fields
 self.location = location

 def execute(self, context):
 if self.bq_cursor is None:
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 conn = hook.get_conn()
 self.bq_cursor = conn.cursor()
 self.bq_cursor.run_query(
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 hook.run_query(
 sql=self.sql,
 destination_dataset_table=self.destination_dataset_table,
 write_disposition=self.write_disposition,
Expand All@@ -184,12 +180,6 @@ def execute(self, context):
 cluster_fields=self.cluster_fields,
 )

 def on_kill(self):
 super(BigQueryOperator, self).on_kill()
 if self.bq_cursor is not None:
 self.log.info('Cancelling running query')
 self.bq_cursor.cancel_query()


class BigQueryCreateEmptyTableOperator(BaseOperator):
 """
Expand DownExpand Up@@ -328,10 +318,7 @@ def execute(self, context):
 else:
 schema_fields = self.schema_fields

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_table(
 bq_hook.create_empty_table(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 table_id=self.table_id,
Expand DownExpand Up@@ -408,8 +395,8 @@ class BigQueryCreateExternalTableOperator(BaseOperator):
 work, the service account making the request must have domain-wide
 delegation enabled.
 :type delegate_to: str
 :param src_fmt_configs: configure optional fields specific to the source format
 :type src_fmt_configs: dict
 :param external_config_options: configure optional fields specific to the source format
 :type external_config_options: dict
 :param labels: a dictionary containing labels for the table, passed to BigQuery
 :type labels: dict
 """
Expand All@@ -435,7 +422,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
src_fmt_configs={},
external_config_options=None,
 labels=None,
 *args, **kwargs):

Expand All@@ -462,7 +449,7 @@ def __init__(self,
 self.google_cloud_storage_conn_id = google_cloud_storage_conn_id
 self.delegate_to = delegate_to

 self.src_fmt_configs = src_fmt_configs
 self.external_config_options = external_config_options
 self.labels = labels

 def execute(self, context):
Expand All@@ -482,10 +469,8 @@ def execute(self, context):

 source_uris = ['gs://{}/{}'.format(self.bucket, source_object)
 for source_object in self.source_objects]
 conn = bq_hook.get_conn()
 cursor = conn.cursor()

cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -497,8 +482,8 @@ def execute(self, context):
 quote_character=self.quote_character,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs,
 labels=self.labels
external_config_options=self.external_config_options,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This will have to be for 2.0 as it will break things. Also, it needs to be backward-compatible to make updation smooth from 1.X to 2.0
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Haven't yet reviewed the entire PR but schemed through it. Will try to find some time to look at it more thoroughly
 labels=self.labels,
 )


Expand DownExpand Up@@ -545,10 +530,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.delete_dataset(
 bq_hook.delete_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id
 )
Expand DownExpand Up@@ -608,10 +590,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_dataset(
 bq_hook.create_empty_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 dataset_reference=self.dataset_reference)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_table_delete_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,4 @@ def execute(self, context):
 self.log.info('Deleting: %s', self.deletion_dataset_table)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)
 hook.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_bigquery.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,9 +85,7 @@ def execute(self, context):
 )
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_copy(
 hook.run_copy(
 self.source_project_dataset_tables,
 self.destination_project_dataset_table,
 self.write_disposition,
Expand Down

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_gcs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ def execute(self, context):
 self.destination_cloud_storage_uris)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_extract(
 hook.run_extract(
 self.source_project_dataset_table,
 self.destination_cloud_storage_uris,
 self.compression,
Expand Down

14 changes: 5 additions & 9 deletions
airflow/contrib/operators/gcs_to_bq.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ def __init__(self,
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
 schema_update_options=(),
src_fmt_configs=None,
external_config_options=None,
 external_table=False,
 time_partitioning=None,
 cluster_fields=None,
Expand All@@ -158,10 +158,6 @@ def __init__(self,
 super(GoogleCloudStorageToBigQueryOperator, self).__init__(*args, **kwargs)

 # GCS config
 if src_fmt_configs is None:
 src_fmt_configs = {}
 if time_partitioning is None:
 time_partitioning = {}
 self.bucket = bucket
 self.source_objects = source_objects
 self.schema_object = schema_object
Expand All@@ -188,7 +184,7 @@ def __init__(self,
 self.delegate_to = delegate_to

 self.schema_update_options = schema_update_options
 self.src_fmt_configs = src_fmt_configs
 self.external_config_options, = external_config_options,
 self.time_partitioning = time_partitioning
 self.cluster_fields = cluster_fields
 self.autodetect = autodetect
Expand DownExpand Up@@ -220,7 +216,7 @@ def execute(self, context):
 cursor = conn.cursor()

 if self.external_table:
cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -233,10 +229,10 @@ def execute(self, context):
 ignore_unknown_values=self.ignore_unknown_values,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs
external_config_options=self.external_config_options,
 )
 else:
cursor.run_load(
bq_hook.run_load(
 destination_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand Down

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ def write_version(filename=os.path.join(*['airflow',
 'google-auth-httplib2>=0.0.1',
 'google-cloud-container>=0.1.1',
 'google-cloud-bigtable==0.31.0',
 'google-cloud-bigquery>=1.8.1',
 'google-cloud-spanner>=1.7.1',
 'grpcio-gcp>=0.2.2',
 'PyOpenSSL',
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
WIP: [AIRFLOW-1894] Google cloud bigquery#4607

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

 Closed

jmcarp
wants to merge
1
commit into

from

 Closed


WIP: [AIRFLOW-1894] Google cloud bigquery
#4607
Show file tree
Hide file tree
 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


1,433 changes: 363 additions & 1,070 deletions
airflow/contrib/hooks/bigquery_hook.py

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 3 additions & 3 deletions
airflow/contrib/operators/bigquery_check_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class BigQueryCheckOperator(CheckOperator):
 def __init__(self,
 sql,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We shouldn't change this behaviour
 *args, **kwargs):
 super(BigQueryCheckOperator, self).__init__(sql=sql, *args, **kwargs)
 self.bigquery_conn_id = bigquery_conn_id
Expand DownExpand Up@@ -92,7 +92,7 @@ def __init__(self, sql,
 pass_value,
 tolerance=None,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
 *args, **kwargs):
 super(BigQueryValueCheckOperator, self).__init__(
 sql=sql, pass_value=pass_value, tolerance=tolerance,
Expand DownExpand Up@@ -132,7 +132,7 @@ class BigQueryIntervalCheckOperator(IntervalCheckOperator):
 @apply_defaults
 def __init__(self, table, metrics_thresholds, date_filter_column='ds',
 days_back=-7, bigquery_conn_id='bigquery_default',
 use_legacy_sql=True, *args, **kwargs):
 use_legacy_sql=False, *args, **kwargs):
 super(BigQueryIntervalCheckOperator, self).__init__(
 table=table, metrics_thresholds=metrics_thresholds,
 date_filter_column=date_filter_column, days_back=days_back,
Expand Down

25 changes: 7 additions & 18 deletions
airflow/contrib/operators/bigquery_get_data.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,21 +96,10 @@ def execute(self, context):
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = hook.get_conn()
 cursor = conn.cursor()
 response = cursor.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)

 self.log.info('Total Extracted rows: %s', response['totalRows'])
 rows = response['rows']

 table_data = []
 for dict_row in rows:
 single_row = []
 for fields in dict_row['f']:
 single_row.append(fields['v'])
 table_data.append(single_row)

 return table_data
 rows = hook.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)
 rows = list(rows)
 self.log.info('Total Extracted rows: %s', len(rows))
 return rows

59 changes: 19 additions & 40 deletions
airflow/contrib/operators/bigquery_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 delegate_to=None,
 udf_config=None,
 use_legacy_sql=True,
 use_legacy_sql=False,
 maximum_billing_tier=None,
 maximum_bytes_billed=None,
 create_disposition='CREATE_IF_NEEDED',
Expand DownExpand Up@@ -147,25 +147,21 @@ def __init__(self,
 self.schema_update_options = schema_update_options
 self.query_params = query_params
 self.labels = labels
 self.bq_cursor = None
 self.priority = priority
 self.time_partitioning = time_partitioning
 self.api_resource_configs = api_resource_configs
 self.cluster_fields = cluster_fields
 self.location = location

 def execute(self, context):
 if self.bq_cursor is None:
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 conn = hook.get_conn()
 self.bq_cursor = conn.cursor()
 self.bq_cursor.run_query(
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 hook.run_query(
 sql=self.sql,
 destination_dataset_table=self.destination_dataset_table,
 write_disposition=self.write_disposition,
Expand All@@ -184,12 +180,6 @@ def execute(self, context):
 cluster_fields=self.cluster_fields,
 )

 def on_kill(self):
 super(BigQueryOperator, self).on_kill()
 if self.bq_cursor is not None:
 self.log.info('Cancelling running query')
 self.bq_cursor.cancel_query()


class BigQueryCreateEmptyTableOperator(BaseOperator):
 """
Expand DownExpand Up@@ -328,10 +318,7 @@ def execute(self, context):
 else:
 schema_fields = self.schema_fields

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_table(
 bq_hook.create_empty_table(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 table_id=self.table_id,
Expand DownExpand Up@@ -408,8 +395,8 @@ class BigQueryCreateExternalTableOperator(BaseOperator):
 work, the service account making the request must have domain-wide
 delegation enabled.
 :type delegate_to: str
 :param src_fmt_configs: configure optional fields specific to the source format
 :type src_fmt_configs: dict
 :param external_config_options: configure optional fields specific to the source format
 :type external_config_options: dict
 :param labels: a dictionary containing labels for the table, passed to BigQuery
 :type labels: dict
 """
Expand All@@ -435,7 +422,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
src_fmt_configs={},
external_config_options=None,
 labels=None,
 *args, **kwargs):

Expand All@@ -462,7 +449,7 @@ def __init__(self,
 self.google_cloud_storage_conn_id = google_cloud_storage_conn_id
 self.delegate_to = delegate_to

 self.src_fmt_configs = src_fmt_configs
 self.external_config_options = external_config_options
 self.labels = labels

 def execute(self, context):
Expand All@@ -482,10 +469,8 @@ def execute(self, context):

 source_uris = ['gs://{}/{}'.format(self.bucket, source_object)
 for source_object in self.source_objects]
 conn = bq_hook.get_conn()
 cursor = conn.cursor()

cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -497,8 +482,8 @@ def execute(self, context):
 quote_character=self.quote_character,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs,
 labels=self.labels
external_config_options=self.external_config_options,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This will have to be for 2.0 as it will break things. Also, it needs to be backward-compatible to make updation smooth from 1.X to 2.0
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Haven't yet reviewed the entire PR but schemed through it. Will try to find some time to look at it more thoroughly
 labels=self.labels,
 )


Expand DownExpand Up@@ -545,10 +530,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.delete_dataset(
 bq_hook.delete_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id
 )
Expand DownExpand Up@@ -608,10 +590,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_dataset(
 bq_hook.create_empty_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 dataset_reference=self.dataset_reference)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_table_delete_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,4 @@ def execute(self, context):
 self.log.info('Deleting: %s', self.deletion_dataset_table)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)
 hook.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_bigquery.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,9 +85,7 @@ def execute(self, context):
 )
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_copy(
 hook.run_copy(
 self.source_project_dataset_tables,
 self.destination_project_dataset_table,
 self.write_disposition,
Expand Down

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_gcs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ def execute(self, context):
 self.destination_cloud_storage_uris)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_extract(
 hook.run_extract(
 self.source_project_dataset_table,
 self.destination_cloud_storage_uris,
 self.compression,
Expand Down

14 changes: 5 additions & 9 deletions
airflow/contrib/operators/gcs_to_bq.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ def __init__(self,
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
 schema_update_options=(),
src_fmt_configs=None,
external_config_options=None,
 external_table=False,
 time_partitioning=None,
 cluster_fields=None,
Expand All@@ -158,10 +158,6 @@ def __init__(self,
 super(GoogleCloudStorageToBigQueryOperator, self).__init__(*args, **kwargs)

 # GCS config
 if src_fmt_configs is None:
 src_fmt_configs = {}
 if time_partitioning is None:
 time_partitioning = {}
 self.bucket = bucket
 self.source_objects = source_objects
 self.schema_object = schema_object
Expand All@@ -188,7 +184,7 @@ def __init__(self,
 self.delegate_to = delegate_to

 self.schema_update_options = schema_update_options
 self.src_fmt_configs = src_fmt_configs
 self.external_config_options, = external_config_options,
 self.time_partitioning = time_partitioning
 self.cluster_fields = cluster_fields
 self.autodetect = autodetect
Expand DownExpand Up@@ -220,7 +216,7 @@ def execute(self, context):
 cursor = conn.cursor()

 if self.external_table:
cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -233,10 +229,10 @@ def execute(self, context):
 ignore_unknown_values=self.ignore_unknown_values,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs
external_config_options=self.external_config_options,
 )
 else:
cursor.run_load(
bq_hook.run_load(
 destination_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand Down

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ def write_version(filename=os.path.join(*['airflow',
 'google-auth-httplib2>=0.0.1',
 'google-cloud-container>=0.1.1',
 'google-cloud-bigtable==0.31.0',
 'google-cloud-bigquery>=1.8.1',
 'google-cloud-spanner>=1.7.1',
 'grpcio-gcp>=0.2.2',
 'PyOpenSSL',
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
WIP: [AIRFLOW-1894] Google cloud bigquery#4607

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

 Closed

jmcarp
wants to merge
1
commit into

from

 Closed


WIP: [AIRFLOW-1894] Google cloud bigquery
#4607
Show file tree
Hide file tree
 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


1,433 changes: 363 additions & 1,070 deletions
airflow/contrib/hooks/bigquery_hook.py

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 3 additions & 3 deletions
airflow/contrib/operators/bigquery_check_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class BigQueryCheckOperator(CheckOperator):
 def __init__(self,
 sql,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We shouldn't change this behaviour
 *args, **kwargs):
 super(BigQueryCheckOperator, self).__init__(sql=sql, *args, **kwargs)
 self.bigquery_conn_id = bigquery_conn_id
Expand DownExpand Up@@ -92,7 +92,7 @@ def __init__(self, sql,
 pass_value,
 tolerance=None,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
 *args, **kwargs):
 super(BigQueryValueCheckOperator, self).__init__(
 sql=sql, pass_value=pass_value, tolerance=tolerance,
Expand DownExpand Up@@ -132,7 +132,7 @@ class BigQueryIntervalCheckOperator(IntervalCheckOperator):
 @apply_defaults
 def __init__(self, table, metrics_thresholds, date_filter_column='ds',
 days_back=-7, bigquery_conn_id='bigquery_default',
 use_legacy_sql=True, *args, **kwargs):
 use_legacy_sql=False, *args, **kwargs):
 super(BigQueryIntervalCheckOperator, self).__init__(
 table=table, metrics_thresholds=metrics_thresholds,
 date_filter_column=date_filter_column, days_back=days_back,
Expand Down

25 changes: 7 additions & 18 deletions
airflow/contrib/operators/bigquery_get_data.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,21 +96,10 @@ def execute(self, context):
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = hook.get_conn()
 cursor = conn.cursor()
 response = cursor.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)

 self.log.info('Total Extracted rows: %s', response['totalRows'])
 rows = response['rows']

 table_data = []
 for dict_row in rows:
 single_row = []
 for fields in dict_row['f']:
 single_row.append(fields['v'])
 table_data.append(single_row)

 return table_data
 rows = hook.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)
 rows = list(rows)
 self.log.info('Total Extracted rows: %s', len(rows))
 return rows

59 changes: 19 additions & 40 deletions
airflow/contrib/operators/bigquery_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 delegate_to=None,
 udf_config=None,
 use_legacy_sql=True,
 use_legacy_sql=False,
 maximum_billing_tier=None,
 maximum_bytes_billed=None,
 create_disposition='CREATE_IF_NEEDED',
Expand DownExpand Up@@ -147,25 +147,21 @@ def __init__(self,
 self.schema_update_options = schema_update_options
 self.query_params = query_params
 self.labels = labels
 self.bq_cursor = None
 self.priority = priority
 self.time_partitioning = time_partitioning
 self.api_resource_configs = api_resource_configs
 self.cluster_fields = cluster_fields
 self.location = location

 def execute(self, context):
 if self.bq_cursor is None:
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 conn = hook.get_conn()
 self.bq_cursor = conn.cursor()
 self.bq_cursor.run_query(
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 hook.run_query(
 sql=self.sql,
 destination_dataset_table=self.destination_dataset_table,
 write_disposition=self.write_disposition,
Expand All@@ -184,12 +180,6 @@ def execute(self, context):
 cluster_fields=self.cluster_fields,
 )

 def on_kill(self):
 super(BigQueryOperator, self).on_kill()
 if self.bq_cursor is not None:
 self.log.info('Cancelling running query')
 self.bq_cursor.cancel_query()


class BigQueryCreateEmptyTableOperator(BaseOperator):
 """
Expand DownExpand Up@@ -328,10 +318,7 @@ def execute(self, context):
 else:
 schema_fields = self.schema_fields

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_table(
 bq_hook.create_empty_table(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 table_id=self.table_id,
Expand DownExpand Up@@ -408,8 +395,8 @@ class BigQueryCreateExternalTableOperator(BaseOperator):
 work, the service account making the request must have domain-wide
 delegation enabled.
 :type delegate_to: str
 :param src_fmt_configs: configure optional fields specific to the source format
 :type src_fmt_configs: dict
 :param external_config_options: configure optional fields specific to the source format
 :type external_config_options: dict
 :param labels: a dictionary containing labels for the table, passed to BigQuery
 :type labels: dict
 """
Expand All@@ -435,7 +422,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
src_fmt_configs={},
external_config_options=None,
 labels=None,
 *args, **kwargs):

Expand All@@ -462,7 +449,7 @@ def __init__(self,
 self.google_cloud_storage_conn_id = google_cloud_storage_conn_id
 self.delegate_to = delegate_to

 self.src_fmt_configs = src_fmt_configs
 self.external_config_options = external_config_options
 self.labels = labels

 def execute(self, context):
Expand All@@ -482,10 +469,8 @@ def execute(self, context):

 source_uris = ['gs://{}/{}'.format(self.bucket, source_object)
 for source_object in self.source_objects]
 conn = bq_hook.get_conn()
 cursor = conn.cursor()

cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -497,8 +482,8 @@ def execute(self, context):
 quote_character=self.quote_character,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs,
 labels=self.labels
external_config_options=self.external_config_options,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This will have to be for 2.0 as it will break things. Also, it needs to be backward-compatible to make updation smooth from 1.X to 2.0
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Haven't yet reviewed the entire PR but schemed through it. Will try to find some time to look at it more thoroughly
 labels=self.labels,
 )


Expand DownExpand Up@@ -545,10 +530,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.delete_dataset(
 bq_hook.delete_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id
 )
Expand DownExpand Up@@ -608,10 +590,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_dataset(
 bq_hook.create_empty_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 dataset_reference=self.dataset_reference)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_table_delete_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,4 @@ def execute(self, context):
 self.log.info('Deleting: %s', self.deletion_dataset_table)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)
 hook.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_bigquery.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,9 +85,7 @@ def execute(self, context):
 )
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_copy(
 hook.run_copy(
 self.source_project_dataset_tables,
 self.destination_project_dataset_table,
 self.write_disposition,
Expand Down

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_gcs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ def execute(self, context):
 self.destination_cloud_storage_uris)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_extract(
 hook.run_extract(
 self.source_project_dataset_table,
 self.destination_cloud_storage_uris,
 self.compression,
Expand Down

14 changes: 5 additions & 9 deletions
airflow/contrib/operators/gcs_to_bq.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ def __init__(self,
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
 schema_update_options=(),
src_fmt_configs=None,
external_config_options=None,
 external_table=False,
 time_partitioning=None,
 cluster_fields=None,
Expand All@@ -158,10 +158,6 @@ def __init__(self,
 super(GoogleCloudStorageToBigQueryOperator, self).__init__(*args, **kwargs)

 # GCS config
 if src_fmt_configs is None:
 src_fmt_configs = {}
 if time_partitioning is None:
 time_partitioning = {}
 self.bucket = bucket
 self.source_objects = source_objects
 self.schema_object = schema_object
Expand All@@ -188,7 +184,7 @@ def __init__(self,
 self.delegate_to = delegate_to

 self.schema_update_options = schema_update_options
 self.src_fmt_configs = src_fmt_configs
 self.external_config_options, = external_config_options,
 self.time_partitioning = time_partitioning
 self.cluster_fields = cluster_fields
 self.autodetect = autodetect
Expand DownExpand Up@@ -220,7 +216,7 @@ def execute(self, context):
 cursor = conn.cursor()

 if self.external_table:
cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -233,10 +229,10 @@ def execute(self, context):
 ignore_unknown_values=self.ignore_unknown_values,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs
external_config_options=self.external_config_options,
 )
 else:
cursor.run_load(
bq_hook.run_load(
 destination_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand Down

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ def write_version(filename=os.path.join(*['airflow',
 'google-auth-httplib2>=0.0.1',
 'google-cloud-container>=0.1.1',
 'google-cloud-bigtable==0.31.0',
 'google-cloud-bigquery>=1.8.1',
 'google-cloud-spanner>=1.7.1',
 'grpcio-gcp>=0.2.2',
 'PyOpenSSL',
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
WIP: [AIRFLOW-1894] Google cloud bigquery#4607

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

 Closed

jmcarp
wants to merge
1
commit into

from

 Closed


WIP: [AIRFLOW-1894] Google cloud bigquery
#4607
Show file tree
Hide file tree
 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


1,433 changes: 363 additions & 1,070 deletions
airflow/contrib/hooks/bigquery_hook.py

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 3 additions & 3 deletions
airflow/contrib/operators/bigquery_check_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class BigQueryCheckOperator(CheckOperator):
 def __init__(self,
 sql,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We shouldn't change this behaviour
 *args, **kwargs):
 super(BigQueryCheckOperator, self).__init__(sql=sql, *args, **kwargs)
 self.bigquery_conn_id = bigquery_conn_id
Expand DownExpand Up@@ -92,7 +92,7 @@ def __init__(self, sql,
 pass_value,
 tolerance=None,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
 *args, **kwargs):
 super(BigQueryValueCheckOperator, self).__init__(
 sql=sql, pass_value=pass_value, tolerance=tolerance,
Expand DownExpand Up@@ -132,7 +132,7 @@ class BigQueryIntervalCheckOperator(IntervalCheckOperator):
 @apply_defaults
 def __init__(self, table, metrics_thresholds, date_filter_column='ds',
 days_back=-7, bigquery_conn_id='bigquery_default',
 use_legacy_sql=True, *args, **kwargs):
 use_legacy_sql=False, *args, **kwargs):
 super(BigQueryIntervalCheckOperator, self).__init__(
 table=table, metrics_thresholds=metrics_thresholds,
 date_filter_column=date_filter_column, days_back=days_back,
Expand Down

25 changes: 7 additions & 18 deletions
airflow/contrib/operators/bigquery_get_data.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,21 +96,10 @@ def execute(self, context):
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = hook.get_conn()
 cursor = conn.cursor()
 response = cursor.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)

 self.log.info('Total Extracted rows: %s', response['totalRows'])
 rows = response['rows']

 table_data = []
 for dict_row in rows:
 single_row = []
 for fields in dict_row['f']:
 single_row.append(fields['v'])
 table_data.append(single_row)

 return table_data
 rows = hook.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)
 rows = list(rows)
 self.log.info('Total Extracted rows: %s', len(rows))
 return rows

59 changes: 19 additions & 40 deletions
airflow/contrib/operators/bigquery_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 delegate_to=None,
 udf_config=None,
 use_legacy_sql=True,
 use_legacy_sql=False,
 maximum_billing_tier=None,
 maximum_bytes_billed=None,
 create_disposition='CREATE_IF_NEEDED',
Expand DownExpand Up@@ -147,25 +147,21 @@ def __init__(self,
 self.schema_update_options = schema_update_options
 self.query_params = query_params
 self.labels = labels
 self.bq_cursor = None
 self.priority = priority
 self.time_partitioning = time_partitioning
 self.api_resource_configs = api_resource_configs
 self.cluster_fields = cluster_fields
 self.location = location

 def execute(self, context):
 if self.bq_cursor is None:
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 conn = hook.get_conn()
 self.bq_cursor = conn.cursor()
 self.bq_cursor.run_query(
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 hook.run_query(
 sql=self.sql,
 destination_dataset_table=self.destination_dataset_table,
 write_disposition=self.write_disposition,
Expand All@@ -184,12 +180,6 @@ def execute(self, context):
 cluster_fields=self.cluster_fields,
 )

 def on_kill(self):
 super(BigQueryOperator, self).on_kill()
 if self.bq_cursor is not None:
 self.log.info('Cancelling running query')
 self.bq_cursor.cancel_query()


class BigQueryCreateEmptyTableOperator(BaseOperator):
 """
Expand DownExpand Up@@ -328,10 +318,7 @@ def execute(self, context):
 else:
 schema_fields = self.schema_fields

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_table(
 bq_hook.create_empty_table(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 table_id=self.table_id,
Expand DownExpand Up@@ -408,8 +395,8 @@ class BigQueryCreateExternalTableOperator(BaseOperator):
 work, the service account making the request must have domain-wide
 delegation enabled.
 :type delegate_to: str
 :param src_fmt_configs: configure optional fields specific to the source format
 :type src_fmt_configs: dict
 :param external_config_options: configure optional fields specific to the source format
 :type external_config_options: dict
 :param labels: a dictionary containing labels for the table, passed to BigQuery
 :type labels: dict
 """
Expand All@@ -435,7 +422,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
src_fmt_configs={},
external_config_options=None,
 labels=None,
 *args, **kwargs):

Expand All@@ -462,7 +449,7 @@ def __init__(self,
 self.google_cloud_storage_conn_id = google_cloud_storage_conn_id
 self.delegate_to = delegate_to

 self.src_fmt_configs = src_fmt_configs
 self.external_config_options = external_config_options
 self.labels = labels

 def execute(self, context):
Expand All@@ -482,10 +469,8 @@ def execute(self, context):

 source_uris = ['gs://{}/{}'.format(self.bucket, source_object)
 for source_object in self.source_objects]
 conn = bq_hook.get_conn()
 cursor = conn.cursor()

cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -497,8 +482,8 @@ def execute(self, context):
 quote_character=self.quote_character,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs,
 labels=self.labels
external_config_options=self.external_config_options,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This will have to be for 2.0 as it will break things. Also, it needs to be backward-compatible to make updation smooth from 1.X to 2.0
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Haven't yet reviewed the entire PR but schemed through it. Will try to find some time to look at it more thoroughly
 labels=self.labels,
 )


Expand DownExpand Up@@ -545,10 +530,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.delete_dataset(
 bq_hook.delete_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id
 )
Expand DownExpand Up@@ -608,10 +590,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_dataset(
 bq_hook.create_empty_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 dataset_reference=self.dataset_reference)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_table_delete_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,4 @@ def execute(self, context):
 self.log.info('Deleting: %s', self.deletion_dataset_table)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)
 hook.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_bigquery.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,9 +85,7 @@ def execute(self, context):
 )
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_copy(
 hook.run_copy(
 self.source_project_dataset_tables,
 self.destination_project_dataset_table,
 self.write_disposition,
Expand Down

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_gcs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ def execute(self, context):
 self.destination_cloud_storage_uris)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_extract(
 hook.run_extract(
 self.source_project_dataset_table,
 self.destination_cloud_storage_uris,
 self.compression,
Expand Down

14 changes: 5 additions & 9 deletions
airflow/contrib/operators/gcs_to_bq.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ def __init__(self,
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
 schema_update_options=(),
src_fmt_configs=None,
external_config_options=None,
 external_table=False,
 time_partitioning=None,
 cluster_fields=None,
Expand All@@ -158,10 +158,6 @@ def __init__(self,
 super(GoogleCloudStorageToBigQueryOperator, self).__init__(*args, **kwargs)

 # GCS config
 if src_fmt_configs is None:
 src_fmt_configs = {}
 if time_partitioning is None:
 time_partitioning = {}
 self.bucket = bucket
 self.source_objects = source_objects
 self.schema_object = schema_object
Expand All@@ -188,7 +184,7 @@ def __init__(self,
 self.delegate_to = delegate_to

 self.schema_update_options = schema_update_options
 self.src_fmt_configs = src_fmt_configs
 self.external_config_options, = external_config_options,
 self.time_partitioning = time_partitioning
 self.cluster_fields = cluster_fields
 self.autodetect = autodetect
Expand DownExpand Up@@ -220,7 +216,7 @@ def execute(self, context):
 cursor = conn.cursor()

 if self.external_table:
cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -233,10 +229,10 @@ def execute(self, context):
 ignore_unknown_values=self.ignore_unknown_values,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs
external_config_options=self.external_config_options,
 )
 else:
cursor.run_load(
bq_hook.run_load(
 destination_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand Down

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ def write_version(filename=os.path.join(*['airflow',
 'google-auth-httplib2>=0.0.1',
 'google-cloud-container>=0.1.1',
 'google-cloud-bigtable==0.31.0',
 'google-cloud-bigquery>=1.8.1',
 'google-cloud-spanner>=1.7.1',
 'grpcio-gcp>=0.2.2',
 'PyOpenSSL',
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
WIP: [AIRFLOW-1894] Google cloud bigquery#4607

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

 Closed

jmcarp
wants to merge
1
commit into

from

 Closed


WIP: [AIRFLOW-1894] Google cloud bigquery
#4607
Show file tree
Hide file tree
 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


1,433 changes: 363 additions & 1,070 deletions
airflow/contrib/hooks/bigquery_hook.py

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 3 additions & 3 deletions
airflow/contrib/operators/bigquery_check_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class BigQueryCheckOperator(CheckOperator):
 def __init__(self,
 sql,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We shouldn't change this behaviour
 *args, **kwargs):
 super(BigQueryCheckOperator, self).__init__(sql=sql, *args, **kwargs)
 self.bigquery_conn_id = bigquery_conn_id
Expand DownExpand Up@@ -92,7 +92,7 @@ def __init__(self, sql,
 pass_value,
 tolerance=None,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
 *args, **kwargs):
 super(BigQueryValueCheckOperator, self).__init__(
 sql=sql, pass_value=pass_value, tolerance=tolerance,
Expand DownExpand Up@@ -132,7 +132,7 @@ class BigQueryIntervalCheckOperator(IntervalCheckOperator):
 @apply_defaults
 def __init__(self, table, metrics_thresholds, date_filter_column='ds',
 days_back=-7, bigquery_conn_id='bigquery_default',
 use_legacy_sql=True, *args, **kwargs):
 use_legacy_sql=False, *args, **kwargs):
 super(BigQueryIntervalCheckOperator, self).__init__(
 table=table, metrics_thresholds=metrics_thresholds,
 date_filter_column=date_filter_column, days_back=days_back,
Expand Down

25 changes: 7 additions & 18 deletions
airflow/contrib/operators/bigquery_get_data.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,21 +96,10 @@ def execute(self, context):
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = hook.get_conn()
 cursor = conn.cursor()
 response = cursor.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)

 self.log.info('Total Extracted rows: %s', response['totalRows'])
 rows = response['rows']

 table_data = []
 for dict_row in rows:
 single_row = []
 for fields in dict_row['f']:
 single_row.append(fields['v'])
 table_data.append(single_row)

 return table_data
 rows = hook.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)
 rows = list(rows)
 self.log.info('Total Extracted rows: %s', len(rows))
 return rows

59 changes: 19 additions & 40 deletions
airflow/contrib/operators/bigquery_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 delegate_to=None,
 udf_config=None,
 use_legacy_sql=True,
 use_legacy_sql=False,
 maximum_billing_tier=None,
 maximum_bytes_billed=None,
 create_disposition='CREATE_IF_NEEDED',
Expand DownExpand Up@@ -147,25 +147,21 @@ def __init__(self,
 self.schema_update_options = schema_update_options
 self.query_params = query_params
 self.labels = labels
 self.bq_cursor = None
 self.priority = priority
 self.time_partitioning = time_partitioning
 self.api_resource_configs = api_resource_configs
 self.cluster_fields = cluster_fields
 self.location = location

 def execute(self, context):
 if self.bq_cursor is None:
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 conn = hook.get_conn()
 self.bq_cursor = conn.cursor()
 self.bq_cursor.run_query(
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 hook.run_query(
 sql=self.sql,
 destination_dataset_table=self.destination_dataset_table,
 write_disposition=self.write_disposition,
Expand All@@ -184,12 +180,6 @@ def execute(self, context):
 cluster_fields=self.cluster_fields,
 )

 def on_kill(self):
 super(BigQueryOperator, self).on_kill()
 if self.bq_cursor is not None:
 self.log.info('Cancelling running query')
 self.bq_cursor.cancel_query()


class BigQueryCreateEmptyTableOperator(BaseOperator):
 """
Expand DownExpand Up@@ -328,10 +318,7 @@ def execute(self, context):
 else:
 schema_fields = self.schema_fields

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_table(
 bq_hook.create_empty_table(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 table_id=self.table_id,
Expand DownExpand Up@@ -408,8 +395,8 @@ class BigQueryCreateExternalTableOperator(BaseOperator):
 work, the service account making the request must have domain-wide
 delegation enabled.
 :type delegate_to: str
 :param src_fmt_configs: configure optional fields specific to the source format
 :type src_fmt_configs: dict
 :param external_config_options: configure optional fields specific to the source format
 :type external_config_options: dict
 :param labels: a dictionary containing labels for the table, passed to BigQuery
 :type labels: dict
 """
Expand All@@ -435,7 +422,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
src_fmt_configs={},
external_config_options=None,
 labels=None,
 *args, **kwargs):

Expand All@@ -462,7 +449,7 @@ def __init__(self,
 self.google_cloud_storage_conn_id = google_cloud_storage_conn_id
 self.delegate_to = delegate_to

 self.src_fmt_configs = src_fmt_configs
 self.external_config_options = external_config_options
 self.labels = labels

 def execute(self, context):
Expand All@@ -482,10 +469,8 @@ def execute(self, context):

 source_uris = ['gs://{}/{}'.format(self.bucket, source_object)
 for source_object in self.source_objects]
 conn = bq_hook.get_conn()
 cursor = conn.cursor()

cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -497,8 +482,8 @@ def execute(self, context):
 quote_character=self.quote_character,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs,
 labels=self.labels
external_config_options=self.external_config_options,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This will have to be for 2.0 as it will break things. Also, it needs to be backward-compatible to make updation smooth from 1.X to 2.0
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Haven't yet reviewed the entire PR but schemed through it. Will try to find some time to look at it more thoroughly
 labels=self.labels,
 )


Expand DownExpand Up@@ -545,10 +530,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.delete_dataset(
 bq_hook.delete_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id
 )
Expand DownExpand Up@@ -608,10 +590,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_dataset(
 bq_hook.create_empty_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 dataset_reference=self.dataset_reference)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_table_delete_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,4 @@ def execute(self, context):
 self.log.info('Deleting: %s', self.deletion_dataset_table)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)
 hook.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_bigquery.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,9 +85,7 @@ def execute(self, context):
 )
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_copy(
 hook.run_copy(
 self.source_project_dataset_tables,
 self.destination_project_dataset_table,
 self.write_disposition,
Expand Down

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_gcs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ def execute(self, context):
 self.destination_cloud_storage_uris)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_extract(
 hook.run_extract(
 self.source_project_dataset_table,
 self.destination_cloud_storage_uris,
 self.compression,
Expand Down

14 changes: 5 additions & 9 deletions
airflow/contrib/operators/gcs_to_bq.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ def __init__(self,
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
 schema_update_options=(),
src_fmt_configs=None,
external_config_options=None,
 external_table=False,
 time_partitioning=None,
 cluster_fields=None,
Expand All@@ -158,10 +158,6 @@ def __init__(self,
 super(GoogleCloudStorageToBigQueryOperator, self).__init__(*args, **kwargs)

 # GCS config
 if src_fmt_configs is None:
 src_fmt_configs = {}
 if time_partitioning is None:
 time_partitioning = {}
 self.bucket = bucket
 self.source_objects = source_objects
 self.schema_object = schema_object
Expand All@@ -188,7 +184,7 @@ def __init__(self,
 self.delegate_to = delegate_to

 self.schema_update_options = schema_update_options
 self.src_fmt_configs = src_fmt_configs
 self.external_config_options, = external_config_options,
 self.time_partitioning = time_partitioning
 self.cluster_fields = cluster_fields
 self.autodetect = autodetect
Expand DownExpand Up@@ -220,7 +216,7 @@ def execute(self, context):
 cursor = conn.cursor()

 if self.external_table:
cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -233,10 +229,10 @@ def execute(self, context):
 ignore_unknown_values=self.ignore_unknown_values,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs
external_config_options=self.external_config_options,
 )
 else:
cursor.run_load(
bq_hook.run_load(
 destination_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand Down

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ def write_version(filename=os.path.join(*['airflow',
 'google-auth-httplib2>=0.0.1',
 'google-cloud-container>=0.1.1',
 'google-cloud-bigtable==0.31.0',
 'google-cloud-bigquery>=1.8.1',
 'google-cloud-spanner>=1.7.1',
 'grpcio-gcp>=0.2.2',
 'PyOpenSSL',
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
WIP: [AIRFLOW-1894] Google cloud bigquery#4607

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

 Closed

jmcarp
wants to merge
1
commit into

from

 Closed


WIP: [AIRFLOW-1894] Google cloud bigquery
#4607
Show file tree
Hide file tree
 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


1,433 changes: 363 additions & 1,070 deletions
airflow/contrib/hooks/bigquery_hook.py

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 3 additions & 3 deletions
airflow/contrib/operators/bigquery_check_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class BigQueryCheckOperator(CheckOperator):
 def __init__(self,
 sql,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We shouldn't change this behaviour
 *args, **kwargs):
 super(BigQueryCheckOperator, self).__init__(sql=sql, *args, **kwargs)
 self.bigquery_conn_id = bigquery_conn_id
Expand DownExpand Up@@ -92,7 +92,7 @@ def __init__(self, sql,
 pass_value,
 tolerance=None,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
 *args, **kwargs):
 super(BigQueryValueCheckOperator, self).__init__(
 sql=sql, pass_value=pass_value, tolerance=tolerance,
Expand DownExpand Up@@ -132,7 +132,7 @@ class BigQueryIntervalCheckOperator(IntervalCheckOperator):
 @apply_defaults
 def __init__(self, table, metrics_thresholds, date_filter_column='ds',
 days_back=-7, bigquery_conn_id='bigquery_default',
 use_legacy_sql=True, *args, **kwargs):
 use_legacy_sql=False, *args, **kwargs):
 super(BigQueryIntervalCheckOperator, self).__init__(
 table=table, metrics_thresholds=metrics_thresholds,
 date_filter_column=date_filter_column, days_back=days_back,
Expand Down

25 changes: 7 additions & 18 deletions
airflow/contrib/operators/bigquery_get_data.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,21 +96,10 @@ def execute(self, context):
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = hook.get_conn()
 cursor = conn.cursor()
 response = cursor.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)

 self.log.info('Total Extracted rows: %s', response['totalRows'])
 rows = response['rows']

 table_data = []
 for dict_row in rows:
 single_row = []
 for fields in dict_row['f']:
 single_row.append(fields['v'])
 table_data.append(single_row)

 return table_data
 rows = hook.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)
 rows = list(rows)
 self.log.info('Total Extracted rows: %s', len(rows))
 return rows

59 changes: 19 additions & 40 deletions
airflow/contrib/operators/bigquery_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 delegate_to=None,
 udf_config=None,
 use_legacy_sql=True,
 use_legacy_sql=False,
 maximum_billing_tier=None,
 maximum_bytes_billed=None,
 create_disposition='CREATE_IF_NEEDED',
Expand DownExpand Up@@ -147,25 +147,21 @@ def __init__(self,
 self.schema_update_options = schema_update_options
 self.query_params = query_params
 self.labels = labels
 self.bq_cursor = None
 self.priority = priority
 self.time_partitioning = time_partitioning
 self.api_resource_configs = api_resource_configs
 self.cluster_fields = cluster_fields
 self.location = location

 def execute(self, context):
 if self.bq_cursor is None:
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 conn = hook.get_conn()
 self.bq_cursor = conn.cursor()
 self.bq_cursor.run_query(
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 hook.run_query(
 sql=self.sql,
 destination_dataset_table=self.destination_dataset_table,
 write_disposition=self.write_disposition,
Expand All@@ -184,12 +180,6 @@ def execute(self, context):
 cluster_fields=self.cluster_fields,
 )

 def on_kill(self):
 super(BigQueryOperator, self).on_kill()
 if self.bq_cursor is not None:
 self.log.info('Cancelling running query')
 self.bq_cursor.cancel_query()


class BigQueryCreateEmptyTableOperator(BaseOperator):
 """
Expand DownExpand Up@@ -328,10 +318,7 @@ def execute(self, context):
 else:
 schema_fields = self.schema_fields

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_table(
 bq_hook.create_empty_table(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 table_id=self.table_id,
Expand DownExpand Up@@ -408,8 +395,8 @@ class BigQueryCreateExternalTableOperator(BaseOperator):
 work, the service account making the request must have domain-wide
 delegation enabled.
 :type delegate_to: str
 :param src_fmt_configs: configure optional fields specific to the source format
 :type src_fmt_configs: dict
 :param external_config_options: configure optional fields specific to the source format
 :type external_config_options: dict
 :param labels: a dictionary containing labels for the table, passed to BigQuery
 :type labels: dict
 """
Expand All@@ -435,7 +422,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
src_fmt_configs={},
external_config_options=None,
 labels=None,
 *args, **kwargs):

Expand All@@ -462,7 +449,7 @@ def __init__(self,
 self.google_cloud_storage_conn_id = google_cloud_storage_conn_id
 self.delegate_to = delegate_to

 self.src_fmt_configs = src_fmt_configs
 self.external_config_options = external_config_options
 self.labels = labels

 def execute(self, context):
Expand All@@ -482,10 +469,8 @@ def execute(self, context):

 source_uris = ['gs://{}/{}'.format(self.bucket, source_object)
 for source_object in self.source_objects]
 conn = bq_hook.get_conn()
 cursor = conn.cursor()

cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -497,8 +482,8 @@ def execute(self, context):
 quote_character=self.quote_character,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs,
 labels=self.labels
external_config_options=self.external_config_options,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This will have to be for 2.0 as it will break things. Also, it needs to be backward-compatible to make updation smooth from 1.X to 2.0
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Haven't yet reviewed the entire PR but schemed through it. Will try to find some time to look at it more thoroughly
 labels=self.labels,
 )


Expand DownExpand Up@@ -545,10 +530,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.delete_dataset(
 bq_hook.delete_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id
 )
Expand DownExpand Up@@ -608,10 +590,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_dataset(
 bq_hook.create_empty_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 dataset_reference=self.dataset_reference)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_table_delete_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,4 @@ def execute(self, context):
 self.log.info('Deleting: %s', self.deletion_dataset_table)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)
 hook.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_bigquery.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,9 +85,7 @@ def execute(self, context):
 )
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_copy(
 hook.run_copy(
 self.source_project_dataset_tables,
 self.destination_project_dataset_table,
 self.write_disposition,
Expand Down

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_gcs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ def execute(self, context):
 self.destination_cloud_storage_uris)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_extract(
 hook.run_extract(
 self.source_project_dataset_table,
 self.destination_cloud_storage_uris,
 self.compression,
Expand Down

14 changes: 5 additions & 9 deletions
airflow/contrib/operators/gcs_to_bq.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ def __init__(self,
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
 schema_update_options=(),
src_fmt_configs=None,
external_config_options=None,
 external_table=False,
 time_partitioning=None,
 cluster_fields=None,
Expand All@@ -158,10 +158,6 @@ def __init__(self,
 super(GoogleCloudStorageToBigQueryOperator, self).__init__(*args, **kwargs)

 # GCS config
 if src_fmt_configs is None:
 src_fmt_configs = {}
 if time_partitioning is None:
 time_partitioning = {}
 self.bucket = bucket
 self.source_objects = source_objects
 self.schema_object = schema_object
Expand All@@ -188,7 +184,7 @@ def __init__(self,
 self.delegate_to = delegate_to

 self.schema_update_options = schema_update_options
 self.src_fmt_configs = src_fmt_configs
 self.external_config_options, = external_config_options,
 self.time_partitioning = time_partitioning
 self.cluster_fields = cluster_fields
 self.autodetect = autodetect
Expand DownExpand Up@@ -220,7 +216,7 @@ def execute(self, context):
 cursor = conn.cursor()

 if self.external_table:
cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -233,10 +229,10 @@ def execute(self, context):
 ignore_unknown_values=self.ignore_unknown_values,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs
external_config_options=self.external_config_options,
 )
 else:
cursor.run_load(
bq_hook.run_load(
 destination_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand Down

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ def write_version(filename=os.path.join(*['airflow',
 'google-auth-httplib2>=0.0.1',
 'google-cloud-container>=0.1.1',
 'google-cloud-bigtable==0.31.0',
 'google-cloud-bigquery>=1.8.1',
 'google-cloud-spanner>=1.7.1',
 'grpcio-gcp>=0.2.2',
 'PyOpenSSL',
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
WIP: [AIRFLOW-1894] Google cloud bigquery#4607

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

 Closed

jmcarp
wants to merge
1
commit into

from

 Closed


WIP: [AIRFLOW-1894] Google cloud bigquery
#4607
Show file tree
Hide file tree
 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


1,433 changes: 363 additions & 1,070 deletions
airflow/contrib/hooks/bigquery_hook.py

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 3 additions & 3 deletions
airflow/contrib/operators/bigquery_check_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,7 @@ class BigQueryCheckOperator(CheckOperator):
 def __init__(self,
 sql,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We shouldn't change this behaviour
 *args, **kwargs):
 super(BigQueryCheckOperator, self).__init__(sql=sql, *args, **kwargs)
 self.bigquery_conn_id = bigquery_conn_id
Expand DownExpand Up@@ -92,7 +92,7 @@ def __init__(self, sql,
 pass_value,
 tolerance=None,
 bigquery_conn_id='bigquery_default',
 use_legacy_sql=True,
 use_legacy_sql=False,
 *args, **kwargs):
 super(BigQueryValueCheckOperator, self).__init__(
 sql=sql, pass_value=pass_value, tolerance=tolerance,
Expand DownExpand Up@@ -132,7 +132,7 @@ class BigQueryIntervalCheckOperator(IntervalCheckOperator):
 @apply_defaults
 def __init__(self, table, metrics_thresholds, date_filter_column='ds',
 days_back=-7, bigquery_conn_id='bigquery_default',
 use_legacy_sql=True, *args, **kwargs):
 use_legacy_sql=False, *args, **kwargs):
 super(BigQueryIntervalCheckOperator, self).__init__(
 table=table, metrics_thresholds=metrics_thresholds,
 date_filter_column=date_filter_column, days_back=days_back,
Expand Down

25 changes: 7 additions & 18 deletions
airflow/contrib/operators/bigquery_get_data.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,21 +96,10 @@ def execute(self, context):
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = hook.get_conn()
 cursor = conn.cursor()
 response = cursor.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)

 self.log.info('Total Extracted rows: %s', response['totalRows'])
 rows = response['rows']

 table_data = []
 for dict_row in rows:
 single_row = []
 for fields in dict_row['f']:
 single_row.append(fields['v'])
 table_data.append(single_row)

 return table_data
 rows = hook.get_tabledata(dataset_id=self.dataset_id,
 table_id=self.table_id,
 max_results=self.max_results,
 selected_fields=self.selected_fields)
 rows = list(rows)
 self.log.info('Total Extracted rows: %s', len(rows))
 return rows

59 changes: 19 additions & 40 deletions
airflow/contrib/operators/bigquery_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,7 +117,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 delegate_to=None,
 udf_config=None,
 use_legacy_sql=True,
 use_legacy_sql=False,
 maximum_billing_tier=None,
 maximum_bytes_billed=None,
 create_disposition='CREATE_IF_NEEDED',
Expand DownExpand Up@@ -147,25 +147,21 @@ def __init__(self,
 self.schema_update_options = schema_update_options
 self.query_params = query_params
 self.labels = labels
 self.bq_cursor = None
 self.priority = priority
 self.time_partitioning = time_partitioning
 self.api_resource_configs = api_resource_configs
 self.cluster_fields = cluster_fields
 self.location = location

 def execute(self, context):
 if self.bq_cursor is None:
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 conn = hook.get_conn()
 self.bq_cursor = conn.cursor()
 self.bq_cursor.run_query(
 self.log.info('Executing: %s', self.sql)
 hook = BigQueryHook(
 bigquery_conn_id=self.bigquery_conn_id,
 use_legacy_sql=self.use_legacy_sql,
 delegate_to=self.delegate_to,
 location=self.location,
 )
 hook.run_query(
 sql=self.sql,
 destination_dataset_table=self.destination_dataset_table,
 write_disposition=self.write_disposition,
Expand All@@ -184,12 +180,6 @@ def execute(self, context):
 cluster_fields=self.cluster_fields,
 )

 def on_kill(self):
 super(BigQueryOperator, self).on_kill()
 if self.bq_cursor is not None:
 self.log.info('Cancelling running query')
 self.bq_cursor.cancel_query()


class BigQueryCreateEmptyTableOperator(BaseOperator):
 """
Expand DownExpand Up@@ -328,10 +318,7 @@ def execute(self, context):
 else:
 schema_fields = self.schema_fields

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_table(
 bq_hook.create_empty_table(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 table_id=self.table_id,
Expand DownExpand Up@@ -408,8 +395,8 @@ class BigQueryCreateExternalTableOperator(BaseOperator):
 work, the service account making the request must have domain-wide
 delegation enabled.
 :type delegate_to: str
 :param src_fmt_configs: configure optional fields specific to the source format
 :type src_fmt_configs: dict
 :param external_config_options: configure optional fields specific to the source format
 :type external_config_options: dict
 :param labels: a dictionary containing labels for the table, passed to BigQuery
 :type labels: dict
 """
Expand All@@ -435,7 +422,7 @@ def __init__(self,
 bigquery_conn_id='bigquery_default',
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
src_fmt_configs={},
external_config_options=None,
 labels=None,
 *args, **kwargs):

Expand All@@ -462,7 +449,7 @@ def __init__(self,
 self.google_cloud_storage_conn_id = google_cloud_storage_conn_id
 self.delegate_to = delegate_to

 self.src_fmt_configs = src_fmt_configs
 self.external_config_options = external_config_options
 self.labels = labels

 def execute(self, context):
Expand All@@ -482,10 +469,8 @@ def execute(self, context):

 source_uris = ['gs://{}/{}'.format(self.bucket, source_object)
 for source_object in self.source_objects]
 conn = bq_hook.get_conn()
 cursor = conn.cursor()

cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -497,8 +482,8 @@ def execute(self, context):
 quote_character=self.quote_character,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs,
 labels=self.labels
external_config_options=self.external_config_options,
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

This will have to be for 2.0 as it will break things. Also, it needs to be backward-compatible to make updation smooth from 1.X to 2.0
@kaxilkaxilFeb 12, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Haven't yet reviewed the entire PR but schemed through it. Will try to find some time to look at it more thoroughly
 labels=self.labels,
 )


Expand DownExpand Up@@ -545,10 +530,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.delete_dataset(
 bq_hook.delete_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id
 )
Expand DownExpand Up@@ -608,10 +590,7 @@ def execute(self, context):
 bq_hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)

 conn = bq_hook.get_conn()
 cursor = conn.cursor()

 cursor.create_empty_dataset(
 bq_hook.create_empty_dataset(
 project_id=self.project_id,
 dataset_id=self.dataset_id,
 dataset_reference=self.dataset_reference)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_table_delete_operator.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,4 @@ def execute(self, context):
 self.log.info('Deleting: %s', self.deletion_dataset_table)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)
 hook.run_table_delete(self.deletion_dataset_table, self.ignore_if_missing)

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_bigquery.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,9 +85,7 @@ def execute(self, context):
 )
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_copy(
 hook.run_copy(
 self.source_project_dataset_tables,
 self.destination_project_dataset_table,
 self.write_disposition,
Expand Down

4 changes: 1 addition & 3 deletions
airflow/contrib/operators/bigquery_to_gcs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -93,9 +93,7 @@ def execute(self, context):
 self.destination_cloud_storage_uris)
 hook = BigQueryHook(bigquery_conn_id=self.bigquery_conn_id,
 delegate_to=self.delegate_to)
 conn = hook.get_conn()
 cursor = conn.cursor()
 cursor.run_extract(
 hook.run_extract(
 self.source_project_dataset_table,
 self.destination_cloud_storage_uris,
 self.compression,
Expand Down

14 changes: 5 additions & 9 deletions
airflow/contrib/operators/gcs_to_bq.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,7 @@ def __init__(self,
 google_cloud_storage_conn_id='google_cloud_default',
 delegate_to=None,
 schema_update_options=(),
src_fmt_configs=None,
external_config_options=None,
 external_table=False,
 time_partitioning=None,
 cluster_fields=None,
Expand All@@ -158,10 +158,6 @@ def __init__(self,
 super(GoogleCloudStorageToBigQueryOperator, self).__init__(*args, **kwargs)

 # GCS config
 if src_fmt_configs is None:
 src_fmt_configs = {}
 if time_partitioning is None:
 time_partitioning = {}
 self.bucket = bucket
 self.source_objects = source_objects
 self.schema_object = schema_object
Expand All@@ -188,7 +184,7 @@ def __init__(self,
 self.delegate_to = delegate_to

 self.schema_update_options = schema_update_options
 self.src_fmt_configs = src_fmt_configs
 self.external_config_options, = external_config_options,
 self.time_partitioning = time_partitioning
 self.cluster_fields = cluster_fields
 self.autodetect = autodetect
Expand DownExpand Up@@ -220,7 +216,7 @@ def execute(self, context):
 cursor = conn.cursor()

 if self.external_table:
cursor.create_external_table(
bq_hook.create_external_table(
 external_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand All@@ -233,10 +229,10 @@ def execute(self, context):
 ignore_unknown_values=self.ignore_unknown_values,
 allow_quoted_newlines=self.allow_quoted_newlines,
 allow_jagged_rows=self.allow_jagged_rows,
src_fmt_configs=self.src_fmt_configs
external_config_options=self.external_config_options,
 )
 else:
cursor.run_load(
bq_hook.run_load(
 destination_project_dataset_table=self.destination_project_dataset_table,
 schema_fields=schema_fields,
 source_uris=source_uris,
Expand Down

1 change: 1 addition & 0 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,6 +176,7 @@ def write_version(filename=os.path.join(*['airflow',
 'google-auth-httplib2>=0.0.1',
 'google-cloud-container>=0.1.1',
 'google-cloud-bigtable==0.31.0',
 'google-cloud-bigquery>=1.8.1',
 'google-cloud-spanner>=1.7.1',
 'grpcio-gcp>=0.2.2',
 'PyOpenSSL',
Expand Down
Loading