Skip to content

functions: Don't sort series in formatPathExpressions. #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iain-buclaw-sociomantic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

functions: Don't sort series in formatPathExpressions. #237

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
4 changes: 3 additions & 1 deletion graphite_api/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,9 @@ def formatPathExpressions(seriesList):
"""
Returns a comma-separated list of unique path expressions.
"""
pathExpressions = sorted(set([s.pathExpression for s in seriesList]))
pathExpressions = []
[pathExpressions.append(s.pathExpression)
for s in seriesList if not pathExpressions.count(s.pathExpression)]
return ','.join(pathExpressions)

# Series Functions
Expand Down
7 changes: 5 additions & 2 deletions tests/test_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,8 +856,8 @@ def test_sum_series_wildcards(self):
self.assertEqual(sum_.pathExpression,
"sumSeries(collectd.test-db4.load.value,"
"sumSeries(collectd.test-db3.load.value,"
"sumSeries(collectd.test-db1.load.value,"
"collectd.test-db2.load.value)))")
"sumSeries(collectd.test-db2.load.value,"
"collectd.test-db1.load.value)))")
self.assertEqual(sum_[:3], [3, 5, 6])

def test_diff_series_empty(self):
Expand All @@ -867,6 +867,9 @@ def test_diff_series_empty(self):
def test_diff_series(self):
series = self._generate_series_list()[:2]
diff = functions.diffSeries({}, [series[0]], [series[1]])[0]
self.assertEqual(diff.pathExpression,
"diffSeries(collectd.test-db1.load.value,"
"collectd.test-db2.load.value)")
self.assertEqual(diff[:3], [-2, -2, -2])

def test_average_series_empty(self):
Expand Down
4 changes: 2 additions & 2 deletions tests/test_render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def test_sumseries(self):
for series in data:
agg[series['target']] = series['datapoints']
for index, value in enumerate(agg['baz']):
self.assertEqual(value, agg['sumSeries(sin(bar),sin(foo))'][index])
self.assertEqual(value, agg['sumSeries(sin(foo),sin(bar))'][index])

response = self.app.get(self.url, query_string={
'target': ['sumSeries(sin("foo"), sin("bar", 2))',
Expand All @@ -206,7 +206,7 @@ def test_sumseries(self):
self.assertTrue(len(series['datapoints']) <= 100)
agg[series['target']] = series['datapoints']
for index, value in enumerate(agg['baz']):
self.assertEqual(value, agg['sumSeries(sin(bar),sin(foo))'][index])
self.assertEqual(value, agg['sumSeries(sin(foo),sin(bar))'][index])

def test_correct_timezone(self):
response = self.app.get(self.url, query_string={
Expand Down