Merge pull request ClickHouse#80102 from ClickHouse/bug-79403

Disallow {marks_compress/primary_key}_compress_block_size = 0

Author: rschu1ze

src/Processors/QueryPlan/QueryPlanSerializationSettings.h

@@ -13,14 +13,14 @@ struct QueryPlanSerializationSettingsImpl;
 #define QUERY_PLAN_SERIALIZATION_SETTINGS_SUPPORTED_TYPES(CLASS_NAME, M) \
     M(CLASS_NAME, Bool) \
     M(CLASS_NAME, Float) \
+    M(CLASS_NAME, JoinAlgorithm) \
     M(CLASS_NAME, NonZeroUInt64) \
     M(CLASS_NAME, OverflowMode) \
     M(CLASS_NAME, OverflowModeGroupBy) \
     M(CLASS_NAME, Seconds) \
     M(CLASS_NAME, String) \
     M(CLASS_NAME, TotalsMode) \
     M(CLASS_NAME, UInt64) \
-    M(CLASS_NAME, JoinAlgorithm) \
 
 QUERY_PLAN_SERIALIZATION_SETTINGS_SUPPORTED_TYPES(QueryPlanSerializationSettings, DECLARE_SETTING_TRAIT)
 

src/Storages/MergeTree/MergeTreeIOSettings.cpp

@@ -17,16 +17,16 @@ namespace Setting
 
 namespace MergeTreeSetting
 {
-    extern const MergeTreeSettingsUInt64 adaptive_write_buffer_initial_size;
     extern const MergeTreeSettingsBool compress_primary_key;
-    extern const MergeTreeSettingsUInt64 marks_compress_block_size;
+    extern const MergeTreeSettingsBool use_adaptive_write_buffer_for_dynamic_subcolumns;
+    extern const MergeTreeSettingsBool use_compact_variant_discriminators_serialization;
+    extern const MergeTreeSettingsNonZeroUInt64 marks_compress_block_size;
     extern const MergeTreeSettingsString marks_compression_codec;
+    extern const MergeTreeSettingsString primary_key_compression_codec;
+    extern const MergeTreeSettingsUInt64 adaptive_write_buffer_initial_size;
     extern const MergeTreeSettingsUInt64 max_compress_block_size;
     extern const MergeTreeSettingsUInt64 min_compress_block_size;
-    extern const MergeTreeSettingsUInt64 primary_key_compress_block_size;
-    extern const MergeTreeSettingsString primary_key_compression_codec;
-    extern const MergeTreeSettingsBool use_adaptive_write_buffer_for_dynamic_subcolumns;
-    extern const MergeTreeSettingsBool use_compact_variant_discriminators_serialization;
+    extern const MergeTreeSettingsNonZeroUInt64 primary_key_compress_block_size;
 }
 
 MergeTreeWriterSettings::MergeTreeWriterSettings(
@@ -38,10 +38,8 @@ MergeTreeWriterSettings::MergeTreeWriterSettings(
     bool save_marks_in_cache_,
     bool save_primary_index_in_memory_,
     bool blocks_are_granules_size_)
-    : min_compress_block_size(
-          (*storage_settings)[MergeTreeSetting::min_compress_block_size] ? (*storage_settings)[MergeTreeSetting::min_compress_block_size] : global_settings[Setting::min_compress_block_size])
-    , max_compress_block_size(
-          (*storage_settings)[MergeTreeSetting::max_compress_block_size] ? (*storage_settings)[MergeTreeSetting::max_compress_block_size] : global_settings[Setting::max_compress_block_size])
+    : min_compress_block_size((*storage_settings)[MergeTreeSetting::min_compress_block_size] ? (*storage_settings)[MergeTreeSetting::min_compress_block_size] : global_settings[Setting::min_compress_block_size])
+    , max_compress_block_size((*storage_settings)[MergeTreeSetting::max_compress_block_size] ? (*storage_settings)[MergeTreeSetting::max_compress_block_size] : global_settings[Setting::max_compress_block_size])
     , marks_compression_codec((*storage_settings)[MergeTreeSetting::marks_compression_codec])
     , marks_compress_block_size((*storage_settings)[MergeTreeSetting::marks_compress_block_size])
     , compress_primary_key((*storage_settings)[MergeTreeSetting::compress_primary_key])

src/Storages/MergeTree/MergeTreeSettings.cpp

@@ -1,3 +1,4 @@
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Columns/IColumn.h>
 #include <Core/BaseSettings.h>
 #include <Core/BaseSettingsFwdMacrosImpl.h>
@@ -10,7 +11,6 @@
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/FieldFromAST.h>
 #include <Parsers/isDiskFunction.h>
-#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/System/MutableColumnsAndConstraints.h>
 #include <Common/Exception.h>
 #include <Common/NamePrompter.h>
@@ -1709,10 +1709,10 @@ namespace ErrorCodes
     Compression encoding used by primary, primary key is small enough and cached,
     so the default compression is ZSTD(3).
     )", 0) \
-    DECLARE(UInt64, marks_compress_block_size, 65536, R"(
+    DECLARE(NonZeroUInt64, marks_compress_block_size, 65536, R"(
     Mark compress block size, the actual size of the block to compress.
     )", 0) \
-    DECLARE(UInt64, primary_key_compress_block_size, 65536, R"(
+    DECLARE(NonZeroUInt64, primary_key_compress_block_size, 65536, R"(
     Primary compress block size, the actual size of the block to compress.
     )", 0) \
     DECLARE(Bool, primary_key_lazy_load, true, R"(Load primary key in memory on

src/Storages/MergeTree/MergeTreeSettings.h

@@ -44,6 +44,7 @@ struct MutableColumnsAndConstraints;
     M(CLASS_NAME, MaxThreads) \
     M(CLASS_NAME, MergeSelectorAlgorithm) \
     M(CLASS_NAME, Milliseconds) \
+    M(CLASS_NAME, NonZeroUInt64) \
     M(CLASS_NAME, Seconds) \
     M(CLASS_NAME, String) \
     M(CLASS_NAME, UInt64)

tests/queries/0_stateless/03457_bug79403_marks_compress_block_is_zero.reference

@@ -0,0 +1,2 @@
+CREATE TABLE t0 (c0 Int) ENGINE = MergeTree() ORDER BY tuple() SETTINGS marks_compress_block_size = 0; -- { serverError BAD_ARGUMENTS }
+CREATE TABLE t0 (c0 Int) ENGINE = MergeTree() ORDER BY tuple() SETTINGS primary_key_compress_block_size = 0; -- { serverError BAD_ARGUMENTS }