') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Optimize catalog filters and pagination by jredrejo · Pull Request #2626 · learningequality/studio · GitHub
Skip to content

Optimize catalog filters and pagination - #2626

Merged
jredrejo merged 3 commits into
learningequality:developfrom
jredrejo:optimize_catalog
Dec 8, 2020
Merged

Optimize catalog filters and pagination#2626
jredrejo merged 3 commits into
learningequality:developfrom
jredrejo:optimize_catalog

Conversation

@jredrejo

@jredrejojredrejo commented Dec 4, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

Description

Solves some performance problems in the Catalog results and filters optimizing pagination and filter

Issue Addressed (if applicable)

Addresses #2072

Steps to Test

Using the "explore without an account" in the sign in page the catalog can be reached.
There, filter by subtitles: results must be visible in a reasonable time (a few seconds, not minutes or hours)

Implementation Notes (optional)

Several improvements have been done:

  1. Subtitle filter has the kind="video" condition added, supposing all nodes with subtitles will be videos. This reduces in an order of magnitude the amount of rows to be joined with the File table, thus making the sql query be executed much faster.
  2. Using the techniques applied in Annotate after paginate (and some more stuff) #2511 : Count of the results is cached, so it's not recalculated between pages, and annotations are applied after the page has been retrieved, affecting less records.

@codecov

codecovBot commented Dec 4, 2020•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #2626 (c32c5ea) into develop (4f6a535) will increase coverage by 0.09%.
The diff coverage is 76.00%.

Impacted file tree graph

@@ Coverage Diff @@## develop #2626 +/- ##
===========================================
+ Coverage 84.97% 85.06% +0.09% 
===========================================
Files 294 295 +1 Lines 15008 15016 +8 ===========================================
+ Hits 12753 12774 +21 + Misses 2255 2242 -13
Impacted FilesCoverage Δ
...ontentcuration/contentcuration/viewsets/channel.py78.14% <50.00%> (-1.59%)⬇️
...ontentcuration/contentcuration/utils/pagination.py85.29% <85.29%> (ø)
contentcuration/search/viewsets/contentnode.py53.04% <100.00%> (+6.78%)⬆️
contentcuration/contentcuration/viewsets/common.py93.46% <0.00%> (-0.66%)⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4f6a535...c32c5ea. Read the comment docs.

rtibbles
rtibbles approved these changes Dec 7, 2020
View reviewed changes

@rtibblesrtibbles left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One small tweak, but the code looks sensible, and it works in manual testing.

Comment threadcontentcuration/contentcuration/viewsets/channel.py Outdated
def filter_subtitles(self, queryset, name, value):
subtitle_query = self.main_tree_query.filter(files__preset__subtitle=True)
subtitle_query = self.main_tree_query.filter(
files__preset__subtitle=True, kind="video"

@rtibblesrtibblesDec 7, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For consistency, let's use content_kinds.VIDEO here.

@jredrejojredrejoDec 7, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rtibbles thanks, done!

@jredrejo
jredrejo merged commit 338feeb into learningequality:developDec 8, 2020
@jredrejo
jredrejo deleted the optimize_catalog branch December 8, 2020 09:19
@jredrejojredrejo mentioned this pull request Dec 8, 2020
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rtibblesrtibblesrtibbles approved these changes
@jayoshihjayoshihAwaiting requested review from jayoshih

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jredrejo@rtibbles