Adjust benchmark page caching + og:url/og:type/rel=canonical (#10439)

docs/tools/build.py

@@ -127,8 +127,10 @@ def build_for_lang(lang, args):
         if args.htmlproofer:
             plugins.append('htmlproofer')
 
+        site_name = site_names.get(lang, site_names['en']) % args.version_prefix
+        site_name = site_name.replace('  ', ' ')
         raw_config = dict(
-            site_name=site_names.get(lang, site_names['en']) % args.version_prefix,
+            site_name=site_name,
             site_url=f'https://clickhouse.tech/docs/{lang}/',
             docs_dir=os.path.join(args.docs_dir, lang),
             site_dir=site_dir,

website/benchmark/dbms/index.html

 {% extends 'templates/base.html' %}
 
 {% set title = 'Performance comparison of database management systems' %}
-{% set extra_js = ['queries.js', 'results.js', '../benchmark.js'] %}
+{% set extra_js = [
+    'queries.js?' + rev_short,
+    'results.js?' + rev_short,
+    '../benchmark.js?' + rev_short]
+%}
+{% set url = 'https://clickhouse.tech/benchmark/dbms/' %}
 {% set no_footer = True %}
 
 {% block content %}

website/benchmark/hardware/index.html

 {% extends 'templates/base.html' %}
 
 {% set title = 'Performance comparison of ClickHouse on various hardware' %}
-{% set extra_js = ['queries.js', 'results.js', '../benchmark.js'] %}
+{% set extra_js = [
+    'queries.js?' + rev_short,
+    'results.js?' + rev_short,
+    '../benchmark.js?' + rev_short]
+%}
+{% set url = 'https://clickhouse.tech/benchmark/hardware/' %}
 {% set no_footer = True %}
 
 {% block content %}

website/main.html

@@ -4,6 +4,7 @@
 {% set direction = config.theme.direction %}
 {% set single_page = config.extra.single_page %}
 {% set no_footer = True %}
+{% set og_type = 'article' %}
 
 {% if page and page.meta and page.meta.title %}
     {% set title = page.meta.title %}

website/templates/common_meta.html

@@ -9,13 +9,14 @@
 
 <meta property="og:title" content="{% if title %}{{ title }}{% else %}{{ _('ClickHouse DBMS') }}{% endif %}"/>
 <meta property="og:description" content="{{ description }}"/>
-<meta property="og:type" content="website" />
+<meta property="og:type" content="{{ og_type or 'website' }}" />
 <meta property="og:image" content="https://clickhouse.tech/images/logo.png" />
-{% if page %}
-<meta property="og:url" content="{{ page.abs_url or 'https://clickhouse.tech/' }}" />
-{% else %}
-<meta property="og:url" content="https://clickhouse.tech/" />
+{% if page and page.abs_url %}
+    {% set url = 'https://clickhouse.tech' + page.abs_url %}
 {% endif %}
+<meta property="og:url" content="{{ url or 'https://clickhouse.tech/' }}"/>
+<link rel="canonical" href="{{ url or 'https://clickhouse.tech/' }}" />
+
 
 <meta property="twitter:title" content="{% if title %}{{ title }}{% else %}{{ _('ClickHouse DBMS') }}{% endif %}"/>