From 667e9ed6d4f2cc6a6901187f3c82b9f4246aa920 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 25 Jan 2020 21:47:02 +0300
Subject: [PATCH] Added example to config.xml and fixed formatting after
 previous committers #8794

---
 dbms/programs/server/config.xml | 39 +++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/dbms/programs/server/config.xml b/dbms/programs/server/config.xml
index fec7ad9ef1b..1ed9c75e5ec 100644
--- a/dbms/programs/server/config.xml
+++ b/dbms/programs/server/config.xml
@@ -3,24 +3,24 @@
   NOTE: User and query level settings are set up in "users.xml" file.
 -->
 <yandex>
-	<!-- The list of hosts allowed to use in URL-related storage engines and table functions.
-		If this section is not present in configuration, all hosts are allowed.
-	-->
-	<remote_url_allow_hosts>
-		<!-- Host should be specified exactly as in URL. The name is checked before DNS resolution.
-			Example: "yandex.ru", "yandex.ru." and "www.yandex.ru" are different hosts.
-            		If port is explicitly specified in URL, the host:port is checked as a whole.
-            		If host specified here without port, any port with this host allowed.
-            		"yandex.ru" -> "yandex.ru:443", "yandex.ru:80" etc. is allowed, but "yandex.ru:80" -> only "yandex.ru:80" is allowed. 
-			If the host is specified as IP address, it is checked as specified in URL. Example: "[2a02:6b8:a::a]".
-			If there are redirects and support for redirects is enabled, every redirect (the Location field) is checked. 
-		-->
+    <!-- The list of hosts allowed to use in URL-related storage engines and table functions.
+        If this section is not present in configuration, all hosts are allowed.
+    -->
+    <remote_url_allow_hosts>
+        <!-- Host should be specified exactly as in URL. The name is checked before DNS resolution.
+            Example: "yandex.ru", "yandex.ru." and "www.yandex.ru" are different hosts.
+                    If port is explicitly specified in URL, the host:port is checked as a whole.
+                    If host specified here without port, any port with this host allowed.
+                    "yandex.ru" -> "yandex.ru:443", "yandex.ru:80" etc. is allowed, but "yandex.ru:80" -> only "yandex.ru:80" is allowed.
+            If the host is specified as IP address, it is checked as specified in URL. Example: "[2a02:6b8:a::a]".
+            If there are redirects and support for redirects is enabled, every redirect (the Location field) is checked.
+        -->
 
-		<!-- Regular expression can be specified. RE2 engine is used for regexps.
-			Regexps are not aligned: don't forget to add ^ and $. Also don't forget to escape dot (.) metacharacter
-			(forgetting to do so is a common source of error).
-		-->
-	</remote_url_allow_hosts>
+        <!-- Regular expression can be specified. RE2 engine is used for regexps.
+            Regexps are not aligned: don't forget to add ^ and $. Also don't forget to escape dot (.) metacharacter
+            (forgetting to do so is a common source of error).
+        -->
+    </remote_url_allow_hosts>
 
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/Logger.h#L105 -->
@@ -355,6 +355,11 @@
                 toStartOfHour(event_time)
         -->
         <partition_by>toYYYYMM(event_date)</partition_by>
+
+        <!-- Instead of partition_by, you can provide full engine expression (starting with ENGINE = ) with parameters,
+             Example: <engine>ENGINE = MergeTree PARTITION BY toYYYYMM(event_date) ORDER BY (event_date, event_time) SETTINGS index_granularity = 1024</engine>
+          -->
+
         <!-- Interval of flushing data. -->
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </query_log>