Fixed tests

src/Access/AccessRights.cpp

@@ -1,8 +1,8 @@
 #include <Access/AccessRights.h>
 #include <base/logger_useful.h>
+#include <base/sort.h>
 #include <boost/container/small_vector.hpp>
 #include <boost/range/adaptor/map.hpp>
-#include <boost/range/algorithm/sort.hpp>
 #include <unordered_map>
 
 namespace DB
@@ -101,7 +101,7 @@ namespace
         AccessRightsElements getResult() const
         {
             ProtoElements sorted = *this;
-            boost::range::sort(sorted);
+            ::sort(sorted.begin(), sorted.end());
             AccessRightsElements res;
             res.reserve(sorted.size());
 

src/Access/RolesOrUsersSet.cpp

@@ -7,8 +7,8 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <boost/range/algorithm/set_algorithm.hpp>
-#include <boost/range/algorithm/sort.hpp>
 #include <boost/range/algorithm_ext/push_back.hpp>
+#include <base/sort.h>
 
 
 namespace DB
@@ -132,7 +132,7 @@ std::shared_ptr<ASTRolesOrUsersSet> RolesOrUsersSet::toAST() const
         ast->names.reserve(ids.size());
         for (const UUID & id : ids)
             ast->names.emplace_back(::DB::toString(id));
-        boost::range::sort(ast->names);
+        ::sort(ast->names.begin(), ast->names.end());
     }
 
     if (!except_ids.empty())
@@ -140,7 +140,7 @@ std::shared_ptr<ASTRolesOrUsersSet> RolesOrUsersSet::toAST() const
         ast->except_names.reserve(except_ids.size());
         for (const UUID & except_id : except_ids)
             ast->except_names.emplace_back(::DB::toString(except_id));
-        boost::range::sort(ast->except_names);
+        ::sort(ast->except_names.begin(), ast->except_names.end());
     }
 
     return ast;
@@ -161,7 +161,7 @@ std::shared_ptr<ASTRolesOrUsersSet> RolesOrUsersSet::toASTWithNames(const Access
             if (name)
                 ast->names.emplace_back(std::move(*name));
         }
-        boost::range::sort(ast->names);
+        ::sort(ast->names.begin(), ast->names.end());
     }
 
     if (!except_ids.empty())
@@ -173,7 +173,7 @@ std::shared_ptr<ASTRolesOrUsersSet> RolesOrUsersSet::toASTWithNames(const Access
             if (except_name)
                 ast->except_names.emplace_back(std::move(*except_name));
         }
-        boost::range::sort(ast->except_names);
+        ::sort(ast->except_names.begin(), ast->except_names.end());
     }
 
     return ast;

src/Interpreters/Access/InterpreterShowAccessQuery.cpp

@@ -10,7 +10,7 @@
 #include <Access/Common/AccessFlags.h>
 #include <Access/AccessControl.h>
 #include <base/range.h>
-#include <boost/range/algorithm/sort.hpp>
+#include <base/sort.h>
 #include <boost/range/algorithm_ext/push_back.hpp>
 
 
@@ -61,7 +61,7 @@ std::vector<AccessEntityPtr> InterpreterShowAccessQuery::getEntities() const
         }
     }
 
-    boost::range::sort(entities, IAccessEntity::LessByTypeAndName{});
+    ::sort(entities.begin(), entities.end(), IAccessEntity::LessByTypeAndName{});
     return entities;
 }
 

src/Interpreters/Access/InterpreterShowCreateAccessEntityQuery.cpp

@@ -27,7 +27,7 @@
 #include <Interpreters/Context.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <base/range.h>
-#include <boost/range/algorithm/sort.hpp>
+#include <base/sort.h>
 
 
 namespace DB
@@ -341,7 +341,7 @@ std::vector<AccessEntityPtr> InterpreterShowCreateAccessEntityQuery::getEntities
             entities.push_back(access_control.read(access_control.getID(show_query.type, name)));
     }
 
-    boost::range::sort(entities, IAccessEntity::LessByName{});
+    ::sort(entities.begin(), entities.end(), IAccessEntity::LessByName{});
     return entities;
 }
 

src/Interpreters/Access/InterpreterShowGrantsQuery.cpp

@@ -13,8 +13,8 @@
 #include <DataTypes/DataTypeString.h>
 #include <Interpreters/Context.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
-#include <boost/range/algorithm/sort.hpp>
 #include <boost/range/algorithm_ext/push_back.hpp>
+#include <base/sort.h>
 
 
 namespace DB
@@ -159,7 +159,7 @@ std::vector<AccessEntityPtr> InterpreterShowGrantsQuery::getEntities() const
             entities.push_back(entity);
     }
 
-    boost::range::sort(entities, IAccessEntity::LessByTypeAndName{});
+    ::sort(entities.begin(), entities.end(), IAccessEntity::LessByTypeAndName{});
     return entities;
 }
 

tests/integration/test_multiple_disks/test.py

@@ -382,12 +382,18 @@ def test_round_robin(start_cluster, name, engine):
         used_disk = get_used_disks_for_table(node1, name)
         assert len(used_disk) == 1, 'More than one disk used for single insert'
 
+        # sleep is required because we order disks by their modification time, and if insert will be fast
+        # modification time of two disks will be equal, then sort will not provide deterministic results
+        time.sleep(5)
+
         node1.query_with_retry("insert into {} select * from numbers(10000, 10000)".format(name))
         used_disks = get_used_disks_for_table(node1, name)
 
         assert len(used_disks) == 2, 'Two disks should be used for two parts'
         assert used_disks[0] != used_disks[1], "Should write to different disks"
 
+        time.sleep(5)
+
         node1.query_with_retry("insert into {} select * from numbers(20000, 10000)".format(name))
         used_disks = get_used_disks_for_table(node1, name)