kallithea Changeset - 06a98912325c

Changeset - 06a98912325c

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 15 years ago 2010-11-29 03:31:29
marcin@python-works.com

fixed bug when invalidation was making to many queries when there was no list of invalidation

1 file changed with 21 insertions and 12 deletions:

rhodecode/model/scm.py

0 comments (0 inline, 0 general)

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -112,24 +112,25 @@ class ScmModel(BaseModel): @@
     def get_repos(self, all_repos=None):
         """
         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: give specific repositories list, good for filtering
         """
         if all_repos is None:
             all_repos = self.sa.query(Repository)\
                 .order_by(Repository.repo_name).all()
         #get the repositories that should be invalidated
         invalidation_list = [str(x.cache_key) for x in \
                              self.sa.query(CacheInvalidation.cache_key)\
                              .filter(CacheInvalidation.cache_active == False)\
                              .all()]
         for r in all_repos:
             repo = self.get(r.repo_name, invalidation_list)
             if repo is not None:
                 last_change = repo.last_change
                 tip = h.get_changeset_safe(repo, 'tip')
@@ @@ -149,31 +150,51 @@ class ScmModel(BaseModel): @@
                 tmp_d['repo_archives'] = list(repo._get_archives())
                 tmp_d['last_msg'] = tip.message
                 tmp_d['repo'] = repo
                 yield tmp_d
     def get_repo(self, repo_name):
         return self.get(repo_name)
     def get(self, repo_name, invalidation_list=None):
         """
         Get's repository from given name, creates BackendInstance and
         propagates it's data from database with all additional information
         :param repo_name:
         :param invalidation_list: if a invalidation list is given the get
             method should not manually check if this repository needs
             invalidation and just invalidate the repositories in list
         """
         if not HasRepoPermissionAny('repository.read', 'repository.write',
                             'repository.admin')(repo_name, 'get repo check'):
             return
         pre_invalidate = True
         if invalidation_list is not None:
             pre_invalidate = repo_name in invalidation_list
         if pre_invalidate:
             invalidate = self._should_invalidate(repo_name)
             if invalidate:
                 log.info('invalidating cache for repository %s', repo_name)
                 region_invalidate(_get_repo, None, repo_name)
                 self._mark_invalidated(invalidate)
         #======================================================================
         # CACHE FUNCTION
         #======================================================================
         @cache_region('long_term')
         def _get_repo(repo_name):
             repo_path = os.path.join(self.repos_path, repo_name)
             try:
                 alias = get_scm(repo_path)[0]
                 log.debug('Creating instance of %s repository', alias)
                 backend = get_backend(alias)
             except VCSError:
                 log.error(traceback.format_exc())
@@ @@ -194,36 +215,24 @@ class ScmModel(BaseModel): @@
                 .filter(Repository.repo_name == repo_name)\
                 .scalar()
             make_transient(dbrepo)
             if dbrepo.user:
                 make_transient(dbrepo.user)
             if dbrepo.fork:
                 make_transient(dbrepo.fork)
             repo.dbrepo = dbrepo
             return repo
         pre_invalidate = True
         if invalidation_list:
             pre_invalidate = repo_name in invalidation_list
         if pre_invalidate:
             invalidate = self._should_invalidate(repo_name)
             if invalidate:
                 log.info('invalidating cache for repository %s', repo_name)
                 region_invalidate(_get_repo, None, repo_name)
                 self._mark_invalidated(invalidate)
         return _get_repo(repo_name)
     def mark_for_invalidation(self, repo_name):
         """
         Puts cache invalidation task into db for
         further global cache invalidation
         :param repo_name: this repo that should invalidation take place
         """
         log.debug('marking %s for invalidation', repo_name)

0 comments (0 inline, 0 general)