Changeset 33

Timestamp:

11/21/04 03:30:23

Author:

fumanchu

Message:

Rewrote handling of Unit.dirty. For UnitProperty? types which were mutable (like list and dict), we had to explicitly set dirty, because dirty only set automatically on rebind, not mutate. New system uses a hash of unit._properties; unit.dirty() compares unit._initial_property_hash with the current hash, returning True if they differ. Unit.cleanse() sets _initial_property_hash to the current hash, and is called in Unit.init().

Files:

• trunk/__init__.py (modified) (8 diffs)
• trunk/doc/framework.html (modified) (2 diffs)
• trunk/engines.py (modified) (1 diff)
• trunk/readme.py (modified) (2 diffs)
• trunk/storage/__init__.py (modified) (2 diffs)
• trunk/storage/storeado.py (modified) (2 diffs)
• trunk/storage/storeodbc.py (modified) (3 diffs)
• trunk/storage/test_storeado.py (modified) (1 diff)
• trunk/test_dejavu.py (modified) (4 diffs)

trunk/__init__.py

@@ -1 +1 @@
-import ConfigParser
-import datetime
-
+
+
+
+
+
-
-from dejavu.containers import *
@@ -134 +138 @@
-            if unit.sandbox and self.pre:
-                self.pre(unit, value)
-            unit.dirty = True
-            unit._properties[self.key] = value
-            if unit.sandbox and self.post:
@@ -201 +204 @@
-        these processes should set the sandbox attribute.
-    
-a flag indicating
+indicates
-        have been modified. This flag is used by Sandboxes to optimize
-        forget(): they do not ask Storage Managers to save data for Units
@@ -228 +231 @@
-        
-        self.sandbox = None
-        self.dirty = False
-        
-        for k, v in kwargs.iteritems():
-            setattr(self, k, v)
+        self.cleanse()
+    
+    def _property_hash(self):
+        return sha.new(pickle.dumps(self._properties)).digest()
+    
+    def dirty(self):
+        return self._initial_property_hash != self._property_hash()
+    
+    def cleanse(self):
+        self._initial_property_hash = self._property_hash()
-    
-    def set_property(cls, key, type=unicode, index=False,
@@ -294 +306 @@
-    
-    def __getstate__(self):
-dirty
+_initial_property_hash
-    
-    def __setstate__(self, state):
-        self.sandbox = None
-dirty
+_initial_property_hash
-    
-    def add(self, unit):
@@ -517 +529 @@
-        
-        # Ask the store to accept the unit, assigning it an ID if
-set unit.dirty to False
- or not
+call unit.cleanse()
+
-        store = self.arena.storage(cls)
-        if store:
@@ -738 +750 @@
-                unit.on_repress()
-            
-
+()
-                store.save(unit)
-    
@@ -753 +765 @@
-        cls = unit.__class__
-        store = self.arena.storage(cls)
-
+()
-            store.save(unit)
-        

trunk/doc/framework.html

@@ -150 +150 @@
-        which is a working decompiler for ADO databases. You should be able
-        to tweak it for most databases with a couple of SQL syntax changes.
-
-
+
-    <li><tt>ADOSQLDecompiler</tt> is built on a simple Visitor-style base
- extensions
-are easily added to this base class; each bytecode in the Expressio
-
+
+extensions are easily added to this base class; each bytecode i
+the Expression 
-    <li>You don't have to handle globals or cell references within the
-        lambda--when the lambda gets wrapped in an Expression, all free
@@ -189 +188 @@
-        in the sequence. You should probably lock this whole method in a
-        <tt>threading.Lock</tt>.</li>
-
+()
-        iterate through the Unit's properties() and persist each value,
-        using an Adapter to coerce each value to the type expected by your
-        database (or not, it's up to you; storeado special-cases
-
+
+
+
-    <li><b>destroy</b>: <tt>"DELETE * FROM [%(table)s] WHERE ID = 
-        %(id)s"</tt>. That's all.</li>

trunk/engines.py

@@ -56 +56 @@
-    
-    def __getstate__(self):
-dirty
+_initial_property_hash
-    
-    def __setstate__(self, state):
-        self.sandbox = None
-        self._mutex = threading.RLock()
-dirty
+_initial_property_hash
-    
-    def acquire(self):

trunk/readme.py

@@ -49 +49 @@
-
-todo = """
-1. Batched triggers:
-    Some pre/post triggers should be delayed until end of request,
-    particularly those which affect related Units. Also on_forget(), etc.
-    There should be a generic trigger mechanism with the ability for
-    client code to register new trigger points. Probably each Unit class
-    should maintain an attribute triggers = {}, where each key is a string
-    and each value is a callable which gets passed "self". Standard
-    triggers would include:
-        1. Pre-modify property X
-        2. Post-modify property X.
-        3. Pre-forget/post-forget.
-        4. on_flush (end of request)
-2. For UnitProperty types which are mutable (like dicts), we currently have to
-    explicitly set dirty, because dirty only sets automatically on rebind,
-    not mutate. Fix if possible, or doc the heck out of it.
-3. Speed issues:
-    1. Chained, related Unit classes would be nice to have in Expressions.
-        lambda x: x.Amount > 0 and x.Characteristic.Type = 'grr'
-    2. It would be nice to declare e.g. Job has only one Project;
-        this would allow job.Project() to set quota = 1 on recall.
-    3. Batch memorize when adding several units with auto ID's.
-4. u"SELECT * FROM [djvMissionTrip] WHERE ((([djvMissionTrip].[LastDate] <> Null)
-    and ([djvMissionTrip].[LastDate] >= #10/14/2004#))
-    and ([djvMissionTrip].[Field] = 'BC'))
-    and ([u'C'] Like '%djvMissionTrip].[Plan%')"
-5. More SM's.
-    SQLite
-    PostgreSQL
-    shelve
-    dbm
-
-
-2.0:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        huge issue--it only affects those who wish to deploy the same app
-        twice within the same process--an odd corner case.
-
-
-
+5. 
+6. 
+7. 
-        with respect to dejavu instead of sqlobject.
-"""
@@ -98 +90 @@
-    2. UnitProperty now supplies .key from local attribute name when
-        specified in class body (see MetaUnit __init__).
+    3. Made Decompiler less fragile by adding stack sentinels:
+        cannot_represent, table_arg, kw_arg
+    4. Rewrote handling of Unit.dirty. For UnitProperty types which were
+        mutable (like list and dict), we had to explicitly set dirty,
+        because dirty only set automatically on rebind, not mutate.
+        New system uses a hash of unit._properties; unit.dirty() compares
+        unit._initial_property_hash with the current hash, returning True
+        if they differ. Unit.cleanse() sets _initial_property_hash to the
+        current hash, and is called in Unit.__init__().
-
-1.2.5 (11/15/04):

trunk/storage/__init__.py

@@ -159 +159 @@
-        """Store the unit."""
-        # Defer store.save() for sweepers.
-
+()
-            lock = self._get_lock(unit.__class__)
-            try:
@@ -205 +205 @@
-                    or lastRecall < lastSweepTime):
-                    unit = pickle.loads(cache[id])
-
+()
-                        self.nextstore.save(unit)
-                    

trunk/storage/storeado.py

@@ -855 +855 @@
-        The ID should be supplied by UnitSequencers via reserve().
-        """
-
+()
-            cls = unit.__class__
-            clsname = cls.__name__
@@ -884 +884 @@
-            anRS.Update()
-            anRS.Close()
-dirty = False
+cleanse()
-    
-    def save_expanded(self, unit, key):

trunk/storage/storeodbc.py

@@ -278 +278 @@
-            coercer.consume(eachKey, row[self.colIndices[eachKey.lower()]])
-        unit.concrete = True
-dirty = False
+cleanse()
-        return True
-    
@@ -423 +423 @@
-        The ID should be already supplied by the UnitServer(s).
-        """
-
+()
-            # Use an UPDATE command.
-            SETAtoms = [u"%s = %s" % (eachKey, savecoercer.coerce(getattr(unit, eachKey)))
@@ -449 +449 @@
-                                   % (tablename, unit.ID))
-                self.execute(insertStatement)
-dirty = False
+cleanse()
-        return True
-    

trunk/storage/test_storeado.py

@@ -191 +191 @@
-        # This broke on 5/10/04, because "== None" wasn't succeeding as "= Null".
-        trial(lambda x: x.DateTo == None, u"[djvThings].[DateTo] Is Null", False)
-
+
+
+
+
-        # Multiple arguments (? Why should this be supported?)
-        trial(lambda x, y, z: x.Date == 3 and y.Qty > 4 and z.Qty < 20,

trunk/test_dejavu.py

@@ -13 +13 @@
-        a.ID = 321
-        self.assertEqual(a.ID, 321)
-
+()
-        a.ID = '444'
-        self.assertEqual(a.ID, 444)
@@ -33 +33 @@
-            Unicode = dejavu.UnitProperty(unicode)
-            Datetime = Triggered(datetime.datetime)
+            Dict = dejavu.UnitProperty(dict)
-        
-        # Instance creation and population
-        t = Thing(Integer=3, String='abc', Unicode=u'foo')
+        self.assertEqual(t.dirty(), False)
-        self.assertEqual(t.Integer, 3)
-        self.assertEqual(t.String, 'abc')
@@ -42 +44 @@
-        self.assertEqual(type(t.Unicode), unicode)
-        self.assertEqual(t.Datetime, None)
+        self.assertEqual(t.Dict, None)
-        
-        # Index attribute
-        self.assertEqual(t.__class__.Integer.index, True)
-        
-, 
+/
-        t.sandbox = True
-        self.assertEqual(hasattr(t, 'preval'), False)
@@ -52 +55 @@
-        self.assertEqual(t.preval, aDate)
-        self.assertEqual(t.postval, aDate)
-
+
+
+
+
+
+
-
-if __name__ == "__main__":