diff --git a/docs/source/resultset.rst b/docs/source/resultset.rst
index 6c36463f..b1c3206f 100644
--- a/docs/source/resultset.rst
+++ b/docs/source/resultset.rst
@@ -18,7 +18,7 @@ Using ``rs.get_points()`` will return a generator for all the points in the Resu
Filtering by measurement
------------------------
-Using ``rs.get_points('cpu')`` will return a generator for all the points that are in a serie with measurement name ``cpu``, no matter the tags.
+Using ``rs.get_points('cpu')`` will return a generator for all the points that are in a series with measurement name ``cpu``, no matter the tags.
::
rs = cli.query("SELECT * from cpu")
@@ -36,7 +36,7 @@ Using ``rs.get_points(tags={'host_name': 'influxdb.com'})`` will return a genera
Filtering by measurement and tags
---------------------------------
-Using measurement name and tags will return a generator for all the points that are in a serie with the specified measurement name AND whose tags match the given tags.
+Using measurement name and tags will return a generator for all the points that are in a series with the specified measurement name AND whose tags match the given tags.
::
rs = cli.query("SELECT * from cpu")
diff --git a/influxdb/influxdb08/client.py b/influxdb/influxdb08/client.py
index 41600404..965a91db 100644
--- a/influxdb/influxdb08/client.py
+++ b/influxdb/influxdb08/client.py
@@ -435,7 +435,7 @@ def _query(self, query, time_precision='s', chunked=False):
else:
chunked_param = 'false'
- # Build the URL of the serie to query
+ # Build the URL of the series to query
url = "db/{0}/series".format(self._database)
params = {
diff --git a/influxdb/resultset.py b/influxdb/resultset.py
index 79d72ca8..ba4f3c13 100644
--- a/influxdb/resultset.py
+++ b/influxdb/resultset.py
@@ -41,12 +41,12 @@ def error(self):
def __getitem__(self, key):
"""Retrieve the series name or specific set based on key.
- :param key: Either a serie name, or a tags_dict, or
- a 2-tuple(serie_name, tags_dict).
- If the serie name is None (or not given) then any serie
+ :param key: Either a series name, or a tags_dict, or
+ a 2-tuple(series_name, tags_dict).
+ If the series name is None (or not given) then any serie
matching the eventual given tags will be given its points
one after the other.
- To get the points of every serie in this resultset then
+ To get the points of every series in this resultset then
you have to provide None as key.
:return: A generator yielding `Point`s matching the given key.
NB:
@@ -93,22 +93,25 @@ def get_points(self, measurement=None, tags=None):
(bytes, type(b''.decode()), type(None))):
raise TypeError('measurement must be an str or None')
- for serie in self._get_series():
- serie_name = serie.get('measurement', serie.get('name', 'results'))
- if serie_name is None:
+ for series in self._get_series():
+ series_name = series.get('measurement',
+ series.get('name', 'results'))
+ if series_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 item in self._get_points_for_serie(serie):
+ for item in self._get_points_for_series(series):
yield item
- elif measurement in (None, serie_name):
+ elif measurement in (None, series_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 item in self._get_points_for_serie(serie):
+ # we will matches every returned series
+ series_tags = series.get('tags', {})
+ for item in self._get_points_for_series(series):
+ if tags is None or \
+ self._tag_matches(item, tags) or \
+ self._tag_matches(series_tags, tags):
yield item
def __repr__(self):
@@ -121,7 +124,7 @@ def __repr__(self):
return "ResultSet({%s})" % ", ".join(items)
def __iter__(self):
- """Yield one dict instance per serie result."""
+ """Yield one dict instance per series result."""
for key in self.keys():
yield list(self.__getitem__(key))
@@ -131,10 +134,10 @@ def _tag_matches(tags, filter):
for tag_name, tag_value in filter.items():
# using _sentinel as I'm not sure that "None"
# could be used, because it could be a valid
- # serie_tags value : when a serie has no such tag
+ # series_tags value : when a series has no such tag
# then I think it's set to /null/None/.. TBC..
- serie_tag_value = tags.get(tag_name, _sentinel)
- if serie_tag_value != tag_value:
+ series_tag_value = tags.get(tag_name, _sentinel)
+ if series_tag_value != tag_value:
return False
return True
@@ -150,14 +153,14 @@ def __len__(self):
def keys(self):
"""Return the list of keys in the ResultSet.
- :return: List of keys. Keys are tuples (serie_name, tags)
+ :return: List of keys. Keys are tuples (series_name, tags)
"""
keys = []
- for serie in self._get_series():
+ for series in self._get_series():
keys.append(
- (serie.get('measurement',
- serie.get('name', 'results')),
- serie.get('tags', None))
+ (series.get('measurement',
+ series.get('name', 'results')),
+ series.get('tags', None))
)
return keys
@@ -167,24 +170,24 @@ def items(self):
:return: List of tuples, (key, generator)
"""
items = []
- for serie in self._get_series():
- serie_key = (serie.get('measurement',
- serie.get('name', 'results')),
- serie.get('tags', None))
+ for series in self._get_series():
+ series_key = (series.get('measurement',
+ series.get('name', 'results')),
+ series.get('tags', None))
items.append(
- (serie_key, self._get_points_for_serie(serie))
+ (series_key, self._get_points_for_series(series))
)
return items
- def _get_points_for_serie(self, serie):
- """Return generator of dict from columns and values of a serie.
+ def _get_points_for_series(self, series):
+ """Return generator of dict from columns and values of a series.
- :param serie: One serie
+ :param series: One series
:return: Generator of dicts
"""
- for point in serie.get('values', []):
+ for point in series.get('values', []):
yield self.point_from_cols_vals(
- serie['columns'],
+ series['columns'],
point
)
diff --git a/influxdb/tests/resultset_test.py b/influxdb/tests/resultset_test.py
index dd088b79..83faa4dd 100644
--- a/influxdb/tests/resultset_test.py
+++ b/influxdb/tests/resultset_test.py
@@ -19,26 +19,25 @@ def setUp(self):
"""Set up an instance of TestResultSet."""
self.query_response = {
"results": [
- {"series": [{"measurement": "cpu_load_short",
- "tags": {"host": "server01",
- "region": "us-west"},
- "columns": ["time", "value"],
+ {"series": [{"name": "cpu_load_short",
+ "columns": ["time", "value", "host", "region"],
"values": [
- ["2015-01-29T21:51:28.968422294Z", 0.64]
+ ["2015-01-29T21:51:28.968422294Z",
+ 0.64,
+ "server01",
+ "us-west"],
+ ["2015-01-29T21:51:28.968422294Z",
+ 0.65,
+ "server02",
+ "us-west"],
]},
- {"measurement": "cpu_load_short",
- "tags": {"host": "server02",
- "region": "us-west"},
- "columns": ["time", "value"],
+ {"name": "other_series",
+ "columns": ["time", "value", "host", "region"],
"values": [
- ["2015-01-29T21:51:28.968422294Z", 0.65]
- ]},
- {"measurement": "other_serie",
- "tags": {"host": "server01",
- "region": "us-west"},
- "columns": ["time", "value"],
- "values": [
- ["2015-01-29T21:51:28.968422294Z", 0.66]
+ ["2015-01-29T21:51:28.968422294Z",
+ 0.66,
+ "server01",
+ "us-west"],
]}]}
]
}
@@ -48,8 +47,14 @@ def setUp(self):
def test_filter_by_name(self):
"""Test filtering by name in TestResultSet object."""
expected = [
- {'value': 0.64, 'time': '2015-01-29T21:51:28.968422294Z'},
- {'value': 0.65, 'time': '2015-01-29T21:51:28.968422294Z'}
+ {'value': 0.64,
+ 'time': '2015-01-29T21:51:28.968422294Z',
+ 'host': 'server01',
+ 'region': 'us-west'},
+ {'value': 0.65,
+ 'time': '2015-01-29T21:51:28.968422294Z',
+ 'host': 'server02',
+ 'region': 'us-west'},
]
self.assertEqual(expected, list(self.rs['cpu_load_short']))
@@ -60,8 +65,14 @@ def test_filter_by_name(self):
def test_filter_by_tags(self):
"""Test filter by tags in TestResultSet object."""
expected = [
- {'time': '2015-01-29T21:51:28.968422294Z', 'value': 0.64},
- {'time': '2015-01-29T21:51:28.968422294Z', 'value': 0.66}
+ {'value': 0.64,
+ 'time': '2015-01-29T21:51:28.968422294Z',
+ 'host': 'server01',
+ 'region': 'us-west'},
+ {'value': 0.66,
+ 'time': '2015-01-29T21:51:28.968422294Z',
+ 'host': 'server01',
+ 'region': 'us-west'},
]
self.assertEqual(
@@ -78,14 +89,23 @@ def test_filter_by_name_and_tags(self):
"""Test filter by name and tags in TestResultSet object."""
self.assertEqual(
list(self.rs[('cpu_load_short', {"host": "server01"})]),
- [{'time': '2015-01-29T21:51:28.968422294Z', 'value': 0.64}]
+ [{'value': 0.64,
+ 'time': '2015-01-29T21:51:28.968422294Z',
+ 'host': 'server01',
+ 'region': 'us-west'}]
)
self.assertEqual(
list(self.rs[('cpu_load_short', {"region": "us-west"})]),
[
- {'value': 0.64, 'time': '2015-01-29T21:51:28.968422294Z'},
- {'value': 0.65, 'time': '2015-01-29T21:51:28.968422294Z'}
+ {'value': 0.64,
+ 'time': '2015-01-29T21:51:28.968422294Z',
+ 'host': 'server01',
+ 'region': 'us-west'},
+ {'value': 0.65,
+ 'time': '2015-01-29T21:51:28.968422294Z',
+ 'host': 'server02',
+ 'region': 'us-west'},
]
)
@@ -94,9 +114,8 @@ def test_keys(self):
self.assertEqual(
self.rs.keys(),
[
- ('cpu_load_short', {'host': 'server01', 'region': 'us-west'}),
- ('cpu_load_short', {'host': 'server02', 'region': 'us-west'}),
- ('other_serie', {'host': 'server01', 'region': 'us-west'})
+ ('cpu_load_short', None),
+ ('other_series', None),
]
)
@@ -104,7 +123,7 @@ def test_len(self):
"""Test length in TestResultSet object."""
self.assertEqual(
len(self.rs),
- 3
+ 2
)
def test_items(self):
@@ -116,21 +135,23 @@ def test_items(self):
items_lists,
[
(
- ('cpu_load_short',
- {'host': 'server01', 'region': 'us-west'}),
- [{'value': 0.64, 'time': '2015-01-29T21:51:28.968422294Z'}]
- ),
+ ('cpu_load_short', None),
+ [
+ {'time': '2015-01-29T21:51:28.968422294Z',
+ 'value': 0.64,
+ 'host': 'server01',
+ 'region': 'us-west'},
+ {'time': '2015-01-29T21:51:28.968422294Z',
+ 'value': 0.65,
+ 'host': 'server02',
+ 'region': 'us-west'}]),
(
- ('cpu_load_short',
- {'host': 'server02', 'region': 'us-west'}),
- [{'value': 0.65, 'time': '2015-01-29T21:51:28.968422294Z'}]
- ),
- (
- ('other_serie',
- {'host': 'server01', 'region': 'us-west'}),
- [{'value': 0.66, 'time': '2015-01-29T21:51:28.968422294Z'}]
- )
- ]
+ ('other_series', None),
+ [
+ {'time': '2015-01-29T21:51:28.968422294Z',
+ 'value': 0.66,
+ 'host': 'server01',
+ 'region': 'us-west'}])]
)
def test_point_from_cols_vals(self):
diff --git a/influxdb/tests/server_tests/client_test_with_server.py b/influxdb/tests/server_tests/client_test_with_server.py
index a7dedddd..701f72ac 100644
--- a/influxdb/tests/server_tests/client_test_with_server.py
+++ b/influxdb/tests/server_tests/client_test_with_server.py
@@ -38,9 +38,9 @@
THIS_DIR = os.path.abspath(os.path.dirname(__file__))
-def point(serie_name, timestamp=None, tags=None, **fields):
+def point(series_name, timestamp=None, tags=None, **fields):
"""Define what a point looks like."""
- res = {'measurement': serie_name}
+ res = {'measurement': series_name}
if timestamp:
res['time'] = timestamp
@@ -638,7 +638,7 @@ def test_drop_retention_policy(self):
def test_issue_143(self):
"""Test for PR#143 from repo."""
- pt = partial(point, 'a_serie_name', timestamp='2015-03-30T16:16:37Z')
+ pt = partial(point, 'a_series_name', timestamp='2015-03-30T16:16:37Z')
pts = [
pt(value=15),
pt(tags={'tag_1': 'value1'}, value=5),
@@ -646,19 +646,20 @@ def test_issue_143(self):
]
self.cli.write_points(pts)
time.sleep(1)
- rsp = list(self.cli.query('SELECT * FROM a_serie_name GROUP BY tag_1'))
+ rsp = list(self.cli.query('SELECT * FROM a_series_name \
+GROUP BY tag_1').get_points())
self.assertEqual(
[
- [{'value': 15, 'time': '2015-03-30T16:16:37Z'}],
- [{'value': 5, 'time': '2015-03-30T16:16:37Z'}],
- [{'value': 10, 'time': '2015-03-30T16:16:37Z'}]
+ {'time': '2015-03-30T16:16:37Z', 'value': 15},
+ {'time': '2015-03-30T16:16:37Z', 'value': 5},
+ {'time': '2015-03-30T16:16:37Z', 'value': 10}
],
rsp
)
# a slightly more complex one with 2 tags values:
- pt = partial(point, 'serie2', timestamp='2015-03-30T16:16:37Z')
+ pt = partial(point, 'series2', timestamp='2015-03-30T16:16:37Z')
pts = [
pt(tags={'tag1': 'value1', 'tag2': 'v1'}, value=0),
pt(tags={'tag1': 'value1', 'tag2': 'v2'}, value=5),
@@ -666,18 +667,18 @@ def test_issue_143(self):
]
self.cli.write_points(pts)
time.sleep(1)
- rsp = self.cli.query('SELECT * FROM serie2 GROUP BY tag1,tag2')
+ rsp = self.cli.query('SELECT * FROM series2 GROUP BY tag1,tag2')
self.assertEqual(
[
- [{'value': 0, 'time': '2015-03-30T16:16:37Z'}],
- [{'value': 5, 'time': '2015-03-30T16:16:37Z'}],
- [{'value': 10, 'time': '2015-03-30T16:16:37Z'}]
+ {'value': 0, 'time': '2015-03-30T16:16:37Z'},
+ {'value': 5, 'time': '2015-03-30T16:16:37Z'},
+ {'value': 10, 'time': '2015-03-30T16:16:37Z'}
],
- list(rsp)
+ list(rsp['series2'])
)
- all_tag2_equal_v1 = list(rsp[None, {'tag2': 'v1'}])
+ all_tag2_equal_v1 = list(rsp.get_points(tags={'tag2': 'v1'}))
self.assertEqual(
[{'value': 0, 'time': '2015-03-30T16:16:37Z'},
@@ -687,13 +688,13 @@ def test_issue_143(self):
def test_query_multiple_series(self):
"""Test query for multiple series."""
- pt = partial(point, 'serie1', timestamp='2015-03-30T16:16:37Z')
+ pt = partial(point, 'series1', timestamp='2015-03-30T16:16:37Z')
pts = [
pt(tags={'tag1': 'value1', 'tag2': 'v1'}, value=0),
]
self.cli.write_points(pts)
- pt = partial(point, 'serie2', timestamp='1970-03-30T16:16:37Z')
+ pt = partial(point, 'series2', timestamp='1970-03-30T16:16:37Z')
pts = [
pt(tags={'tag1': 'value1', 'tag2': 'v1'},
value=0, data1=33, data2="bla"),
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy