From a343d18e1a832ed79977a2ee65bd8952d7fd513f Mon Sep 17 00:00:00 2001 From: chaser-ch Date: Thu, 8 Feb 2024 22:16:51 +0000 Subject: [PATCH] [CP] fix zlib error message --- deps/oblib/src/lib/compress/ob_compress_util.h | 4 ++++ src/share/config/ob_config_helper.cpp | 7 +++++-- src/share/parameter/ob_parameter_seed.ipp | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/deps/oblib/src/lib/compress/ob_compress_util.h b/deps/oblib/src/lib/compress/ob_compress_util.h index cfa8f2f94b..dbc3fa0671 100644 --- a/deps/oblib/src/lib/compress/ob_compress_util.h +++ b/deps/oblib/src/lib/compress/ob_compress_util.h @@ -54,11 +54,15 @@ const char *const all_compressor_name[] = }; STATIC_ASSERT(ARRAYSIZEOF(all_compressor_name) == ObCompressorType::MAX_COMPRESSOR, "compressor count mismatch"); + +#define DISABLED_ZLIB_1_COMPRESS_IDX 3 + const char *const compress_funcs[] = { "lz4_1.0", "none", "snappy_1.0", + "zlib_1.0", // temporarily disable zlib_1.0 "zstd_1.0", "zstd_1.3.8", "lz4_1.9.1", diff --git a/src/share/config/ob_config_helper.cpp b/src/share/config/ob_config_helper.cpp index 25200b67e2..c9bd4782b2 100644 --- a/src/share/config/ob_config_helper.cpp +++ b/src/share/config/ob_config_helper.cpp @@ -307,9 +307,12 @@ bool ObConfigStaleTimeChecker::check(const ObConfigItem &t) const bool ObConfigCompressFuncChecker::check(const ObConfigItem &t) const { bool is_valid = false; - for (int i = 0; i < ARRAYSIZEOF(common::compress_funcs) && !is_valid; ++i) { + for (int i = 0; i < ARRAYSIZEOF(common::compress_funcs); ++i) { if (0 == ObString::make_string(compress_funcs[i]).case_compare(t.str())) { - is_valid = true; + if (i != DISABLED_ZLIB_1_COMPRESS_IDX) { + is_valid = true; + } + break; } } return is_valid; diff --git a/src/share/parameter/ob_parameter_seed.ipp b/src/share/parameter/ob_parameter_seed.ipp index 12d85bdf91..1519c940ef 100644 --- a/src/share/parameter/ob_parameter_seed.ipp +++ b/src/share/parameter/ob_parameter_seed.ipp @@ -147,7 +147,7 @@ DEF_STR_WITH_CHECKER(_publish_schema_mode, OB_TENANT_PARAMETER, "BEST_EFFORT", DEF_STR_WITH_CHECKER(default_compress_func, OB_CLUSTER_PARAMETER, "zstd_1.3.8", common::ObConfigCompressFuncChecker, "default compress function name for create new table, " - "values: none, lz4_1.0, snappy_1.0, zlib_1.0, zstd_1.0, zstd_1.3.8", + "values: none, lz4_1.0, snappy_1.0, zstd_1.0, zstd_1.3.8", ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE)); DEF_STR_WITH_CHECKER(default_row_format, OB_CLUSTER_PARAMETER, "dynamic",