Changeset 7617

Timestamp:

02/26/08 23:23:55 (1 year ago)

Author:

fabien

Message:

added routing cache for generate() and parse() method (massive speedup!)

Files:

• branches/1.1/lib/routing/sfPatternRouting.class.php (modified) (9 diffs)

branches/1.1/lib/routing/sfPatternRouting.class.php

@@ -26 +26 @@
-    $currentRouteParameters = null,
-    $defaultSuffix          = '',
-
+
+
+
-
-  /**
@@ -64 +66 @@
-
-    $this->setDefaultSuffix(isset($options['suffix']) ? $options['suffix'] : '');
+
+    if (!is_null($this->cache) && $cacheData = $this->cache->get('data'))
+    {
+      $this->cacheData = unserialize($cacheData);
+    }
-  }
-
@@ -71 +78 @@
-  public function loadConfiguration()
-  {
-
+!is_null($this->cache) && 
-    {
-      $this->routes = unserialize($routes);
@@ -84 +91 @@
-      parent::loadConfiguration();
-
-
+
+
+
+
-    }
-  }
@@ -418 +428 @@
-    $params = $this->fixDefaults($params);
-
+    if (!is_null($this->cache))
+    {
+      $cacheKey = 'generate_'.$name.serialize($params);
+      if (isset($this->cacheData[$cacheKey]))
+      {
+        return $this->cacheData[$cacheKey];
+      }
+    }
+
-    // named route?
-    if ($name)
@@ -521 +540 @@
-    }
-
+    if (!is_null($this->cache))
+    {
+      $this->cacheChanged = true;
+      $this->cacheData[$cacheKey] = $realUrl;
+    }
+
-    return $realUrl;
-  }
@@ -543 +568 @@
-    // remove multiple /
-    $url = preg_replace('#/+#', '/', $url);
+
+    if (!is_null($this->cache))
+    {
+      $cacheKey = 'parse_'.$url;
+      if (isset($this->cacheData[$cacheKey]))
+      {
+        return $this->cacheData[$cacheKey];
+      }
+    }
-
-    $found = false;
@@ -594 +628 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
-  }
-
@@ -608 +650 @@
-    return $parameters;
-  }
+
+  /**
+   * @see sfRouting
+   */
+  public function shutdown()
+  {
+    if (!is_null($this->cache) && $this->cacheChanged)
+    {
+      $this->cacheChanged = false;
+      $this->cache->set('data', serialize($this->cacheData));
+    }
+  }
-}