r2766 - listCells(): lookup and update both entity caches

 - spotEntity(): idem

diff --git a/inc/database.php b/inc/database.php
index 3b9f8f5c8d42c34ef3ed979361a0f38d9414a54e..32ee7602fc2c2818e43d394630488eec24e314bd 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -255,6 +255,12 @@ function getNarrowObjectList ($varname = '')
 // enough information for judgeCell() to execute.
 function listCells ($realm, $parent_id = 0)
 {
+       if (!$parent_id)
+       {
+               global $entityCache;
+               if (isset ($entityCache['complete'][$realm]))
+                       return $entityCache['complete'][$realm];
+       }
        global $SQLSchema;
        if (!isset ($SQLSchema[$realm]))
        {
@@ -304,7 +310,9 @@ function listCells ($realm, $parent_id = 0)
                                'parent_id' => $taglist[$row['tag_id']]['parent_id'],
                        );
        }
-       // Add necessary finish to the list before returning it.
+       // Add necessary finish to the list before returning it. Maintain caches.
+       if (!$parent_id)
+               unset ($entityCache['partial'][$realm]);
        foreach (array_keys ($ret) as $entity_id)
        {
                $ret[$entity_id]['etags'] = getExplicitTagsOnly ($ret[$entity_id]['etags']);
@@ -333,6 +341,10 @@ function listCells ($realm, $parent_id = 0)
                default:
                        break;
                }
+               if (!$parent_id)
+                       $entityCache['complete'][$realm][$entity_id] = $ret[$entity_id];
+               else
+                       $entityCache['partial'][$realm][$entity_id] = $ret[$entity_id];
        }
        return $ret;
 }
@@ -341,6 +353,12 @@ function listCells ($realm, $parent_id = 0)
 // if it does not exist).
 function spotEntity ($realm, $id)
 {
+       global $entityCache;
+       if (isset ($entityCache['complete'][$realm]))
+       // Emphasize the absence of record, if listCells() has already been called.
+               return (isset ($entityCache['complete'][$realm][$id])) ? $entityCache['complete'][$realm][$id] : NULL;
+       elseif (isset ($entityCache['partial'][$realm][$id]))
+               return $entityCache['partial'][$realm][$id];
        global $SQLSchema;
        if (!isset ($SQLSchema[$realm]))
        {
@@ -409,6 +427,7 @@ function spotEntity ($realm, $id)
        default:
                break;
        }
+       $entityCache['partial'][$realm][$id] = $ret;
        return $ret;
 }
 

diff --git a/inc/init.php b/inc/init.php
index 399929d16aaa5a6749e405fd26cce5f2bd9eed30..bb7eecf54853dbada472e90721449adbb7e5aee5 100644 (file)
--- a/inc/init.php
+++ b/inc/init.php
@@ -138,6 +138,8 @@ $pTable = buildPredicateTable ($rackCode);
 // things running is to maintain application cache for them.
 $parseCache = array();
 
+$entityCache = array();
+
 $taglist = getTagList();
 $tagtree = treeFromList ($taglist);
 sortTree ($tagtree, 'taginfoCmp');