Skip to content

perf: replace KeyError exception with dict.get() in BoundStatement.bind() #754

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
mykaul wants to merge 1 commit into from
Closed

perf: replace KeyError exception with dict.get() in BoundStatement.bind() #754

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
21 changes: 12 additions & 9 deletions cassandra/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
Only valid when using native protocol v4+
"""

_BIND_SENTINEL = object()
"""Sentinel for dict.get() in BoundStatement.bind() to distinguish missing keys from None values."""

NON_ALPHA_REGEX = re.compile('[^a-zA-Z0-9]')
START_BADCHAR_REGEX = re.compile('^[^a-zA-Z0-9]*')
END_BADCHAR_REGEX = re.compile('[^a-zA-Z0-9_]*$')
Expand Down Expand Up @@ -608,15 +611,15 @@ def bind(self, values):

# sort values accordingly
for col in col_meta:
try:
values.append(values_dict[col.name])
except KeyError:
if proto_version >= 4:
values.append(UNSET_VALUE)
else:
raise KeyError(
'Column name `%s` not found in bound dict.' %
(col.name))
val = values_dict.get(col.name, _BIND_SENTINEL)
if val is not _BIND_SENTINEL:
values.append(val)
elif proto_version >= 4:
values.append(UNSET_VALUE)
else:
raise KeyError(
'Column name `%s` not found in bound dict.' %
(col.name))

value_len = len(values)
col_meta_len = len(col_meta)
Expand Down
Loading