Skip to content

Commit 94526a1

Browse files
dhermesdhermes
committed
Renaming dataset_id->project_id on PartitionId.
1 parent 3f18953 commit 94526a1

10 files changed

Lines changed: 32 additions & 29 deletions

File tree

‎gcloud/datastore/connection.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import os
1818

19+
from gcloud._helpers import _has_field
1920
from gcloud import connection
2021
from gcloud.environment_vars import GCD_HOST
2122
from gcloud.exceptions import make_exception
@@ -401,10 +402,10 @@ def _prepare_key_for_request(key_pb): # pragma: NO COVER copied from helpers
401402
:returns: A key which will be added to a request. It will be the
402403
original if nothing needs to be changed.
403404
"""
404-
if key_pb.partition_id.HasField('dataset_id'):
405+
if _has_field(key_pb.partition_id, 'project_id'):
405406
new_key_pb = _entity_pb2.Key()
406407
new_key_pb.CopyFrom(key_pb)
407-
new_key_pb.partition_id.ClearField('dataset_id')
408+
new_key_pb.partition_id.ClearField('project_id')
408409
key_pb = new_key_pb
409410
return key_pb
410411

‎gcloud/datastore/helpers.py‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import six
2424

2525
from gcloud._helpers import _datetime_from_microseconds
26+
from gcloud._helpers import _has_field
2627
from gcloud._helpers import _microseconds_from_datetime
2728
from gcloud.datastore._generated import entity_pb2 as _entity_pb2
2829
from gcloud.datastore.entity import Entity
@@ -61,7 +62,7 @@ def find_true_project(project, connection):
6162
# the project so the backend won't complain.
6263
bogus_key_pb = Key('__MissingLookupKind', 1,
6364
project=project).to_protobuf()
64-
bogus_key_pb.partition_id.ClearField('dataset_id')
65+
bogus_key_pb.partition_id.ClearField('project_id')
6566

6667
found_pbs, missing_pbs, _ = connection.lookup(project, [bogus_key_pb])
6768
# By not passing in `deferred`, lookup will continue until
@@ -70,7 +71,7 @@ def find_true_project(project, connection):
7071
# We only asked for one, so should only receive one.
7172
returned_pb, = all_pbs
7273

73-
return returned_pb.key.partition_id.dataset_id
74+
return returned_pb.key.partition_id.project_id
7475

7576

7677
def _get_meaning(value_pb, is_list=False):
@@ -267,8 +268,8 @@ def key_from_protobuf(pb):
267268
path_args.append(element.name)
268269

269270
project = None
270-
if pb.partition_id.HasField('dataset_id'):
271-
project = pb.partition_id.dataset_id
271+
if _has_field(pb.partition_id, 'project_id'):
272+
project = pb.partition_id.project_id
272273
namespace = None
273274
if pb.partition_id.HasField('namespace'):
274275
namespace = pb.partition_id.namespace
@@ -428,18 +429,18 @@ def _prepare_key_for_request(key_pb):
428429
:returns: A key which will be added to a request. It will be the
429430
original if nothing needs to be changed.
430431
"""
431-
if key_pb.partition_id.HasField('dataset_id'):
432-
# We remove the dataset_id from the protobuf. This is because
432+
if _has_field(key_pb.partition_id, 'project_id'):
433+
# We remove the project_id from the protobuf. This is because
433434
# the backend fails a request if the key contains un-prefixed
434435
# project. The backend fails because requests to
435436
# /datastore/.../datasets/foo/...
436437
# and
437438
# /datastore/.../datasets/s~foo/...
438439
# both go to the datastore given by 's~foo'. So if the key
439-
# protobuf in the request body has dataset_id='foo', the
440+
# protobuf in the request body has project_id='foo', the
440441
# backend will reject since 'foo' != 's~foo'.
441442
new_key_pb = _entity_pb2.Key()
442443
new_key_pb.CopyFrom(key_pb)
443-
new_key_pb.partition_id.ClearField('dataset_id')
444+
new_key_pb.partition_id.ClearField('project_id')
444445
key_pb = new_key_pb
445446
return key_pb

