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

switch back from GIST to GIN indexes

pull/2769/head
Matthew Hodgson 2018-01-09 16:37:48 +00:00
parent 3f9f1c50f3
commit e79db0a673
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
synapse/storage/search.py
View File

@ -31,7 +31,7 @@ class SearchStore(BackgroundUpdateStore):
EVENT_SEARCH_UPDATE_NAME = "event_search" EVENT_SEARCH_UPDATE_NAME = "event_search"
EVENT_SEARCH_ORDER_UPDATE_NAME = "event_search_order" EVENT_SEARCH_ORDER_UPDATE_NAME = "event_search_order"
EVENT_SEARCH_USE_GIST_POSTGRES_NAME = "event_search_postgres_gist" EVENT_SEARCH_USE_GIN_POSTGRES_NAME = "event_search_postgres_gin"
def __init__(self, db_conn, hs): def __init__(self, db_conn, hs):
super(SearchStore, self).__init__(db_conn, hs) super(SearchStore, self).__init__(db_conn, hs)
@ -43,8 +43,8 @@ class SearchStore(BackgroundUpdateStore):
self._background_reindex_search_order self._background_reindex_search_order
) )
self.register_background_update_handler( self.register_background_update_handler(
self.EVENT_SEARCH_USE_GIST_POSTGRES_NAME, self.EVENT_SEARCH_USE_GIN_POSTGRES_NAME,
self._background_reindex_gist_search self._background_reindex_gin_search
) )
@defer.inlineCallbacks @defer.inlineCallbacks
@ -145,25 +145,30 @@ class SearchStore(BackgroundUpdateStore):
defer.returnValue(result) defer.returnValue(result)
@defer.inlineCallbacks @defer.inlineCallbacks
def _background_reindex_gist_search(self, progress, batch_size): def _background_reindex_gin_search(self, progress, batch_size):
'''This handles old synapses which used GIST indexes; converting them
back to be GIN as per the actual schema. Otherwise it crashes out
as a NOOP
'''
def create_index(conn): def create_index(conn):
conn.rollback() conn.rollback()
conn.set_session(autocommit=True) conn.set_session(autocommit=True)
c = conn.cursor() c = conn.cursor()
c.execute( c.execute(
"CREATE INDEX CONCURRENTLY event_search_fts_idx_gist" "CREATE INDEX CONCURRENTLY event_search_fts_idx"
" ON event_search USING GIST (vector)" " ON event_search USING GIN (vector)"
) )
c.execute("DROP INDEX event_search_fts_idx") c.execute("DROP INDEX event_search_fts_idx_gist")
conn.set_session(autocommit=False) conn.set_session(autocommit=False)
if isinstance(self.database_engine, PostgresEngine): if isinstance(self.database_engine, PostgresEngine):
yield self.runWithConnection(create_index) yield self.runWithConnection(create_index)
yield self._end_background_update(self.EVENT_SEARCH_USE_GIST_POSTGRES_NAME) yield self._end_background_update(self.EVENT_SEARCH_USE_GIN_POSTGRES_NAME)
defer.returnValue(1) defer.returnValue(1)
@defer.inlineCallbacks @defer.inlineCallbacks