Improve ResultSet.items() performance

a-sk · a-sk · commit 797070121d83 · 2015-12-14T00:59:07.000+03:00
Use straightforward method of getting points for a serie:
no need to try to filter by measurement/tag: it greatly decreases performance.
diff --git a/influxdb/resultset.py b/influxdb/resultset.py
@@ -88,27 +88,22 @@ def get_points(self, measurement=None, tags=None):
 
         for serie in self._get_series():
             serie_name = serie.get('measurement', serie.get('name', 'results'))
+            print serie_name
             if serie_name is None:
                 # this is a "system" query or a query which
                 # doesn't return a name attribute.
                 # like 'show retention policies' ..
                 if tags is None:
-                    for point in serie['values']:
-                        yield self.point_from_cols_vals(
-                            serie['columns'],
-                            point
-                        )
+                    for item in self._get_points_for_serie(serie):
+                        yield item
 
             elif measurement in (None, serie_name):
                 # by default if no tags was provided then
                 # we will matches every returned serie
                 serie_tags = serie.get('tags', {})
                 if tags is None or self._tag_matches(serie_tags, tags):
-                    for point in serie.get('values', []):
-                        yield self.point_from_cols_vals(
-                            serie['columns'],
-                            point
-                        )
+                    for item in self._get_points_for_serie(serie):
+                        yield item
 
     def __repr__(self):
         items = []
@@ -166,10 +161,22 @@ def items(self):
                                    serie.get('name', 'results')),
                          serie.get('tags', None))
             items.append(
-                (serie_key, self[serie_key])
+                (serie_key, self._get_points_for_serie(serie))
             )
         return items
 
+    def _get_points_for_serie(self, serie):
+        """ Return generator of dict from columns and values of a serie
+
+        :param serie: One serie
+        :return: Generator of dicts
+        """
+        for point in serie.get('values', []):
+            yield self.point_from_cols_vals(
+                serie['columns'],
+                point
+            )
+
     @staticmethod
     def point_from_cols_vals(cols, vals):
         """ Creates a dict from columns and values lists
