| hg-reviewers |
"cache" is generic and revlog instances have multiple caches. Let's
be descriptive about what this is a cache for.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/bundlerepo.py (6 lines) | |||
| M | mercurial/revlog.py (26 lines) | |||
| M | mercurial/unionrepo.py (2 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Gregory Szorc | Oct 3 2018, 1:32 PM |
| if node == nullid: | if node == nullid: | ||||
| return "" | return "" | ||||
| rawtext = None | rawtext = None | ||||
| chain = [] | chain = [] | ||||
| iterrev = rev | iterrev = rev | ||||
| # reconstruct the revision if it is from a changegroup | # reconstruct the revision if it is from a changegroup | ||||
| while iterrev > self.repotiprev: | while iterrev > self.repotiprev: | ||||
| if self._cache and self._cache[1] == iterrev: | if self._revisioncache and self._revisioncache[1] == iterrev: | ||||
| rawtext = self._cache[2] | rawtext = self._revisioncache[2] | ||||
| break | break | ||||
| chain.append(iterrev) | chain.append(iterrev) | ||||
| iterrev = self.index[iterrev][3] | iterrev = self.index[iterrev][3] | ||||
| if rawtext is None: | if rawtext is None: | ||||
| rawtext = self.baserevision(iterrev) | rawtext = self.baserevision(iterrev) | ||||
| while chain: | while chain: | ||||
| delta = self._chunk(chain.pop()) | delta = self._chunk(chain.pop()) | ||||
| rawtext = mdiff.patches(rawtext, [delta]) | rawtext = mdiff.patches(rawtext, [delta]) | ||||
| text, validatehash = self._processflags(rawtext, self.flags(rev), | text, validatehash = self._processflags(rawtext, self.flags(rev), | ||||
| 'read', raw=raw) | 'read', raw=raw) | ||||
| if validatehash: | if validatehash: | ||||
| self.checkhash(text, node, rev=rev) | self.checkhash(text, node, rev=rev) | ||||
| self._cache = (node, rev, rawtext) | self._revisioncache = (node, rev, rawtext) | ||||
| return text | return text | ||||
| def baserevision(self, nodeorrev): | def baserevision(self, nodeorrev): | ||||
| # Revlog subclasses may override 'revision' method to modify format of | # Revlog subclasses may override 'revision' method to modify format of | ||||
| # content retrieved from revlog. To use bundlerevlog with such class one | # content retrieved from revlog. To use bundlerevlog with such class one | ||||
| # needs to override 'baserevision' and make more specific call here. | # needs to override 'baserevision' and make more specific call here. | ||||
| return revlog.revlog.revision(self, nodeorrev, raw=True) | return revlog.revlog.revision(self, nodeorrev, raw=True) | ||||
| self.indexfile = indexfile | self.indexfile = indexfile | ||||
| self.datafile = datafile or (indexfile[:-2] + ".d") | self.datafile = datafile or (indexfile[:-2] + ".d") | ||||
| self.opener = opener | self.opener = opener | ||||
| # When True, indexfile is opened with checkambig=True at writing, to | # When True, indexfile is opened with checkambig=True at writing, to | ||||
| # avoid file stat ambiguity. | # avoid file stat ambiguity. | ||||
| self._checkambig = checkambig | self._checkambig = checkambig | ||||
| self._censorable = censorable | self._censorable = censorable | ||||
| # 3-tuple of (node, rev, text) for a raw revision. | # 3-tuple of (node, rev, text) for a raw revision. | ||||
| self._cache = None | self._revisioncache = None | ||||
| # Maps rev to chain base rev. | # Maps rev to chain base rev. | ||||
| self._chainbasecache = util.lrucachedict(100) | self._chainbasecache = util.lrucachedict(100) | ||||
| # 2-tuple of (offset, data) of raw data from the revlog at an offset. | # 2-tuple of (offset, data) of raw data from the revlog at an offset. | ||||
| self._chunkcache = (0, '') | self._chunkcache = (0, '') | ||||
| # How much data to read and cache into the raw revlog data cache. | # How much data to read and cache into the raw revlog data cache. | ||||
| self._chunkcachesize = 65536 | self._chunkcachesize = 65536 | ||||
| self._maxchainlen = None | self._maxchainlen = None | ||||
| self._deltabothparents = True | self._deltabothparents = True | ||||
| # could have a same revlog node with different flags (i.e. different | # could have a same revlog node with different flags (i.e. different | ||||
| # rawtext contents) and the delta could be incompatible. | # rawtext contents) and the delta could be incompatible. | ||||
| if ((self.flags(baserev) & REVIDX_RAWTEXT_CHANGING_FLAGS) | if ((self.flags(baserev) & REVIDX_RAWTEXT_CHANGING_FLAGS) | ||||
| or (self.flags(rev) & REVIDX_RAWTEXT_CHANGING_FLAGS)): | or (self.flags(rev) & REVIDX_RAWTEXT_CHANGING_FLAGS)): | ||||
| return False | return False | ||||
| return True | return True | ||||
| def clearcaches(self): | def clearcaches(self): | ||||
| self._cache = None | self._revisioncache = None | ||||
| self._chainbasecache.clear() | self._chainbasecache.clear() | ||||
| self._chunkcache = (0, '') | self._chunkcache = (0, '') | ||||
| self._pcache = {} | self._pcache = {} | ||||
| try: | try: | ||||
| self._nodecache.clearcaches() | self._nodecache.clearcaches() | ||||
| except AttributeError: | except AttributeError: | ||||
| self._nodecache = {nullid: nullrev} | self._nodecache = {nullid: nullrev} | ||||
| node = nodeorrev | node = nodeorrev | ||||
| rev = None | rev = None | ||||
| cachedrev = None | cachedrev = None | ||||
| flags = None | flags = None | ||||
| rawtext = None | rawtext = None | ||||
| if node == nullid: | if node == nullid: | ||||
| return "" | return "" | ||||
| if self._cache: | if self._revisioncache: | ||||
| if self._cache[0] == node: | if self._revisioncache[0] == node: | ||||
| # _cache only stores rawtext | # _cache only stores rawtext | ||||
| if raw: | if raw: | ||||
| return self._cache[2] | return self._revisioncache[2] | ||||
| # duplicated, but good for perf | # duplicated, but good for perf | ||||
| if rev is None: | if rev is None: | ||||
| rev = self.rev(node) | rev = self.rev(node) | ||||
| if flags is None: | if flags is None: | ||||
| flags = self.flags(rev) | flags = self.flags(rev) | ||||
| # no extra flags set, no flag processor runs, text = rawtext | # no extra flags set, no flag processor runs, text = rawtext | ||||
| if flags == REVIDX_DEFAULT_FLAGS: | if flags == REVIDX_DEFAULT_FLAGS: | ||||
| return self._cache[2] | return self._revisioncache[2] | ||||
| # rawtext is reusable. need to run flag processor | # rawtext is reusable. need to run flag processor | ||||
| rawtext = self._cache[2] | rawtext = self._revisioncache[2] | ||||
| cachedrev = self._cache[1] | cachedrev = self._revisioncache[1] | ||||
| # look up what we need to read | # look up what we need to read | ||||
| if rawtext is None: | if rawtext is None: | ||||
| if rev is None: | if rev is None: | ||||
| rev = self.rev(node) | rev = self.rev(node) | ||||
| chain, stopped = self._deltachain(rev, stoprev=cachedrev) | chain, stopped = self._deltachain(rev, stoprev=cachedrev) | ||||
| if stopped: | if stopped: | ||||
| rawtext = self._cache[2] | rawtext = self._revisioncache[2] | ||||
| # drop cache to save memory | # drop cache to save memory | ||||
| self._cache = None | self._revisioncache = None | ||||
| targetsize = None | targetsize = None | ||||
| rawsize = self.index[rev][2] | rawsize = self.index[rev][2] | ||||
| if 0 <= rawsize: | if 0 <= rawsize: | ||||
| targetsize = 4 * rawsize | targetsize = 4 * rawsize | ||||
| bins = self._chunks(chain, df=_df, targetsize=targetsize) | bins = self._chunks(chain, df=_df, targetsize=targetsize) | ||||
| if rawtext is None: | if rawtext is None: | ||||
| rawtext = bytes(bins[0]) | rawtext = bytes(bins[0]) | ||||
| bins = bins[1:] | bins = bins[1:] | ||||
| rawtext = mdiff.patches(rawtext, bins) | rawtext = mdiff.patches(rawtext, bins) | ||||
| self._cache = (node, rev, rawtext) | self._revisioncache = (node, rev, rawtext) | ||||
| if flags is None: | if flags is None: | ||||
| if rev is None: | if rev is None: | ||||
| rev = self.rev(node) | rev = self.rev(node) | ||||
| flags = self.flags(rev) | flags = self.flags(rev) | ||||
| text, validatehash = self._processflags(rawtext, flags, 'read', raw=raw) | text, validatehash = self._processflags(rawtext, flags, 'read', raw=raw) | ||||
| if validatehash: | if validatehash: | ||||
| link, offset) | link, offset) | ||||
| rawtext = btext[0] | rawtext = btext[0] | ||||
| if alwayscache and rawtext is None: | if alwayscache and rawtext is None: | ||||
| rawtext = deltacomputer.buildtext(revinfo, fh) | rawtext = deltacomputer.buildtext(revinfo, fh) | ||||
| if type(rawtext) == bytes: # only accept immutable objects | if type(rawtext) == bytes: # only accept immutable objects | ||||
| self._cache = (node, curr, rawtext) | self._revisioncache = (node, curr, rawtext) | ||||
| self._chainbasecache[curr] = deltainfo.chainbase | self._chainbasecache[curr] = deltainfo.chainbase | ||||
| return node | return node | ||||
| def _writeentry(self, transaction, ifh, dfh, entry, data, link, offset): | def _writeentry(self, transaction, ifh, dfh, entry, data, link, offset): | ||||
| # Files opened in a+ mode have inconsistent behavior on various | # Files opened in a+ mode have inconsistent behavior on various | ||||
| # platforms. Windows requires that a file positioning call be made | # platforms. Windows requires that a file positioning call be made | ||||
| # when the file handle transitions between reads and writes. See | # when the file handle transitions between reads and writes. See | ||||
| # 3686fa2b8eee and the mixedfilemodewrapper in windows.py. On other | # 3686fa2b8eee and the mixedfilemodewrapper in windows.py. On other | ||||
| transaction.add(self.datafile, end) | transaction.add(self.datafile, end) | ||||
| end = rev * self._io.size | end = rev * self._io.size | ||||
| else: | else: | ||||
| end += rev * self._io.size | end += rev * self._io.size | ||||
| transaction.add(self.indexfile, end) | transaction.add(self.indexfile, end) | ||||
| # then reset internal state in memory to forget those revisions | # then reset internal state in memory to forget those revisions | ||||
| self._cache = None | self._revisioncache = None | ||||
| self._chaininfocache = {} | self._chaininfocache = {} | ||||
| self._chunkclear() | self._chunkclear() | ||||
| for x in pycompat.xrange(rev, len(self)): | for x in pycompat.xrange(rev, len(self)): | ||||
| del self.nodemap[self.node(x)] | del self.nodemap[self.node(x)] | ||||
| del self.index[rev:-1] | del self.index[rev:-1] | ||||
| self._nodepos = None | self._nodepos = None | ||||
| node = nodeorrev | node = nodeorrev | ||||
| rev = self.rev(node) | rev = self.rev(node) | ||||
| if node == nullid: | if node == nullid: | ||||
| return "" | return "" | ||||
| if rev > self.repotiprev: | if rev > self.repotiprev: | ||||
| text = self.revlog2.revision(node) | text = self.revlog2.revision(node) | ||||
| self._cache = (node, rev, text) | self._revisioncache = (node, rev, text) | ||||
| else: | else: | ||||
| text = self.baserevision(rev) | text = self.baserevision(rev) | ||||
| # already cached | # already cached | ||||
| return text | return text | ||||
| def baserevision(self, nodeorrev): | def baserevision(self, nodeorrev): | ||||
| # Revlog subclasses may override 'revision' method to modify format of | # Revlog subclasses may override 'revision' method to modify format of | ||||
| # content retrieved from revlog. To use unionrevlog with such class one | # content retrieved from revlog. To use unionrevlog with such class one | ||||