Merge branch 'master' into parallelize_output_from_storages-fix

.gitmodules

@@ -19,7 +19,7 @@
 	url = https://github.com/google/googletest
 [submodule "contrib/capnproto"]
 	path = contrib/capnproto
-	url = https://github.com/capnproto/capnproto
+	url = https://github.com/ClickHouse/capnproto
 [submodule "contrib/double-conversion"]
 	path = contrib/double-conversion
 	url = https://github.com/google/double-conversion

docs/en/engines/table-engines/integrations/postgresql.md

@@ -136,7 +136,7 @@ postgresql> SELECT * FROM test;
 
 ### Creating Table in ClickHouse, and connecting to  PostgreSQL table created above
 
-This example uses the [PostgreSQL table engine](/docs/en/engines/table-engines/integrations/postgresql.md) to connect the ClickHouse table to the PostgreSQL table:
+This example uses the [PostgreSQL table engine](/docs/en/engines/table-engines/integrations/postgresql.md) to connect the ClickHouse table to the PostgreSQL table and use both SELECT and INSERT statements to the PostgreSQL database:
 
 ``` sql
 CREATE TABLE default.postgresql_table
@@ -150,10 +150,21 @@ ENGINE = PostgreSQL('localhost:5432', 'public', 'test', 'postges_user', 'postgre
 
 ### Inserting initial data from PostgreSQL table into ClickHouse table, using a SELECT query
 
-The [postgresql table function](/docs/en/sql-reference/table-functions/postgresql.md) copies the data from PostgreSQL to ClickHouse, which is often used for improving the query performance of the data by querying or performing analytics in ClickHouse rather than in PostgreSQL, or can also be used for migrating data from PostgreSQL to ClickHouse:
+The [postgresql table function](/docs/en/sql-reference/table-functions/postgresql.md) copies the data from PostgreSQL to ClickHouse, which is often used for improving the query performance of the data by querying or performing analytics in ClickHouse rather than in PostgreSQL, or can also be used for migrating data from PostgreSQL to ClickHouse. Since we will be copying the data from PostgreSQL to ClickHouse, we will use a MergeTree table engine in ClickHouse and call it postgresql_copy:
 
 ``` sql
-INSERT INTO default.postgresql_table
+CREATE TABLE default.postgresql_copy
+(
+    `float_nullable` Nullable(Float32),
+    `str` String,
+    `int_id` Int32
+)
+ENGINE = MergeTree
+ORDER BY (int_id);
+```
+
+``` sql
+INSERT INTO default.postgresql_copy
 SELECT * FROM postgresql('localhost:5432', 'public', 'test', 'postges_user', 'postgres_password');
 ```
 
@@ -164,13 +175,13 @@ If then performing ongoing synchronization between the PostgreSQL table and Clic
 This would require keeping track of the max ID or timestamp previously added, such as the following:
 
 ``` sql
-SELECT max(`int_id`) AS maxIntID FROM default.postgresql_table;
+SELECT max(`int_id`) AS maxIntID FROM default.postgresql_copy;
 ```
 
 Then inserting values from PostgreSQL table greater than the max
 
 ``` sql
-INSERT INTO default.postgresql_table
+INSERT INTO default.postgresql_copy
 SELECT * FROM postgresql('localhost:5432', 'public', 'test', 'postges_user', 'postgres_password');
 WHERE int_id > maxIntID;
 ```
@@ -178,7 +189,7 @@ WHERE int_id > maxIntID;
 ### Selecting data from the resulting ClickHouse table
 
 ``` sql
-SELECT * FROM postgresql_table WHERE str IN ('test');
+SELECT * FROM postgresql_copy WHERE str IN ('test');
 ```
 
 ``` text

docs/en/sql-reference/table-functions/mysql.md

@@ -107,6 +107,30 @@ SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123');
 └────────┴───────┘
 ```
 
+Copying data from MySQL table into ClickHouse table:
+
+```sql
+CREATE TABLE mysql_copy
+(
+   `id` UInt64,
+   `datetime` DateTime('UTC'),
+   `description` String,
+)
+ENGINE = MergeTree
+ORDER BY (id,datetime);
+
+INSERT INTO mysql_copy
+SELECT * FROM mysql('host:port', 'database', 'table', 'user', 'password');
+```
+
+Or if copying only an incremental batch from MySQL based on the max current id:
+
+```sql
+INSERT INTO mysql_copy
+SELECT * FROM mysql('host:port', 'database', 'table', 'user', 'password')
+WHERE id > (SELECT max(id) from mysql_copy);
+```
+
 **See Also**
 
 - [The ‘MySQL’ table engine](../../engines/table-engines/integrations/mysql.md)

tests/queries/0_stateless/02703_max_local_read_bandwidth.sh

@@ -32,7 +32,7 @@ for read_method in "${read_methods[@]}"; do
             query_duration_ms >= 7e3,
             ProfileEvents['ReadBufferFromFileDescriptorReadBytes'] > 8e6,
             ProfileEvents['LocalReadThrottlerBytes'] > 8e6,
-            ProfileEvents['LocalReadThrottlerSleepMicroseconds'] > 7e6*0.9
+            ProfileEvents['LocalReadThrottlerSleepMicroseconds'] > 7e6*0.5
         FROM system.query_log
         WHERE current_database = '$CLICKHOUSE_DATABASE' AND query_id = '$query_id' AND type != 'QueryStart'
     "

tests/queries/0_stateless/02703_max_local_write_bandwidth.sh

@@ -19,7 +19,7 @@ $CLICKHOUSE_CLIENT -nm -q "
         query_duration_ms >= 7e3,
         ProfileEvents['WriteBufferFromFileDescriptorWriteBytes'] > 8e6,
         ProfileEvents['LocalWriteThrottlerBytes'] > 8e6,
-        ProfileEvents['LocalWriteThrottlerSleepMicroseconds'] > 7e6*0.9
+        ProfileEvents['LocalWriteThrottlerSleepMicroseconds'] > 7e6*0.5
     FROM system.query_log
     WHERE current_database = '$CLICKHOUSE_DATABASE' AND query_id = '$query_id' AND type != 'QueryStart'
 "