Fixed exception messages [#CLICKHOUSE-2].

dbms/src/Interpreters/ProcessList.cpp

@@ -28,7 +28,7 @@ ProcessList::EntryPtr ProcessList::insert(
 
         if (!is_kill_query && max_size && cur_size >= max_size
             && (!settings.queue_max_wait_ms.totalMilliseconds() || !have_space.tryWait(mutex, settings.queue_max_wait_ms.totalMilliseconds())))
-            throw Exception("Too much simultaneous queries. Maximum: " + toString(max_size), ErrorCodes::TOO_MUCH_SIMULTANEOUS_QUERIES);
+            throw Exception("Too many simultaneous queries. Maximum: " + toString(max_size), ErrorCodes::TOO_MUCH_SIMULTANEOUS_QUERIES);
 
         /** Why we use current user?
           * Because initial one is passed by client and credentials for it is not verified,
@@ -47,7 +47,7 @@ ProcessList::EntryPtr ProcessList::insert(
             {
                 if (!is_kill_query && settings.max_concurrent_queries_for_user
                     && user_process_list->second.queries.size() >= settings.max_concurrent_queries_for_user)
-                    throw Exception("Too much simultaneous queries for user " + client_info.current_user
+                    throw Exception("Too many simultaneous queries for user " + client_info.current_user
                         + ". Current: " + toString(user_process_list->second.queries.size())
                         + ", maximum: " + settings.max_concurrent_queries_for_user.toString(),
                         ErrorCodes::TOO_MUCH_SIMULTANEOUS_QUERIES);

dbms/src/Storages/MergeTree/MergeTreeData.cpp

@@ -1558,7 +1558,7 @@ void MergeTreeData::delayInsertIfNeeded(Poco::Event * until)
     if (parts_count >= settings.parts_to_throw_insert)
     {
         ProfileEvents::increment(ProfileEvents::RejectedInserts);
-        throw Exception("Too much parts (" + toString(parts_count) + "). Merges are processing significantly slower than inserts.", ErrorCodes::TOO_MUCH_PARTS);
+        throw Exception("Too many parts (" + toString(parts_count) + "). Merges are processing significantly slower than inserts.", ErrorCodes::TOO_MUCH_PARTS);
     }
 
     const size_t max_k = settings.parts_to_throw_insert - settings.parts_to_delay_insert; /// always > 0

dbms/src/Storages/MergeTree/MergeTreeSettings.h

@@ -47,7 +47,7 @@ struct MergeTreeSettings
     /** If table contains at least that many active parts, artificially slow down insert into table. */       \
     M(SettingUInt64, parts_to_delay_insert, 150)                                                              \
                                                                                                               \
-    /** If more than this number active parts, throw 'Too much parts ...' exception */                        \
+    /** If more than this number active parts, throw 'Too many parts ...' exception */                        \
     M(SettingUInt64, parts_to_throw_insert, 300)                                                              \
                                                                                                               \
     /** Max delay of inserting data into MergeTree table in seconds, if there are a lot of unmerged parts. */ \

dbms/src/Storages/StorageReplicatedMergeTree.cpp

@@ -1237,7 +1237,7 @@ bool StorageReplicatedMergeTree::executeLogEntry(const LogEntry & entry)
         static std::atomic_uint total_fetches {0};
         if (data.settings.replicated_max_parallel_fetches && total_fetches >= data.settings.replicated_max_parallel_fetches)
         {
-            throw Exception("Too much total fetches from replicas, maximum: " + data.settings.replicated_max_parallel_fetches.toString(),
+            throw Exception("Too many total fetches from replicas, maximum: " + data.settings.replicated_max_parallel_fetches.toString(),
                 ErrorCodes::TOO_MUCH_FETCHES);
         }
 
@@ -1246,7 +1246,7 @@ bool StorageReplicatedMergeTree::executeLogEntry(const LogEntry & entry)
 
         if (data.settings.replicated_max_parallel_fetches_for_table && current_table_fetches >= data.settings.replicated_max_parallel_fetches_for_table)
         {
-            throw Exception("Too much fetches from replicas for table, maximum: " + data.settings.replicated_max_parallel_fetches_for_table.toString(),
+            throw Exception("Too many fetches from replicas for table, maximum: " + data.settings.replicated_max_parallel_fetches_for_table.toString(),
                 ErrorCodes::TOO_MUCH_FETCHES);
         }
 
@@ -3382,7 +3382,7 @@ void StorageReplicatedMergeTree::fetchPartition(const ASTPtr & partition, const
             LOG_INFO(log, "Some of parts (" << missing_parts.size() << ") are missing. Will try to fetch covering parts.");
 
         if (try_no >= 5)
-            throw Exception("Too much retries to fetch parts from " + best_replica_path, ErrorCodes::TOO_MUCH_RETRIES_TO_FETCH_PARTS);
+            throw Exception("Too many retries to fetch parts from " + best_replica_path, ErrorCodes::TOO_MUCH_RETRIES_TO_FETCH_PARTS);
 
         Strings parts = getZooKeeper()->getChildren(best_replica_path + "/parts");
         ActiveDataPartSet active_parts_set(data.format_version, parts);