X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=roundup%2Fbackends%2Fback_bsddb.py;h=6f7aa9d7a15dd5a153282e3c9185b7878cab6109;hb=f33816f46bf6fec4906e05ad93a8fbc493fdda98;hp=cc4e924e5a52ad353698bd15053c1e1dbdf8a556;hpb=7ef36b5a488d7b08043740b1e48420151ac815c9;p=roundup.git diff --git a/roundup/backends/back_bsddb.py b/roundup/backends/back_bsddb.py index cc4e924..6f7aa9d 100644 --- a/roundup/backends/back_bsddb.py +++ b/roundup/backends/back_bsddb.py @@ -15,59 +15,22 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -#$Id: back_bsddb.py,v 1.11 2001-10-09 23:58:10 richard Exp $ +#$Id: back_bsddb.py,v 1.24 2002-09-13 08:20:11 richard Exp $ +''' +This module defines a backend that saves the hyperdatabase in BSDDB. +''' import bsddb, os, marshal -from roundup import hyperdb, date, password +from roundup import hyperdb, date + +# these classes are so similar, we just use the anydbm methods +from back_anydbm import Database, Class, FileClass, IssueClass # # Now the database # -class Database(hyperdb.Database): +class Database(Database): """A database for storing records containing flexible data types.""" - - def __init__(self, storagelocator, journaltag=None): - """Open a hyperdatabase given a specifier to some storage. - - The meaning of 'storagelocator' depends on the particular - implementation of the hyperdatabase. It could be a file name, - a directory path, a socket descriptor for a connection to a - database over the network, etc. - - The 'journaltag' is a token that will be attached to the journal - entries for any edits done on the database. If 'journaltag' is - None, the database is opened in read-only mode: the Class.create(), - Class.set(), and Class.retire() methods are disabled. - """ - self.dir, self.journaltag = storagelocator, journaltag - self.classes = {} - - # - # Classes - # - def __getattr__(self, classname): - """A convenient way of calling self.getclass(classname).""" - return self.classes[classname] - - def addclass(self, cl): - cn = cl.classname - if self.classes.has_key(cn): - raise ValueError, cn - self.classes[cn] = cl - - def getclasses(self): - """Return a list of the names of all existing classes.""" - l = self.classes.keys() - l.sort() - return l - - def getclass(self, classname): - """Get the Class object representing a particular class. - - If 'classname' is not a valid class name, a KeyError is raised. - """ - return self.classes[classname] - # # Class DBs # @@ -86,72 +49,29 @@ class Database(hyperdb.Database): if os.path.exists(path): return bsddb.btopen(path, mode) else: - return bsddb.btopen(path, 'n') + return bsddb.btopen(path, 'c') - # - # Nodes - # - def addnode(self, classname, nodeid, node): - ''' add the specified node to its class's db + def opendb(self, name, mode): + '''Low-level database opener that gets around anydbm/dbm + eccentricities. ''' - db = self.getclassdb(classname, 'c') - db[nodeid] = marshal.dumps(node) - db.close() - setnode = addnode - - def getnode(self, classname, nodeid, cldb=None): - ''' add the specified node to its class's db - ''' - db = cldb or self.getclassdb(classname) - if not db.has_key(nodeid): - raise IndexError, nodeid - res = marshal.loads(db[nodeid]) - if not cldb: db.close() - return res - - def hasnode(self, classname, nodeid, cldb=None): - ''' add the specified node to its class's db - ''' - db = cldb or self.getclassdb(classname) - res = db.has_key(nodeid) - if not cldb: db.close() - return res - - def countnodes(self, classname, cldb=None): - db = cldb or self.getclassdb(classname) - return len(db.keys()) - if not cldb: db.close() - return res - - def getnodeids(self, classname, cldb=None): - db = cldb or self.getclassdb(classname) - res = db.keys() - if not cldb: db.close() - return res + if __debug__: + print >>hyperdb.DEBUG, 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 __debug__: + print >>hyperdb.DEBUG, "opendb bsddb.open(%r, 'c')"%path + return bsddb.btopen(path, 'c') + + # open the database with the correct module + if __debug__: + print >>hyperdb.DEBUG, "opendb bsddb.open(%r, %r)"%(path, mode) + return bsddb.btopen(path, mode) # # Journal # - def addjournal(self, classname, nodeid, action, params): - ''' Journal the Action - 'action' may be: - - 'create' or 'set' -- 'params' is a dictionary of property values - 'link' or 'unlink' -- 'params' is (classname, nodeid, propname) - 'retire' -- 'params' is None - ''' - entry = (nodeid, date.Date().get_tuple(), self.journaltag, action, - params) - db = bsddb.btopen(os.path.join(self.dir, 'journals.%s'%classname), 'c') - if db.has_key(nodeid): - s = db[nodeid] - l = marshal.loads(db[nodeid]) - l.append(entry) - else: - l = [entry] - db[nodeid] = marshal.dumps(l) - db.close() - def getjournal(self, classname, nodeid): ''' get the journal for id ''' @@ -162,88 +82,28 @@ class Database(hyperdb.Database): 'r') except bsddb.error, error: if error.args[0] != 2: raise - return [] - # mor handling of bad journals - if not db.has_key(nodeid): return [] + raise IndexError, 'no such %s %s'%(classname, nodeid) + # more handling of bad journals + if not db.has_key(nodeid): + raise IndexError, 'no such %s %s'%(classname, nodeid) journal = marshal.loads(db[nodeid]) res = [] for entry in journal: - (nodeid, date_stamp, self.journaltag, action, params) = entry + (nodeid, date_stamp, user, action, params) = entry date_obj = date.Date(date_stamp) - res.append((nodeid, date_obj, self.journaltag, action, params)) + res.append((nodeid, date_obj, user, action, params)) db.close() return res - def close(self): - ''' Close the Database - we must release the circular refs so that - we can be del'ed and the underlying bsddb connections closed - cleanly. - ''' - self.classes = None - - - # - # Basic transaction support - # - # TODO: well, write these methods (and then use them in other code) - def register_action(self): - ''' Register an action to the transaction undo log - ''' - - def commit(self): - ''' Commit the current transaction, start a new one - ''' - - def rollback(self): - ''' Reverse all actions from the current transaction + def getCachedJournalDB(self, classname): + ''' get the journal db, looking in our cache of databases for commit ''' + # get the database handle + db_name = 'journals.%s'%classname + if self.databases.has_key(db_name): + return self.databases[db_name] + else: + db = bsddb.btopen(os.path.join(self.dir, db_name), 'c') + self.databases[db_name] = db + return db -# -#$Log: not supported by cvs2svn $ -#Revision 1.10 2001/10/09 07:25:59 richard -#Added the Password property type. See "pydoc roundup.password" for -#implementation details. Have updated some of the documentation too. -# -#Revision 1.9 2001/08/12 06:32:36 richard -#using isinstance(blah, Foo) now instead of isFooType -# -#Revision 1.8 2001/08/07 00:24:42 richard -#stupid typo -# -#Revision 1.7 2001/08/07 00:15:51 richard -#Added the copyright/license notice to (nearly) all files at request of -#Bizar Software. -# -#Revision 1.6 2001/07/30 02:36:23 richard -#Handle non-existence of db files in the other backends (code from anydbm). -# -#Revision 1.5 2001/07/30 01:41:36 richard -#Makes schema changes mucho easier. -# -#Revision 1.4 2001/07/23 08:25:33 richard -#more handling of bad journals -# -#Revision 1.3 2001/07/23 08:20:44 richard -#Moved over to using marshal in the bsddb and anydbm backends. -#roundup-admin now has a "freshen" command that'll load/save all nodes (not -# retired - mod hyperdb.Class.list() so it lists retired nodes) -# -#Revision 1.2 2001/07/23 07:56:05 richard -#Storing only marshallable data in the db - no nasty pickled class references. -# -#Revision 1.1 2001/07/23 07:22:13 richard -#*sigh* some databases have _foo.so as their underlying implementation. -#This time for sure, Rocky. -# -#Revision 1.1 2001/07/23 07:15:57 richard -#Moved the backends into the backends package. Anydbm hasn't been tested at all. -# -#Revision 1.1 2001/07/23 06:23:41 richard -#moved hyper_bsddb.py to the new backends package as bsddb.py -# -#Revision 1.2 2001/07/22 12:09:32 richard -#Final commit of Grande Splite -# -#Revision 1.1 2001/07/22 11:58:35 richard -#More Grande Splite -#