From f95af92ae3bc6bd7d7d4a9e09042bcca9f35ffec Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Fri, 13 Mar 2020 15:16:04 +0000
Subject: [PATCH 01/12] [FIX] website: perf - prefetch every website menus in
 one go

Without this commit, the website menus would not be prefetch all in once.
Thus, every call to `submenu` template (called recursively) would do SQL
queries. One when accessing website.menu_id, then for every access on menu's
child_ids. It would also make an extra request for groups since the menus have
an ir.rule for that.

with following structure, 13 SQL queries will be avoided, regardless if there is
a group or not on the menus:
- Top menu
  - Home
  - Contact us
    - Sub Contact us
      - Sub Sub Contact us

Related to #47257
task-2211013

X-original-commit: 7fb016f9966bb5e2289ba17eacafb8887626514e
---
 addons/website/models/website.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index c8dd03d8107..270a6199c95 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -133,9 +133,18 @@ class Website(models.Model):
             self.default_lang_id = language_ids[0]
 
     def _compute_menu(self):
-        Menu = self.env['website.menu']
         for website in self:
-            website.menu_id = Menu.search([('parent_id', '=', False), ('website_id', '=', website.id)], order='id', limit=1).id
+            menus = self.env['website.menu'].search([('website_id', '=', website.id)])
+
+            # use field parent_id (1 query) to determine field child_id (2 queries by level)"
+            for menu in menus:
+                menu._cache['child_id'] = ()
+            for menu in menus:
+                # don't add child menu if parent is forbidden
+                if menu.parent_id and menu.parent_id in menus:
+                    menu.parent_id._cache['child_id'] += (menu.id,)
+
+            website.menu_id = menus and menus.filtered(lambda m: not m.parent_id)[0].id or False
 
     @api.model
     def create(self, vals):

From 1d981f22f36b748c4c7b548e9db33284e7eefc6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Fri, 13 Mar 2020 15:16:10 +0000
Subject: [PATCH 02/12] [FIX] website: perf - prefetch website.menu's
 mega_menu_content

Since this field is not sanitized, it is safe (perf wise) to prefetch it.
It should not be CPU heavy, plus whenever we access a `website.menu`, it is
most likely we will read that field.

with following structure, 5 SQL queries will be avoided:
- Top menu
  - Home
  - Contact us
    - Sub Contact us
      - Sub Sub Contact us

Related to #47257
task-2211013

X-original-commit: 20cddcd899e7a119fa9f365e62527499f8e5ff7d
---
 addons/website/models/website_menu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/models/website_menu.py b/addons/website/models/website_menu.py
index 1eaa513fb4d..bed9fb8cf26 100644
--- a/addons/website/models/website_menu.py
+++ b/addons/website/models/website_menu.py
@@ -44,7 +44,7 @@ class Menu(models.Model):
     group_ids = fields.Many2many('res.groups', string='Visible Groups',
                                  help="User need to be at least in one of these groups to see the menu")
     is_mega_menu = fields.Boolean(compute=_compute_field_is_mega_menu, inverse=_set_field_is_mega_menu)
-    mega_menu_content = fields.Html(translate=html_translate, sanitize=False)
+    mega_menu_content = fields.Html(translate=html_translate, sanitize=False, prefetch=True)
     mega_menu_classes = fields.Char()
 
     def name_get(self):

From 30f24d1ca7d467dd3194eb75c44ba20a56f36f7f Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 13 Mar 2020 15:16:15 +0000
Subject: [PATCH 03/12] [FIX] website: perf - don't search backend menu if you
 will not see it

Before this commit, in all cases, we search the backend menu to open if you
click on edit backend menu.
But the backend menu edit is useless for non editor user.

This feature has been introduce in v13, since eLearning have his own apps, so
when you edit in backend, you want to see the slide form view, into the
elearning app and no website App.

Related to #47257
task-2211013

X-original-commit: 1da7e53f4cdd82574688eb62f7a1cb8ddca871e6
---
 addons/website/models/ir_ui_view.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index c2eb62acfb5..8a20ecc7f25 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -384,8 +384,9 @@ class View(models.Model):
                 elif request.env.user.has_group('website.group_website_publisher'):
                     new_context = dict(self._context, inherit_branding_auto=True)
             if values and 'main_object' in values:
