Skip to content

Add a max_size argument to Pub / Sub Batch. #3157

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

Jump to bottom
Merged
lukesneeringer merged 5 commits into from
Mar 20, 2017
Merged

Add a max_size argument to Pub / Sub Batch. #3157

lukesneeringer merged 5 commits into from
Mar 20, 2017

Conversation

@lukesneeringer
Copy link
Contributor

@lukesneeringer lukesneeringer commented Mar 16, 2017

Fixes #3154

@lukesneeringer lukesneeringer self-assigned this Mar 16, 2017
@lukesneeringer lukesneeringer requested a review from dhermes March 16, 2017 18:08
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Mar 16, 2017
lukesneeringer
lukesneeringer commented Mar 16, 2017
View reviewed changes
pubsub/unit_tests/test_topic.py
self.assertEqual(list(batch.messages), [MESSAGE1, MESSAGE2])
self.assertEqual(getattr(api, '_topic_published', self), self)

def test_batch_messages(self):

This comment was marked as spam.

Sign in to view

@lukesneeringer lukesneeringer mentioned this pull request Mar 16, 2017
Closed
@dhermes dhermes changed the title Add a max_size argument to Batch. Add a max_size argument to Pub / Sub Batch. Mar 16, 2017
dhermes
dhermes reviewed Mar 16, 2017
View reviewed changes
pubsub/google/cloud/pubsub/topic.py Outdated

def __init__(self, topic, client, max_interval=_INFINITY,
max_messages=_INFINITY):
max_messages=_INFINITY, max_size=10e6):

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

pubsub/google/cloud/pubsub/topic.py Outdated
if isinstance(message, six.text_type):
encoded += base64.b64encode(message.encode('utf8'))
else:
encoded += base64.b64encode(message)

This comment was marked as spam.

Sign in to view

pubsub/google/cloud/pubsub/topic.py
else:
encoded += base64.b64encode(message)
encoded += base64.b64encode(
json.dumps(attrs, ensure_ascii=False).encode('utf8'),

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

pubsub/google/cloud/pubsub/topic.py
self.message_ids.extend(message_ids)
del self.messages[:]
self._start_timestamp = time.time()
self._current_size = 0

This comment was marked as spam.

Sign in to view

@lukesneeringer
Copy link
Contributor Author

lukesneeringer commented Mar 20, 2017 •
edited
Loading

Approved by @dhermes in chat, confirmed by OP in #3154 to work.

@lukesneeringer lukesneeringer merged commit 6cca1ec into googleapis:master Mar 20, 2017
@lukesneeringer lukesneeringer deleted the pubsub-issue-3154 branch March 20, 2017 15:43
richkadel pushed a commit to richkadel/google-cloud-python that referenced this pull request May 6, 2017
@lukesneeringer
Add a max_size argument to Pub / Sub Batch. (googleapis#3157)
2b7f19f
@tseaver tseaver mentioned this pull request Jun 14, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@tseaver tseaver tseaver left review comments

@dhermes dhermes dhermes left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@lukesneeringer lukesneeringer

Labels

cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lukesneeringer @tseaver @dhermes @googlebot