Fix style and tests

src/Storages/MergeTree/MergeTreeDataWriter.cpp

@@ -254,7 +254,7 @@ Block MergeTreeDataWriter::mergeBlock(const Block & block, SortDescription sort_
     IMergingAlgorithm::Status status = merging_algorithm->merge();
     while (!status.is_finished)
         status = merging_algorithm->merge();
-    
+
     /// Merged Block is sorted and we don't need to use permutation anymore
     *permutation = nullptr;
 

tests/integration/test_graphite_merge_tree/test.py

@@ -8,7 +8,8 @@ from helpers.test_tools import TSV
 
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance('instance',
-                                main_configs=['configs/graphite_rollup.xml'])
+                                main_configs=['configs/graphite_rollup.xml'],
+                                user_configs=["configs/users.xml"])
 q = instance.query
 
 

tests/integration/test_row_policy/configs/users.d/another_user.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
 <yandex>
+    <profiles>
+        <default>
+            <optimize_on_insert>0</optimize_on_insert>
+        </default>
+    </profiles>
     <users>
         <another>
             <password/>
@@ -10,4 +15,4 @@
             <quota>default</quota>
         </another>
     </users>
-</yandex>
+</yandex>

tests/integration/test_row_policy/configs/users.xml

@@ -3,7 +3,6 @@
     <profiles>
         <default>
             <any_join_distinct_right_table_keys>1</any_join_distinct_right_table_keys>
-            <optimize_on_insert>0</optimize_on_insert>
         </default>
     </profiles>
     <users>