openstack/deb-ceilometer
Code Issues Proposed changes

Remove unused variable

Browse Source 
I removed the unused variables in code

Change-Id: Ie2250ae28e0ffaf97c92205d5e2f2da38c9afef1
This commit is contained in:
Béla Vancsics 2016-02-12 16:07:46 +01:00
parent d3c485c0ee
commit 35773a3593
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/storage/hbase/utils.py
View File

@ -385,7 +385,7 @@ def deserialize_entry(entry, get_raw_meta=True):
else:
metadata = metadata_flattened
return flatten_result, sources, meters, metadata
return flatten_result, meters, metadata
def serialize_entry(data=None, **kwargs):

6
ceilometer/storage/impl_hbase.py
View File

@ -214,7 +214,7 @@ class Connection(hbase_base.Connection, base.Connection):
LOG.debug("Query Resource table: %s", q)
for resource_id, data in resource_table.scan(filter=q,
limit=limit):
f_res, sources, meters, md = hbase_utils.deserialize_entry(
f_res, meters, md = hbase_utils.deserialize_entry(
data)
resource_id = hbase_utils.encode_unicode(resource_id)
# Unfortunately happybase doesn't keep ordered result from
@ -230,7 +230,7 @@ class Connection(hbase_base.Connection, base.Connection):
row = resource_table.row(
resource_id, columns=['f:project_id', 'f:user_id',
'f:resource_metadata'])
f_res, _s, _m, md = hbase_utils.deserialize_entry(row)
f_res, _m, md = hbase_utils.deserialize_entry(row)
yield models.Resource(
resource_id=resource_id,
first_sample_timestamp=first_ts,
@ -271,7 +271,7 @@ class Connection(hbase_base.Connection, base.Connection):
# https://bugs.launchpad.net/ceilometer/+bug/1301371
result = set()
for ignored, data in gen:
flatten_result, s, meters, md = hbase_utils.deserialize_entry(
flatten_result, meters, md = hbase_utils.deserialize_entry(
data)
for m in meters:
if limit and len(result) >= limit: