Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Go back to storing JSON in TEXT

This commit is contained in:
Erik Johnston 2015-04-16 11:17:52 +01:00
parent bc9e69e160
commit b8092fbc82
11 changed files with 20 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/storage/_base.py
View File

@ -818,9 +818,6 @@ 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(

4
synapse/storage/appservice.py
View File

@ -366,9 +366,7 @@ class ApplicationServiceTransactionStore(SQLBaseStore):
new_txn_id = max(highest_txn_id, last_txn_id) + 1
# Insert new txn into txn table
event_ids = buffer(
json.dumps([e.event_id for e in events]).encode("utf8")
)
event_ids = json.dumps([e.event_id for e in events])
txn.execute(
"INSERT INTO application_services_txns(as_id, txn_id, event_ids) "
"VALUES(?,?,?)",

3
synapse/storage/engines/postgres.py
View File

@ -39,6 +39,3 @@ class PostgresEngine(object):
if isinstance(error, self.module.DatabaseError):
return error.pgcode in ["40001", "40P01"]
return False
def load_unicode(self, v):
return bytes(v).decode("UTF8")

5
synapse/storage/engines/sqlite3.py
View File

@ -37,8 +37,3 @@ class Sqlite3Engine(object):
def is_deadlock(self, error):
return False
def load_unicode(self, v):
if isinstance(v, types.UnicodeType):
return v
return bytes(v).decode("UTF8")

16
synapse/storage/events.py
View File

@ -168,7 +168,7 @@ class EventsStore(SQLBaseStore):
metadata_json = encode_canonical_json(
event.internal_metadata.get_dict()
)
).decode("UTF-8")
# If we have already persisted this event, we don't need to do any
# more processing.
@ -184,7 +184,7 @@ class EventsStore(SQLBaseStore):
)
txn.execute(
sql,
(buffer(metadata_json), event.event_id,)
(metadata_json, event.event_id,)
)
sql = (
@ -229,14 +229,14 @@ class EventsStore(SQLBaseStore):
values={
"event_id": event.event_id,
"room_id": event.room_id,
"internal_metadata": buffer(metadata_json),
"json": buffer(encode_canonical_json(event_dict)),
"internal_metadata": metadata_json,
"json": encode_canonical_json(event_dict).decode("UTF-8"),
},
)
content = buffer(encode_canonical_json(
content = encode_canonical_json(
event.content
))
).decode("UTF-8")
vals = {
"topological_ordering": event.depth,
@ -261,9 +261,9 @@ class EventsStore(SQLBaseStore):
]
}
vals["unrecognized_keys"] = buffer(encode_canonical_json(
vals["unrecognized_keys"] = encode_canonical_json(
unrec
))
).decode("UTF-8")
sql = (
"INSERT INTO events"

5
synapse/storage/profile.py
View File

@ -35,16 +35,13 @@ class ProfileStore(SQLBaseStore):
desc="get_profile_displayname",
)
if name:
name = self.database_engine.load_unicode(name)
defer.returnValue(name)
def set_profile_displayname(self, user_localpart, new_displayname):
return self._simple_update_one(
table="profiles",
keyvalues={"user_id": user_localpart},
updatevalues={"displayname": new_displayname.encode("utf8")},
updatevalues={"displayname": new_displayname},
desc="set_profile_displayname",
)

5
synapse/storage/registration.py
View File

@ -98,11 +98,6 @@ class RegistrationStore(SQLBaseStore):
allow_none=True,
)
if user_info:
user_info["password_hash"] = self.database_engine.load_unicode(
user_info["password_hash"]
)
defer.returnValue(user_info)
@cached()

2
synapse/storage/schema/delta/15/appservice_txns.sql
View File

@ -22,7 +22,7 @@ CREATE TABLE IF NOT EXISTS application_services_state(
CREATE TABLE IF NOT EXISTS application_services_txns(
as_id VARCHAR(150) NOT NULL,
txn_id INTEGER NOT NULL,
event_ids LONGBLOB NOT NULL,
event_ids TEXT NOT NULL,
UNIQUE(as_id, txn_id)
);

8
synapse/storage/schema/full_schemas/11/im.sql
View File

@ -19,8 +19,8 @@ CREATE TABLE IF NOT EXISTS events(
event_id VARCHAR(150) NOT NULL,
type VARCHAR(150) NOT NULL,
room_id VARCHAR(150) NOT NULL,
content bytea NOT NULL,
unrecognized_keys bytea,
content TEXT NOT NULL,
unrecognized_keys TEXT,
processed BOOL NOT NULL,
outlier BOOL NOT NULL,
depth BIGINT DEFAULT 0 NOT NULL,
@ -35,8 +35,8 @@ CREATE INDEX events_room_id ON events (room_id);
CREATE TABLE IF NOT EXISTS event_json(
event_id VARCHAR(150) NOT NULL,
room_id VARCHAR(150) NOT NULL,
internal_metadata bytea NOT NULL,
json bytea NOT NULL,
internal_metadata TEXT NOT NULL,
json TEXT NOT NULL,
UNIQUE (event_id)
);

2
synapse/storage/schema/full_schemas/16/application_services.sql
View File

@ -39,7 +39,7 @@ CREATE TABLE IF NOT EXISTS application_services_state(
CREATE TABLE IF NOT EXISTS application_services_txns(
as_id VARCHAR(150) NOT NULL,
txn_id INTEGER NOT NULL,
event_ids bytea NOT NULL,
event_ids TEXT NOT NULL,
UNIQUE(as_id, txn_id)
);

8
synapse/storage/schema/full_schemas/16/im.sql
View File

@ -19,8 +19,8 @@ CREATE TABLE IF NOT EXISTS events(
event_id VARCHAR(150) NOT NULL,
type VARCHAR(150) NOT NULL,
room_id VARCHAR(150) NOT NULL,
content bytea NOT NULL,
unrecognized_keys bytea,
content TEXT NOT NULL,
unrecognized_keys TEXT,
processed BOOL NOT NULL,
outlier BOOL NOT NULL,
depth BIGINT DEFAULT 0 NOT NULL,
@ -39,8 +39,8 @@ CREATE INDEX events_order_room ON events (
CREATE TABLE IF NOT EXISTS event_json(
event_id VARCHAR(150) NOT NULL,
room_id VARCHAR(150) NOT NULL,
internal_metadata bytea NOT NULL,
json bytea NOT NULL,
internal_metadata TEXT NOT NULL,
json TEXT NOT NULL,
UNIQUE (event_id)
);