Mercurial Repository: p/roundup/code: roundup/hyperdb.py comparison

comparison roundup/hyperdb.py @ 836:bf55b2b800b9

Added explicit closing of backend database handles.

author	Richard Jones <richard@users.sourceforge.net>
date	Wed, 10 Jul 2002 00:19:48 +0000
parents	568eed5fb4fd
children	234996e85699

comparison

equal deleted inserted replaced

-:255bdcf39e8c
+:bf55b2b800b9
 # BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 # FOR A PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS"
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: hyperdb.py,v 1.72 2002-07-09 21:53:38 gmcm Exp $
+# $Id: hyperdb.py,v 1.73 2002-07-10 00:19:48 richard Exp $
 __doc__ = """
 Hyperdatabase implementation, especially field types.
 """
 'keyvalue' matches one of the values for the key property among
 the nodes in this class, the matching node's id is returned;
 otherwise a KeyError is raised.
 """
 cldb = self.db.getclassdb(self.classname)
-for nodeid in self.db.getnodeids(self.classname, cldb):
+try:
-node = self.db.getnode(self.classname, nodeid, cldb)
+for nodeid in self.db.getnodeids(self.classname, cldb):
-if node.has_key(self.db.RETIRED_FLAG):
+node = self.db.getnode(self.classname, nodeid, cldb)
-continue
+if node.has_key(self.db.RETIRED_FLAG):
-if node[self.key] == keyvalue:
+continue
-return nodeid
+if node[self.key] == keyvalue:
+cldb.close()
+return nodeid
+finally:
+cldb.close()
 raise KeyError, keyvalue
 # XXX: change from spec - allows multiple props to match
 def find(self, **propspec):
 """Get the ids of nodes in this class which link to the given nodes.
 #        raise ValueError, '%s has no node %s'%(prop.classname, nodeid)
 # ok, now do the find
 cldb = self.db.getclassdb(self.classname)
 l = []
-for id in self.db.getnodeids(self.classname, db=cldb):
+try:
-node = self.db.getnode(self.classname, id, db=cldb)
+for id in self.db.getnodeids(self.classname, db=cldb):
-if node.has_key(self.db.RETIRED_FLAG):
+node = self.db.getnode(self.classname, id, db=cldb)
-continue
+if node.has_key(self.db.RETIRED_FLAG):
-for propname, nodeids in propspec:
-# can't test if the node doesn't have this property
-if not node.has_key(propname):
 continue
-if type(nodeids) is type(''):
+for propname, nodeids in propspec:
-nodeids = {nodeids:1}
+# can't test if the node doesn't have this property
-prop = self.properties[propname]
+if not node.has_key(propname):
-value = node[propname]
+continue
-if isinstance(prop, Link) and nodeids.has_key(value):
+if type(nodeids) is type(''):
-l.append(id)
+nodeids = {nodeids:1}
-break
+prop = self.properties[propname]
-elif isinstance(prop, Multilink):
+value = node[propname]
-hit = 0
+if isinstance(prop, Link) and nodeids.has_key(value):
-for v in value:
+l.append(id)
-if nodeids.has_key(v):
+break
-l.append(id)
+elif isinstance(prop, Multilink):
-hit = 1
+hit = 0
+for v in value:
+if nodeids.has_key(v):
+l.append(id)
+hit = 1
+break
+if hit:
 break
