X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FFilter.py;h=42589e046eee7c20b21e2279b5b57576e95523f1;hb=35090de3c94d062d296ff328686d495e667db66f;hp=a979f59ab9e829583f3d3b163b03b88e6896aafc;hpb=a59391b90cd617548832ba90bec3267421d4398c;p=plcapi.git diff --git a/PLC/Filter.py b/PLC/Filter.py index a979f59..42589e0 100644 --- a/PLC/Filter.py +++ b/PLC/Filter.py @@ -1,5 +1,6 @@ -# $Id$ -# $URL$ +# +# Thierry Parmentelat - INRIA +# from types import StringTypes try: set @@ -16,7 +17,7 @@ class Filter(Parameter, dict): """ A type of parameter that represents a filter on one or more columns of a database table. - Special features provide support for negation, upper and lower bounds, + Special features provide support for negation, upper and lower bounds, as well as sorting and clipping. @@ -29,11 +30,18 @@ class Filter(Parameter, dict): filter should be a dictionary of field names and values - representing the criteria for filtering. + representing the criteria for filtering. example : filter = { 'hostname' : '*.edu' , site_id : [34,54] } - Whether the filter represents an intersection (AND) or a union (OR) - of these criteria is determined by the join_with argument - provided to the sql method below + + + Whether the filter represents an intersection (AND) or a union (OR) + of these criteria is determined as follows: + * if the dictionnary has the '-AND' or the '-OR' key, this is chosen + * otherwise, the join_with argument, as provided to the sql method below, + is expected to hold the 'AND' or 'OR' string + this argument defaults to 'AND' and in most of the code, this default applies + as the join_with argument is left unspecified + Special features: @@ -56,28 +64,33 @@ class Filter(Parameter, dict): example : filter = { '>time' : 1178531418 } in this example the integer value denotes a unix timestamp - * if a value is a sequence type, then it should represent + * if a value is a sequence type, then it should represent a list of possible values for that field example : filter = { 'node_id' : [12,34,56] } * a (string) value containing either a * or a % character is treated as a (sql) pattern; * are replaced with % that is the SQL wildcard character. - example : filter = { 'hostname' : '*.jp' } + example : filter = { 'hostname' : '*.jp' } * the filter's keys starting with '-' are special and relate to sorting and clipping * '-SORT' : a field name, or an ordered list of field names that are used for sorting these fields may start with + (default) or - for denoting increasing or decreasing order example : filter = { '-SORT' : [ '+node_id', '-hostname' ] } * '-OFFSET' : the number of first rows to be ommitted - * '-LIMIT' : the amount of rows to be returned + * '-LIMIT' : the amount of rows to be returned example : filter = { '-OFFSET' : 100, '-LIMIT':25} + Here are a few realistic examples - GetNodes ( { 'node_type' : 'regular' , 'hostname' : '*.edu' , '-SORT' : 'hostname' , '-OFFSET' : 30 , '-LIMIT' : 25 } ) + GetNodes ( { 'node_type' : 'regular' , 'hostname' : '*.edu' , + '-SORT' : 'hostname' , '-OFFSET' : 30 , '-LIMIT' : 25 } ) would return regular (usual) nodes matching '*.edu' in alphabetical order from 31th to 55th + GetNodes ( { '~peer_id' : None } ) + returns the foreign nodes - that have an integer peer_id + GetPersons ( { '|role_ids' : [ 20 , 40] } ) would return all persons that have either pi (20) or tech (40) roles @@ -88,6 +101,9 @@ class Filter(Parameter, dict): all 4 forms are equivalent and would return all admin users in the system """ + debug=False +# debug=True + def __init__(self, fields = {}, filter = {}, doc = "Attribute filter"): # Store the filter in our dict instance dict.__init__(self, filter) @@ -95,7 +111,7 @@ class Filter(Parameter, dict): # Declare ourselves as a type of parameter that can take # either a value or a list of values for each of the specified # fields. - self.fields = dict ( [ ( field, Mixed (expected, [expected])) + self.fields = dict ( [ ( field, Mixed (expected, [expected])) for (field,expected) in fields.iteritems() ] ) # Null filter means no filter @@ -106,6 +122,15 @@ class Filter(Parameter, dict): Returns a SQL conditional that represents this filter. """ + if self.has_key('-AND'): + del self['-AND'] + join_with='AND' + if self.has_key('-OR'): + del self['-OR'] + join_with='OR' + + self.join_with=join_with + # So that we always return something if join_with == "AND": conditionals = ["True"] @@ -114,20 +139,20 @@ class Filter(Parameter, dict): else: assert join_with in ("AND", "OR") - # init + # init sorts = [] clips = [] for field, value in self.iteritems(): - # handle negation, numeric comparisons - # simple, 1-depth only mechanism + # handle negation, numeric comparisons + # simple, 1-depth only mechanism - modifiers={'~' : False, - '<' : False, '>' : False, - '[' : False, ']' : False, + modifiers={'~' : False, + '<' : False, '>' : False, + '[' : False, ']' : False, '-' : False, '&' : False, '|' : False, - } + } def check_modifiers(field): if field[0] in modifiers.keys(): modifiers[field[0]] = True @@ -152,7 +177,7 @@ class Filter(Parameter, dict): value = "NULL" elif isinstance(value, StringTypes) and \ (value.find("*") > -1 or value.find("%") > -1): - operator = "LIKE" + operator = "ILIKE" # insert *** in pattern instead of either * or % # we dont use % as requests are likely to %-expansion later on # actual replacement to % done in PostgreSQL.py @@ -169,14 +194,13 @@ class Filter(Parameter, dict): operator='<=' if modifiers[']']: operator='>=' - value = str(api.db.quote(value)) return (operator, value) if isinstance(value, (list, tuple, set)): # handling filters like '~slice_id':[] # this should return true, as it's the opposite of 'slice_id':[] which is false - # prior to this fix, 'slice_id':[] would have returned ``slice_id IN (NULL) '' which is unknown + # prior to this fix, 'slice_id':[] would have returned ``slice_id IN (NULL) '' which is unknown # so it worked by coincidence, but the negation '~slice_ids':[] would return false too if not value: if modifiers['&'] or modifiers['|']: @@ -186,40 +210,30 @@ class Filter(Parameter, dict): field="" operator="" value = "FALSE" + clause = "%s %s %s" % (field, operator, value) else: - do_join = True vals = {} for val in value: base_op, val = get_op_and_val(val) - if base_op != '=': - do_join = False if base_op in vals: vals[base_op].append(val) else: vals[base_op] = [val] - if do_join: - if modifiers['&']: - operator = "@>" - value = "ARRAY[%s]" % ", ".join(value) - elif modifiers['|']: - operator = "&&" - value = "ARRAY[%s]" % ", ".join(value) - else: - operator = "IN" - value = "(%s)" % ", ".join(value) - clause = "%s %s %s" % (field, operator, value) - else: - # We need something more complex - subclauses = [] - for operator in vals.keys(): - if operator == '=': - subclauses.append("(%s IN (%s))" % (field, ",".join(vals[operator]))) - elif operator == 'IS': - subclauses.append("(%s IS NULL)" % field) + subclauses = [] + for operator in vals.keys(): + if operator == '=': + if modifiers['&']: + subclauses.append("(%s @> ARRAY[%s])" % (field, ",".join(vals[operator]))) + elif modifiers['|']: + subclauses.append("(%s && ARRAY[%s])" % (field, ",".join(vals[operator]))) else: - for value in vals[operator]: - subclauses.append("(%s %s %s)" % (field, operator, value)) - clause = "(" + " OR ".join(subclauses) + ")" + subclauses.append("(%s IN (%s))" % (field, ",".join(vals[operator]))) + elif operator == 'IS': + subclauses.append("(%s IS NULL)" % field) + else: + for value in vals[operator]: + subclauses.append("(%s %s %s)" % (field, operator, value)) + clause = "(" + " OR ".join(subclauses) + ")" else: operator, value = get_op_and_val(value) @@ -260,5 +274,5 @@ class Filter(Parameter, dict): clip_part += " ORDER BY " + ",".join(sorts) if clips: clip_part += " " + " ".join(clips) -# print 'where_part=',where_part,'clip_part',clip_part + if Filter.debug: print 'Filter.sql: where_part=',where_part,'clip_part',clip_part return (where_part,clip_part)