bigquery: remove Table.exists (#4145)

Author: jba

bigquery/google/cloud/bigquery/table.py

@@ -20,7 +20,6 @@
 
 import six
 
-from google.cloud import exceptions
 from google.cloud._helpers import _datetime_from_microseconds
 from google.cloud._helpers import _millis_from_datetime
 from google.cloud.bigquery.schema import SchemaField
@@ -660,30 +659,6 @@ def _build_resource(self, filter_fields):
  resource[api_field] = getattr(self, f)
  return resource
 
- def exists(self, client=None):
- """API call: test for the existence of the table via a GET request
-
- See
- https://cloud.google.com/bigquery/docs/reference/rest/v2/tables/get
-
- :type client: :class:`~google.cloud.bigquery.client.Client` or
- ``NoneType``
- :param client: the client to use. If not passed, falls back to the
- ``client`` stored on the current dataset.
-
- :rtype: bool
- :returns: Boolean indicating existence of the table.
- """
- client = self._require_client(client)
-
- try:
- client._connection.api_request(method='GET', path=self.path,
- query_params={'fields': 'id'})
- except exceptions.NotFound:
- return False
- else:
- return True
-
  def row_from_mapping(self, mapping):
  """Convert a mapping to a row tuple using the schema.
 

bigquery/tests/system.py

@@ -192,12 +192,12 @@ def test_create_table(self):
  age = bigquery.SchemaField('age', 'INTEGER', mode='REQUIRED')
  table_arg = Table(dataset.table(table_id), schema=[full_name, age],
  client=Config.CLIENT)
- self.assertFalse(table_arg.exists())
+ self.assertFalse(_table_exists(table_arg))
 
  table = retry_403(Config.CLIENT.create_table)(table_arg)
  self.to_delete.insert(0, table)
 
- self.assertTrue(table.exists())
+ self.assertTrue(_table_exists(table))
  self.assertEqual(table.table_id, table_id)
 
  def test_get_table_w_public_dataset(self):
@@ -259,10 +259,10 @@ def test_update_table(self):
  ]
  table_arg = Table(dataset.table(TABLE_NAME), schema=schema,
  client=Config.CLIENT)
- self.assertFalse(table_arg.exists())
+ self.assertFalse(_table_exists(table_arg))
  table = retry_403(Config.CLIENT.create_table)(table_arg)
  self.to_delete.insert(0, table)
- self.assertTrue(table.exists())
+ self.assertTrue(_table_exists(table))
  self.assertIsNone(table.friendly_name)
  self.assertIsNone(table.description)
  table.friendly_name = 'Friendly'
@@ -294,10 +294,10 @@ def test_update_table_schema(self):
  ]
  table_arg = Table(dataset.table(TABLE_NAME), schema=schema,
  client=Config.CLIENT)
- self.assertFalse(table_arg.exists())
+ self.assertFalse(_table_exists(table_arg))
  table = retry_403(Config.CLIENT.create_table)(table_arg)
  self.to_delete.insert(0, table)
- self.assertTrue(table.exists())
+ self.assertTrue(_table_exists(table))
  voter = bigquery.SchemaField('voter', 'BOOLEAN', mode='NULLABLE')
  schema = table.schema
  schema.append(voter)
@@ -338,10 +338,10 @@ def test_insert_data_then_dump_table(self):
  now = bigquery.SchemaField('now', 'TIMESTAMP')
  table_arg = Table(dataset.table(TABLE_NAME),
  schema=[full_name, age, now], client=Config.CLIENT)
- self.assertFalse(table_arg.exists())
+ self.assertFalse(_table_exists(table_arg))
  table = retry_403(Config.CLIENT.create_table)(table_arg)
  self.to_delete.insert(0, table)
- self.assertTrue(table.exists())
+ self.assertTrue(_table_exists(table))
 
  errors = table.insert_data(ROWS, ROW_IDS)
  self.assertEqual(len(errors), 0)
@@ -1317,7 +1317,7 @@ def test_create_table_insert_fetch_nested_schema(self):
  client=Config.CLIENT)
  table = retry_403(Config.CLIENT.create_table)(table_arg)
  self.to_delete.insert(0, table)
- self.assertTrue(table.exists())
+ self.assertTrue(_table_exists(table))
  self.assertEqual(table.table_id, table_name)
 
  to_insert = []
@@ -1386,3 +1386,12 @@ def _dataset_exists(ds):
  return True
  except NotFound:
  return False
+
+
+def _table_exists(t):
+ try:
+ tr = DatasetReference(t.project, t.dataset_id).table(t.table_id)
+ Config.CLIENT.get_table(tr)
+ return True
+ except NotFound:
+ return False

bigquery/tests/unit/test_table.py

@@ -708,43 +708,6 @@ def test_list_partitions(self):
  client=client)
  self.assertEqual(table.list_partitions(), [20160804, 20160805])
 
- def test_exists_miss_w_bound_client(self):
- PATH = 'projects/%s/datasets/%s/tables/%s' % (
- self.PROJECT, self.DS_ID, self.TABLE_NAME)
- conn = _Connection()
- client = _Client(project=self.PROJECT, connection=conn)
- dataset = DatasetReference(self.PROJECT, self.DS_ID)
- table_ref = dataset.table(self.TABLE_NAME)
- table = self._make_one(table_ref, client=client)
-
- self.assertFalse(table.exists())
-
- self.assertEqual(len(conn._requested), 1)
- req = conn._requested[0]
- self.assertEqual(req['method'], 'GET')
- self.assertEqual(req['path'], '/%s' % PATH)
- self.assertEqual(req['query_params'], {'fields': 'id'})
-
- def test_exists_hit_w_alternate_client(self):
- PATH = 'projects/%s/datasets/%s/tables/%s' % (
- self.PROJECT, self.DS_ID, self.TABLE_NAME)
- conn1 = _Connection()
- client1 = _Client(project=self.PROJECT, connection=conn1)
- conn2 = _Connection({})
- client2 = _Client(project=self.PROJECT, connection=conn2)
- dataset = DatasetReference(self.PROJECT, self.DS_ID)
- table_ref = dataset.table(self.TABLE_NAME)
- table = self._make_one(table_ref, client=client1)
-
- self.assertTrue(table.exists(client=client2))
-
- self.assertEqual(len(conn1._requested), 0)
- self.assertEqual(len(conn2._requested), 1)
- req = conn2._requested[0]
- self.assertEqual(req['method'], 'GET')
- self.assertEqual(req['path'], '/%s' % PATH)
- self.assertEqual(req['query_params'], {'fields': 'id'})
-
  def test_row_from_mapping_wo_schema(self):
  from google.cloud.bigquery.table import _TABLE_HAS_NO_SCHEMA
  MAPPING = {'full_name': 'Phred Phlyntstone', 'age': 32}
@@ -1239,13 +1202,6 @@ def __init__(self, *responses):
  self._requested = []
 
  def api_request(self, **kw):
- from google.cloud.exceptions import NotFound
-
  self._requested.append(kw)
-
- try:
- response, self._responses = self._responses[0], self._responses[1:]
- except IndexError:
- raise NotFound('miss')
- else:
- return response
+ response, self._responses = self._responses[0], self._responses[1:]
+ return response