-                func = getattr(values['main_object'], 'get_backend_menu_id', False)
-                values['backend_menu_id'] = func and func() or self.env.ref('website.menu_website_configuration').id
+                if request.env.user.has_group('website.group_website_publisher'):
+                    func = getattr(values['main_object'], 'get_backend_menu_id', False)
+                    values['backend_menu_id'] = func and func() or self.env.ref('website.menu_website_configuration').id
 
                 # Fallback incase main_object dont't inherit 'website.seo.metadata'
                 if not hasattr(values['main_object'], 'get_website_meta'):

From 51c9599b79cfef7d1299b8c774b9e28917923509 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 13 Mar 2020 15:16:20 +0000
Subject: [PATCH 04/12] [FIX] website: perf - use lang cached to check if rtl
 or not

Before this commit, on each rendering of frontend layout, we make a new request
to check if env lang was in rtl or ltr.

Now we use a cached method, that have more than probably already cached this
record.

Related to #47257
task-2211013

X-original-commit: 7566b06500e42593919631cc6fa180aececfc623
---
 addons/portal/views/portal_templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index 40b595518ed..a784e1def09 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -2,7 +2,7 @@
 <odoo>
     <template id="frontend_layout" name="Main Frontend Layout" inherit_id="web.frontend_layout">
         <xpath expr="//div[@id='wrapwrap']" position="attributes">
-            <attribute name="t-attf-class" add="#{request.env['res.lang'].search([('code', '=', request.env.lang)]).direction == 'rtl' and 'o_rtl' or ''}" separator=" "/>
+            <attribute name="t-attf-class" add="#{request.env['res.lang']._lang_get(request.env.lang).direction == 'rtl' and 'o_rtl' or ''}" separator=" "/>
             <attribute name="t-attf-class" add="#{'o_portal' if is_portal else ''}" separator=" "/>
         </xpath>
         <xpath expr="//div[@id='wrapwrap']/header/img" position="replace">

From 124c3539aa37e449b52dc20c6325b2317afe32a4 Mon Sep 17 00:00:00 2001
From: fja-odoo <fja@odoo.com>
Date: Fri, 13 Mar 2020 15:16:25 +0000
Subject: [PATCH 05/12] [FIX] website: perf - prefetch access token to avoid
 extra request

Access_token has a restricted group, so it not fetched by defaut.

In our case, we know that after the first access to partner_id, that will fill
the cache without access_token, we will access access_token (so new query).

So we access first the access_token, to have only one request that fill the
cache with the access_token, and the partner_id used later.

Related to #47257
task-2211013

X-original-commit: 7dd69d10d00d5f4a7c12ec414d63f868a10683be
---
 addons/website/models/website_visitor.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/website/models/website_visitor.py b/addons/website/models/website_visitor.py
index f942a83fc1f..c9f9d826c8d 100644
--- a/addons/website/models/website_visitor.py
+++ b/addons/website/models/website_visitor.py
@@ -172,6 +172,9 @@ class WebsiteVisitor(models.Model):
         access_token = request.httprequest.cookies.get('visitor_uuid')
         if access_token:
             visitor = Visitor.with_context(active_test=False).search([('access_token', '=', access_token)])
+            # Prefetch access_token and other fields. Since access_token has a restricted group and we access
+            # a non restricted field (partner_id) first it is not fetched and will require an additional query to be retrieved.
+            visitor.access_token
 
         if not self.env.user._is_public():
             partner_id = self.env.user.partner_id

From e27eb978a6e4283510e4704fe574585e4ee27d64 Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Fri, 13 Mar 2020 15:16:29 +0000
Subject: [PATCH 06/12] [FIX] website: perf - don't force homepage on website
 in data

Let the homepage being set in bootstraping

Without this, any -i will set generic homepage as website homepage_id.
This is not really an issue for enduser as they probably don't do -i once
website is already installed.

But this code was useless anyway, as the homepage_id set in XML would be
overriden during bootstraping of the homepage in website create() override.

