Mercurial > p > roundup > code
changeset 570:e346a9792335
fixed back_bsddb so it passed the journal tests
... it didn't seem happy using the back_anydbm _open method, which is odd.
Yet another occurrance of whichdb not being able to recognise older bsddb
databases. Yadda yadda. Made the HYPERDBDEBUG stuff more sane in the
process.
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Tue, 22 Jan 2002 07:21:13 +0000 |
| parents | d426d44abd3c |
| children | 2998d683e2cf |
| files | CHANGES.txt roundup/backends/back_anydbm.py roundup/backends/back_bsddb.py roundup/hyperdb.py test/test_db.py |
| diffstat | 5 files changed, 68 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGES.txt Tue Jan 22 07:08:50 2002 +0000 +++ b/CHANGES.txt Tue Jan 22 07:21:13 2002 +0000 @@ -18,7 +18,7 @@ Fixed: . handle attachments with no name (eg tnef) . fixed setting nosy as argument in subject line - + . fixed back_bsddb so it passed the journal tests 2002-01-16 - 0.4.0b2 Fixed:
--- a/roundup/backends/back_anydbm.py Tue Jan 22 07:08:50 2002 +0000 +++ b/roundup/backends/back_anydbm.py Tue Jan 22 07:21:13 2002 +0000 @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -#$Id: back_anydbm.py,v 1.26 2002-01-22 05:18:38 rochecompaan Exp $ +#$Id: back_anydbm.py,v 1.27 2002-01-22 07:21:13 richard Exp $ ''' This module defines a backend that saves the hyperdatabase in a database chosen by anydbm. It is guaranteed to always be available in python @@ -26,8 +26,6 @@ import whichdb, anydbm, os, marshal from roundup import hyperdb, date, password -DEBUG=os.environ.get('HYPERDBDEBUG', '') - # # Now the database # @@ -71,13 +69,13 @@ def __getattr__(self, classname): """A convenient way of calling self.getclass(classname).""" if self.classes.has_key(classname): - if DEBUG: + if hyperdb.DEBUG: print '__getattr__', (self, classname) return self.classes[classname] raise AttributeError, classname def addclass(self, cl): - if DEBUG: + if hyperdb.DEBUG: print 'addclass', (self, cl) cn = cl.classname if self.classes.has_key(cn): @@ -86,7 +84,7 @@ def getclasses(self): """Return a list of the names of all existing classes.""" - if DEBUG: + if hyperdb.DEBUG: print 'getclasses', (self,) l = self.classes.keys() l.sort() @@ -97,7 +95,7 @@ If 'classname' is not a valid class name, a KeyError is raised. """ - if DEBUG: + if hyperdb.DEBUG: print 'getclass', (self, classname) return self.classes[classname] @@ -107,7 +105,7 @@ def clear(self): '''Delete all database contents ''' - if DEBUG: + if hyperdb.DEBUG: print 'clear', (self,) for cn in self.classes.keys(): for type in 'nodes', 'journals': @@ -121,7 +119,7 @@ ''' grab a connection to the class db that will be used for multiple actions ''' - if DEBUG: + if hyperdb.DEBUG: print 'getclassdb', (self, classname, mode) return self._opendb('nodes.%s'%classname, mode) @@ -129,7 +127,7 @@ '''Low-level database opener that gets around anydbm/dbm eccentricities. ''' - if DEBUG: + if hyperdb.DEBUG: print '_opendb', (self, name, mode) # determine which DB wrote the class file db_type = '' @@ -145,7 +143,7 @@ # new database? let anydbm pick the best dbm if not db_type: - if DEBUG: + if hyperdb.DEBUG: print "_opendb anydbm.open(%r, 'n')"%path return anydbm.open(path, 'n') @@ -156,7 +154,7 @@ raise hyperdb.DatabaseError, \ "Couldn't open database - the required module '%s'"\ "is not available"%db_type - if DEBUG: + if hyperdb.DEBUG: print "_opendb %r.open(%r, %r)"%(db_type, path, mode) return dbm.open(path, mode) @@ -166,7 +164,7 @@ def addnode(self, classname, nodeid, node): ''' add the specified node to its class's db ''' - if DEBUG: + if hyperdb.DEBUG: print 'addnode', (self, classname, nodeid, node) self.newnodes.setdefault(classname, {})[nodeid] = 1 self.cache.setdefault(classname, {})[nodeid] = node @@ -175,7 +173,7 @@ def setnode(self, classname, nodeid, node): ''' change the specified node ''' - if DEBUG: + if hyperdb.DEBUG: print 'setnode', (self, classname, nodeid, node) self.dirtynodes.setdefault(classname, {})[nodeid] = 1 # can't set without having already loaded the node @@ -185,15 +183,15 @@ def savenode(self, classname, nodeid, node): ''' perform the saving of data specified by the set/addnode ''' - if DEBUG: + if hyperdb.DEBUG: print 'savenode', (self, classname, nodeid, node) self.transactions.append((self._doSaveNode, (classname, nodeid, node))) def getnode(self, classname, nodeid, db=None, cache=1): ''' get a node from the database ''' - if DEBUG: - print 'getnode', (self, classname, nodeid, cldb) + if hyperdb.DEBUG: + print 'getnode', (self, classname, nodeid, db) if cache: # try the cache cache = self.cache.setdefault(classname, {}) @@ -213,8 +211,8 @@ def hasnode(self, classname, nodeid, db=None): ''' determine if the database has a given node ''' - if DEBUG: - print 'hasnode', (self, classname, nodeid, cldb) + if hyperdb.DEBUG: + print 'hasnode', (self, classname, nodeid, db) # try the cache cache = self.cache.setdefault(classname, {}) if cache.has_key(nodeid): @@ -227,8 +225,8 @@ return res def countnodes(self, classname, db=None): - if DEBUG: - print 'countnodes', (self, classname, cldb) + if hyperdb.DEBUG: + print 'countnodes', (self, classname, db) # include the new nodes not saved to the DB yet count = len(self.newnodes.get(classname, {})) @@ -239,7 +237,7 @@ return count def getnodeids(self, classname, db=None): - if DEBUG: + if hyperdb.DEBUG: print 'getnodeids', (self, classname, db) # start off with the new nodes res = self.newnodes.get(classname, {}).keys() @@ -294,7 +292,7 @@ 'link' or 'unlink' -- 'params' is (classname, nodeid, propname) 'retire' -- 'params' is None ''' - if DEBUG: + if hyperdb.DEBUG: print 'addjournal', (self, classname, nodeid, action, params) self.transactions.append((self._doSaveJournal, (classname, nodeid, action, params))) @@ -302,7 +300,7 @@ def getjournal(self, classname, nodeid): ''' get the journal for id ''' - if DEBUG: + if hyperdb.DEBUG: print 'getjournal', (self, classname, nodeid) # attempt to open the journal - in some rare cases, the journal may # not exist @@ -322,7 +320,7 @@ def pack(self, pack_before): ''' delete all journal entries before 'pack_before' ''' - if DEBUG: + if hyperdb.DEBUG: print 'packjournal', (self, pack_before) pack_before = pack_before.get_tuple() @@ -375,7 +373,7 @@ def commit(self): ''' Commit the current transactions. ''' - if DEBUG: + if hyperdb.DEBUG: print 'commit', (self,) # TODO: lock the DB @@ -399,7 +397,7 @@ self.transactions = [] def _doSaveNode(self, classname, nodeid, node): - if DEBUG: + if hyperdb.DEBUG: print '_doSaveNode', (self, classname, nodeid, node) # get the database handle @@ -413,7 +411,7 @@ db[nodeid] = marshal.dumps(node) def _doSaveJournal(self, classname, nodeid, action, params): - if DEBUG: + if hyperdb.DEBUG: print '_doSaveJournal', (self, classname, nodeid, action, params) entry = (nodeid, date.Date().get_tuple(), self.journaltag, action, params) @@ -441,7 +439,7 @@ def rollback(self): ''' Reverse all actions from the current transaction. ''' - if DEBUG: + if hyperdb.DEBUG: print 'rollback', (self, ) for method, args in self.transactions: # delete temporary files @@ -455,6 +453,9 @@ # #$Log: not supported by cvs2svn $ +#Revision 1.26 2002/01/22 05:18:38 rochecompaan +#last_set_entry was referenced before assignment +# #Revision 1.25 2002/01/22 05:06:08 rochecompaan #We need to keep the last 'set' entry in the journal to preserve #information on 'activity' for nodes.
--- a/roundup/backends/back_bsddb.py Tue Jan 22 07:08:50 2002 +0000 +++ b/roundup/backends/back_bsddb.py Tue Jan 22 07:21:13 2002 +0000 @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -#$Id: back_bsddb.py,v 1.13 2001-12-10 22:20:01 richard Exp $ +#$Id: back_bsddb.py,v 1.14 2002-01-22 07:21:13 richard Exp $ ''' This module defines a backend that saves the hyperdatabase in BSDDB. ''' @@ -51,6 +51,24 @@ else: return bsddb.btopen(path, 'n') + def _opendb(self, name, mode): + '''Low-level database opener that gets around anydbm/dbm + eccentricities. + ''' + if hyperdb.DEBUG: + print self, '_opendb', (self, name, mode) + # determine which DB wrote the class file + path = os.path.join(os.getcwd(), self.dir, name) + if not os.path.exists(path): + if hyperdb.DEBUG: + print "_opendb bsddb.open(%r, 'n')"%path + return bsddb.btopen(path, 'n') + + # open the database with the correct module + if hyperdb.DEBUG: + print "_opendb bsddb.open(%r, %r)"%(path, mode) + return bsddb.btopen(path, mode) + # # Journal # @@ -91,6 +109,13 @@ # #$Log: not supported by cvs2svn $ +#Revision 1.13 2001/12/10 22:20:01 richard +#Enabled transaction support in the bsddb backend. It uses the anydbm code +#where possible, only replacing methods where the db is opened (it uses the +#btree opener specifically.) +#Also cleaned up some change note generation. +#Made the backends package work with pydoc too. +# #Revision 1.12 2001/11/21 02:34:18 richard #Added a target version field to the extended issue schema #
--- a/roundup/hyperdb.py Tue Jan 22 07:08:50 2002 +0000 +++ b/roundup/hyperdb.py Tue Jan 22 07:21:13 2002 +0000 @@ -15,18 +15,19 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: hyperdb.py,v 1.52 2002-01-21 16:33:19 rochecompaan Exp $ +# $Id: hyperdb.py,v 1.53 2002-01-22 07:21:13 richard Exp $ __doc__ = """ Hyperdatabase implementation, especially field types. """ # standard python modules -import cPickle, re, string, weakref +import cPickle, re, string, weakref, os # roundup modules import date, password +DEBUG = os.environ.get('HYPERDBDEBUG', '') # # Types @@ -1065,6 +1066,9 @@ # # $Log: not supported by cvs2svn $ +# Revision 1.52 2002/01/21 16:33:19 rochecompaan +# You can now use the roundup-admin tool to pack the database +# # Revision 1.51 2002/01/21 03:01:29 richard # brief docco on the do_journal argument #
--- a/test/test_db.py Tue Jan 22 07:08:50 2002 +0000 +++ b/test/test_db.py Tue Jan 22 07:21:13 2002 +0000 @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: test_db.py,v 1.17 2002-01-22 05:06:09 rochecompaan Exp $ +# $Id: test_db.py,v 1.18 2002-01-22 07:21:13 richard Exp $ import unittest, os, shutil @@ -246,7 +246,6 @@ self.db.commit() self.db.issue.set('1', status='3') self.db.commit() - pack_before = date.Date(". + 1d") self.db.pack(pack_before) journal = self.db.getjournal('issue', '1') @@ -347,6 +346,10 @@ # # $Log: not supported by cvs2svn $ +# Revision 1.17 2002/01/22 05:06:09 rochecompaan +# We need to keep the last 'set' entry in the journal to preserve +# information on 'activity' for nodes. +# # Revision 1.16 2002/01/21 16:33:20 rochecompaan # You can now use the roundup-admin tool to pack the database #