RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Implemented single cache lookup in AnnotationReader

Browse source
This commit is contained in:
guilhermeblanco 2010-03-30 20:25:51 +00:00
parent 62e7146d2d
commit 517bb66468
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/Doctrine/Common/Annotations/AnnotationReader.php
View file

@ -106,10 +106,9 @@ class AnnotationReader
{ {
$cacheKey = $class->getName() . self::$CACHE_SALT; $cacheKey = $class->getName() . self::$CACHE_SALT;
//FIXME: Just use ->fetch(), otherwise some drivers, i.e. APC will fetch twice because they // Attempt to grab data from cache
// implement contains() in terms of fetch(), *sigh*. if (($data = $this->_cache->fetch($cacheKey)) !== false) {
if ($this->_cache->contains($cacheKey)) { return $data;
return $this->_cache->fetch($cacheKey);
} }
$annotations = $this->_parser->parse($class->getDocComment(), "class ".$class->getName()); $annotations = $this->_parser->parse($class->getDocComment(), "class ".$class->getName());
@ -143,12 +142,11 @@ class AnnotationReader
{ {
$cacheKey = $property->getDeclaringClass()->getName() . '$' . $property->getName() . self::$CACHE_SALT; $cacheKey = $property->getDeclaringClass()->getName() . '$' . $property->getName() . self::$CACHE_SALT;
//FIXME: Just use ->fetch(), otherwise some drivers, i.e. APC will fetch twice because they // Attempt to grab data from cache
// implement contains() in terms of fetch(), *sigh*. if (($data = $this->_cache->fetch($cacheKey)) !== false) {
if ($this->_cache->contains($cacheKey)) { return $data;
return $this->_cache->fetch($cacheKey);
} }
$context = "property ".$property->getDeclaringClass()->getName()."::\$".$property->getName(); $context = "property ".$property->getDeclaringClass()->getName()."::\$".$property->getName();
$annotations = $this->_parser->parse($property->getDocComment(), $context); $annotations = $this->_parser->parse($property->getDocComment(), $context);
$this->_cache->save($cacheKey, $annotations, null); $this->_cache->save($cacheKey, $annotations, null);
@ -181,10 +179,9 @@ class AnnotationReader
{ {
$cacheKey = $method->getDeclaringClass()->getName() . '#' . $method->getName() . self::$CACHE_SALT; $cacheKey = $method->getDeclaringClass()->getName() . '#' . $method->getName() . self::$CACHE_SALT;
//FIXME: Just use ->fetch(), otherwise some drivers, i.e. APC will fetch twice because they // Attempt to grab data from cache
// implement contains() in terms of fetch(), *sigh*. if (($data = $this->_cache->fetch($cacheKey)) !== false) {
if ($this->_cache->contains($cacheKey)) { return $data;
return $this->_cache->fetch($cacheKey);
} }
$context = "method ".$method->getDeclaringClass()->getName()."::".$method->getName()."()"; $context = "method ".$method->getDeclaringClass()->getName()."::".$method->getName()."()";