_collect_objs(), _mark(): Fix some problems that cropped up in the

cycle deletion tests.

lib/python/BDBStorage/BDBFullStorage.py

@@ -15,7 +15,7 @@
 """Berkeley storage with full undo and versioning support.
 """
 
-__version__ = '$Revision: 1.50 $'.split()[-2:][0]
+__version__ = '$Revision: 1.51 $'.split()[-2:][0]
 
 import sys
 import time
@@ -1503,8 +1503,11 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
             oid = orec[1]
             # Delete the object from the serials table
             c = self._serials.cursor(txn)
+            try:
                 try:
                     rec = c.set(oid)
+                except db.DBNotFoundError:
+                    rec = None
                 while rec and rec[0] == oid:
                     c.delete()
                     rec = c.next_dup()
@@ -1519,8 +1522,11 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
                 c.close()
             # Collect all metadata records for this object
             c = self._metadata.cursor(txn)
+            try:
                 try:
                     rec = c.set_range(oid)
+                except db.DBNotFoundError:
+                    rec = None
                 while rec and rec[0][:8] == oid:
                     revid, metadata = rec
                     tid = revid[8:]
@@ -1593,19 +1599,20 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
         # root references, and then for each of those, find all the objects it
         # references, and so on until we've traversed the entire object graph.
         while oid:
-            if self._packmark.has_key(oid):
-                # We've already seen this object
-                continue
+            if not self._packmark.has_key(oid):
+                # We haven't seen this object yet
                 self._packmark.put(oid, PRESENT, txn=txn)
-            # Get the pickle data for the most current revision of this object
-            # as of the pack time.
+                # Get the pickle data for the most current revision of this
+                # object as of the pack time.
                 tid = self._findrev(oid, packtid, txn)
-            # Say there's no root object (as is the case in some of the unit
-            # tests), and we're looking up oid ZERO.  Then serial will be None.
+                # Say there's no root object (as is the case in some of the
+                # unit tests), and we're looking up oid ZERO.  Then serial
+                # will be None.
                 if tid is not None:
                     lrevid = self._metadata[oid+tid][16:24]
                     data = self._pickles[oid+lrevid]
-                # Now get the oids of all the objects referenced by this pickle
+                    # Now get the oids of all the objects referenced by this
+                    # pickle
                     refdoids = []
                     referencesf(data, refdoids)
                     # And append them to the queue for later

lib/python/BDBStorage/BDBMinimalStorage.py

@@ -15,7 +15,7 @@
 """Berkeley storage without undo or versioning.
 """
 
-__version__ = '$Revision: 1.14 $'[-2:][0]
+__version__ = '$Revision: 1.15 $'[-2:][0]
 
 import time
 import threading
@@ -440,17 +440,18 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
         # root references, and then for each of those, find all the objects it
         # references, and so on until we've traversed the entire object graph.
         while oid:
-            if self._packmark.has_key(oid):
-                # We've already seen this object
-                continue
+            if not self._packmark.has_key(oid):
+                # We've haven't yet seen this object
                 self._packmark.put(oid, PRESENT, txn=txn)
                 # Get the pickle data for this object
                 tid = self._getCurrentSerial(oid)
-            # Say there's no root object (as is the case in some of the unit
-            # tests), and we're looking up oid ZERO.  Then serial will be None.
+                # Say there's no root object (as is the case in some of the
+                # unit tests), and we're looking up oid ZERO.  Then serial
+                # will be None.
                 if tid is not None:
                     data = self._pickles[oid+tid]
-                # Now get the oids of all the objects referenced by this pickle
+                    # Now get the oids of all the objects referenced by this
+                    # pickle
                     refdoids = []
                     referencesf(data, refdoids)
                     # And append them to the queue for later
@@ -482,10 +483,14 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
         orec = self._oidqueue.consume()
         while orec:
             oid = orec[1]
+            serial = self._getCurrentSerial(oid)
             # Delete the object from the serials table
             c = self._serials.cursor(txn)
+            try:
                 try:
                     rec = c.set(oid)
+                except db.DBNotFoundError:
+                    rec = None
                 while rec and rec[0] == oid:
                     c.delete()
                     rec = c.next_dup()
@@ -500,8 +505,11 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
                 c.close()
             # Now collect the pickle data and do reference counting
             c = self._pickles.cursor(txn)
+            try:
                 try:
                     rec = c.set_range(oid)
+                except db.DBNotFoundError:
+                    rec = None
                 while rec and rec[0][:8] == oid:
                     data = rec[1]
                     c.delete()
@@ -510,8 +518,7 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
                     self._update(deltas, data, -1)
                     for oid, delta in deltas.items():
                         refcount = U64(self._refcounts.get(oid, ZERO)) + delta
-                        assert refcount >= 0
-                        if refcount == 0:
+                        if refcount <= 0:
                             self._oidqueue.append(oid, txn)
                         else:
                             self._refcounts.put(oid, p64(refcount), txn=txn)

