hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[CP] fix zlib error message

Browse Source
This commit is contained in:
chaser-ch
2024-02-08 22:16:51 +00:00
committed by ob-robot
parent 2d65ebabf1
commit a343d18e1a
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deps/oblib/src/lib/compress/ob_compress_util.h vendored
View File

@ -54,11 +54,15 @@ const char *const all_compressor_name[] =
}; };
STATIC_ASSERT(ARRAYSIZEOF(all_compressor_name) == ObCompressorType::MAX_COMPRESSOR, "compressor count mismatch"); STATIC_ASSERT(ARRAYSIZEOF(all_compressor_name) == ObCompressorType::MAX_COMPRESSOR, "compressor count mismatch");
#define DISABLED_ZLIB_1_COMPRESS_IDX 3
const char *const compress_funcs[] = const char *const compress_funcs[] =
{ {
"lz4_1.0", "lz4_1.0",
"none", "none",
"snappy_1.0", "snappy_1.0",
"zlib_1.0", // temporarily disable zlib_1.0
"zstd_1.0", "zstd_1.0",
"zstd_1.3.8", "zstd_1.3.8",
"lz4_1.9.1", "lz4_1.9.1",

5
src/share/config/ob_config_helper.cpp
View File

@ -307,10 +307,13 @@ bool ObConfigStaleTimeChecker::check(const ObConfigItem &t) const
bool ObConfigCompressFuncChecker::check(const ObConfigItem &t) const bool ObConfigCompressFuncChecker::check(const ObConfigItem &t) const
{ {
bool is_valid = false; 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())) { if (0 == ObString::make_string(compress_funcs[i]).case_compare(t.str())) {
if (i != DISABLED_ZLIB_1_COMPRESS_IDX) {
is_valid = true; is_valid = true;
} }
break;
}
} }
return is_valid; return is_valid;
} }

2
src/share/parameter/ob_parameter_seed.ipp
View File

@ -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", DEF_STR_WITH_CHECKER(default_compress_func, OB_CLUSTER_PARAMETER, "zstd_1.3.8",
common::ObConfigCompressFuncChecker, common::ObConfigCompressFuncChecker,
"default compress function name for create new table, " "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)); ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_STR_WITH_CHECKER(default_row_format, OB_CLUSTER_PARAMETER, "dynamic", DEF_STR_WITH_CHECKER(default_row_format, OB_CLUSTER_PARAMETER, "dynamic",