IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

PERF: Move mention lookups out of the V8 context. (#6640)

Browse Source 
We were looking up each mention one by one without any form of caching and that results
in a problem somewhat similar to an N+1. When we have to do alot of DB
lookups, it also increased the time spent in the V8 context which may
eventually lead to a timeout. The change here makes it such that mention lookups only does a single
DB query per post that happens outside of the V8 context.
This commit is contained in:
Guo Xiang Tan
2018-11-22 14:28:48 +08:00
committed by GitHub
parent 596e09aaf9
commit c5a70eca6e
7 changed files with 125 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pretty_text/helpers.rb
View File

@@ -39,12 +39,6 @@ module PrettyText
username
end
def mention_lookup(name)
return false if name.blank?
return "user" if User.exists?(username_lower: name.downcase)
return "group" if Group.exists?(name: name)
end
def category_hashtag_lookup(category_slug)
if category = Category.query_from_hashtag_slug(category_slug)
[category.url_with_id, category_slug]

41
lib/pretty_text/shims.js
View File

@@ -1,20 +1,26 @@
__PrettyText = require('pretty-text/pretty-text').default;
__buildOptions = require('pretty-text/pretty-text').buildOptions;
__performEmojiUnescape = require('pretty-text/emoji').performEmojiUnescape;
__PrettyText = require("pretty-text/pretty-text").default;
__buildOptions = require("pretty-text/pretty-text").buildOptions;
__performEmojiUnescape = require("pretty-text/emoji").performEmojiUnescape;
__utils = require('discourse/lib/utilities');
__utils = require("discourse/lib/utilities");
__emojiUnicodeReplacer = null;
__setUnicode = function(replacements) {
let unicodeRegexp = new RegExp(Object.keys(replacements).sort().reverse().join("|"), "g");
let unicodeRegexp = new RegExp(
Object.keys(replacements)
.sort()
.reverse()
.join("|"),
"g"
);
__emojiUnicodeReplacer = function(text) {
unicodeRegexp.lastIndex = 0;
let m;
while ((m = unicodeRegexp.exec(text)) !== null) {
let replacement = ":" + replacements[m[0]] + ":";
const before = text.charAt(m.index-1);
const before = text.charAt(m.index - 1);
if (!/\B/.test(before)) {
replacement = "\u200b" + replacement;
}
@@ -23,7 +29,7 @@ __setUnicode = function(replacements) {
// fixes Safari VARIATION SELECTOR-16 issue with some emojis
// https://meta.discourse.org/t/emojis-selected-on-ios-displaying-additional-rectangles/86132
text = text.replace(/\ufe0f/g, '');
text = text.replace(/\ufe0f/g, "");
return text;
};
@@ -35,9 +41,13 @@ function __getURLNoCDN(url) {
if (!url) return url;
// if it's a non relative URL, return it.
if (url !== '/' && !/^\/[^\/]/.test(url)) { return url; }
if (url !== "/" && !/^\/[^\/]/.test(url)) {
return url;
}
if (url.indexOf(__paths.baseUri) !== -1) { return url; }
if (url.indexOf(__paths.baseUri) !== -1) {
return url;
}
if (url[0] !== "/") url = "/" + url;
return __paths.baseUri + url;
@@ -76,12 +86,11 @@ function __categoryLookup(c) {
return __helpers.category_tag_hashtag_lookup(c);
}
function __mentionLookup(u) {
return __helpers.mention_lookup(u);
}
function __lookupAvatar(p) {
return __utils.avatarImg({size: "tiny", avatarTemplate: __helpers.avatar_template(p) }, __getURL);
return __utils.avatarImg(
{ size: "tiny", avatarTemplate: __helpers.avatar_template(p) },
__getURL
);
}
function __formatUsername(username) {
@@ -97,5 +106,7 @@ function __getCurrentUser(userId) {
}
I18n = {
t: function(a,b) { return __helpers.t(a,b); }
t: function(a, b) {
return __helpers.t(a, b);
}
};