Skip to content

[BEAM-2365] Use the highest pickle protocol available. #3226

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

Closed
robertwb wants to merge 3 commits into from
Closed

[BEAM-2365] Use the highest pickle protocol available. #3226

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2a5353
[BEAM-2365] Use the highest pickle protocol available.
robertwb May 25, 2017
accd42b
Fix base64 pickle coder expectations.
robertwb May 26, 2017
45fb55a
fixup: use HIGHEST_PROTOCOL
robertwb May 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions sdks/python/apache_beam/coders/coders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ def maybe_dill_dumps(o):
# We need to use the dill pickler for objects of certain custom classes,
# including, for example, ones that contain lambdas.
try:
return pickle.dumps(o)
Copy link
Copy Markdown
Contributor

@vikkyrk vikkyrk May 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use https://docs.python.org/2/library/pickle.html#pickle.HIGHEST_PROTOCOL to be more clear with the intent?

Copy link
Copy Markdown
Contributor Author

@robertwb robertwb May 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

return pickle.dumps(o, pickle.HIGHEST_PROTOCOL)
except Exception: # pylint: disable=broad-except
return dill.dumps(o)

Expand Down Expand Up @@ -426,7 +426,10 @@ class PickleCoder(_PickleCoderBase):
"""Coder using Python's pickle functionality."""

def _create_impl(self):
return coder_impl.CallbackCoderImpl(pickle.dumps, pickle.loads)
dumps = pickle.dumps
HIGHEST_PROTOCOL = pickle.HIGHEST_PROTOCOL
return coder_impl.CallbackCoderImpl(
lambda x: dumps(x, HIGHEST_PROTOCOL), pickle.loads)


class DillCoder(_PickleCoderBase):
Expand Down Expand Up @@ -515,7 +518,7 @@ class Base64PickleCoder(Coder):
# than via a special Coder.

def encode(self, value):
return base64.b64encode(pickle.dumps(value))
return base64.b64encode(pickle.dumps(value, pickle.HIGHEST_PROTOCOL))

def decode(self, encoded):
return pickle.loads(base64.b64decode(encoded))
Expand Down