Skip to content

Commit

Permalink
perf: Cache reference lookups for subschemas
Browse files Browse the repository at this point in the history
  • Loading branch information
Stranger6667 committed Dec 15, 2021
1 parent 0878727 commit 60242e7
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ v4.3.0

* Fix undesired fallback to brute force container uniqueness check on
certain input types (#893)
* Cache reference lookups for subschemas (#893)
* Implement a PEP544 Protocol for validator classes (#890)

v4.2.1
Expand Down
24 changes: 17 additions & 7 deletions jsonschema/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -767,22 +767,32 @@ def _finditem(self, schema, key):
yield each
values.extendleft(each.values())

def resolve(self, ref):
"""
Resolve the given reference.
"""
url = self._urljoin_cache(self.resolution_scope, ref).rstrip("/")
@lru_cache()
def _find_subschemas(self):
return list(self._finditem(self.referrer, "$id"))

@lru_cache()
def _find_in_subschemas(self, url):
uri, fragment = urldefrag(url)

for subschema in self._finditem(self.referrer, "$id"):
for subschema in self._find_subschemas():
target_uri = self._urljoin_cache(
self.resolution_scope, subschema["$id"],
)
if target_uri.rstrip("/") == uri.rstrip("/"):
if fragment:
subschema = self.resolve_fragment(subschema, fragment)
return url, subschema
return None

def resolve(self, ref):
"""
Resolve the given reference.
"""
url = self._urljoin_cache(self.resolution_scope, ref).rstrip("/")

match = self._find_in_subschemas(url)
if match is not None:
return match

return url, self._remote_cache(url)

Expand Down

0 comments on commit 60242e7

Please sign in to comment.