From 59e233b5853613e1111191cbbe0fec4bcfd77cd3 Mon Sep 17 00:00:00 2001 From: Wolodja Wentland Date: Mon, 13 Jun 2016 17:07:21 +0200 Subject: [PATCH] Remove get_list_series SHOW SERIES returns data in line format since 0.11 and the current functionality is broken. We have to implement a proper line format parser before we can reintroduce this functionality. --- influxdb/_dataframe_client.py | 14 ------ influxdb/client.py | 29 ------------- influxdb/tests/client_test.py | 21 --------- influxdb/tests/dataframe_client_test.py | 43 ------------------- .../server_tests/client_test_with_server.py | 43 ------------------- 5 files changed, 150 deletions(-) diff --git a/influxdb/_dataframe_client.py b/influxdb/_dataframe_client.py index 2e129bae..2980be90 100644 --- a/influxdb/_dataframe_client.py +++ b/influxdb/_dataframe_client.py @@ -90,20 +90,6 @@ def query(self, query, chunked=False, database=None): else: return results - def get_list_series(self, database=None): - """ - Get the list of series, in DataFrame - - """ - results = super(DataFrameClient, self)\ - .query("SHOW SERIES", database=database) - if len(results): - return dict( - (key[0], pd.DataFrame(data)) for key, data in results.items() - ) - else: - return {} - def _to_dataframe(self, rs): result = {} if isinstance(rs, list): diff --git a/influxdb/client.py b/influxdb/client.py index 15957ce3..b1c7c976 100644 --- a/influxdb/client.py +++ b/influxdb/client.py @@ -588,35 +588,6 @@ def get_list_retention_policies(self, database=None): ) return list(rsp.get_points()) - def get_list_series(self, database=None): - """Get the list of series for a database. - - :param database: the name of the database, defaults to the client's - current database - :type database: str - :returns: all series in the specified database - :rtype: list of dictionaries - - :Example: - - >> series = client.get_list_series('my_database') - >> series - [{'name': u'cpu_usage', - 'tags': [{u'_id': 1, - u'host': u'server01', - u'region': u'us-west'}]}] - """ - rsp = self.query("SHOW SERIES", database=database) - series = [] - for serie in rsp.items(): - series.append( - { - "name": serie[0][0], - "tags": list(serie[1]) - } - ) - return series - def get_list_servers(self): """Get the list of servers in InfluxDB cluster. diff --git a/influxdb/tests/client_test.py b/influxdb/tests/client_test.py index 9598eff2..f1adaa9b 100644 --- a/influxdb/tests/client_test.py +++ b/influxdb/tests/client_test.py @@ -517,27 +517,6 @@ def test_get_list_servers_fails(self): with _mocked_session(cli, 'get', 401): cli.get_list_servers() - def test_get_list_series(self): - example_response = \ - '{"results": [{"series": [{"name": "cpu_load_short", "columns": ' \ - '["_id", "host", "region"], "values": ' \ - '[[1, "server01", "us-west"]]}]}]}' - - with requests_mock.Mocker() as m: - m.register_uri( - requests_mock.GET, - "http://localhost:8086/query", - text=example_response - ) - - self.assertListEqual( - self.cli.get_list_series(), - [{'name': 'cpu_load_short', - 'tags': [ - {'host': 'server01', '_id': 1, 'region': 'us-west'} - ]}] - ) - def test_create_retention_policy_default(self): example_response = '{"results":[{}]}' diff --git a/influxdb/tests/dataframe_client_test.py b/influxdb/tests/dataframe_client_test.py index 170617a2..5b868d14 100644 --- a/influxdb/tests/dataframe_client_test.py +++ b/influxdb/tests/dataframe_client_test.py @@ -301,49 +301,6 @@ def test_query_with_empty_result(self): result = cli.query('select column_one from foo;') self.assertEqual(result, {}) - def test_list_series(self): - response = { - 'results': [ - {'series': [ - { - 'columns': ['host'], - 'measurement': 'cpu', - 'values': [ - ['server01']] - }, - { - 'columns': [ - 'host', - 'region' - ], - 'measurement': 'network', - 'values': [ - [ - 'server01', - 'us-west' - ], - [ - 'server01', - 'us-east' - ] - ] - } - ]} - ] - } - - expected = { - 'cpu': pd.DataFrame([['server01']], columns=['host']), - 'network': pd.DataFrame( - [['server01', 'us-west'], ['server01', 'us-east']], - columns=['host', 'region'])} - - cli = DataFrameClient('host', 8086, 'username', 'password', 'db') - with _mocked_session(cli, 'GET', 200, response): - series = cli.get_list_series() - assert_frame_equal(series['cpu'], expected['cpu']) - assert_frame_equal(series['network'], expected['network']) - def test_get_list_database(self): data = {'results': [ {'series': [ diff --git a/influxdb/tests/server_tests/client_test_with_server.py b/influxdb/tests/server_tests/client_test_with_server.py index 9ad38be2..9d061bab 100644 --- a/influxdb/tests/server_tests/client_test_with_server.py +++ b/influxdb/tests/server_tests/client_test_with_server.py @@ -133,15 +133,6 @@ def test_create_database(self): [{'name': 'new_db_1'}, {'name': 'new_db_2'}] ) - def test_get_list_series_empty(self): - rsp = self.cli.get_list_series() - self.assertEqual([], rsp) - - @unittest.skip("Broken as of 0.9.0") - def test_get_list_series_empty_DF(self): - rsp = self.cliDF.get_list_series() - self.assertEqual({}, rsp) - def test_drop_database(self): self.test_create_database() self.assertIsNone(self.cli.drop_database('new_db_1')) @@ -449,44 +440,10 @@ def test_query_chunked(self): del example_object # TODO ? - def test_get_list_series_and_delete(self): - self.cli.write_points(dummy_point) - rsp = self.cli.get_list_series() - self.assertEqual( - [ - {'name': 'cpu_load_short', - 'tags': [ - {'host': 'server01', - 'region': 'us-west', - '_key': - 'cpu_load_short,host=server01,region=us-west'}]} - ], - rsp - ) - def test_delete_series_invalid(self): with self.assertRaises(InfluxDBClientError): self.cli.delete_series() - def test_delete_series(self): - self.assertEqual(len(self.cli.get_list_series()), 0) - self.cli.write_points(dummy_points) - self.assertEqual(len(self.cli.get_list_series()), 2) - self.cli.delete_series(measurement='cpu_load_short') - self.assertEqual(len(self.cli.get_list_series()), 1) - self.cli.delete_series(tags={'region': 'us-west'}) - self.assertEqual(len(self.cli.get_list_series()), 0) - - @unittest.skip("Broken as of 0.9.0") - def test_get_list_series_DF(self): - self.cli.write_points(dummy_point) - rsp = self.cliDF.get_list_series() - - expected = pd.DataFrame( - [[1, 'server01', 'us-west']], - columns=['_id', 'host', 'region']) - assert_frame_equal(rsp['cpu_load_short'], expected) - def test_default_retention_policy(self): rsp = self.cli.get_list_retention_policies() self.assertEqual( 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