-if hit:
+except:
-break
+cldb.close()
 return l
 def stringFind(self, **requirements):
 """Locate a particular node by matching a set of its String
 properties in a caseless search.
 if isinstance(not prop, String):
 raise TypeError, "'%s' not a String property"%propname
 requirements[propname] = requirements[propname].lower()
 l = []
 cldb = self.db.getclassdb(self.classname)
-for nodeid in self.db.getnodeids(self.classname, cldb):
+try:
-node = self.db.getnode(self.classname, nodeid, cldb)
+for nodeid in self.db.getnodeids(self.classname, cldb):
-if node.has_key(self.db.RETIRED_FLAG):
+node = self.db.getnode(self.classname, nodeid, cldb)
-continue
+if node.has_key(self.db.RETIRED_FLAG):
-for key, value in requirements.items():
+continue
-if node[key] and node[key].lower() != value:
+for key, value in requirements.items():
-break
+if node[key] and node[key].lower() != value:
-else:
+break
-l.append(nodeid)
+else:
+l.append(nodeid)
+finally:
+cldb.close()
 return l
 def list(self):
 """Return a list of the ids of the active nodes in this class."""
 l = []
 cn = self.classname
 cldb = self.db.getclassdb(cn)
-for nodeid in self.db.getnodeids(cn, cldb):
+try:
-node = self.db.getnode(cn, nodeid, cldb)
+for nodeid in self.db.getnodeids(cn, cldb):
-if node.has_key(self.db.RETIRED_FLAG):
+node = self.db.getnode(cn, nodeid, cldb)
-continue
+if node.has_key(self.db.RETIRED_FLAG):
-l.append(nodeid)
+continue
+l.append(nodeid)
+finally:
+cldb.close()
 l.sort()
 return l
 # XXX not in spec
 def filter(self, search_matches, filterspec, sort, group,
 filterspec = l
 # now, find all the nodes that are active and pass filtering
 l = []
 cldb = self.db.getclassdb(cn)
-for nodeid in self.db.getnodeids(cn, cldb):
+try:
-node = self.db.getnode(cn, nodeid, cldb)
+for nodeid in self.db.getnodeids(cn, cldb):
-if node.has_key(self.db.RETIRED_FLAG):
+node = self.db.getnode(cn, nodeid, cldb)
-continue
+if node.has_key(self.db.RETIRED_FLAG):
-# apply filter
+continue
-for t, k, v in filterspec:
+# apply filter
-# this node doesn't have this property, so reject it
+for t, k, v in filterspec:
-if not node.has_key(k): break
+# this node doesn't have this property, so reject it
+if not node.has_key(k): break
-if t == 0 and node[k] not in v:
-# link - if this node'd property doesn't appear in the
+if t == 0 and node[k] not in v:
-# filterspec's nodeid list, skip it
+# link - if this node'd property doesn't appear in the
-break
+# filterspec's nodeid list, skip it
-elif t == 1:
+break
-# multilink - if any of the nodeids required by the
+elif t == 1:
-# filterspec aren't in this node's property, then skip
+# multilink - if any of the nodeids required by the
-# it
+# filterspec aren't in this node's property, then skip
-for value in v:
+# it
-if value not in node[k]:
+for value in v:
-break
+if value not in node[k]:
-else:
+break
-continue
+else:
-break
+continue
-elif t == 2 and (node[k] is None or not v.search(node[k])):
+break
-# RE search
+elif t == 2 and (node[k] is None or not v.search(node[k])):
-break
+# RE search
-elif t == 6 and node[k] != v:
+break
-# straight value comparison for the other types
+elif t == 6 and node[k] != v:
-break
+# straight value comparison for the other types
-else:
+break
-l.append((nodeid, node))
+else:
+l.append((nodeid, node))
+finally:
+cldb.close()
 l.sort()
 # filter based on full text search
 if search_matches is not None:
 k = []
 cl.create(name=options[i], order=i)
 return hyperdb.Link(name)
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.72  2002/07/09 21:53:38  gmcm
+# Optimize Class.find so that the propspec can contain a set of ids to match.
+# This is used by indexer.search so it can do just one find for all the index matches.
+# This was already confusing code, but for common terms (lots of index matches),
+# it is enormously faster.
+#
 # Revision 1.71  2002/07/09 03:02:52  richard
 # More indexer work:
 # - all String properties may now be indexed too. Currently there's a bit of
 #   "issue" specific code in the actual searching which needs to be
 #   addressed. In a nutshell:

Mercurial > p > roundup > code

comparison roundup/hyperdb.py @ 836:bf55b2b800b9