diff --git a/dbms/src/Interpreters/ProcessList.h b/dbms/src/Interpreters/ProcessList.h index 6bc31a7ecf59de7dddfe190381e4640422daa86b..d970ebe767887865af6d705fc6394acdf5dec261 100644 --- a/dbms/src/Interpreters/ProcessList.h +++ b/dbms/src/Interpreters/ProcessList.h @@ -245,7 +245,7 @@ public: using EntryPtr = std::shared_ptr; /** Register running query. Returns refcounted object, that will remove element from list in destructor. - * If too much running queries - wait for not more than specified (see settings) amount of time. + * If too many running queries - wait for not more than specified (see settings) amount of time. * If timeout is passed - throw an exception. * Don't count KILL QUERY queries. */ diff --git a/dbms/src/Storages/MergeTree/PKCondition.cpp b/dbms/src/Storages/MergeTree/PKCondition.cpp index b2a0e2e5146f08ef85149a2391f212461559691b..72ec091851f308b6abc6aaa7aaa367c8a3943fb1 100644 --- a/dbms/src/Storages/MergeTree/PKCondition.cpp +++ b/dbms/src/Storages/MergeTree/PKCondition.cpp @@ -512,7 +512,7 @@ static void castValueToType(const DataTypePtr & desired_type, Field & src_value, bool PKCondition::atomFromAST(const ASTPtr & node, const Context & context, Block & block_with_constants, RPNElement & out) { /** Functions < > = != <= >= in `notIn`, where one argument is a constant, and the other is one of columns of primary key, - * or itself, wrapped in a chain of possibly-monotone functions, + * or itself, wrapped in a chain of possibly-monotonic functions, * or constant expression - number. */ Field const_value; @@ -525,7 +525,7 @@ bool PKCondition::atomFromAST(const ASTPtr & node, const Context & context, Bloc return false; DataTypePtr key_expr_type; /// Type of expression containing primary key column - size_t key_arg_pos; /// Position of argument with primary key column (non-const argument) + size_t key_arg_pos; /// Position of argument with primary key column (non-const argument) size_t key_column_num; /// Number of a primary key column (inside sort_descr array) RPNElement::MonotonicFunctionsChain chain; bool is_set_const = false; diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp index f8ca88b91092d911508a4bdaf2d1d7e3df177ad5..5638c680ccd2828abc1fbb5fc7ce8b4ef5d30cf1 100644 --- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp +++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp @@ -192,7 +192,7 @@ void ReplicatedMergeTreePartCheckThread::searchForMissingPart(const String & par size_t part_length_in_blocks = part_info.max_block + 1 - part_info.min_block; if (part_length_in_blocks > 1000) { - LOG_ERROR(log, "Won't add nonincrement_block_numbers because part spans too much blocks (" << part_length_in_blocks << ")"); + LOG_ERROR(log, "Won't add nonincrement_block_numbers because part spans too many blocks (" << part_length_in_blocks << ")"); return; } diff --git a/dbms/src/Storages/MergeTree/SimpleMergeSelector.cpp b/dbms/src/Storages/MergeTree/SimpleMergeSelector.cpp index 041b84312718442fdd4c144add3204dbacab29ea..882d1dfd8a930c2c3680cd472b3df01f0f023fb3 100644 --- a/dbms/src/Storages/MergeTree/SimpleMergeSelector.cpp +++ b/dbms/src/Storages/MergeTree/SimpleMergeSelector.cpp @@ -148,7 +148,7 @@ void selectWithinPartition( for (size_t begin = 0; begin < parts_count; ++begin) { - /// If too much parts, select only from first, to avoid complexity. + /// If too many parts, select only from first, to avoid complexity. if (begin > 1000) break; diff --git a/dbms/src/Storages/MergeTree/SimpleMergeSelector.h b/dbms/src/Storages/MergeTree/SimpleMergeSelector.h index 28918f072ed9af06d3cefae7509a7805a65bbc75..2f5219baf3d500f705dd403e7a21499d5b888642 100644 --- a/dbms/src/Storages/MergeTree/SimpleMergeSelector.h +++ b/dbms/src/Storages/MergeTree/SimpleMergeSelector.h @@ -29,8 +29,8 @@ public: /** Base is lowered until 1 (effectively means "merge any two parts") depending on several variables: * - * 1. Total number of parts in partition. If too much - then base is lowered. - * It means: when too much parts - do merges more urgently. + * 1. Total number of parts in partition. If too many - then base is lowered. + * It means: when too many parts - do merges more urgently. * * 2. Minimum age of parts participating in merge. If higher age - then base is lowered. * It means: do less wide merges only rarely. diff --git a/dbms/src/Storages/StorageBuffer.cpp b/dbms/src/Storages/StorageBuffer.cpp index 839b5995a8bacf333bf820fe86976a569b1a7649..67d50111c4077c280e29aa07f0e412db6429ba8e 100644 --- a/dbms/src/Storages/StorageBuffer.cpp +++ b/dbms/src/Storages/StorageBuffer.cpp @@ -474,7 +474,7 @@ void StorageBuffer::flushBuffer(Buffer & buffer, bool check_thresholds) return; /** For simplicity, buffer is locked during write. - * We could unlock buffer temporary, but it would lead to too much difficulties: + * We could unlock buffer temporary, but it would lead to too many difficulties: * - data, that is written, will not be visible for SELECTs; * - new data could be appended to buffer, and in case of exception, we must merge it with old data, that has not been written; * - this could lead to infinite memory growth.