Note that this is important to have the correct homepage_id in DB, otherwise
it has to prefetch the generic homepage.

Related to #47257
task-2211013

X-original-commit: 385203d7632daeaab762c57319cc93b8312cc043
---
 addons/website/data/website_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 82c41c7810d..9daa9716d0a 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -278,7 +278,7 @@
             <field name="domain"></field>
             <field name="company_id" ref="base.main_company"/>
             <field name="user_id" ref="base.public_user"/>
-            <field name="homepage_id" ref="homepage_page"/>
+            <!-- Correct homepage will be set during bootstraping --> 
         </record>
 
         <!-- Open website on install -->

From c2142a34f73cb8329e8d214596484bd9a581b3e6 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 13 Mar 2020 15:16:35 +0000
Subject: [PATCH 07/12] [FIX] website: perf - cache the compute hash for
 translation

Before this commit, we compute the hash on each request, to know if we need to
download the file from the frontend or if we can use cache.

Now we store the hash computed in cache. The cache will be invalidated when we
touch one of these translations (openerp-web in the comments) or when you
install a new lang (already the case).

+ avoid to use read on a record, since it will not use the cache from record.

Related to #47257
task-2211013

X-original-commit: d5aaecbc51de19ef1d8d9988b691177fc73a4b86
---
 addons/http_routing/models/ir_http.py     | 12 ++------
 addons/web/models/ir_http.py              | 11 ++-----
 odoo/addons/base/models/ir_translation.py | 35 +++++++++++++++++++----
 3 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/addons/http_routing/models/ir_http.py b/addons/http_routing/models/ir_http.py
index d4755f0b2b7..4f441b2079a 100644
--- a/addons/http_routing/models/ir_http.py
+++ b/addons/http_routing/models/ir_http.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import hashlib
-import json
 import logging
 import os
 import re
@@ -302,18 +300,12 @@ class IrHttp(models.AbstractModel):
         modules = IrHttpModel.get_translation_frontend_modules()
         user_context = request.session.get_context() if request.session.uid else {}
         lang = user_context.get('lang')
-        translations, lang_params = request.env['ir.translation'].get_translations_for_webclient(modules, lang)
-        translation_cache = {
-            'lang_parameters': lang_params,
-            'modules': translations,
-            'multi_lang': len(request.env['res.lang'].sudo().get_installed()) > 1,
-            'lang': lang,
-        }
+        translation_hash = request.env['ir.translation'].get_web_translations_hash(modules, lang)
 
         session_info.update({
             'translationURL': '/website/translations',
             'cache_hashes': {
-                'translations': hashlib.sha512(json.dumps(translation_cache, sort_keys=True).encode()).hexdigest()[:64],  # sha512/256
+                'translations': translation_hash,
             },
         })
         return session_info
diff --git a/addons/web/models/ir_http.py b/addons/web/models/ir_http.py
index fd4e3bc923e..3c5839aa042 100644
--- a/addons/web/models/ir_http.py
+++ b/addons/web/models/ir_http.py
@@ -50,19 +50,12 @@ class Http(models.AbstractModel):
             mods = module_boot()
             qweb_checksum = HomeStaticTemplateHelpers.get_qweb_templates_checksum(addons=mods, debug=request.session.debug)
             lang = user_context.get("lang")
-            translations_per_module, lang_params = request.env['ir.translation'].get_translations_for_webclient(mods, lang)
-            translation_cache = {
-                'lang': lang,
-                'lang_parameters': lang_params,
-                'modules': translations_per_module,
-                'multi_lang': len(request.env['res.lang'].sudo().get_installed()) > 1,
-            }
+            translation_hash = request.env['ir.translation'].get_web_translations_hash(mods, lang)
             menu_json_utf8 = json.dumps(request.env['ir.ui.menu'].load_menus(request.session.debug), default=ustr, sort_keys=True).encode()
