Skip to content

[BEAM-1251] Upgrade snappy and use a memoryview #5911

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

Merged
charlesccychen merged 1 commit into from
Jul 10, 2018
Merged

[BEAM-1251] Upgrade snappy and use a memoryview #5911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions sdks/python/apache_beam/io/avroio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,8 @@ def _decompress_bytes(data, codec):

# Compressed data includes a 4-byte CRC32 checksum which we verify.
# We take care to avoid extra copies of data while slicing large objects
# by use of a buffer.
result = snappy.decompress(buffer(data)[:-4])
# by use of a memoryview.
result = snappy.decompress(memoryview(data)[:-4])
avroio.BinaryDecoder(io.BytesIO(data[-4:])).check_crc32(result)
return result
else:
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/apache_beam/io/tfrecordio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def _default_crc32c_fn(value):
if not _default_crc32c_fn.fn:
try:
import snappy # pylint: disable=import-error
_default_crc32c_fn.fn = snappy._crc32c # pylint: disable=protected-access
_default_crc32c_fn.fn = snappy._snappy._crc32c # pylint: disable=protected-access
except ImportError:
logging.warning('Couldn\'t find python-snappy so the implementation of '
'_TFRecordUtil._masked_crc32c is not as fast as it could '
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/apache_beam/runners/dataflow/internal/names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

# Update this version to the next version whenever there is a change that will
# require changes to legacy Dataflow worker execution environment.
BEAM_CONTAINER_VERSION = 'beam-master-20180619'
BEAM_CONTAINER_VERSION = 'beam-master-20180709'
# Update this version to the next version whenever there is a change that
# requires changes to SDK harness container or SDK harness launcher.
BEAM_FNAPI_CONTAINER_VERSION = 'beam-master-20180619'
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ RUN \
# Optional packages
pip install "cython == 0.28.1" && \
pip install "guppy == 0.1.10" && \
pip install "python-snappy == 0.5.1" && \
pip install "python-snappy == 0.5.3" && \
# These are additional packages likely to be used by customers.
pip install "numpy == 1.13.3" --no-binary=:all: && \
pip install "pandas == 0.18.1" && \
Expand Down