Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Remove get_list_series #336

Merged
merged 1 commit into from
Jun 13, 2016
Merged

Remove get_list_series #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions influxdb/_dataframe_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
29 changes: 0 additions & 29 deletions influxdb/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
21 changes: 0 additions & 21 deletions influxdb/tests/client_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":[{}]}'

Expand Down
43 changes: 0 additions & 43 deletions influxdb/tests/dataframe_client_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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': [
Expand Down
43 changes: 0 additions & 43 deletions influxdb/tests/server_tests/client_test_with_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down Expand Up @@ -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(
Expand Down