11import calendar
22from collections import defaultdict
33from datetime import datetime
4- import logging
54
65from apiclient .discovery import build
76import httplib2
87from oauth2client .client import SignedJwtAssertionCredentials
98
9+ from bigquery import logger
10+
1011
1112BIGQUERY_SCOPE = 'https://www.googleapis.com/auth/bigquery'
1213BIGQUERY_SCOPE_READ_ONLY = 'https://www.googleapis.com/auth/bigquery.readonly'
@@ -81,7 +82,7 @@ def query(self, query, max_results=None, timeout=10):
8182 job id and query rows if query completed.
8283 """
8384
84- logging .debug ('Executing query: %s' % query )
85+ logger .debug ('Executing query: %s' % query )
8586
8687 job_collection = self .bigquery .jobs ()
8788 query_data = {'query' : query , 'timeoutMs' : timeout * 1000 }
@@ -112,7 +113,7 @@ def get_query_schema(self, job_id):
112113 job_collection , self .project_id , job_id , offset = 0 , limit = 0 )
113114
114115 if not query_reply ['jobComplete' ]:
115- logging .warning ('BigQuery job %s not complete' % job_id )
116+ logger .warning ('BigQuery job %s not complete' % job_id )
116117 return []
117118
118119 return query_reply ['schema' ]['fields' ]
@@ -153,7 +154,7 @@ def get_query_rows(self, job_id, offset=None, limit=None):
153154 limit = limit )
154155
155156 if not query_reply ['jobComplete' ]:
156- logging .warning ('BigQuery job %s not complete' % job_id )
157+ logger .warning ('BigQuery job %s not complete' % job_id )
157158 return []
158159
159160 schema = query_reply ['schema' ]['fields' ]
@@ -211,7 +212,7 @@ def create_table(self, dataset, table, schema):
211212 return True
212213
213214 except :
214- logging .error ('Cannot create table %s.%s' % (dataset , table ))
215+ logger .error ('Cannot create table %s.%s' % (dataset , table ))
215216 return False
216217
217218 def delete_table (self , dataset , table ):
@@ -234,7 +235,7 @@ def delete_table(self, dataset, table):
234235 return True
235236
236237 except :
237- logging .error ('Cannot delete table %s.%s' % (dataset , table ))
238+ logger .error ('Cannot delete table %s.%s' % (dataset , table ))
238239 return False
239240
240241 def get_tables (self , dataset_id , app_id , start_time , end_time ):
@@ -287,13 +288,13 @@ def push_rows(self, rows, insert_id_key, dataset, table):
287288 ).execute ()
288289
289290 if response .get ('insertErrors' ):
290- logging .error ('BigQuery insert errors: %s' % response )
291+ logger .error ('BigQuery insert errors: %s' % response )
291292 return False
292293
293294 return True
294295
295296 except :
296- logging .error ('Problem with BigQuery insertAll' )
297+ logger .error ('Problem with BigQuery insertAll' )
297298 return False
298299
299300 def _get_all_tables (self , dataset_id ):
0 commit comments