Fix results for cassandra backend in detailed mode

When using the Cassandra backend in detailed mode, attempting to
retrieve the results results in an error because of improperly
decoded metadata (introduced by
6d64d7a24f15311a0bd13baf7f6a9879176d2d08).

The metadata for `children` and `traceback` are encoded before being
grouped into the dictionary, which itself is encoded later prior to
being stored in Cassandra. During retrieval in detailed mode, these
are not decoded again, causing them to be interpreted as encoded
unicode literals instead of their native types.

CHANGES:
- the `results` metadata is encoded regardless of whether Cassandra is
  used in detailed or non-detailed mode. This is being consistent with
  the other backends where the results are always encoded. It may be
  unnecessary (results in double encoding), however.

- The logic for encoding/decoding metadata is now consistent for both
  detailed and non-detailed modes.

REFERENCE:
- 21cdf82fc4310320c21687cf80a3f98802565bd5 - cassandra detailed mode
- 6d64d7a24f15311a0bd13baf7f6a9879176d2d08 - backends support children

Conflicts:
	celery/backends/cassandra.py

celery/backends/cassandra.py

@@ -145,15 +145,14 @@ class CassandraBackend(BaseBackend):
             meta = {'status': status,
                     'date_done': date_done.strftime('%Y-%m-%dT%H:%M:%SZ'),
                     'traceback': self.encode(traceback),
+                    'result': self.encode(result),
                     'children': self.encode(
                         self.current_task_children(request),
                     )}
             if self.detailed_mode:
-                meta['result'] = result
                 cf.insert(task_id, {date_done: self.encode(meta)},
                           ttl=self.expires and timedelta_seconds(self.expires))
             else:
-                meta['result'] = self.encode(result)
                 cf.insert(task_id, meta,
                           ttl=self.expires and timedelta_seconds(self.expires))
 
@@ -167,18 +166,18 @@ class CassandraBackend(BaseBackend):
             try:
                 if self.detailed_mode:
                     row = cf.get(task_id, column_reversed=True, column_count=1)
-                    meta = self.decode(list(row.values())[0])
-                    meta['task_id'] = task_id
+                    obj = self.decode(list(row.values())[0])
                 else:
                     obj = cf.get(task_id)
-                    meta = {
-                        'task_id': task_id,
-                        'status': obj['status'],
-                        'result': self.decode(obj['result']),
-                        'date_done': obj['date_done'],
-                        'traceback': self.decode(obj['traceback']),
-                        'children': self.decode(obj['children']),
-                    }
+
+                meta = {
+                    'task_id': task_id,
+                    'status': obj['status'],
+                    'result': self.decode(obj['result']),
+                    'date_done': obj['date_done'],
+                    'traceback': self.decode(obj['traceback']),
+                    'children': self.decode(obj['children']),
+                }
             except (KeyError, pycassa.NotFoundException):
                 meta = {'status': states.PENDING, 'result': None}
             return meta