Skip to content

Commit 07bf38d

Browse files
authored
Merge pull request ClickHouse#80140 from ClickHouse/ahmadov/max-block-size-zero
Prevent setting max_block_size to 0
2 parents d164eeb + 940f3c1 commit 07bf38d

29 files changed

+33
-35
lines changed

ci/jobs/scripts/check_style/check-settings-style

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ done
6969
# previous releases, which is more important than consistency
7070
for setting in $(
7171
awk '{ gsub(/^.*Settings/, "", $2); print $1 " " $2}' "${SETTINGS_FILE}" | \
72-
sort | uniq | awk '{ print $1 }' | uniq -d | grep -v "connect_timeout" | grep -v "max_connections"
72+
sort | uniq | awk '{ print $1 }' | uniq -d | grep -v "connect_timeout" | grep -v "max_connections" | grep -v "max_block_size"
7373
);
7474
do
7575
echo "# Found multiple definitions of setting ${setting} with different types: "

programs/keeper-bench/Runner.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace CurrentMetrics
4141

4242
namespace DB::Setting
4343
{
44-
extern const SettingsUInt64 max_block_size;
44+
extern const SettingsNonZeroUInt64 max_block_size;
4545
}
4646

4747
namespace DB::ErrorCodes

src/Client/ClientBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ namespace Setting
104104
extern const SettingsBool allow_settings_after_format_in_insert;
105105
extern const SettingsBool async_insert;
106106
extern const SettingsDialect dialect;
107-
extern const SettingsUInt64 max_block_size;
107+
extern const SettingsNonZeroUInt64 max_block_size;
108108
extern const SettingsUInt64 max_insert_block_size;
109109
extern const SettingsUInt64 max_parser_backtracks;
110110
extern const SettingsUInt64 max_parser_depth;

src/Core/Settings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ This is an expert-level setting, and you shouldn't change it if you're just gett
103103
104104
Don't confuse blocks for compression (a chunk of memory consisting of bytes) with blocks for query processing (a set of rows from a table).
105105
)", 0) \
106-
DECLARE(UInt64, max_block_size, DEFAULT_BLOCK_SIZE, R"(
106+
DECLARE(NonZeroUInt64, max_block_size, DEFAULT_BLOCK_SIZE, R"(
107107
In ClickHouse, data is processed by blocks, which are sets of column parts. The internal processing cycles for a single block are efficient but there are noticeable costs when processing each block.
108108
109109
The `max_block_size` setting indicates the recommended maximum number of rows to include in a single block when loading data from tables. Blocks the size of `max_block_size` are not always loaded from the table: if ClickHouse determines that less data needs to be retrieved, a smaller block is processed.

src/Core/SettingsQuirks.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ namespace Setting
5353
extern const SettingsBool async_query_sending_for_remote;
5454
extern const SettingsBool async_socket_for_remote;
5555
extern const SettingsUInt64 input_format_parquet_max_block_size;
56-
extern const SettingsUInt64 max_block_size;
56+
extern const SettingsNonZeroUInt64 max_block_size;
5757
extern const SettingsUInt64 max_insert_block_size;
5858
extern const SettingsUInt64 min_insert_block_size_rows;
5959
extern const SettingsUInt64 min_insert_block_size_bytes_for_materialized_views;

src/Interpreters/InterpreterInsertQuery.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ namespace Setting
7272
extern const SettingsMaxThreads max_threads;
7373
extern const SettingsUInt64 max_insert_threads;
7474
extern const SettingsUInt64 min_insert_block_size_rows;
75-
extern const SettingsUInt64 max_block_size;
75+
extern const SettingsNonZeroUInt64 max_block_size;
7676
extern const SettingsUInt64 preferred_block_size_bytes;
7777
extern const SettingsUInt64 min_insert_block_size_bytes;
7878
extern const SettingsString insert_deduplication_token;

src/Interpreters/InterpreterSelectQuery.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ namespace Setting
141141
extern const SettingsBool group_by_use_nulls;
142142
extern const SettingsSeconds lock_acquire_timeout;
143143
extern const SettingsUInt64 max_analyze_depth;
144-
extern const SettingsUInt64 max_block_size;
144+
extern const SettingsNonZeroUInt64 max_block_size;
145145
extern const SettingsUInt64 max_bytes_in_distinct;
146146
extern const SettingsUInt64 max_columns_to_read;
147147
extern const SettingsUInt64 max_distributed_connections;

src/Interpreters/InterpreterWatchQuery.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace Setting
2828
{
2929
extern const SettingsBool allow_experimental_live_view;
3030
extern const SettingsBool allow_experimental_window_view;
31-
extern const SettingsUInt64 max_block_size;
31+
extern const SettingsNonZeroUInt64 max_block_size;
3232
extern const SettingsUInt64 max_columns_to_read;
3333
extern const SettingsUInt64 max_result_bytes;
3434
extern const SettingsUInt64 max_result_rows;

src/Interpreters/JoinInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace ErrorCodes
2121
namespace Setting
2222
{
2323
extern const SettingsJoinAlgorithm join_algorithm;
24-
extern const SettingsUInt64 max_block_size;
24+
extern const SettingsNonZeroUInt64 max_block_size;
2525
extern const SettingsUInt64 max_rows_in_join;
2626
extern const SettingsUInt64 max_bytes_in_join;
2727
extern const SettingsOverflowMode join_overflow_mode;

src/Interpreters/MutationsInterpreter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace Setting
5252
{
5353
extern const SettingsBool allow_experimental_analyzer;
5454
extern const SettingsBool allow_nondeterministic_mutations;
55-
extern const SettingsUInt64 max_block_size;
55+
extern const SettingsNonZeroUInt64 max_block_size;
5656
extern const SettingsBool use_concurrency_control;
5757
extern const SettingsBool validate_mutation_query;
5858
}

0 commit comments

Comments
 (0)