| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/wireprotosimplecache.py (44 lines) |
| stringutil, | stringutil, | ||||
| ) | ) | ||||
| CACHE = None | CACHE = None | ||||
| configtable = {} | configtable = {} | ||||
| configitem = registrar.configitem(configtable) | configitem = registrar.configitem(configtable) | ||||
| configitem('simplecache', 'cacheapi', | configitem(b'simplecache', b'cacheapi', | ||||
| default=False) | default=False) | ||||
| configitem('simplecache', 'cacheobjects', | configitem(b'simplecache', b'cacheobjects', | ||||
| default=False) | default=False) | ||||
| configitem('simplecache', 'redirectsfile', | configitem(b'simplecache', b'redirectsfile', | ||||
| default=None) | default=None) | ||||
| # API handler that makes cached keys available. | # API handler that makes cached keys available. | ||||
| def handlecacherequest(rctx, req, res, checkperm, urlparts): | def handlecacherequest(rctx, req, res, checkperm, urlparts): | ||||
| if rctx.repo.ui.configbool('simplecache', 'cacheobjects'): | if rctx.repo.ui.configbool(b'simplecache', b'cacheobjects'): | ||||
| res.status = b'500 Internal Server Error' | res.status = b'500 Internal Server Error' | ||||
| res.setbodybytes(b'cacheobjects not supported for api server') | res.setbodybytes(b'cacheobjects not supported for api server') | ||||
| return | return | ||||
| if not urlparts: | if not urlparts: | ||||
| res.status = b'200 OK' | res.status = b'200 OK' | ||||
| res.headers[b'Content-Type'] = b'text/plain' | res.headers[b'Content-Type'] = b'text/plain' | ||||
| res.setbodybytes(b'simple cache server') | res.setbodybytes(b'simple cache server') | ||||
| res.status = b'200 OK' | res.status = b'200 OK' | ||||
| res.headers[b'Content-Type'] = b'application/mercurial-cbor' | res.headers[b'Content-Type'] = b'application/mercurial-cbor' | ||||
| res.setbodybytes(CACHE[key]) | res.setbodybytes(CACHE[key]) | ||||
| def cachedescriptor(req, repo): | def cachedescriptor(req, repo): | ||||
| return {} | return {} | ||||
| wireprotoserver.API_HANDLERS[b'simplecache'] = { | wireprotoserver.API_HANDLERS[b'simplecache'] = { | ||||
| 'config': (b'simplecache', b'cacheapi'), | b'config': (b'simplecache', b'cacheapi'), | ||||
| 'handler': handlecacherequest, | b'handler': handlecacherequest, | ||||
| 'apidescriptor': cachedescriptor, | b'apidescriptor': cachedescriptor, | ||||
| } | } | ||||
| @interfaceutil.implementer(repository.iwireprotocolcommandcacher) | @interfaceutil.implementer(repository.iwireprotocolcommandcacher) | ||||
| class memorycacher(object): | class memorycacher(object): | ||||
| def __init__(self, ui, command, encodefn, redirecttargets, redirecthashes, | def __init__(self, ui, command, encodefn, redirecttargets, redirecthashes, | ||||
| req): | req): | ||||
| self.ui = ui | self.ui = ui | ||||
| self.encodefn = encodefn | self.encodefn = encodefn | ||||
| self.redirecttargets = redirecttargets | self.redirecttargets = redirecttargets | ||||
| self.redirecthashes = redirecthashes | self.redirecthashes = redirecthashes | ||||
| self.req = req | self.req = req | ||||
| self.key = None | self.key = None | ||||
| self.cacheobjects = ui.configbool('simplecache', 'cacheobjects') | self.cacheobjects = ui.configbool(b'simplecache', b'cacheobjects') | ||||
| self.cacheapi = ui.configbool('simplecache', 'cacheapi') | self.cacheapi = ui.configbool(b'simplecache', b'cacheapi') | ||||
| self.buffered = [] | self.buffered = [] | ||||
| ui.log('simplecache', 'cacher constructed for %s\n', command) | ui.log(b'simplecache', b'cacher constructed for %s\n', command) | ||||
| def __enter__(self): | def __enter__(self): | ||||
| return self | return self | ||||
| def __exit__(self, exctype, excvalue, exctb): | def __exit__(self, exctype, excvalue, exctb): | ||||
| if exctype: | if exctype: | ||||
| self.ui.log('simplecache', 'cacher exiting due to error\n') | self.ui.log(b'simplecache', b'cacher exiting due to error\n') | ||||
| def adjustcachekeystate(self, state): | def adjustcachekeystate(self, state): | ||||
| # Needed in order to make tests deterministic. Don't copy this | # Needed in order to make tests deterministic. Don't copy this | ||||
| # pattern for production caches! | # pattern for production caches! | ||||
| del state[b'repo'] | del state[b'repo'] | ||||
| def setcachekey(self, key): | def setcachekey(self, key): | ||||
| self.key = key | self.key = key | ||||
| return True | return True | ||||
| def lookup(self): | def lookup(self): | ||||
| if self.key not in CACHE: | if self.key not in CACHE: | ||||
| self.ui.log('simplecache', 'cache miss for %s\n', self.key) | self.ui.log(b'simplecache', b'cache miss for %s\n', self.key) | ||||
| return None | return None | ||||
| entry = CACHE[self.key] | entry = CACHE[self.key] | ||||
| self.ui.log('simplecache', 'cache hit for %s\n', self.key) | self.ui.log(b'simplecache', b'cache hit for %s\n', self.key) | ||||
| redirectable = True | redirectable = True | ||||
| if not self.cacheapi: | if not self.cacheapi: | ||||
| redirectable = False | redirectable = False | ||||
| elif not self.redirecttargets: | elif not self.redirecttargets: | ||||
| redirectable = False | redirectable = False | ||||
| else: | else: | ||||
| clienttargets = set(self.redirecttargets) | clienttargets = set(self.redirecttargets) | ||||
| ourtargets = set(t[b'name'] for t in loadredirecttargets(self.ui)) | ourtargets = set(t[b'name'] for t in loadredirecttargets(self.ui)) | ||||
| # We only ever redirect to a single target (for now). So we don't | # We only ever redirect to a single target (for now). So we don't | ||||
| # need to store which target matched. | # need to store which target matched. | ||||
| if not clienttargets & ourtargets: | if not clienttargets & ourtargets: | ||||
| redirectable = False | redirectable = False | ||||
| if redirectable: | if redirectable: | ||||
| paths = self.req.dispatchparts[:-3] | paths = self.req.dispatchparts[:-3] | ||||
| paths.append(b'simplecache') | paths.append(b'simplecache') | ||||
| paths.append(self.key) | paths.append(self.key) | ||||
| url = b'%s/%s' % (self.req.baseurl, b'/'.join(paths)) | url = b'%s/%s' % (self.req.baseurl, b'/'.join(paths)) | ||||
| #url = b'http://example.com/%s' % self.key | #url = b'http://example.com/%s' % self.key | ||||
| self.ui.log('simplecache', 'sending content redirect for %s to ' | self.ui.log(b'simplecache', b'sending content redirect for %s to ' | ||||
| '%s\n', self.key, url) | b'%s\n', self.key, url) | ||||
| response = wireprototypes.alternatelocationresponse( | response = wireprototypes.alternatelocationresponse( | ||||
| url=url, | url=url, | ||||
| mediatype=b'application/mercurial-cbor') | mediatype=b'application/mercurial-cbor') | ||||
| return {'objs': [response]} | return {b'objs': [response]} | ||||
| if self.cacheobjects: | if self.cacheobjects: | ||||
| return { | return { | ||||
| 'objs': entry, | b'objs': entry, | ||||
| } | } | ||||
| else: | else: | ||||
| return { | return { | ||||
| 'objs': [wireprototypes.encodedresponse(entry)], | b'objs': [wireprototypes.encodedresponse(entry)], | ||||
| } | } | ||||
| def onobject(self, obj): | def onobject(self, obj): | ||||
| if self.cacheobjects: | if self.cacheobjects: | ||||
| self.buffered.append(obj) | self.buffered.append(obj) | ||||
| else: | else: | ||||
| self.buffered.extend(self.encodefn(obj)) | self.buffered.extend(self.encodefn(obj)) | ||||
| yield obj | yield obj | ||||
| def onfinished(self): | def onfinished(self): | ||||
| self.ui.log('simplecache', 'storing cache entry for %s\n', self.key) | self.ui.log(b'simplecache', b'storing cache entry for %s\n', self.key) | ||||
| if self.cacheobjects: | if self.cacheobjects: | ||||
| CACHE[self.key] = self.buffered | CACHE[self.key] = self.buffered | ||||
| else: | else: | ||||
| CACHE[self.key] = b''.join(self.buffered) | CACHE[self.key] = b''.join(self.buffered) | ||||
| return [] | return [] | ||||
| def makeresponsecacher(orig, repo, proto, command, args, objencoderfn, | def makeresponsecacher(orig, repo, proto, command, args, objencoderfn, | ||||
| redirecttargets, redirecthashes): | redirecttargets, redirecthashes): | ||||
| return memorycacher(repo.ui, command, objencoderfn, redirecttargets, | return memorycacher(repo.ui, command, objencoderfn, redirecttargets, | ||||
| redirecthashes, proto._req) | redirecthashes, proto._req) | ||||
| def loadredirecttargets(ui): | def loadredirecttargets(ui): | ||||
| path = ui.config('simplecache', 'redirectsfile') | path = ui.config(b'simplecache', b'redirectsfile') | ||||
| if not path: | if not path: | ||||
| return [] | return [] | ||||
| with open(path, 'rb') as fh: | with open(path, 'rb') as fh: | ||||
| s = fh.read() | s = fh.read() | ||||
| return stringutil.evalpythonliteral(s) | return stringutil.evalpythonliteral(s) | ||||
| def getadvertisedredirecttargets(orig, repo, proto): | def getadvertisedredirecttargets(orig, repo, proto): | ||||
| return loadredirecttargets(repo.ui) | return loadredirecttargets(repo.ui) | ||||
| def extsetup(ui): | def extsetup(ui): | ||||
| global CACHE | global CACHE | ||||
| CACHE = util.lrucachedict(10000) | CACHE = util.lrucachedict(10000) | ||||
| extensions.wrapfunction(wireprotov2server, 'makeresponsecacher', | extensions.wrapfunction(wireprotov2server, b'makeresponsecacher', | ||||
| makeresponsecacher) | makeresponsecacher) | ||||
| extensions.wrapfunction(wireprotov2server, 'getadvertisedredirecttargets', | extensions.wrapfunction(wireprotov2server, b'getadvertisedredirecttargets', | ||||
| getadvertisedredirecttargets) | getadvertisedredirecttargets) | ||||