diff -r fa565be41647 -r 11953d585a55 cubicweb/server/querier.py --- a/cubicweb/server/querier.py Wed Mar 13 10:40:05 2019 +0100 +++ b/cubicweb/server/querier.py Wed Mar 13 11:02:39 2019 +0100 @@ -211,7 +211,7 @@ noinvariant = () if cached is None: self.cnx.vreg.rqlhelper.simplify(union) - self.querier.rqlannotator.annotate(union) + RQLAnnotator(self.querier.schema).annotate(union) set_qdata(self.querier.schema.rschema, union, noinvariant) if union.has_text_query: self.cache_key = None @@ -475,8 +475,6 @@ self.clear_caches() # rql planner self._planner = SSPlanner(schema, self._repo.vreg.rqlhelper) - # sql generation annotator - self.rqlannotator = RQLAnnotator(schema) def clear_caches(self, eids=None, etypes=None): if eids is None: @@ -562,7 +560,6 @@ } start = time.time() - # execute the plan try: results = plan.execute()