diff --git a/dbms/tests/performance/arithmetic.xml b/dbms/tests/performance/arithmetic.xml
index 2af6e18ef303217d0916465942669c93bdcbed35..5aa381235ac613f90f08c62f4ed0aec4f4347445 100644
--- a/dbms/tests/performance/arithmetic.xml
+++ b/dbms/tests/performance/arithmetic.xml
@@ -73,7 +73,8 @@ SELECT
toInt64(x),
toFloat32(x),
toFloat64(x)
-FROM numbers_mt(1000000000);
+FROM numbers_mt(100000000)
+;
SELECT count() FROM nums WHERE NOT ignore({op}({arg}, {arg}))
diff --git a/dbms/tests/performance/group_array_moving_sum.xml b/dbms/tests/performance/group_array_moving_sum.xml
index 7c3285cb00ec432305913cb046c11d17f7f19920..7b571f47615168e1bb2e5c701005c9e92ce4d9c9 100644
--- a/dbms/tests/performance/group_array_moving_sum.xml
+++ b/dbms/tests/performance/group_array_moving_sum.xml
@@ -16,7 +16,7 @@
millions
- 50
+ 200
100
diff --git a/dbms/tests/performance/parallel_insert.xml b/dbms/tests/performance/parallel_insert.xml
index 1f856f93ee375eeef99d30df5401a0c46f92b010..a2ca1ad365ed287c017cfa2920cf4e7df4fb3d83 100644
--- a/dbms/tests/performance/parallel_insert.xml
+++ b/dbms/tests/performance/parallel_insert.xml
@@ -10,15 +10,19 @@
default.hits_10m_single
- CREATE TABLE hits2 AS hits_10m_single
+ CREATE TABLE hits2 AS hits
+ ALTER TABLE hits2 MODIFY SETTING parts_to_delay_insert = 5000
+ ALTER TABLE hits2 MODIFY SETTING parts_to_throw_insert = 5000
set max_insert_threads=8
+ system stop merges
- INSERT INTO hits2 SELECT * FROM hits_10m_single LIMIT 1 * 1000 * 1000
+ INSERT INTO hits2 SELECT * FROM hits_10m_single LIMIT 2 * 1000 * 1000
+ system start merges
DROP TABLE IF EXISTS hits2
diff --git a/dbms/tests/performance/website.xml b/dbms/tests/performance/website.xml
index 0ad3bdebb405da30c143667f26bf6e0dd2a424a7..1936448c7db663c66c3758fc95ff4a24e4e554ca 100644
--- a/dbms/tests/performance/website.xml
+++ b/dbms/tests/performance/website.xml
@@ -34,13 +34,13 @@
SELECT count() FROM {table} WHERE AdvEngineID != 0
SELECT sum(AdvEngineID), count(), avg(ResolutionWidth) FROM {table}
SELECT sum(UserID) FROM {table}
-SELECT uniq(UserID) FROM {table}
-SELECT uniq(SearchPhrase) FROM {table}
+SELECT uniq(UserID) FROM {table} FORMAT Null
+SELECT uniq(SearchPhrase) FROM {table} FORMAT Null
SELECT min(EventDate), max(EventDate) FROM {table}
-SELECT AdvEngineID, count() FROM {table} WHERE AdvEngineID != 0 GROUP BY AdvEngineID ORDER BY count() DESC
+SELECT AdvEngineID, count() FROM hits_100m_single WHERE AdvEngineID != 0 GROUP BY AdvEngineID ORDER BY count() DESC LIMIT 10
SELECT RegionID, uniq(UserID) AS u FROM {table} GROUP BY RegionID ORDER BY u DESC LIMIT 10
SELECT RegionID, sum(AdvEngineID), count() AS c, avg(ResolutionWidth), uniq(UserID) FROM {table} GROUP BY RegionID ORDER BY c DESC LIMIT 10
-SELECT MobilePhoneModel, uniq(UserID) AS u FROM {table} WHERE MobilePhoneModel != '' GROUP BY MobilePhoneModel ORDER BY u DESC LIMIT 10
+SELECT MobilePhoneModel, uniq(UserID) AS u FROM hits_100m_single WHERE MobilePhoneModel != '' GROUP BY MobilePhoneModel ORDER BY u DESC LIMIT 10
SELECT MobilePhone, MobilePhoneModel, uniq(UserID) AS u FROM {table} WHERE MobilePhoneModel != '' GROUP BY MobilePhone, MobilePhoneModel ORDER BY u DESC LIMIT 10
SELECT SearchPhrase, count() AS c FROM {table} WHERE SearchPhrase != '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10
SELECT SearchPhrase, uniq(UserID) AS u FROM {table} WHERE SearchPhrase != '' GROUP BY SearchPhrase ORDER BY u DESC LIMIT 10
@@ -55,8 +55,8 @@
SELECT SearchPhrase, any(URL), any(Title), count() AS c, uniq(UserID) FROM {table} WHERE Title LIKE '%Яндекс%' AND URL NOT LIKE '%.yandex.%' AND SearchPhrase != '' GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10
SELECT * FROM {table} WHERE URL LIKE '%metrika%' ORDER BY EventTime LIMIT 10
SELECT SearchPhrase FROM hits_100m_single WHERE SearchPhrase != '' ORDER BY EventTime LIMIT 10
-SELECT SearchPhrase FROM {table} WHERE SearchPhrase != '' ORDER BY SearchPhrase LIMIT 10
-SELECT SearchPhrase FROM {table} WHERE SearchPhrase != '' ORDER BY EventTime, SearchPhrase LIMIT 10
+SELECT SearchPhrase FROM hits_100m_single WHERE SearchPhrase != '' ORDER BY SearchPhrase LIMIT 10
+SELECT SearchPhrase FROM hits_100m_single WHERE SearchPhrase != '' ORDER BY EventTime, SearchPhrase LIMIT 10
SELECT CounterID, avg(length(URL)) AS l, count() AS c FROM {table} WHERE URL != '' GROUP BY CounterID HAVING c > 100000 ORDER BY l DESC LIMIT 25
SELECT domainWithoutWWW(Referer) AS key, avg(length(Referer)) AS l, count() AS c, any(Referer) FROM {table} WHERE Referer != '' GROUP BY key HAVING c > 100000 ORDER BY l DESC LIMIT 25
SELECT sum(ResolutionWidth), sum(ResolutionWidth + 1), sum(ResolutionWidth + 2), sum(ResolutionWidth + 3), sum(ResolutionWidth + 4), sum(ResolutionWidth + 5), sum(ResolutionWidth + 6), sum(ResolutionWidth + 7), sum(ResolutionWidth + 8), sum(ResolutionWidth + 9), sum(ResolutionWidth + 10), sum(ResolutionWidth + 11), sum(ResolutionWidth + 12), sum(ResolutionWidth + 13), sum(ResolutionWidth + 14), sum(ResolutionWidth + 15), sum(ResolutionWidth + 16), sum(ResolutionWidth + 17), sum(ResolutionWidth + 18), sum(ResolutionWidth + 19), sum(ResolutionWidth + 20), sum(ResolutionWidth + 21), sum(ResolutionWidth + 22), sum(ResolutionWidth + 23), sum(ResolutionWidth + 24), sum(ResolutionWidth + 25), sum(ResolutionWidth + 26), sum(ResolutionWidth + 27), sum(ResolutionWidth + 28), sum(ResolutionWidth + 29), sum(ResolutionWidth + 30), sum(ResolutionWidth + 31), sum(ResolutionWidth + 32), sum(ResolutionWidth + 33), sum(ResolutionWidth + 34), sum(ResolutionWidth + 35), sum(ResolutionWidth + 36), sum(ResolutionWidth + 37), sum(ResolutionWidth + 38), sum(ResolutionWidth + 39), sum(ResolutionWidth + 40), sum(ResolutionWidth + 41), sum(ResolutionWidth + 42), sum(ResolutionWidth + 43), sum(ResolutionWidth + 44), sum(ResolutionWidth + 45), sum(ResolutionWidth + 46), sum(ResolutionWidth + 47), sum(ResolutionWidth + 48), sum(ResolutionWidth + 49), sum(ResolutionWidth + 50), sum(ResolutionWidth + 51), sum(ResolutionWidth + 52), sum(ResolutionWidth + 53), sum(ResolutionWidth + 54), sum(ResolutionWidth + 55), sum(ResolutionWidth + 56), sum(ResolutionWidth + 57), sum(ResolutionWidth + 58), sum(ResolutionWidth + 59), sum(ResolutionWidth + 60), sum(ResolutionWidth + 61), sum(ResolutionWidth + 62), sum(ResolutionWidth + 63), sum(ResolutionWidth + 64), sum(ResolutionWidth + 65), sum(ResolutionWidth + 66), sum(ResolutionWidth + 67), sum(ResolutionWidth + 68), sum(ResolutionWidth + 69), sum(ResolutionWidth + 70), sum(ResolutionWidth + 71), sum(ResolutionWidth + 72), sum(ResolutionWidth + 73), sum(ResolutionWidth + 74), sum(ResolutionWidth + 75), sum(ResolutionWidth + 76), sum(ResolutionWidth + 77), sum(ResolutionWidth + 78), sum(ResolutionWidth + 79), sum(ResolutionWidth + 80), sum(ResolutionWidth + 81), sum(ResolutionWidth + 82), sum(ResolutionWidth + 83), sum(ResolutionWidth + 84), sum(ResolutionWidth + 85), sum(ResolutionWidth + 86), sum(ResolutionWidth + 87), sum(ResolutionWidth + 88), sum(ResolutionWidth + 89) FROM {table}