Skip to content

pickle_loads(): Handle empty memoryview #4595

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
jakirkham merged 1 commit into from
Mar 18, 2021
Merged

pickle_loads(): Handle empty memoryview #4595

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
8 changes: 6 additions & 2 deletions distributed/protocol/serialize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,13 @@ def pickle_loads(header, frames):
mv = memoryview(buffers[i])
if writeable[i] == mv.readonly:
if mv.readonly:
buffers[i] = memoryview(bytearray(mv)).cast(mv.format, mv.shape)
buf = memoryview(bytearray(mv))
else:
buffers[i] = memoryview(bytes(mv)).cast(mv.format, mv.shape)
buf = memoryview(bytes(mv))
if buf.nbytes > 0:
buffers[i] = buf.cast(mv.format, mv.shape)
else:
buffers[i] = buf.cast(mv.format)
return pickle.loads(x, buffers=buffers)


Expand Down
11 changes: 11 additions & 0 deletions distributed/protocol/tests/test_pickle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from distributed.protocol import deserialize, serialize
from distributed.protocol.pickle import HIGHEST_PROTOCOL, dumps, loads
from distributed.protocol.serialize import pickle_dumps

if sys.version_info < (3, 8):
try:
Expand Down Expand Up @@ -71,6 +72,16 @@ def __reduce_ex__(self, protocol):
assert isinstance(f[0], bytes)


def test_pickle_empty():
np = pytest.importorskip("numpy")
x = np.arange(2)[0:0] # Empty view
header, frames = pickle_dumps(x)
header["writeable"] = [False] * len(frames)
y = deserialize(header, frames)
assert memoryview(y).nbytes == 0
assert memoryview(y).readonly


def test_pickle_numpy():
np = pytest.importorskip("numpy")
x = np.ones(5)
Expand Down