From 3b428d6585be14a978a85d2310d99d7f95b0cf07 Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Thu, 9 Jul 2020 13:46:16 +0300
Subject: [PATCH] fixes

---
 tests/performance/decimal_aggregates.xml      |  4 +++
 tests/performance/least_greatest_hits.xml     |  2 +-
 .../performance/read_in_order_many_parts.xml  | 26 ++++++++-----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/performance/decimal_aggregates.xml b/tests/performance/decimal_aggregates.xml
index c14f4e51760..9c3f0c17464 100644
--- a/tests/performance/decimal_aggregates.xml
+++ b/tests/performance/decimal_aggregates.xml
@@ -1,4 +1,8 @@
 <test>
+    <settings>
+        <max_memory_usage>20G</max_memory_usage>
+    </settings>
+
     <create_query>CREATE TABLE t (x UInt64, d32 Decimal32(3), d64 Decimal64(4), d128 Decimal128(5)) ENGINE = Memory</create_query>
     <fill_query>INSERT INTO t SELECT number AS x, x % 1000000 AS d32, x AS d64, x d128 FROM numbers_mt(1000000000)</fill_query>
     <drop_query>DROP TABLE IF EXISTS t</drop_query>
diff --git a/tests/performance/least_greatest_hits.xml b/tests/performance/least_greatest_hits.xml
index 2194581adfe..5b27fc8f363 100644
--- a/tests/performance/least_greatest_hits.xml
+++ b/tests/performance/least_greatest_hits.xml
@@ -4,6 +4,6 @@
     </preconditions>
 
     <query>SELECT count() FROM hits_100m_single WHERE NOT ignore(least(URL, Referer))</query>
-    <query>SELECT count() FROM hits_100m_single WHERE NOT ignore(greatest(URL, Referer, Title))</query>
+    <query>SELECT count() FROM hits_10m_single WHERE NOT ignore(greatest(URL, Referer, Title))</query>
     <query>SELECT count() FROM hits_100m_single WHERE NOT ignore(greatest(ClientIP, RemoteIP))</query>
 </test>
diff --git a/tests/performance/read_in_order_many_parts.xml b/tests/performance/read_in_order_many_parts.xml
index 9da19410f5f..3372d62194a 100644
--- a/tests/performance/read_in_order_many_parts.xml
+++ b/tests/performance/read_in_order_many_parts.xml
@@ -2,31 +2,27 @@
     <settings>
         <optimize_aggregation_in_order>1</optimize_aggregation_in_order>
         <optimize_read_in_order>1</optimize_read_in_order>
-        <max_partitions_per_insert_block>200</max_partitions_per_insert_block>
+        <max_partitions_per_insert_block>2000</max_partitions_per_insert_block>
         <max_threads>8</max_threads>
     </settings>
 
     <substitutions>
         <substitution>
-            <name>table</name>
+            <name>parts</name>
             <values>
-                <value>mt_20_parts</value>
-                <value>mt_200_parts</value>
+                <value>200</value>
+                <value>2000</value>
             </values>
         </substitution>
     </substitutions>
 
-    <create_query>CREATE TABLE mt_20_parts(id UInt32, val1 UInt32, val2 UInt32) ENGINE = MergeTree ORDER BY val1 PARTITION BY id % 20</create_query>
-    <create_query>CREATE TABLE mt_200_parts(id UInt32, val1 UInt32, val2 UInt32) ENGINE = MergeTree ORDER BY val1 PARTITION BY id % 200</create_query>
+    <create_query>CREATE TABLE mt_{parts}_parts(id UInt32, val1 UInt32, val2 UInt32) ENGINE = MergeTree ORDER BY val1 PARTITION BY id % {parts}</create_query>
+    <fill_query>INSERT INTO mt_{parts}_parts SELECT number, rand() % 10000, rand() FROM numbers_mt(100000000)</fill_query>
+    <fill_query>OPTIMIZE TABLE mt_{parts}_parts FINAL</fill_query>
 
-    <fill_query>INSERT INTO mt_20_parts SELECT number, rand() % 10000, rand() FROM numbers_mt(1000000000)</fill_query>
-    <fill_query>INSERT INTO mt_200_parts SELECT number, rand() % 10000, rand() FROM numbers_mt(1000000000)</fill_query>
-    <fill_query>OPTIMIZE TABLE mt_20_parts FINAL</fill_query>
-    <fill_query>OPTIMIZE TABLE mt_200_parts FINAL</fill_query>
+    <query>SELECT val2 FROM mt_{parts}_parts ORDER BY val1 LIMIT 1000 FORMAT Null</query>
+    <query>SELECT val2 FROM mt_{parts}_parts ORDER BY val1 LIMIT 100000 FORMAT Null</query>
+    <query>SELECT sum(val2) FROM mt_{parts}_parts GROUP BY val1 FORMAT Null</query>
 
-    <query>SELECT val2 FROM {table} ORDER BY val1 LIMIT 100 FORMAT Null</query>
-    <query>SELECT val2 FROM {table} ORDER BY val1 LIMIT 100000 FORMAT Null</query>
-    <query>SELECT sum(val2) FROM {table} GROUP BY val1 FORMAT Null</query>
-
-    <drop_query>DROP TABLE IF EXISTS {table}</drop_query>
+    <drop_query>DROP TABLE IF EXISTS mt_{parts}_parts</drop_query>
 </test>