Changeset 1114

Timestamp:

12/05/07 18:13:51 (9 months ago)

Author:

mikey

Message:

Fixed bug: annotation cache did not store information that an annotation is not present which lead to parsing a doc block again and again for an annotation that is not present. Not loading the annotation parser classes and not doing any parsing for annotations saves about 30% of the runtime.

Files:

• trunk/src/main/php/net/stubbles/reflection/annotations/stubAnnotationCache.php (modified) (6 diffs)
• trunk/src/main/php/net/stubbles/reflection/annotations/stubAnnotationFactory.php (modified) (2 diffs)
• trunk/src/test/php/net/stubbles/reflection/annotations/stubAnnotationFactoryTestCase.php (modified) (2 diffs)

trunk/src/main/php/net/stubbles/reflection/annotations/stubAnnotationCache.php

@@ -4 +4 @@
- *
- * @author      Stephan Schmidt <schst@stubbles.net>
+ * @author      Frank Kleine <mikey@stubbles.net>
- * @package     stubbles
- * @subpackage  reflection_annotations
@@ -67 +68 @@
-     * @param  stubAnnotation  $annotation      optional  the annotation to store
-     */
-
-
+
+
+
-            self::$annotations[$target][$targetName] = array();
-        }
@@ -76 +78 @@
-            self::$annotations[$target][$targetName][$annotationName] = $clone->getSerialized();
-        } else {
-null
+''
-        }
+    }
+
+    /**
+     * removes an annotation from the cache
+     *
+     * @param  int             $target          target of the annotation
+     * @param  string          $targetName      name of the target
+     * @param  string          $annotationName  name of the annotation
+     */
+    public static function remove($target, $targetName, $annotationName)
+    {
+        if (isset(self::$annotations[$target][$targetName]) === false || isset(self::$annotations[$target][$targetName][$annotationName]) === false) {
+            return;
+        }
+        
+        unset(self::$annotations[$target][$targetName][$annotationName]);
-    }
-
@@ -88 +106 @@
-     * @return  bool
-     */
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (isset(self::$annotations[$target][$targetName]) == false) {
-            return false;
@@ -97 +137 @@
-        }
-        
-true
+self::$annotations[$target][$targetName][$annotationName] === ''
-    }
-
@@ -108 +148 @@
-     * @return  stubAnnotation
-     */
-
-
+
+
+
-            return clone self::$annotations[$target][$targetName][$annotationName]->getUnserialized();
-        }

trunk/src/main/php/net/stubbles/reflection/annotations/stubAnnotationFactory.php

@@ -55 +55 @@
-            return stubAnnotationCache::get($target, $fileName . '::' . $targetName, $annotationName);
-        }
+        
+        if (stubAnnotationCache::hasNot($target, $fileName . '::' . $targetName, $annotationName) === true) {
+            throw new ReflectionException('Can not find annotation ' . $annotationName);
+        }
-
-        $hash = md5($fileName . $comment . $targetName);
@@ -67 +71 @@
-
-        if (isset(self::$annotations[$hash][$annotationName]) === false) {
+            // put null into cache to save that the annotation does not exist
+            stubAnnotationCache::put($target, $fileName . '::' . $targetName, $annotationName);
-            throw new ReflectionException('Can not find annotation ' . $annotationName);
-        }

trunk/src/test/php/net/stubbles/reflection/annotations/stubAnnotationFactoryTestCase.php

@@ -163 +163 @@
-    {
-        // clear the cache from both annotations first
-put(stubAnnotation::TARGET_CLASS, __FILE__ . '1' . '::' . 'MyClass', 'MyAnnotation', null
-put(stubAnnotation::TARGET_CLASS, __FILE__ . '2' . '::' . 'MyClass', 'MyAnnotation', null
+remove(stubAnnotation::TARGET_CLASS, __FILE__ . '1' . '::' . 'MyClass', 'MyAnnotation'
+remove(stubAnnotation::TARGET_CLASS, __FILE__ . '2' . '::' . 'MyClass', 'MyAnnotation'
-        
-        $myAnnotation1 = stubAnnotationFactory::create($this->commentComplex, 'MyAnnotation', stubAnnotation::TARGET_CLASS, 'MyClass', __FILE__ . '1');
-        $this->assertTrue(stubAnnotationCache::has(stubAnnotation::TARGET_CLASS, __FILE__ . '1' . '::' . 'MyClass', 'MyAnnotation'));
+        $this->assertFalse(stubAnnotationCache::hasNot(stubAnnotation::TARGET_CLASS, __FILE__ . '1' . '::' . 'MyClass', 'MyAnnotation'));
-        $this->assertFalse(stubAnnotationCache::has(stubAnnotation::TARGET_CLASS, __FILE__ . '2' . '::' . 'MyClass', 'MyAnnotation'));
+        $this->assertFalse(stubAnnotationCache::hasNot(stubAnnotation::TARGET_CLASS, __FILE__ . '2' . '::' . 'MyClass', 'MyAnnotation'));
-        $myAnnotation2 = stubAnnotationFactory::create($this->commentComplex, 'MyAnnotation', stubAnnotation::TARGET_CLASS, 'MyClass', __FILE__ . '2');
-        $this->assertTrue(stubAnnotationCache::has(stubAnnotation::TARGET_CLASS, __FILE__ . '1' . '::' . 'MyClass', 'MyAnnotation'));
+        $this->assertFalse(stubAnnotationCache::hasNot(stubAnnotation::TARGET_CLASS, __FILE__ . '1' . '::' . 'MyClass', 'MyAnnotation'));
-        $this->assertTrue(stubAnnotationCache::has(stubAnnotation::TARGET_CLASS, __FILE__ . '2' . '::' . 'MyClass', 'MyAnnotation'));
+        $this->assertFalse(stubAnnotationCache::hasNot(stubAnnotation::TARGET_CLASS, __FILE__ . '2' . '::' . 'MyClass', 'MyAnnotation'));
-    }
-
@@ -277 +281 @@
-        $this->assertEqual('cucumber', $anno3->veggie);
-    }
+
+    /**
+     * ensure that information about a non-existing annotation is cached as well
+     */
+    public function testCachingOfNonExistingAnnotations()
+    {
+        // make sure that the information is really not in the cache
+        stubAnnotationCache::remove(stubAnnotation::TARGET_CLASS, __FILE__ . '::' . 'MyClass', 'NonExistingAnnotation');
+        $this->assertFalse(stubAnnotationCache::has(stubAnnotation::TARGET_CLASS, __FILE__  . '::' . 'MyClass', 'NonExistingAnnotation'));
+        $this->assertFalse(stubAnnotationCache::hasNot(stubAnnotation::TARGET_CLASS, __FILE__ . '::' . 'MyClass', 'NonExistingAnnotation'));
+        try {
+            $myAnnotation1 = stubAnnotationFactory::create($this->commentComplex, 'NonExistingAnnotation', stubAnnotation::TARGET_CLASS, 'MyClass', __FILE__);
+        } catch (Exception $e) {
+            $this->assertFalse(stubAnnotationCache::has(stubAnnotation::TARGET_CLASS, __FILE__  . '::' . 'MyClass', 'NonExistingAnnotation'));
+            $this->assertTrue(stubAnnotationCache::hasNot(stubAnnotation::TARGET_CLASS, __FILE__ . '::' . 'MyClass', 'NonExistingAnnotation'));
+            return;
+        }
+        
+        $this->fail('Found NonExistingAnnotation while this annotation should not be present.');
+    }
-}
-?>