Changeset 567

Timestamp:

11/02/07 12:58:42

Author:

fumanchu

Message:

Work in progress.

Files:

• branches/crazycache/dejavu/storage/caching.py (modified) (4 diffs)
• branches/crazycache/dejavu/storage/storememcached.py (modified) (1 diff)
• branches/crazycache/dejavu/test/zoo_fixture.py (modified) (1 diff)

branches/crazycache/dejavu/storage/caching.py

@@ -5 +5 @@
-from dejavu import logic, logflags, recur
-from dejavu.storage import ProxyStorage, resolve
+
+
+simple_attr_lookup = logic.Expression(lambda x: x.Thing == 4).func.func_code.co_code
-
-
@@ -43 +46 @@
-        self.fullquery = allOptions.get("fullquery", False)
-        self.fulljoin = allOptions.get("fulljoin", False)
+        self.cache_recalls = []
+        self.xspecial_stride = 50
-        
-        self.cache = allOptions.get("cache")
@@ -68 +73 @@
-        
-        return u
+    
+    def xspecial(self, cls, key, value, order=None):
+        """Yield multiple units of the given cls where key=value."""
+        keyattrs = self.cache._keyattrs[cls]
+        
+        # Get a cached list of identifier-tuples, ordered if requested.
+        # TODO: add order to the idkey.
+        ids = self.cache.get_index(cls, key, value)
+        if ids is None:
+            # Not in the cache. Grab the list of id-tuples from nextstore.
+            ids = self.view((cls, keyattrs, {key: value}), order=order)
+            # Then cache the list result for next time.
+            self.cache.put_index(cls, key, value, ids, time = 5 * 60)
+        
+        # Query the cache for multiple units (by id).
+        items = self.cache.scan_index(cls, ids)
+        misses = [k for k in ids if k not in items]
+        
+        # Now query the DB for any items that the cache missed...
+        if self.xspecial_stride:
+            # ...in chunks of length: self.xspecial_stride.
+            for step in xrange(0, len(misses), self.xspecial_stride):
+                # TODO: allow for multiple identifiers
+                f = lambda x: ((getattr(x, keyattrs[0]), ) in
+                               misses[step:step + self.xspecial_stride])
+                for unit in self.recall(cls, f):
+                    items[tuple([getattr(unit, a) for a in keyattrs])] = unit
+        elif misses:
+            # ...or all in one chunk if desired.
+            f = lambda x: (getattr(x, keyattrs[0]), ) in misses
+            for unit in self.recall(cls, f):
+                items[tuple([getattr(unit, a) for a in keyattrs])] = unit
+        
+        # Return non-null items only, preserving order
+        for k in ids:
+            yield items[k]
+##            unit = items[k]
+##            if unit is not None:
+##                yield unit
-    
-    def xrecall(self, classes, expr=None, order=None, limit=None, offset=None):
@@ -101 +145 @@
-        elif offset:
-            raise TypeError("Order argument expected when offset is provided.")
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        # Query storage.

branches/crazycache/dejavu/storage/storememcached.py

@@ -387 +387 @@
-        # else:
-        #     self.increment_generation(cls)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

branches/crazycache/dejavu/test/zoo_fixture.py

@@ -1630 +1630 @@
-            tools.djvTestRunner.run(loader(KeyStoreTests))
-            tools.djvTestRunner.run(loader(NumericTests))
-
+##
-            tools.djvTestRunner.run(loader(DiscoveryTests))
-        except: