Merge branch 'master' of github.com:yandex/ClickHouse

cmake/find_llvm.cmake

@@ -26,10 +26,10 @@ if (ENABLE_EMBEDDED_COMPILER)
 
         if (LLVM_FOUND)
             find_library (LLD_LIBRARY_TEST lldCore PATHS ${LLVM_LIBRARY_DIRS})
-            find_path (LLD_INCLUDE_DIR_TEST NAMES lld/Common/Driver.h PATHS ${LLVM_INCLUDE_DIRS})
+            find_path (LLD_INCLUDE_DIR_TEST NAMES lld/Common/AbsoluteAtom.h PATHS ${LLVM_INCLUDE_DIRS})
             if (NOT LLD_LIBRARY_TEST OR NOT LLD_INCLUDE_DIR_TEST)
                 set (LLVM_FOUND 0)
-                message(WARNING "liblld not found in ${LLVM_INCLUDE_DIRS} ${LLVM_LIBRARY_DIRS}. Disabling internal compiler.")
+                message(WARNING "liblld (${LLD_LIBRARY_TEST}, ${LLD_INCLUDE_DIR_TEST}) not found in ${LLVM_INCLUDE_DIRS} ${LLVM_LIBRARY_DIRS}. Disabling internal compiler.")
             endif ()
         endif ()
 

dbms/src/AggregateFunctions/AggregateFunctionArray.cpp

@@ -18,6 +18,9 @@ public:
 
     DataTypes transformArguments(const DataTypes & arguments) const override
     {
+        if (0 == arguments.size())
+            throw Exception("-Array aggregate functions require at least one argument", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
         DataTypes nested_arguments;
         for (const auto & type : arguments)
         {

dbms/src/Storages/StorageMergeTree.cpp

@@ -311,6 +311,7 @@ std::vector<MergeTreeMutationStatus> StorageMergeTree::getMutationsStatus() cons
     part_data_versions.reserve(data_parts.size());
     for (const auto & part : data_parts)
         part_data_versions.push_back(part->info.getDataVersion());
+    std::sort(part_data_versions.begin(), part_data_versions.end());
 
     std::vector<MergeTreeMutationStatus> result;
     for (const auto & kv : current_mutations_by_version)

dbms/tests/queries/0_stateless/00534_filimonov.data

@@ -428,5 +428,7 @@ SELECT COVAR_SAMPArray([CAST( 0  AS Int8)],arrayPopBack([CAST( 0  AS Int8)]));
 SELECT medianTimingWeightedArray([CAST( 0  AS Int8)],arrayPopBack([CAST( 0  AS Int8)]));
 SELECT quantilesDeterministicArray([CAST( 0  AS Int8)],arrayPopBack([CAST( 0  AS Int32)]));
 
-SELECT maxIntersections([], [])
-SELECT sumMap([], [])
+SELECT maxIntersections([], []);
+SELECT sumMap([], []);
+
+SELECT countArray();