Mercurial > public > mercurial-scm > hg
comparison mercurial/hg.py @ 28119:91a827e760df
hg: make cachedlocalrepo cache appropriate repoview object
Before this patch, 'cachedlocalrepo' always caches "visible" repoview
object, because 'cachedlocalrepo' uses "visible" repoview returned by
'hg.repository()' without any additional processing.
If the client of 'cachedlocalrepo' wants "served" repoview, some
objects to be cached are discarded unintentionally.
1. 'cachedlocalrepo' newly caches "visible" repoview object
(call it VIEW1)
2. 'cachedlocalrepo' returns VIEW1 to the client of it at 'fetch()'
3. the client gets "served" repoview object by 'filtered("served")'
on VIEW1 (call this "served" repoview VIEW2)
4. accessing to 'repo.changelog' implies:
- instantiation of changelog via 'localrepository.changelog'
- instantiation of "filtered changelog" via 'repoview.changelog'
5. "filtered changelog" above is cached in VIEW2
6. VIEW2 is discarded after processing, because there is no
reference to it
7. 'cachedlocalrepo' returns VIEW1 cached at (1) above to the
client at next 'fetch()'
8. 'filtered("served")' on VIEW1 at the client side creates new
"served" repoview again, because VIEW1 is "visible"
(call this new "served" repoview VIEW3)
9. accessing to 'repo.changelog' implies instantiation of filtered
changelog again, because "filtered changelog" is cached in
VIEW2 at (5), but not in VIEW3 currently used
10. (go to (7) above)
As described above, "served" repoview object and "filtered changelog"
cached in it are discarded always, even if the repository itself
hasn't been changed since last access.
For example, in the case of 'hgweb_mod.hgweb', "newly caching" occurs,
when:
- all cached objects are already assigned to another threads
(in this case, repoview is created in 'cachedlocalrepo.copy()')
- or, stat of '00changelog.i' is changed from last access
(in this case, repoview is created in 'cachedlocalrepo.fetch()')
once changes are pushed via HTTP, this always occurs.
The root cause of this inefficiency is that 'cachedlocalrepo' always
caches "visible" repoview object, even if the client of it wants
another view.
To make 'cachedlocalrepo' cache appropriate repoview object, this
patch adds additional filtering on the repo object returned by
'hg.repository()'. It is assumed that initial repoview object should
be already filtered by expected view.
After this patch:
- 'filtered("served")' on VIEW1 at (3)/(7) above returns VIEW1
itself, because VIEW1 is now "served", and
- VIEW2 and VIEW3 equal VIEW1
- therefore, "filtered changelog" is cached in VIEW1, and reused
intentionally
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sun, 14 Feb 2016 01:33:55 +0900 |
| parents | cffa46cbdb8f |
| children | 60adda1a0188 |
comparison
equal
deleted
inserted
replaced
| 28118:0e3835c7e1cf | 28119:91a827e760df |
|---|---|
| 863 turned into a cache, it may not refresh properly. | 863 turned into a cache, it may not refresh properly. |
| 864 """ | 864 """ |
| 865 assert isinstance(repo, localrepo.localrepository) | 865 assert isinstance(repo, localrepo.localrepository) |
| 866 self._repo = repo | 866 self._repo = repo |
| 867 self._state, self.mtime = self._repostate() | 867 self._state, self.mtime = self._repostate() |
| 868 self._filtername = repo.filtername | |
| 868 | 869 |
| 869 def fetch(self): | 870 def fetch(self): |
| 870 """Refresh (if necessary) and return a repository. | 871 """Refresh (if necessary) and return a repository. |
| 871 | 872 |
| 872 If the cached instance is out of date, it will be recreated | 873 If the cached instance is out of date, it will be recreated |
| 882 | 883 |
| 883 state, mtime = self._repostate() | 884 state, mtime = self._repostate() |
| 884 if state == self._state: | 885 if state == self._state: |
| 885 return self._repo, False | 886 return self._repo, False |
| 886 | 887 |
| 887 self._repo = repository(self._repo.baseui, self._repo.url()) | 888 repo = repository(self._repo.baseui, self._repo.url()) |
| 889 if self._filtername: | |
| 890 self._repo = repo.filtered(self._filtername) | |
| 891 else: | |
| 892 self._repo = repo.unfiltered() | |
| 888 self._state = state | 893 self._state = state |
| 889 self.mtime = mtime | 894 self.mtime = mtime |
| 890 | 895 |
| 891 return self._repo, True | 896 return self._repo, True |
| 892 | 897 |
| 910 | 915 |
| 911 A new localrepository instance is obtained. The new instance should be | 916 A new localrepository instance is obtained. The new instance should be |
| 912 completely independent of the original. | 917 completely independent of the original. |
| 913 """ | 918 """ |
| 914 repo = repository(self._repo.baseui, self._repo.origroot) | 919 repo = repository(self._repo.baseui, self._repo.origroot) |
| 920 if self._filtername: | |
| 921 repo = repo.filtered(self._filtername) | |
| 922 else: | |
| 923 repo = repo.unfiltered() | |
| 915 c = cachedlocalrepo(repo) | 924 c = cachedlocalrepo(repo) |
| 916 c._state = self._state | 925 c._state = self._state |
| 917 c.mtime = self.mtime | 926 c.mtime = self.mtime |
| 918 return c | 927 return c |