Use the uid map, and save tons of database calls to load the syncCache.

horde · Oct 17, 2013 · 3a6a1a3 · 3a6a1a3
1 parent b70fc22
commit 3a6a1a3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Collections.php b/framework/ActiveSync/lib/Horde/ActiveSync/Collections.php
@@ -316,10 +316,14 @@ public function getBackendIdForFolderUid($folderid)
      *
      * @return string The EAS uid.
      */
-
-    public function getFolderUidForBackendId($id)
+    public function getFolderUidForBackendId($folderid)
     {
-        return $this->_as->state->getFolderUidForBackendId($id);
+        $map = $this->_as->state->getFolderUidToBankendIdMap();
+        if (empty($map[$folderid])) {
+            return false;
+        }
+
+        return $map[$folderid];
     }
 
     /**

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php
@@ -351,17 +351,21 @@ static public function buildFbString($fb, Horde_Date $start, Horde_Date $end)
      */
     protected function _getFolderUidForBackendId($imap)
     {
-        if ($id = $this->_state->getFolderUidForBackendId($imap)) {
-            return $id;
-        } elseif (empty($this->_tempMap[$imap])) {
-            $this->_tempMap[$imap] = sprintf('F%04x%04x', mt_rand(0, 0xffff), mt_rand(0, 0xffff));
-            $this->_logger->info(sprintf(
-                '[%s] Creating new folder uuid for %s: %s',
-                getmypid(),
-                $imap,
-                $this->_tempMap[$imap]));
+        $map = $this->_state->getFolderUidToBackendIdMap();
+        if (!empty($map[$imap])) {
+            return $map[$imap];
+        } elseif (!empty($this->_tempMap[$imap])) {
+            return $this->_tempMap[$imap];
         }
 
+        // None found, generate a new UID.
+        $this->_tempMap[$imap] = sprintf('F%04x%04x', mt_rand(0, 0xffff), mt_rand(0, 0xffff));
+        $this->_logger->info(sprintf(
+            '[%s] Creating new folder uuid for %s: %s',
+            getmypid(),
+            $imap,
+            $this->_tempMap[$imap]));
+
         return $this->_tempMap[$imap];
     }