Skip to content

Use bytearrays for building up bytes for I/O. #245

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
merged 1 commit into from
Dec 28, 2021
Merged

Use bytearrays for building up bytes for I/O. #245

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
40 changes: 18 additions & 22 deletions bmemcached/protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def _read_socket(self, size):
:param size: Size in bytes to be read.
:return: Data from socket
"""
value = b''
value = bytearray()
while len(value) < size:
data = self.connection.recv(size - len(value))
if not data:
Expand All @@ -206,7 +206,7 @@ def _read_socket(self, size):
if len(value) < size:
raise socket.error()

return value
return bytes(value)

def _get_response(self):
"""
Expand Down Expand Up @@ -501,7 +501,7 @@ def get_multi(self, keys):
if n == 0:
return {}

msg = b''
msg = bytearray()
for i, key in enumerate(keys):
keybytes = str_to_bytes(key)
command = self.COMMANDS['getk' if i == n - 1 else 'getkq']
Expand Down Expand Up @@ -690,7 +690,7 @@ def set_multi(self, mappings, time=100, compress_level=-1):
:rtype: list
"""
mappings = list(mappings.items())
msg = []
msg = bytearray()

for opaque, (key, value) in enumerate(mappings):
if isinstance(key, tuple):
Expand All @@ -707,23 +707,19 @@ def set_multi(self, mappings, time=100, compress_level=-1):

keybytes = str_to_bytes(key)
flags, value = self.serialize(value, compress_level=compress_level)
m = struct.pack(self.HEADER_STRUCT +
self.COMMANDS[command]['struct'] % (len(keybytes), len(value)),
self.MAGIC['request'],
self.COMMANDS[command]['command'],
len(keybytes),
8, 0, 0, len(keybytes) + len(value) + 8, opaque, cas or 0,
flags, time, keybytes, value)
msg.append(m)

m = struct.pack(self.HEADER_STRUCT +
self.COMMANDS['noop']['struct'],
self.MAGIC['request'],
self.COMMANDS['noop']['command'],
0, 0, 0, 0, 0, 0, 0)
msg.append(m)

msg = b''.join(msg)
msg += struct.pack(self.HEADER_STRUCT +
self.COMMANDS[command]['struct'] % (len(keybytes), len(value)),
self.MAGIC['request'],
self.COMMANDS[command]['command'],
len(keybytes),
8, 0, 0, len(keybytes) + len(value) + 8, opaque, cas or 0,
flags, time, keybytes, value)

msg += struct.pack(self.HEADER_STRUCT +
self.COMMANDS['noop']['struct'],
self.MAGIC['request'],
self.COMMANDS['noop']['command'],
0, 0, 0, 0, 0, 0, 0)

self._send(msg)

Expand Down Expand Up @@ -854,7 +850,7 @@ def delete_multi(self, keys):
:rtype: bool
"""
logger.debug('Deleting keys %r', keys)
msg = b''
msg = bytearray()
for key in keys:
keybytes = str_to_bytes(key)
msg += struct.pack(
Expand Down