Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

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

Replace dataset id with project in datastore #1330

Merged
merged 15 commits into from
Jan 14, 2016

Conversation

dhermes
Copy link
Contributor

@dhermes dhermes commented Dec 23, 2015

This is done in advance of v1beta3 where PartitionId.dataset_id becomes PartitionId.project_id.

@tseaver This is part of the plan in #1288. It's a bit of a mouthful, maybe you have some suggestions on how to make it easier to review? (I'm happy to make the necessary changes)

Also note that I haven't changed the use of GCLOUD_TESTS_DATASET_ID and similar for finding the default project. IMO that should come in a separate PR. I feel that that separate PR will be complicated enough without throwing in ALL these renames. (I also realized that we only check the env. var. for the project with every other service, though we could check the App Engine ID or the Compute Engine ID as well.)

@dhermes dhermes added the api: datastore Issues related to the Datastore API. label Dec 23, 2015
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Dec 23, 2015
return dataset_id1[2:] == dataset_id2
elif dataset_id2.startswith('s~') or dataset_id2.startswith('e~'):
# Here we know `dataset_id1` is unprefixed and `dataset_id2`
if project1.startswith('s~') or project1.startswith('e~'):

This comment was marked as spam.

This comment was marked as spam.

@dhermes dhermes force-pushed the replace-dataset-id-with-project branch from 739e80b to 584d44c Compare January 4, 2016 04:28
@dhermes dhermes force-pushed the replace-dataset-id-with-project branch 3 times, most recently from d5b313f to d1bcb86 Compare January 7, 2016 23:29
@dhermes dhermes force-pushed the replace-dataset-id-with-project branch from d1bcb86 to b1d4895 Compare January 7, 2016 23:39
@tseaver
Copy link
Contributor

tseaver commented Jan 14, 2016

LGTM

dhermes added a commit that referenced this pull request Jan 14, 2016
Replace dataset id with project in datastore
@dhermes dhermes merged commit ce7d573 into googleapis:master Jan 14, 2016
@dhermes dhermes deleted the replace-dataset-id-with-project branch January 14, 2016 20:29
@dhermes
Copy link
Contributor Author

dhermes commented Jan 14, 2016

Merging this after #1369 caused a system test error / lint issue in the datastore system tests. Sending PR ASAP.

dhermes added a commit to dhermes/google-cloud-python that referenced this pull request Jan 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api: datastore Issues related to the Datastore API. cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants