OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #328 from matrix-org/erikj/search 

Pull out sender when computing search results
pull/331/head
Erik Johnston 2015-10-26 10:24:19 +00:00
parent b8e37ed944 4cf633d5e9
commit 3f0a57eb9b
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
synapse/storage/schema/delta/25/fts.py
View File

@ -26,22 +26,23 @@ POSTGRES_SQL = """
CREATE TABLE IF NOT EXISTS event_search (
event_id TEXT,
room_id TEXT,
sender TEXT,
key TEXT,
vector tsvector
);
INSERT INTO event_search SELECT
event_id, room_id, 'content.body',
event_id, room_id, json::json->>'sender', 'content.body',
to_tsvector('english', json::json->'content'->>'body')
FROM events NATURAL JOIN event_json WHERE type = 'm.room.message';
INSERT INTO event_search SELECT
event_id, room_id, 'content.name',
event_id, room_id, json::json->>'sender', 'content.name',
to_tsvector('english', json::json->'content'->>'name')
FROM events NATURAL JOIN event_json WHERE type = 'm.room.name';
INSERT INTO event_search SELECT
event_id, room_id, 'content.topic',
event_id, room_id, json::json->>'sender', 'content.topic',
to_tsvector('english', json::json->'content'->>'topic')
FROM events NATURAL JOIN event_json WHERE type = 'm.room.topic';
@ -99,26 +100,28 @@ def run_sqlite_upgrade(cur):
rows = []
for ev in events:
if ev["type"] == "m.room.message":
content = ev.get("content", {})
body = content.get("body", None)
name = content.get("name", None)
topic = content.get("topic", None)
sender = ev.get("sender", None)
if ev["type"] == "m.room.message" and body:
rows.append((
ev["event_id"], ev["room_id"], "content.body",
ev["content"]["body"]
ev["event_id"], ev["room_id"], sender, "content.body", body
))
if ev["type"] == "m.room.name":
if ev["type"] == "m.room.name" and name:
rows.append((
ev["event_id"], ev["room_id"], "content.name",
ev["content"]["name"]
ev["event_id"], ev["room_id"], sender, "content.name", name
))
if ev["type"] == "m.room.topic":
if ev["type"] == "m.room.topic" and topic:
rows.append((
ev["event_id"], ev["room_id"], "content.topic",
ev["content"]["topic"]
ev["event_id"], ev["room_id"], sender, "content.topic", topic
))
if rows:
logger.info(rows)
cur.executemany(
"INSERT INTO event_search (event_id, room_id, key, value)"
" VALUES (?,?,?,?)",
"INSERT INTO event_search (event_id, room_id, sender, key, value)"
" VALUES (?,?,?,?,?)",
rows
)