Mercurial > hg
comparison tests/test-audit-path.t @ 33649:377e8ddaebef stable
pathauditor: disable cache of audited paths by default (issue5628)
The initial attempt was to discard cache when appropriate, but it appears
to be error prone. We had to carefully inspect all places where audit() is
called e.g. without actually updating filesystem, before removing files and
directories, etc.
So, this patch disables the cache of audited paths by default, and enables
it only for the following cases:
- short-lived auditor objects
- repo.vfs, repo.svfs, and repo.cachevfs, which are managed directories
and considered sort of append-only (a file/directory would never be
replaced with a symlink)
There would be more cacheable vfs objects (e.g. mq.queue.opener), but I
decided not to inspect all of them in this patch. We can make them cached
later.
Benchmark result:
- using old clone of http://selenic.com/repo/linux-2.6/ (38319 files)
- on tmpfs
- run HGRCPATH=/dev/null hg up -q --time tip && hg up -q null
- try 4 times and take the last three results
original:
real 7.480 secs (user 1.140+22.760 sys 0.150+1.690)
real 8.010 secs (user 1.070+22.280 sys 0.170+2.120)
real 7.470 secs (user 1.120+22.390 sys 0.120+1.910)
clearcache (the other series):
real 7.680 secs (user 1.120+23.420 sys 0.140+1.970)
real 7.670 secs (user 1.110+23.620 sys 0.130+1.810)
real 7.740 secs (user 1.090+23.510 sys 0.160+1.940)
enable cache only for vfs and svfs (this series):
real 8.730 secs (user 1.500+25.190 sys 0.260+2.260)
real 8.750 secs (user 1.490+25.170 sys 0.250+2.340)
real 9.010 secs (user 1.680+25.340 sys 0.280+2.540)
remove cache function at all (for reference):
real 9.620 secs (user 1.440+27.120 sys 0.250+2.980)
real 9.420 secs (user 1.400+26.940 sys 0.320+3.130)
real 9.760 secs (user 1.530+27.270 sys 0.250+2.970)
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Wed, 26 Jul 2017 22:10:15 +0900 |
parents | 20bac46f7744 |
children | 989e884d1be9 |
comparison
equal
deleted
inserted
replaced
33648:47ea28293d30 | 33649:377e8ddaebef |
---|---|
167 and the rebase should fail (issue5628) | 167 and the rebase should fail (issue5628) |
168 | 168 |
169 $ hg up -qC 2 | 169 $ hg up -qC 2 |
170 $ hg rebase -s 2 -d 1 --config extensions.rebase= | 170 $ hg rebase -s 2 -d 1 --config extensions.rebase= |
171 rebasing 2:e73c21d6b244 "file a/poisoned" (tip) | 171 rebasing 2:e73c21d6b244 "file a/poisoned" (tip) |
172 saved backup bundle to * (glob) | 172 abort: path 'a/poisoned' traverses symbolic link 'a' |
173 [255] | |
173 $ ls ../merge-symlink-out | 174 $ ls ../merge-symlink-out |
174 poisoned | |
175 | 175 |
176 $ cd .. | 176 $ cd .. |
177 | 177 |
178 Test symlink traversal on update: | 178 Test symlink traversal on update: |
179 --------------------------------- | 179 --------------------------------- |
209 audited first by calculateupdates(), where no symlink is created so both | 209 audited first by calculateupdates(), where no symlink is created so both |
210 'a' and 'a/b' are taken as good paths. still applyupdates() should fail. | 210 'a' and 'a/b' are taken as good paths. still applyupdates() should fail. |
211 | 211 |
212 $ hg up -qC null | 212 $ hg up -qC null |
213 $ hg up 1 | 213 $ hg up 1 |
214 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 214 abort: path 'a/b' traverses symbolic link 'a' |
215 [255] | |
215 $ ls ../update-symlink-out | 216 $ ls ../update-symlink-out |
216 b | |
217 $ rm ../update-symlink-out/b | |
218 | 217 |
219 try branch update replacing directory with symlink, and its content: the | 218 try branch update replacing directory with symlink, and its content: the |
220 path 'a' is audited as a directory first, which should be audited again as | 219 path 'a' is audited as a directory first, which should be audited again as |
221 a symlink. | 220 a symlink. |
222 | 221 |
223 $ rm -f a | 222 $ rm -f a |
224 $ hg up -qC 2 | 223 $ hg up -qC 2 |
225 $ hg up 1 | 224 $ hg up 1 |
226 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 225 abort: path 'a/b' traverses symbolic link 'a' |
226 [255] | |
227 $ ls ../update-symlink-out | 227 $ ls ../update-symlink-out |
228 b | |
229 | 228 |
230 $ cd .. | 229 $ cd .. |
231 | 230 |
232 #endif | 231 #endif |