ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server/posts: optimize 'posts around' query

Browse source
This commit is contained in:
rr- 2016-06-13 23:56:59 +02:00
parent 0f1e234a5d
commit 36eddad424
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/szurubooru/search/configs/base_search_config.py
View file

@ -10,6 +10,9 @@ class BaseSearchConfig(object):
def create_filter_query(self): def create_filter_query(self):
raise NotImplementedError() raise NotImplementedError()
def create_around_query(self):
return self.create_filter_query()
def create_count_query(self): def create_count_query(self):
return self.create_filter_query() return self.create_filter_query()

3
server/szurubooru/search/configs/post_search_config.py
View file

@ -78,6 +78,9 @@ class PostSearchConfig(BaseSearchConfig):
new_special_tokens.append(token) new_special_tokens.append(token)
search_query.special_tokens = new_special_tokens search_query.special_tokens = new_special_tokens
def create_around_query(self):
return db.session.query(db.Post.post_id)
def create_filter_query(self): def create_filter_query(self):
return self.create_count_query() \ return self.create_count_query() \
.options( .options(

2
server/szurubooru/search/executor.py
View file

@ -31,7 +31,7 @@ class Executor(object):
search_query = self.parser.parse(query_text) search_query = self.parser.parse(query_text)
self.config.on_search_query_parsed(search_query) self.config.on_search_query_parsed(search_query)
filter_query = self.config \ filter_query = self.config \
.create_filter_query() \ .create_around_query() \
.options(sqlalchemy.orm.lazyload('*')) .options(sqlalchemy.orm.lazyload('*'))
filter_query = self._prepare_db_query(filter_query, search_query, False) filter_query = self._prepare_db_query(filter_query, search_query, False)
prev_filter_query = filter_query \ prev_filter_query = filter_query \