Mercurial > kallithea
changeset 2604:dfa5180cf02f beta
Use simplified cached repos list for quick repo switcher, in some cases it can have 2-3x speed-up since it doesn't need to init the scms
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 14 Jul 2012 19:55:35 +0200 |
| parents | 370ed7829168 |
| children | 0dc09191775b |
| files | rhodecode/controllers/home.py rhodecode/model/scm.py |
| diffstat | 2 files changed, 42 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/home.py Sat Jul 14 19:09:35 2012 +0200 +++ b/rhodecode/controllers/home.py Sat Jul 14 19:55:35 2012 +0200 @@ -51,7 +51,8 @@ if request.is_xhr: all_repos = Repository.query().order_by(Repository.repo_name).all() c.repos_list = self.scm_model.get_repos(all_repos, - sort_key='name_sort') + sort_key='name_sort', + simple=True) return render('/repo_switcher_list.html') else: return HTTPBadRequest()
--- a/rhodecode/model/scm.py Sat Jul 14 19:09:35 2012 +0200 +++ b/rhodecode/model/scm.py Sat Jul 14 19:55:35 2012 +0200 @@ -66,6 +66,10 @@ class CachedRepoList(object): + """ + Cached repo list, uses in-memory cache after initialization, that is + super fast + """ def __init__(self, db_repo_list, repos_path, order_by=None): self.db_repo_list = db_repo_list @@ -106,7 +110,7 @@ tmp_d['name'] = dbr.repo_name tmp_d['name_sort'] = tmp_d['name'].lower() tmp_d['description'] = dbr.description - tmp_d['description_sort'] = tmp_d['description'] + tmp_d['description_sort'] = tmp_d['description'].lower() tmp_d['last_change'] = last_change tmp_d['last_change_sort'] = time.mktime(last_change.timetuple()) tmp_d['tip'] = tip.raw_id @@ -123,6 +127,29 @@ yield tmp_d +class SimpleCachedRepoList(CachedRepoList): + """ + Lighter version of CachedRepoList without the scm initialisation + """ + + def __iter__(self): + for dbr in self.db_repo_list: + # check permission at this level + if not HasRepoPermissionAny( + 'repository.read', 'repository.write', 'repository.admin' + )(dbr.repo_name, 'get repo check'): + continue + + tmp_d = {} + tmp_d['name'] = dbr.repo_name + tmp_d['name_sort'] = tmp_d['name'].lower() + tmp_d['description'] = dbr.description + tmp_d['description_sort'] = tmp_d['description'].lower() + tmp_d['dbrepo'] = dbr.get_dict() + tmp_d['dbrepo_fork'] = dbr.fork.get_dict() if dbr.fork else {} + yield tmp_d + + class GroupList(object): def __init__(self, db_repo_group_list): @@ -215,21 +242,29 @@ return repos - def get_repos(self, all_repos=None, sort_key=None): + def get_repos(self, all_repos=None, sort_key=None, simple=False): """ Get all repos from db and for each repo create it's backend instance and fill that backed with information from database :param all_repos: list of repository names as strings give specific repositories list, good for filtering + + :param sort_key: initial sorting of repos + :param simple: use SimpleCachedList - one without the SCM info """ if all_repos is None: all_repos = self.sa.query(Repository)\ .filter(Repository.group_id == None)\ .order_by(func.lower(Repository.repo_name)).all() - - repo_iter = CachedRepoList(all_repos, repos_path=self.repos_path, - order_by=sort_key) + if simple: + repo_iter = SimpleCachedRepoList(all_repos, + repos_path=self.repos_path, + order_by=sort_key) + else: + repo_iter = CachedRepoList(all_repos, + repos_path=self.repos_path, + order_by=sort_key) return repo_iter