Skip to content

Speedup toolform building #4541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guerler merged 3 commits into from
Sep 3, 2017
+20 −10
Merged

Speedup toolform building #4541

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
471707b
Build converters_by_datatype only once per registry lifetime
mvdbeek Sep 3, 2017
d1a2007
Cache user roles during WorkRequestContext lifetime
mvdbeek Sep 3, 2017
2d8b242
Fix caching of `get_converters_by_datatype` result
mvdbeek Sep 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix caching of get_converters_by_datatype result
  • Loading branch information
@mvdbeek
mvdbeek committed Sep 3, 2017
commit 2d8b242e697a08775879fc873578b5f244d4d5cb
8 changes: 4 additions & 4 deletions lib/galaxy/datatypes/registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def __init__(self, config=None):
self.xml_filename = None
self._edam_formats_mapping = None
self._edam_data_mapping = None
self._converters_by_datatype = None
self._converters_by_datatype = {}
# Build sites
self.build_sites = {}
self.display_sites = {}
Expand Down Expand Up @@ -798,7 +798,7 @@ def set_default_values(self):

def get_converters_by_datatype(self, ext):
"""Returns available converters by source type"""
if not self._converters_by_datatype:
if ext not in self._converters_by_datatype:
converters = odict()
source_datatype = type(self.get_datatype_by_extension(ext))
for ext2, converters_dict in self.datatype_converters.items():
Expand All @@ -808,8 +808,8 @@ def get_converters_by_datatype(self, ext):
# Ensure ext-level converters are present
if ext in self.datatype_converters.keys():
converters.update(self.datatype_converters[ext])
self._converters_by_datatype = converters
return self._converters_by_datatype
self._converters_by_datatype[ext] = converters
return self._converters_by_datatype[ext]

def get_converter_by_target_type(self, source_ext, target_ext):
"""Returns a converter based on source and target datatypes"""
Expand Down