From 41e6c64b591297f52094aa0907ec7423116cf582 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Wed, 11 Mar 2020 23:40:26 +0300
Subject: [PATCH] fixup

---
 dbms/tests/performance/cpu_synthetic.xml              | 11 +++++++----
 .../performance/vectorize_aggregation_combinators.xml |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dbms/tests/performance/cpu_synthetic.xml b/dbms/tests/performance/cpu_synthetic.xml
index 455a5f54230..05ef5e635bd 100644
--- a/dbms/tests/performance/cpu_synthetic.xml
+++ b/dbms/tests/performance/cpu_synthetic.xml
@@ -34,9 +34,10 @@ PageCharset тоже почти всегда непуст, но его сред
 <query>SELECT count() FROM hits_10m_single WHERE NOT ignore(sipHash64(SearchPhrase)) SETTINGS max_threads = 1</query>
 <query>SELECT count() FROM hits_100m_single WHERE NOT ignore(sipHash64(SearchPhrase))</query>
 <!-- 18. Криптографическая хэш-функция для строк. -->
-<query>SELECT count() FROM hits_10m_single WHERE NOT ignore(MD5(SearchPhrase))</query>
+<query>SELECT count() FROM hits_10m_single WHERE NOT ignore(MD5(SearchPhrase)) SETTINGS max_threads = 1</query>
+<query>SELECT count() FROM hits_100m_single WHERE NOT ignore(MD5(SearchPhrase))</query>
 <!-- 19. Криптографическая хэш-функция для строк.  -->
-<query>SELECT count() FROM hits_10m_single WHERE NOT ignore(MD5(URL))</query>
+<!-- MD5 was too slow, removed. -->
 <!-- 20. -->
 <query>SELECT count() FROM hits_10m_single WHERE NOT ignore(cityHash64(URL)) SETTINGS max_threads = 1</query>
 <query>SELECT count() FROM hits_100m_single WHERE NOT ignore(cityHash64(URL))</query>
@@ -83,11 +84,13 @@ PageCharset тоже почти всегда непуст, но его сред
 <query>SELECT uniqCombined(17)(UserID) FROM hits_10m_single SETTINGS max_threads = 1</query>
 <query>SELECT uniqCombined(17)(UserID) FROM hits_100m_single</query>
 <!-- 44. Разные алгоритмы вычисления кардинальности. -->
+<query>SELECT uniqExact(UserID) FROM hits_10m_single SETTINGS max_threads = 1</query>
 <query>SELECT uniqExact(UserID) FROM hits_10m_single</query>
 <!-- 45. Что-то чуть более похожее на реальный запрос. -->
 <query>SELECT RegionID, uniq(UserID) FROM hits_10m_single GROUP BY RegionID SETTINGS max_threads = 1</query>
 <query>SELECT RegionID, uniq(UserID) FROM hits_100m_single GROUP BY RegionID</query>
-<!-- 47. Читаем и разжимаем все столбцы, и ничего с ними потом не делаем. -->
-<query>SELECT count() FROM hits_10m_single WHERE NOT ignore(*)</query>
+<!-- 47. Читаем и разжимаем крупные столбцы, и ничего с ними потом не делаем. -->
+<query>SELECT count() FROM hits_10m_single WHERE NOT ignore(Referer, URL, Title) SETTINGS max_threads = 1</query>
+<query>SELECT count() FROM hits_10m_single WHERE NOT ignore(Referer, URL, Title)</query>
 
 </test>
diff --git a/dbms/tests/performance/vectorize_aggregation_combinators.xml b/dbms/tests/performance/vectorize_aggregation_combinators.xml
index 5e14de10926..88870b56d1f 100644
--- a/dbms/tests/performance/vectorize_aggregation_combinators.xml
+++ b/dbms/tests/performance/vectorize_aggregation_combinators.xml
@@ -19,7 +19,7 @@
 
     <fill_query>INSERT INTO array_data SELECT number % 1024, arrayWithConstant(16, number) from numbers(10000000)</fill_query>
 
-    <query>SELECT countMerge(v) FROM (SELECT countState() v FROM numbers(1000000000)) FORMAT Null</query>
+    <query>SELECT countMerge(v) FROM (SELECT countState() v FROM zeros(1000000000)) FORMAT Null</query>
     <query>SELECT countMerge(v) FROM (SELECT number % 1024 k, countState() v FROM numbers(10000000) GROUP BY k) FORMAT Null</query>
 
     <query>SELECT sumArray(v) FROM array_data FORMAT Null</query>