-            translations_json_utf8 = json.dumps(translation_cache, sort_keys=True).encode()
             cache_hashes = {
                 "load_menus": hashlib.sha512(menu_json_utf8).hexdigest()[:64], # sha512/256
                 "qweb": qweb_checksum,
-                "translations": hashlib.sha512(translations_json_utf8).hexdigest()[:64], # sha512/256
+                "translations": translation_hash,
             }
             session_info.update({
                 # current_company should be default_company
diff --git a/odoo/addons/base/models/ir_translation.py b/odoo/addons/base/models/ir_translation.py
index fa882102bd4..58de90d2bd8 100644
--- a/odoo/addons/base/models/ir_translation.py
+++ b/odoo/addons/base/models/ir_translation.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+import hashlib
 import itertools
+import json
 import logging
 import operator
 from collections import defaultdict
@@ -237,9 +239,11 @@ class IrTranslation(models.Model):
                         record = model.browse(trans.res_id)
                         record.modified([field.name])
         for trans in self:
-            if trans.type != 'model' or trans.name.split(',')[0] in self.CACHED_MODELS:
-                self.clear_caches()
-                break
+            if (trans.type != 'model' or
+               (trans.name.split(',')[0] in self.CACHED_MODELS) or
+               (trans.comments and 'openerp-web' in trans.comments)):  # clear get_web_trans_hash
+                        self.clear_caches()
+                        break
 
     @api.model
     def _set_ids(self, name, tt, lang, ids, value, src=None):
@@ -869,9 +873,16 @@ class IrTranslation(models.Model):
         langs = self.env['res.lang']._lang_get(lang)
         lang_params = None
         if langs:
-            lang_params = langs.read([
-                "name", "direction", "date_format", "time_format",
-                "grouping", "decimal_point", "thousands_sep", "week_start"])[0]
+            lang_params = {
+                "name": langs.name,
+                "direction": langs.direction,
+                "date_format": langs.date_format,
+                "time_format": langs.time_format,
+                "grouping": langs.grouping,
+                "decimal_point": langs.decimal_point,
+                "thousands_sep": langs.thousands_sep,
+                "week_start": langs.week_start,
+            }
             lang_params['week_start'] = int(lang_params['week_start'])
             lang_params['code'] = lang
 
@@ -891,3 +902,15 @@ class IrTranslation(models.Model):
                 for m in msg_group)
 
         return translations_per_module, lang_params
+
+    @api.model
+    @tools.ormcache('frozenset(mods)', 'lang')
+    def get_web_translations_hash(self, mods, lang):
+        translations, lang_params = self.get_translations_for_webclient(mods, lang)
+        translation_cache = {
+            'lang_parameters': lang_params,
+            'modules': translations,
+            'lang': lang,
+            'multi_lang': len(self.env['res.lang'].sudo().get_installed()) > 1,
+        }
+        return hashlib.sha1(json.dumps(translation_cache, sort_keys=True).encode()).hexdigest()

From 4c403934903b68afb08e87ac571b6777042e5a7f Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 13 Mar 2020 15:16:40 +0000
Subject: [PATCH 08/12] [FIX] website: perf - translation - avoid query to find
 what we know

Before this commit, each module override _get_translation_frontend_modules_domain
from ir.http to add its own translation in website if needed and that module
is not starting by website_. Updating the domain from the super() call.
Since we know in most of the case the name, it is useless to do a:
   select name from module where name = 'name1' or name = 'name2'...

Now we support a new override of _get_translation_frontend_modules_name that will
allow to add the known module name directly in the list instead to make a search.

In case nobody override _get_translation_frontend_modules_domain, we don't need to
make an extra rpc to find the module.

Related to #47257
task-2211013

X-original-commit: 0dc54814161ab55c34dd2242f65dea23d19fdfca
---
 addons/http_routing/models/ir_http.py     | 21 ++++++++++++++++-----
 addons/payment/models/ir_http.py          |  7 +++----
 addons/portal/models/ir_http.py           |  7 +++----
 addons/web_editor/models/ir_http.py       |  7 +++----
 addons/website/models/ir_http.py          |  9 +++++----
 addons/website_livechat/models/ir_http.py |  9 ++++-----
 6 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/addons/http_routing/models/ir_http.py b/addons/http_routing/models/ir_http.py
index 4f441b2079a..ae3ca509b73 100644
--- a/addons/http_routing/models/ir_http.py
+++ b/addons/http_routing/models/ir_http.py
@@ -313,17 +313,28 @@ class IrHttp(models.AbstractModel):
     @api.model
     def get_translation_frontend_modules(self):
         Modules = request.env['ir.module.module'].sudo()
-        domain = self._get_translation_frontend_modules_domain()
-        return Modules.search(
-            expression.AND([domain, [('state', '=', 'installed')]])
-        ).mapped('name')
+        extra_modules_domain = self._get_translation_frontend_modules_domain()
+        extra_modules_name = self._get_translation_frontend_modules_name()
+        if extra_modules_domain:
+            new = Modules.search(
+                expression.AND([extra_modules_domain, [('state', '=', 'installed')]])
+            ).mapped('name')
+            extra_modules_name += new
+        return extra_modules_name
 
     @classmethod
     def _get_translation_frontend_modules_domain(cls):
         """ Return a domain to list the domain adding web-translations and
             dynamic resources that may be used frontend views
         """
-        return [('name', '=', 'web')]
+        return []
+
+    @classmethod
+    def _get_translation_frontend_modules_name(cls):
+        """ Return a list of module name where web-translations and
+            dynamic resources may be used in frontend views
+        """
+        return ['web']
 
     bots = "bot|crawl|slurp|spider|curl|wget|facebookexternalhit".split("|")
 
diff --git a/addons/payment/models/ir_http.py b/addons/payment/models/ir_http.py
index 0d9c9c8de32..ad6bddf87cc 100644
--- a/addons/payment/models/ir_http.py
+++ b/addons/payment/models/ir_http.py
@@ -2,13 +2,12 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import models
-from odoo.osv import expression
 
 
 class IrHttp(models.AbstractModel):
     _inherit = 'ir.http'
 
     @classmethod
-    def _get_translation_frontend_modules_domain(cls):
-        domain = super(IrHttp, cls)._get_translation_frontend_modules_domain()
-        return expression.OR([domain, [('name', '=', 'payment')]])
+    def _get_translation_frontend_modules_name(cls):
+        mods = super(IrHttp, cls)._get_translation_frontend_modules_name()
+        return mods + ['payment']
diff --git a/addons/portal/models/ir_http.py b/addons/portal/models/ir_http.py
index 2c654c73986..3fad96ff9f1 100644
--- a/addons/portal/models/ir_http.py
+++ b/addons/portal/models/ir_http.py
@@ -2,13 +2,12 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import models
-from odoo.osv import expression
 
 
 class IrHttp(models.AbstractModel):
     _inherit = 'ir.http'
 
     @classmethod
-    def _get_translation_frontend_modules_domain(cls):
-        domain = super(IrHttp, cls)._get_translation_frontend_modules_domain()
-        return expression.OR([domain, [('name', '=', 'portal')]])
+    def _get_translation_frontend_modules_name(cls):
+        mods = super(IrHttp, cls)._get_translation_frontend_modules_name()
+        return mods + ['portal']
diff --git a/addons/web_editor/models/ir_http.py b/addons/web_editor/models/ir_http.py
index aaf0f67cefb..d9690f5ecfd 100644
--- a/addons/web_editor/models/ir_http.py
+++ b/addons/web_editor/models/ir_http.py
@@ -3,7 +3,6 @@
 
 from odoo import models
 from odoo.http import request
-from odoo.osv import expression
 
 
 class IrHttp(models.AbstractModel):
@@ -22,6 +21,6 @@ class IrHttp(models.AbstractModel):
         return super(IrHttp, cls)._dispatch()
 
     @classmethod
-    def _get_translation_frontend_modules_domain(cls):
-        domain = super(IrHttp, cls)._get_translation_frontend_modules_domain()
-        return expression.OR([domain, [('name', '=', 'web_editor')]])
+    def _get_translation_frontend_modules_name(cls):
+        mods = super(IrHttp, cls)._get_translation_frontend_modules_name()
+        return mods + ['web_editor']
diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index ca734f1afe7..c3f298eddf3 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -17,7 +17,7 @@ from odoo import api, models
 from odoo import registry, SUPERUSER_ID
 from odoo.http import request
 from odoo.tools.safe_eval import safe_eval
-from odoo.osv.expression import FALSE_DOMAIN, OR
+from odoo.osv.expression import FALSE_DOMAIN
 
 from odoo.addons.http_routing.models.ir_http import ModelConverter, _guess_mimetype
 from odoo.addons.portal.controllers.portal import _build_url_w_params
@@ -226,9 +226,10 @@ class Http(models.AbstractModel):
         return super(Http, cls)._get_default_lang()
 
     @classmethod
-    def _get_translation_frontend_modules_domain(cls):
-        domain = super(Http, cls)._get_translation_frontend_modules_domain()
-        return OR([domain, [('name', 'ilike', 'website')]])
+    def _get_translation_frontend_modules_name(cls):
+        mods = super(Http, cls)._get_translation_frontend_modules_name()
+        installed = request.registry._init_modules | set(odoo.conf.server_wide_modules)
+        return mods + [mod for mod in installed if mod.startswith('website')]
 
     @classmethod
     def _serve_page(cls):
diff --git a/addons/website_livechat/models/ir_http.py b/addons/website_livechat/models/ir_http.py
index 3ab3566502a..20f54548c96 100644
--- a/addons/website_livechat/models/ir_http.py
+++ b/addons/website_livechat/models/ir_http.py
@@ -1,14 +1,13 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import api, fields, models
-from odoo.osv import expression
+from odoo import models
 
 
 class IrHttp(models.AbstractModel):
     _inherit = 'ir.http'
 
     @classmethod
-    def _get_translation_frontend_modules_domain(cls):
-        domain = super(IrHttp, cls)._get_translation_frontend_modules_domain()
-        return expression.OR([domain, [('name', '=', 'im_livechat')]])
+    def _get_translation_frontend_modules_name(cls):
+        mods = super(IrHttp, cls)._get_translation_frontend_modules_name()
+        return mods + ['im_livechat']

From 9430dd12878fd702baf2415700842e6db5f1a06c Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 13 Mar 2020 15:16:44 +0000
Subject: [PATCH 09/12] [FIX] website: perf - use lang cache in url for.

Before this commit, url_lang (= url_for) will make query to find the lang_code
but we alrady have this info in ormcache with get_available method.

So instead to rebrowse (search query) the lang, we use a new method that will
try to find it in cache if possible before to make the query.

The gain on each page is n-1 (where n is # lang installed)
Because the switcher of languages do an url_for for each lang available.

Related to #47257
task-2211013

X-original-commit: 2cecbe356ce283e15fb0bbd0a6e9aa4735af520e
---
 addons/http_routing/models/ir_http.py | 2 +-
 odoo/addons/base/models/res_lang.py   | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/http_routing/models/ir_http.py b/addons/http_routing/models/ir_http.py
index ae3ca509b73..5469310228f 100644
--- a/addons/http_routing/models/ir_http.py
+++ b/addons/http_routing/models/ir_http.py
@@ -150,7 +150,7 @@ def url_lang(path_or_uri, lang_code=None):
         location = werkzeug.urls.url_join(request.httprequest.path, location)
         lang_url_codes = [url_code for _, url_code, _ in Lang.get_available()]
         lang_code = pycompat.to_text(lang_code or request.context['lang'])
-        lang_url_code = Lang._lang_get(lang_code).url_code
+        lang_url_code = Lang._lang_code_to_urlcode(lang_code)
         lang_url_code = lang_url_code if lang_url_code in lang_url_codes else lang_code
 
         if (len(lang_url_codes) > 1 or force_lang) and is_multilang_url(location, lang_url_codes):
diff --git a/odoo/addons/base/models/res_lang.py b/odoo/addons/base/models/res_lang.py
index 6528b44482d..0b58daf5411 100644
--- a/odoo/addons/base/models/res_lang.py
+++ b/odoo/addons/base/models/res_lang.py
@@ -213,6 +213,14 @@ class Lang(models.Model):
         langs = self.with_context(active_test=False).search([])
         return sorted([(lang.code, lang.url_code, lang.name) for lang in langs], key=itemgetter(2))
 
+    @api.model
+    @tools.ormcache('code')
+    def _lang_code_to_urlcode(self, code):
+        for c, urlc, name in self.get_available():
+            if c == code:
+                return urlc
+        return self._lang_get(code).url_code
+
     @api.model
     @tools.ormcache()
     def get_installed(self):

From b98d9c968cb7147af6c9042f0f0639d41b565fd7 Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Fri, 13 Mar 2020 15:16:49 +0000
Subject: [PATCH 10/12] [FIX] website: perf - ormcache the website menus

To avoid a SQL Query on hot state, the website menus ids are now prefetch.

Related to #47257
task-2211013

X-original-commit: 73421c27f01e7100403eaa72e027c34dbdf9f720
---
 addons/website/models/website.py      | 7 ++++++-
 addons/website/models/website_menu.py | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 270a6199c95..610f198d4d6 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -134,7 +134,7 @@ class Website(models.Model):
 
     def _compute_menu(self):
         for website in self:
-            menus = self.env['website.menu'].search([('website_id', '=', website.id)])
+            menus = self.env['website.menu'].browse(website._get_menu_ids())
 
             # use field parent_id (1 query) to determine field child_id (2 queries by level)"
             for menu in menus:
@@ -146,6 +146,11 @@ class Website(models.Model):
 
             website.menu_id = menus and menus.filtered(lambda m: not m.parent_id)[0].id or False
 
+    # self.env.uid for ir.rule groups on menu
+    @tools.ormcache('self.env.uid', 'self.id')
+    def _get_menu_ids(self):
+        return self.env['website.menu'].search([('website_id', '=', self.id)]).ids
+
     @api.model
     def create(self, vals):
         self._handle_favicon(vals)
diff --git a/addons/website/models/website_menu.py b/addons/website/models/website_menu.py
index bed9fb8cf26..88e48ca82e0 100644
--- a/addons/website/models/website_menu.py
+++ b/addons/website/models/website_menu.py
@@ -68,6 +68,7 @@ class Menu(models.Model):
                   Be careful to return correct record for ir.model.data xml_id in case
                   of default main menus creation.
         '''
+        self.clear_caches()
         # Only used when creating website_data.xml default menu
         if vals.get('url') == '/default-main-menu':
             return super(Menu, self).create(vals)
@@ -91,7 +92,14 @@ class Menu(models.Model):
                 res = super(Menu, self).create(vals)
         return res  # Only one record is returned but multiple could have been created
 
+    def write(self, values):
+        res = super().write(values)
+        if 'website_id' in values:
+            self.clear_caches()
+        return res
+
     def unlink(self):
+        self.clear_caches()
         default_menu = self.env.ref('website.main_menu', raise_if_not_found=False)
         menus_to_remove = self
         for menu in self.filtered(lambda m: default_menu and m.parent_id.id == default_menu.id):

From 89bbf76c445e7a2b6d1c1066cdd9910fef559fe6 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 13 Mar 2020 15:16:55 +0000
Subject: [PATCH 11/12] [FIX] website: perf - get most specific in SQL

Before this commit, we would get all the pages for the requested URL then
filter to get the most specific.
This can just be done in SQL by sorting website_id desc so the specific are
returned first.

Note that this will respect 41897f0dbab.

This will avoid having to prefetch the generic page when it is useless.

Related to #47257
task-2211013

X-original-commit: b31294592a80d9e55f887f0122cc01225b64966c
---
 addons/website/models/ir_http.py | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index c3f298eddf3..80ec1d9f0c7 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -237,22 +237,15 @@ class Http(models.AbstractModel):
         page_domain = [('url', '=', req_page)] + request.website.website_domain()
 
         published_domain = page_domain
-        # need to bypass website_published, to apply is_most_specific
-        # filter later if not publisher
-        pages = request.env['website.page'].sudo().search(published_domain, order='website_id')
-        pages = pages.filtered(pages._is_most_specific_page)
-
-        if not request.website.is_publisher():
-            pages = pages.filtered('is_visible')
-
-        mypage = pages[0] if pages else False
-        _, ext = os.path.splitext(req_page)
-        if mypage:
-            return request.render(mypage.get_view_identifier(), {
-                # 'path': req_page[1:],
+        # specific page first
+        page = request.env['website.page'].sudo().search(published_domain, order='website_id asc', limit=1)
+        if page and (request.website.is_publisher() or page.is_visible):
+            _, ext = os.path.splitext(req_page)
+            return request.render(page.get_view_identifier(), {
                 'deletable': True,
-                'main_object': mypage,
+                'main_object': page,
             }, mimetype=_guess_mimetype(ext))
+        return False
 
     @classmethod
     def _serve_redirect(cls):

From ffd6ebff720cf347ab88e631c6ca303f24e0a147 Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Fri, 13 Mar 2020 15:17:00 +0000
Subject: [PATCH 12/12] [FIX] website: add SQL performance test for page
 loading

This will ensure the performances stay correct for a blank page (no layout),
a standard page and a homepage (which has its own controller).

Related to #47257
task-2211013

X-original-commit: 08e01b5fc4a71b8f7639a953137fbb546ddf3b3e
---
 addons/website/tests/__init__.py         |  1 +
 addons/website/tests/test_performance.py | 62 ++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 addons/website/tests/test_performance.py

diff --git a/addons/website/tests/__init__.py b/addons/website/tests/__init__.py
index 69fd7f886d6..99ac6f1bc57 100644
--- a/addons/website/tests/__init__.py
+++ b/addons/website/tests/__init__.py
@@ -8,6 +8,7 @@ from . import test_get_current_website
 from . import test_lang_url
 from . import test_menu
 from . import test_page
+from . import test_performance
 from . import test_qweb
 from . import test_res_users
 from . import test_theme
diff --git a/addons/website/tests/test_performance.py b/addons/website/tests/test_performance.py
new file mode 100644
index 00000000000..f3c4834a0a7
--- /dev/null
+++ b/addons/website/tests/test_performance.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.tests.common import HttpCase
+
+EXTRA_REQUEST = 5
+""" During tests, the query on 'base_registry_signaling, base_cache_signaling'
+    won't be executed on hot state, but 6 new queries related to the test cursor
+    will be added:
+        SAVEPOINT "test_cursor_4"
+        SAVEPOINT "test_cursor_4"
+        ROLLBACK TO SAVEPOINT "test_cursor_4"
+        SAVEPOINT "test_cursor_5"
+        [.. usual SQL Queries .. ]
+        SAVEPOINT "test_cursor_5"
+        ROLLBACK TO SAVEPOINT "test_cursor_5"
+"""
+
+
+class TestWebsitePerformance(HttpCase):
+
+    def setUp(self):
+        super().setUp()
+
+        self.page = self.env['website.page'].create({
+            'url': '/sql_page',
+            'name': 'Page Test SQL Perf',
+            'type': 'qweb',
+            'arch': '<t name="Contact Us" t-name="website.contactus"> \
+                       <t t-call="website.layout"> \
+                         <div id="wrap"><div class="oe_structure"/></div> \
+                       </t> \
+                     </t>',
+            'key': 'website.page_test_perf_sql',
+            'is_published': True,
+        })
+
+    def _get_url_hot_query(self, url):
+        # ensure worker is in hot state
+        self.url_open(url)
+        self.url_open(url)
+
+        sql_count = self.registry.test_cr.sql_log_count
+        self.url_open(url)
+        return self.registry.test_cr.sql_log_count - sql_count
+
+    def test_10_perf_sql_queries_page(self):
+        # standard website.page
+        expected_sql = 14 + EXTRA_REQUEST
+        self.assertEqual(self._get_url_hot_query(self.page.url), expected_sql)
+
+    def test_20_perf_sql_queries_homepage(self):
+        # homepage "/" has its own controller
+        # add 5 queries for test environment (RELEASE/SAVEPOINT/ROLLBACK test_cursor)
+        expected_sql = 21 + EXTRA_REQUEST
+        self.assertEqual(self._get_url_hot_query('/'), expected_sql)
+
+    def test_30_perf_sql_queries_page_no_layout(self):
+        # website.page with no call to layout templates
+        self.page.arch = '<div>I am a blank page</div>'
+        expected_sql = 8 + EXTRA_REQUEST
+        self.assertEqual(self._get_url_hot_query(self.page.url), expected_sql)