Skip to content

Fix caching and hash collisions in _fast_make_domain_id #74

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

Open
sebastian-nagel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix caching and hash collisions in _fast_make_domain_id #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions urlserver/id_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,22 @@ def make_subdomain_id(url):
return mmh3.hash(url.normalized_subdomain)


def _fast_make_domain_id(domain):
""" Experimental fast version bypassing cosrlib.URL """
def _fast_make_domain_id(host):
""" Experimental fast version bypassing cosrlib.URL
Note: not compatible with make_domain_id"""

if domain not in URL_DOMAIN_IDS_CACHE:
if host not in URL_DOMAIN_IDS_CACHE:

subdomain, domain, suffix = tld_extract(domain)
subdomain, domain, suffix = tld_extract(host)

if subdomain == "www" or not subdomain:
URL_DOMAIN_IDS_CACHE[domain] = mmh3.hash("%s.%s" % (domain, suffix))
URL_DOMAIN_IDS_CACHE[host] = \
mmh3.hash64("%s.%s" % (domain, suffix))[0]
else:
while subdomain.startswith("www."):
subdomain = subdomain[4:]

URL_DOMAIN_IDS_CACHE[domain] = (
(mmh3.hash(subdomain) << 32) +
mmh3.hash("%s.%s" % (domain, suffix))
)
URL_DOMAIN_IDS_CACHE[host] = \
mmh3.hash64("%s.%s.%s" % (subdomain, domain, suffix))[0]

return URL_DOMAIN_IDS_CACHE[domain]
return URL_DOMAIN_IDS_CACHE[host]