Skip to content

GH-100930: Implement dataclass code caching #92650

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
brandtbucher wants to merge 20 commits into from
Closed

GH-100930: Implement dataclass code caching #92650

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1f7ffa8
Initial implementation of code-caching
brandtbucher May 10, 2022
17dd0d0
More cleanup
brandtbucher May 10, 2022
7096466
More more cleanup
brandtbucher May 10, 2022
52113c5
Smaller diff
brandtbucher May 10, 2022
62d0c87
More diff cleanup
brandtbucher May 10, 2022
af64d69
Revert unnecessary changes
brandtbucher May 10, 2022
e377393
Remove unnecessary code
brandtbucher May 10, 2022
9d01e5c
Simplify tuple patching
brandtbucher May 10, 2022
c9acd33
Further improve tuple patching
brandtbucher May 11, 2022
82f1c75
Simplify cache keying
brandtbucher May 11, 2022
edc066c
Catch up with main
brandtbucher Dec 29, 2022
42e1df8
Report code cache stats after testing
brandtbucher Dec 29, 2022
69fa6d5
Use named symbols and number them later
brandtbucher Dec 29, 2022
66070d2
Discover fields automatically in _create_fn
brandtbucher Dec 29, 2022
b8a1305
Catch up with main
brandtbucher Jan 10, 2023
b0f795f
Refactor how code objects are constructed
brandtbucher Jan 10, 2023
41dacab
fixup
brandtbucher Jan 10, 2023
fecf58f
blurb add
brandtbucher Jan 10, 2023
29416d3
Merge branch 'main' into dataclasses
AlexWaygood Mar 15, 2023
d005378
Merge branch 'main' into dataclasses
AlexWaygood Mar 15, 2023
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
Prev Previous commit
Next Next commit
Smaller diff
  • Loading branch information
@brandtbucher
brandtbucher committed May 10, 2022
commit 52113c5b57dc403ab423605848061e3a6357b1e4
32 changes: 16 additions & 16 deletions Lib/dataclasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ def _tuple_str(obj_name, fields):
if not fields:
return '()'
# Note the trailing comma, needed if this turns out to be a 1-tuple.
return f'({"".join([f"{obj_name}.{symbol(i)}," for i in range(len(fields))])})'
return f'({",".join([f"{obj_name}.{symbol(i)}" for i in range(len(fields))])},)'


# This function's logic is copied from "recursive_repr" function in
Expand Down Expand Up @@ -619,10 +619,10 @@ def _init_fn(fields, std_fields, kw_only_fields, frozen, has_post_init,
f = _create_fn('__init__',
[self_name] + _init_params,
body_lines,
locals=locals,
globals=globals,
fields=fields,
extra_keys=extra_keys)
extra_keys=extra_keys,
locals=locals,
globals=globals)
annotations = {"return": None}
defaults = []
kwdefaults = {}
Expand Down Expand Up @@ -651,8 +651,8 @@ def _repr_fn(fields, globals):
', '.join([f"{symbol(i)}={{self.{symbol(i)}!r}}"
for i in range(len(fields))]) +
')"'],
globals=globals,
fields=fields)
fields=fields,
globals=globals)
return _recursive_repr(fn)


Expand All @@ -665,17 +665,17 @@ def _frozen_get_del_attr(cls, fields, globals):
(f'if type(self) is cls or name in {fields_str}:',
' raise FrozenInstanceError(f"cannot assign to field {name!r}")',
f'super(cls, self).__setattr__(name, value)'),
fields=fields,
locals=locals,
globals=globals,
fields=fields),
globals=globals),
_create_fn('__delattr__',
('self', 'name'),
(f'if type(self) is cls or name in {fields_str}:',
' raise FrozenInstanceError(f"cannot delete field {name!r}")',
f'super(cls, self).__delattr__(name)'),
fields=fields,
locals=locals,
globals=globals,
fields=fields),
globals=globals),
)


Expand All @@ -690,17 +690,17 @@ def _cmp_fn(name, op, self_tuple, other_tuple, globals, fields):
[ 'if other.__class__ is self.__class__:',
f' return {self_tuple}{op}{other_tuple}',
'return NotImplemented'],
globals=globals,
fields=fields)
fields=fields,
globals=globals)


def _hash_fn(fields, globals):
self_tuple = _tuple_str('self', fields)
return _create_fn('__hash__',
('self',),
[f'return hash({self_tuple})'],
globals=globals,
fields=fields)
fields=fields,
globals=globals)


def _is_classvar(a_type, typing):
Expand Down Expand Up @@ -1115,7 +1115,7 @@ def _process_class(cls, init, repr, eq, order, unsafe_hash, frozen,
_set_new_attribute(cls, '__eq__',
_cmp_fn('__eq__', '==',
self_tuple, other_tuple,
globals=globals, fields=flds))
fields=flds, globals=globals))

if order:
# Create and set the ordering methods.
Expand All @@ -1129,7 +1129,7 @@ def _process_class(cls, init, repr, eq, order, unsafe_hash, frozen,
]:
if _set_new_attribute(cls, name,
_cmp_fn(name, op, self_tuple, other_tuple,
globals=globals, fields=flds)):
fields=flds, globals=globals)):
raise TypeError(f'Cannot overwrite attribute {name} '
f'in class {cls.__name__}. Consider using '
'functools.total_ordering')
Expand Down