Mercurial Repository: p/roundup/code: roundup/backends/back

comparison roundup/backends/back_anydbm.py @ 2239:c8a06e10e2c6

much faster anydbm filter(), but it breaks most filtering tests

author	Richard Jones <richard@users.sourceforge.net>
date	Mon, 26 Apr 2004 00:46:34 +0000
parents	f624fc20f8fe
children	7d5398391610

comparison

equal deleted inserted replaced

-:df0444e39bc3
+:c8a06e10e2c6
 # 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: back_anydbm.py,v 1.142 2004-04-25 22:19:15 richard Exp $
+#$Id: back_anydbm.py,v 1.143 2004-04-26 00:46:34 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
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
 serious bugs, and is not available)
 '''
 else:
 l.append((OTHER, k, v))
 filterspec = l
 # now, find all the nodes that are active and pass filtering
-l = []
+matches = []
 cldb = self.db.getclassdb(cn)
 try:
 # TODO: only full-scan once (use items())
 for nodeid in self.getnodeids(cldb):
 node = self.db.getnode(cn, nodeid, cldb)
 elif t == OTHER:
 # straight value comparison for the other types
 if node[k] != v:
 break
 else:
-l.append((nodeid, node))
+matches.append([nodeid, node])
 finally:
 cldb.close()
-l.sort()
 # filter based on full text search
 if search_matches is not None:
 k = []
-for v in l:
+for v in matches:
 if search_matches.has_key(v[0]):
 k.append(v)
-l = k
+matches = k
-# now, sort the result
+# add sorting information to the match entries
-def sortfun(a, b, sort=sort, group=group, properties=self.getprops(),
+directions = []
-db = self.db, cl=self):
+for dir, prop in sort, group:
-a_id, an = a
+if dir is None or prop is None:
-b_id, bn = b
+continue
-# sort by group and then sort
+directions.append(dir)
-for dir, prop in group, sort:
+propclass = props[prop]
-if dir is None or prop is None: continue
+for entry in matches:
+itemid = entry[-2]
-# sorting is class-specific
+item = entry[-1]
-propclass = properties[prop]
 # handle the properties that might be "faked"
 # also, handle possible missing properties
 try:
-if not an.has_key(prop):
+v = self.get(itemid, prop)
-an[prop] = cl.get(a_id, prop)
-av = an[prop]
 except KeyError:
 # the node doesn't have a value for this property
-if isinstance(propclass, Multilink): av = []
+if isinstance(propclass, Multilink): v = []
-else: av = ''
+else: v = None
-try:
+s.append((v, itemid, item))
-if not bn.has_key(prop):
+continue
-bn[prop] = cl.get(b_id, prop)
-bv = bn[prop]
-except KeyError:
-# the node doesn't have a value for this property
-if isinstance(propclass, Multilink): bv = []
-else: bv = ''
-# String and Date values are sorted in the natural way
 if isinstance(propclass, String):
-# clean up the strings
-if av and av[0] in string.uppercase:
-av = av.lower()
-if bv and bv[0] in string.uppercase:
-bv = bv.lower()
-if (isinstance(propclass, String) or
-isinstance(propclass, Date)):
 # it might be a string that's really an integer
-try:
+try: tv = int(v)
-av = int(av)
+except: v = v.lower()
-bv = int(bv)
+else: v = tv
-except:
-pass
-if dir == '+':
-r = cmp(av, bv)
-if r != 0: return r
-elif dir == '-':
-r = cmp(bv, av)
-if r != 0: return r
-# Link properties are sorted according to the value of
-# the "order" property on the linked nodes if it is
-# present; or otherwise on the key string of the linked
-# nodes; or finally on  the node ids.
 elif isinstance(propclass, Link):
-link = db.classes[propclass.classname]
+link = self.db.classes[propclass.classname]
-if av is None and bv is not None: return -1
-if av is not None and bv is None: return 1
-if av is None and bv is None: continue
 if link.getprops().has_key('order'):
-if dir == '+':
+v = link.get(v, 'order')
-r = cmp(link.get(av, 'order'),
-link.get(bv, 'order'))
-if r != 0: return r
-elif dir == '-':
-r = cmp(link.get(bv, 'order'),
-link.get(av, 'order'))
-if r != 0: return r
 elif link.getkey():
 key = link.getkey()
-if dir == '+':
+v = link.get(v, key)
-r = cmp(link.get(av, key), link.get(bv, key))
+entry.insert(0, v)
-if r != 0: return r
-elif dir == '-':
+if directions:
-r = cmp(link.get(bv, key), link.get(av, key))
+# sort using the first one or two columns
-if r != 0: return r
+def sortfun(a, b, directions=directions, n=range(len(directions))):
+for i in n:
+if a[i] == b[i]: continue
+if directions[i] == '-':
+return cmp(a[i],b[i])
 else:
-if dir == '+':
+return cmp(b[i],a[i])
-r = cmp(av, bv)
+return 0
-if r != 0: return r
+matches.sort(sortfun)
-elif dir == '-':
-r = cmp(bv, av)
+# pull the id out of the individual entries
-if r != 0: return r
+matches = [entry[-2] for entry in matches]
-else:
-# all other types just compare
-if dir == '+':
-r = cmp(av, bv)
-elif dir == '-':
-r = cmp(bv, av)
-if r != 0: return r
-# end for dir, prop in sort, group:
-# if all else fails, compare the ids
-return cmp(a[0], b[0])
-l.sort(sortfun)
-l = [i[0] for i in l]
 if __debug__:
 self.db.stats['filtering'] += (time.time() - start_t)
-return l
+return matches
 def count(self):
 '''Get the number of nodes in this class.
 If the returned integer is 'numnodes', the ids of all the nodes

Mercurial > p > roundup > code

comparison roundup/backends/back_anydbm.py @ 2239:c8a06e10e2c6