Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 10:46:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Handle the fact that in sqlite binary data might be stored as unicode or bytes

Browse source
This commit is contained in:
Erik Johnston 2015-04-10 13:41:54 +01:00
parent ce797ad373
commit 7ed2ec3061
5 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
synapse/storage/_base.py
View file

@ -812,6 +812,9 @@ class SQLBaseStore(object):
internal_metadata, js, redacted, rejected_reason = res
internal_metadata = self.database_engine.load_unicode(internal_metadata)
js = self.database_engine.load_unicode(js)
start_time = update_counter("select_event", start_time)
result = self._get_event_from_row_txn(
@ -839,11 +842,11 @@ class SQLBaseStore(object):
return curr_time
logger.debug("Got js: %r", js)
d = json.loads(str(js).decode("utf8"))
d = json.loads(js)
start_time = update_counter("decode_json", start_time)
logger.debug("Got internal_metadata: %r", internal_metadata)
internal_metadata = json.loads(str(internal_metadata).decode("utf8"))
internal_metadata = json.loads(internal_metadata)
start_time = update_counter("decode_internal", start_time)
ev = FrozenEvent(