Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Optimize ABC caches #383

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 8 commits into from
Feb 10, 2017
Merged

Optimize ABC caches #383

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
313ca43
Optimize ABC negative cache for generics
Feb 1, 2017
6382c8a
Add also positive cache and registry links
Feb 1, 2017
6d1bcf2
Formatting
Feb 1, 2017
c464731
Add ABC optimization to PY2
Feb 1, 2017
423fb75
Inline internal helper for more speed
Feb 1, 2017
f998e24
Fix negative cahce setters
ilevkivskyi Feb 2, 2017
9444b53
Fix negative cahce setters on PY2
ilevkivskyi Feb 2, 2017
0ca5c0b
Make negative caches writable only for non-subscripted generics
ilevkivskyi Feb 2, 2017
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
Next Next commit
Optimize ABC negative cache for generics
  • Loading branch information
@ilevkivskyi
Ivan Levkivskyi authored and ilevkivskyi committed Feb 4, 2017
commit 313ca4383f59e62fe75b4746bb12751434570b46
38 changes: 33 additions & 5 deletions src/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@ def _valid_for_check(cls):
"or instance checks" % cls)
if (
cls.__origin__ is not None and
sys._getframe(3).f_globals['__name__'] not in ['abc', 'functools']
sys._getframe(2).f_globals['__name__'] not in ['abc', 'functools']
):
raise TypeError("Parameterized generics cannot be used with class "
"or instance checks")
Expand All @@ -872,7 +872,6 @@ def _make_subclasshook(cls):
# Registered classes need not be checked here because
# cls and its extra share the same _abc_registry.
def __extrahook__(subclass):
_valid_for_check(cls)
res = cls.__extra__.__subclasshook__(subclass)
if res is not NotImplemented:
return res
Expand All @@ -887,7 +886,6 @@ def __extrahook__(subclass):
else:
# For non-ABC extras we'll just call issubclass().
def __extrahook__(subclass):
_valid_for_check(cls)
if cls.__extra__ and issubclass(subclass, cls.__extra__):
return True
return NotImplemented
Expand Down Expand Up @@ -974,6 +972,7 @@ def __new__(cls, name, bases, namespace,
# remove bare Generic from bases if there are other generic bases
if any(isinstance(b, GenericMeta) and b is not Generic for b in bases):
bases = tuple(b for b in bases if b is not Generic)
namespace.update({'__origin__': origin, '__extra__': extra})
self = super().__new__(cls, name, bases, namespace, _root=True)

self.__parameters__ = tvars
Expand All @@ -982,8 +981,6 @@ def __new__(cls, name, bases, namespace,
self.__args__ = tuple(... if a is _TypingEllipsis else
() if a is _TypingEmpty else
a for a in args) if args else None
self.__origin__ = origin
self.__extra__ = extra
# Speed hack (https://github.com/python/typing/issues/196).
self.__next_in_mro__ = _next_in_mro(self)
# Preserve base classes on subclassing (__bases__ are type erased now).
Expand All @@ -1002,13 +999,44 @@ def __new__(cls, name, bases, namespace,
self.__subclasshook__ = _make_subclasshook(self)
if isinstance(extra, abc.ABCMeta):
self._abc_registry = extra._abc_registry
self._abc_cache = extra._abc_cache

if origin and hasattr(origin, '__qualname__'): # Fix for Python 3.2.
self.__qualname__ = origin.__qualname__
self.__tree_hash__ = (hash(self._subs_tree()) if origin else
super(GenericMeta, self).__hash__())
return self

# _abc_negative_cache and _abc_negative_cache_version
# realised as descriptors, since GenClass[t1, t2, ...] always
# share subclass info with GenClass.
# This is an important memory optimization.
@property
def _abc_negative_cache(self):
if isinstance(self.__extra__, abc.ABCMeta):
return self.__extra__._abc_negative_cache
return _gorg(self)._abc_generic_negative_cache
@_abc_negative_cache.setter
def _abc_negative_cache(self, value):
if isinstance(self.__extra__, abc.ABCMeta):
self.__extra__._abc_negative_cache = value
_gorg(self)._abc_generic_negative_cache = value

@property
def _abc_negative_cache_version(self):
if isinstance(self.__extra__, abc.ABCMeta):
return self.__extra__._abc_negative_cache_version
return _gorg(self)._abc_generic_negative_cache_version
@_abc_negative_cache_version.setter
def _abc_negative_cache_version(self, value):
if isinstance(self.__extra__, abc.ABCMeta):
self.__extra__._abc_negative_cache_version = value
_gorg(self)._abc_generic_negative_cache_version = value

def __subclasscheck__(self, cls):
_valid_for_check(self)
return super().__subclasscheck__(cls)

def _get_type_vars(self, tvars):
if self.__origin__ and self.__parameters__:
_get_type_vars(self.__parameters__, tvars)
Expand Down