lib/python/BDBStorage/Full.py

@@ -15,7 +15,7 @@
 """Berkeley storage with full undo and versioning support.
 """
 
-__version__ = '$Revision: 1.50 $'.split()[-2:][0]
+__version__ = '$Revision: 1.51 $'.split()[-2:][0]
 
 import sys
 import time
@@ -1503,8 +1503,11 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
             oid = orec[1]
             # Delete the object from the serials table
             c = self._serials.cursor(txn)
+            try:
                 try:
                     rec = c.set(oid)
+                except db.DBNotFoundError:
+                    rec = None
                 while rec and rec[0] == oid:
                     c.delete()
                     rec = c.next_dup()
@@ -1519,8 +1522,11 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
                 c.close()
             # Collect all metadata records for this object
             c = self._metadata.cursor(txn)
+            try:
                 try:
                     rec = c.set_range(oid)
+                except db.DBNotFoundError:
+                    rec = None
                 while rec and rec[0][:8] == oid:
                     revid, metadata = rec
                     tid = revid[8:]
@@ -1593,19 +1599,20 @@ class Full(BerkeleyBase, ConflictResolvingStorage):
         # root references, and then for each of those, find all the objects it
         # references, and so on until we've traversed the entire object graph.
         while oid:
-            if self._packmark.has_key(oid):
-                # We've already seen this object
-                continue
+            if not self._packmark.has_key(oid):
+                # We haven't seen this object yet
                 self._packmark.put(oid, PRESENT, txn=txn)
-            # Get the pickle data for the most current revision of this object
-            # as of the pack time.
+                # Get the pickle data for the most current revision of this
+                # object as of the pack time.
                 tid = self._findrev(oid, packtid, txn)
-            # Say there's no root object (as is the case in some of the unit
-            # tests), and we're looking up oid ZERO.  Then serial will be None.
+                # Say there's no root object (as is the case in some of the
+                # unit tests), and we're looking up oid ZERO.  Then serial
+                # will be None.
                 if tid is not None:
                     lrevid = self._metadata[oid+tid][16:24]
                     data = self._pickles[oid+lrevid]
-                # Now get the oids of all the objects referenced by this pickle
+                    # Now get the oids of all the objects referenced by this
+                    # pickle
                     refdoids = []
                     referencesf(data, refdoids)
                     # And append them to the queue for later

lib/python/BDBStorage/Minimal.py

@@ -15,7 +15,7 @@
 """Berkeley storage without undo or versioning.
 """
 
-__version__ = '$Revision: 1.14 $'[-2:][0]
+__version__ = '$Revision: 1.15 $'[-2:][0]
 
 import time
 import threading
@@ -440,17 +440,18 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
         # root references, and then for each of those, find all the objects it
         # references, and so on until we've traversed the entire object graph.
         while oid:
-            if self._packmark.has_key(oid):
-                # We've already seen this object
-                continue
+            if not self._packmark.has_key(oid):
+                # We've haven't yet seen this object
                 self._packmark.put(oid, PRESENT, txn=txn)
                 # Get the pickle data for this object
                 tid = self._getCurrentSerial(oid)
-            # Say there's no root object (as is the case in some of the unit
-            # tests), and we're looking up oid ZERO.  Then serial will be None.
+                # Say there's no root object (as is the case in some of the
+                # unit tests), and we're looking up oid ZERO.  Then serial
+                # will be None.
                 if tid is not None:
                     data = self._pickles[oid+tid]
-                # Now get the oids of all the objects referenced by this pickle
+                    # Now get the oids of all the objects referenced by this
+                    # pickle
                     refdoids = []
                     referencesf(data, refdoids)
                     # And append them to the queue for later
@@ -482,10 +483,14 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
         orec = self._oidqueue.consume()
         while orec:
             oid = orec[1]
+            serial = self._getCurrentSerial(oid)
             # Delete the object from the serials table
             c = self._serials.cursor(txn)
+            try:
                 try:
                     rec = c.set(oid)
+                except db.DBNotFoundError:
+                    rec = None
                 while rec and rec[0] == oid:
                     c.delete()
                     rec = c.next_dup()
@@ -500,8 +505,11 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
                 c.close()
             # Now collect the pickle data and do reference counting
             c = self._pickles.cursor(txn)
+            try:
                 try:
                     rec = c.set_range(oid)
+                except db.DBNotFoundError:
+                    rec = None
                 while rec and rec[0][:8] == oid:
                     data = rec[1]
                     c.delete()
@@ -510,8 +518,7 @@ class Minimal(BerkeleyBase, ConflictResolvingStorage):
                     self._update(deltas, data, -1)
                     for oid, delta in deltas.items():
                         refcount = U64(self._refcounts.get(oid, ZERO)) + delta
-                        assert refcount >= 0
-                        if refcount == 0:
+                        if refcount <= 0:
                             self._oidqueue.append(oid, txn)
                         else:
                             self._refcounts.put(oid, p64(refcount), txn=txn)