remove old filter code

we should add support for the new event_filters instead

Author: Ville Tuulos

test/test_filters.py

@@ -294,79 +294,3 @@ def min_timestamp(self):
     def max_timestamp(self):
         return lib.tdb_max_timestamp(self._db)
 
-    def _parse_filter(self, filter_expr):
-        # filter_expr syntax in CNF:
-        # CNF is a list of clauses. A clause is a list of terms. Each term
-        # is an expression of the form FIELD OP VALUE, where FIELD is a field
-        # name, VALUE is field value and OP is either 'equal' or 'notequal'.
-        # Term is represented as dictionary {'field': F, 'value' : V, 'op' : O}
-        # If op is omitted, it defaults to 'equal'
-        #
-        # Example:
-        #
-        # [
-        #   [{'field' : 'network', 'value' : 'Google', 'op' : 'notequal'},
-        #    {'field' : 'network', 'value' : 'Yahoo', 'op' : 'equal'},
-        #    {'field' : 'browser', 'value' : 'Chrome'}],
-        #   ['field' : 'is_valud', 'value' : '1'}
-        # ]
-        def item(field, value):
-            return lib.tdb_get_item(self._db, field, value, c_uint64(len(value)))
-
-        def parse_clause(clause_expr):
-            clause = [0]
-            for term in clause_expr:
-                op = term.get('op', 'equal')
-                if op not in ('equal', 'notequal'):
-                    raise ValueError('Invalid op: ' + op)
-                try:
-                    field = self.field(term['field'])
-                    clause.extend((0 if op == 'equal' else 1,
-                                   item(field, term['value'])))
-
-                except ValueError:
-                    always_true = (term['value'] == '') == (op == 'equal')
-                    clause.extend((1 if always_true else 0, 0))
-            clause[0] = len(clause) - 1
-            return clause
-
-        q = []
-        for clause in filter_expr:
-            q.extend(parse_clause(clause))
-        return (c_uint64 * len(q))(*q)
-
-    def set_filter(self, filter_expr):
-        q = self._parse_filter(filter_expr)
-        if lib.tdb_set_filter(self._db, q, len(q)):
-            raise TrailDBError("Setting filter failed (out of memory?)")
-
-    def get_filter(self):
-
-        def construct_clause(clause_arr):
-            clause = []
-            for i in range(0, len(clause_arr), 2):
-                is_negative = clause_arr[i]
-                item = clause_arr[i + 1]
-                if item == 0:
-                    clause.append(is_negative == 1)
-                else:
-                    field = item & 255
-                    field_str = self.fields[field]
-                    val = item >> 8
-                    value_size = c_uint64()
-                    value = lib.tdb_get_value(self._db, field, val, value_size)
-                    clause.append({'op': 'notequal' if is_negative else 'equal',
-                                   'field' : field_str,
-                                   'value': value[0:value_size.value]})
-            return clause
-
-        filter_len = c_uint64(0)
-        filter_arr = lib.tdb_get_filter(self._db, byref(filter_len))
-        q = []
-        i = 0
-        while i < filter_len.value:
-            clause_len = filter_arr[i]
-            q.append(construct_clause(filter_arr[i + 1:i + 1 + clause_len]))
-            i += 1 + clause_len
-
-        return q