‎gcloud/datastore/key.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ def to_protobuf(self):
240240
:returns: The protobuf representing the key.
241241
"""
242242
key = _entity_pb2.Key()
243-
key.partition_id.dataset_id = self.project
243+
key.partition_id.project_id = self.project
244244

245245
if self.namespace:
246246
key.partition_id.namespace = self.namespace

‎gcloud/datastore/test_batch.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ def to_protobuf(self):
388388
from gcloud.datastore._generated import entity_pb2
389389
key = self._key = entity_pb2.Key()
390390
# Don't assign it, because it will just get ripped out
391-
# key.partition_id.dataset_id = self.project
391+
# key.partition_id.project_id = self.project
392392

393393
element = key.path_element.add()
394394
element.kind = self._kind

‎gcloud/datastore/test_client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def _make_entity_pb(project, kind, integer_id, name=None, str_val=None):
2020
from gcloud.datastore.helpers import _new_value_pb
2121

2222
entity_pb = entity_pb2.Entity()
23-
entity_pb.key.partition_id.dataset_id = project
23+
entity_pb.key.partition_id.project_id = project
2424
path_element = entity_pb.key.path_element.add()
2525
path_element.kind = kind
2626
path_element.id = integer_id
@@ -322,7 +322,7 @@ def test_get_multi_miss_w_missing(self):
322322

323323
# Make a missing entity pb to be returned from mock backend.
324324
missed = entity_pb2.Entity()
325-
missed.key.partition_id.dataset_id = self.PROJECT
325+
missed.key.partition_id.project_id = self.PROJECT
326326
path_element = missed.key.path_element.add()
327327
path_element.kind = KIND
328328
path_element.id = ID

‎gcloud/datastore/test_connection.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,8 @@ def request(self, **kw):
900900

901901

902902
def _compare_key_pb_after_request(test, key_before, key_after):
903-
test.assertFalse(key_after.partition_id.HasField('dataset_id'))
903+
from gcloud._helpers import _has_field
904+
test.assertFalse(_has_field(key_after.partition_id, 'project_id'))
904905
test.assertEqual(key_before.partition_id.namespace,
905906
key_after.partition_id.namespace)
906907
test.assertEqual(len(key_before.path_element),

‎gcloud/datastore/test_helpers.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def test_it(self):
7070
_KIND = 'KIND'
7171
_ID = 1234
7272
entity_pb = entity_pb2.Entity()
73-
entity_pb.key.partition_id.dataset_id = _PROJECT
73+
entity_pb.key.partition_id.project_id = _PROJECT
7474
entity_pb.key.path_element.add(kind=_KIND, id=_ID)
7575

7676
value_pb = _new_value_pb(entity_pb, 'foo')
@@ -117,7 +117,7 @@ def test_mismatched_value_indexed(self):
117117
_KIND = 'KIND'
118118
_ID = 1234
119119
entity_pb = entity_pb2.Entity()
120-
entity_pb.key.partition_id.dataset_id = _PROJECT
120+
entity_pb.key.partition_id.project_id = _PROJECT
121121
entity_pb.key.path_element.add(kind=_KIND, id=_ID)
122122

123123
list_val_pb = _new_value_pb(entity_pb, 'baz')
@@ -173,7 +173,7 @@ def test_nested_entity_no_key(self):
173173
inside_val_pb.integer_value = INSIDE_VALUE
174174

175175
entity_pb = entity_pb2.Entity()
176-
entity_pb.key.partition_id.dataset_id = PROJECT
176+
entity_pb.key.partition_id.project_id = PROJECT
177177
element = entity_pb.key.path_element.add()
178178
element.kind = KIND
179179

@@ -235,7 +235,7 @@ def test_key_only(self):
235235
entity_pb = self._callFUT(entity)
236236

237237
expected_pb = entity_pb2.Entity()
238-
expected_pb.key.partition_id.dataset_id = project
238+
expected_pb.key.partition_id.project_id = project
239239
path_elt = expected_pb.key.path_element.add()
240240
path_elt.kind = kind
241241
path_elt.name = name
@@ -279,7 +279,7 @@ def test_inverts_to_protobuf(self):
279279

280280
original_pb = entity_pb2.Entity()
281281
# Add a key.
282-
original_pb.key.partition_id.dataset_id = project = 'PROJECT'
282+
original_pb.key.partition_id.project_id = project = 'PROJECT'
283283
elem1 = original_pb.key.path_element.add()
284284
elem1.kind = 'Family'
285285
elem1.id = 1234
@@ -322,7 +322,7 @@ def test_inverts_to_protobuf(self):
322322
new_pb = self._callFUT(entity)
323323

324324
# NOTE: entity_to_protobuf() strips the project so we "cheat".
325-
new_pb.key.partition_id.dataset_id = project
325+
new_pb.key.partition_id.project_id = project
326326
self._compareEntityProto(original_pb, new_pb)
327327

328328
def test_meaning_with_change(self):
@@ -355,7 +355,7 @@ def _makePB(self, project=None, namespace=None, path=()):
355355
from gcloud.datastore._generated import entity_pb2
356356
pb = entity_pb2.Key()
357357
if project is not None:
358-
pb.partition_id.dataset_id = project
358+
pb.partition_id.project_id = project
359359
if namespace is not None:
360360
pb.partition_id.namespace = namespace
361361
for elem in path:
@@ -563,7 +563,7 @@ def test_entity(self):
563563
pb = entity_pb2.Value()
564564
entity_pb = pb.entity_value
565565
entity_pb.key.path_element.add(kind='KIND')
566-
entity_pb.key.partition_id.dataset_id = 'PROJECT'
566+
entity_pb.key.partition_id.project_id = 'PROJECT'
567567

568568
value_pb = _new_value_pb(entity_pb, 'foo')
569569
value_pb.string_value = 'Foo'
@@ -740,7 +740,7 @@ def _callFUT(self, key_pb):
740740
def test_prepare_project_valid(self):
741741
from gcloud.datastore._generated import entity_pb2
742742
key = entity_pb2.Key()
743-
key.partition_id.dataset_id = 'foo'
743+
key.partition_id.project_id = 'foo'
744744
new_key = self._callFUT(key)
745745
self.assertFalse(new_key is key)
746746

@@ -907,7 +907,7 @@ def lookup(self, project, key_pbs):
907907

908908
response = entity_pb2.Entity()
909909
response.key.CopyFrom(key_pb)
910-
response.key.partition_id.dataset_id = self.prefix + project
910+
response.key.partition_id.project_id = self.prefix + project
911911

912912
missing = []
913913
deferred = []

‎gcloud/datastore/test_key.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ def test_to_protobuf_defaults(self):
340340
self.assertTrue(isinstance(pb, entity_pb2.Key))
341341

342342
# Check partition ID.
343-
self.assertEqual(pb.partition_id.dataset_id, self._DEFAULT_PROJECT)
343+
self.assertEqual(pb.partition_id.project_id, self._DEFAULT_PROJECT)
344344
self.assertEqual(pb.partition_id.namespace, '')
345345
self.assertFalse(pb.partition_id.HasField('namespace'))
346346

@@ -356,7 +356,7 @@ def test_to_protobuf_w_explicit_project(self):
356356
_PROJECT = 'PROJECT-ALT'
357357
key = self._makeOne('KIND', project=_PROJECT)
358358
pb = key.to_protobuf()
359-
self.assertEqual(pb.partition_id.dataset_id, _PROJECT)
359+
self.assertEqual(pb.partition_id.project_id, _PROJECT)
360360

361361
def test_to_protobuf_w_explicit_namespace(self):
362362
_NAMESPACE = 'NAMESPACE'

‎gcloud/datastore/test_query.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ def _addQueryResults(self, connection, cursor=_END, more=False):
334334
NO_MORE = query_pb2.QueryResultBatch.MORE_RESULTS_AFTER_LIMIT
335335
_ID = 123
336336
entity_pb = entity_pb2.Entity()
337-
entity_pb.key.partition_id.dataset_id = self._PROJECT
337+
entity_pb.key.partition_id.project_id = self._PROJECT
338338
path_element = entity_pb.key.path_element.add()
339339
path_element.kind = self._KIND
340340
path_element.id = _ID

‎gcloud/datastore/test_transaction.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def _make_key(kind, id_, project):
166166
from gcloud.datastore._generated import entity_pb2
167167

168168
key = entity_pb2.Key()
169-
key.partition_id.dataset_id = project
169+
key.partition_id.project_id = project
170170
elem = key.path_element.add()
171171
elem.kind = kind
172172
elem.id = id_

0 commit comments

Comments
 (0)