diff --git a/deps/oblib/src/lib/alloc/memory_sanity.h b/deps/oblib/src/lib/alloc/memory_sanity.h index 774f17c84d..404677a864 100644 --- a/deps/oblib/src/lib/alloc/memory_sanity.h +++ b/deps/oblib/src/lib/alloc/memory_sanity.h @@ -90,7 +90,7 @@ static inline void sanity_poison(const void *ptr, ssize_t len) if (!sanity_addr_in_range(ptr)) return; if (((uint64_t)ptr & 0x7) != 0) abort(); char *shadow = (char*)sanity_to_shadow(ptr); - int32_t n_bytes = sanity_to_shadow_size(len); + int32_t n_bytes = static_cast(sanity_to_shadow_size(len)); if (n_bytes > 0) { static void *(*real_memset)(void *, int, size_t) = (__typeof__(real_memset)) dlsym(RTLD_NEXT, "memset"); @@ -107,7 +107,7 @@ static inline void sanity_unpoison(const void *ptr, ssize_t len) if (!sanity_addr_in_range(ptr)) return; if (((uint64_t)ptr & 0x7) != 0) abort(); char *shadow = (char*)sanity_to_shadow(ptr); - int32_t n_bytes = sanity_to_shadow_size(len); + int32_t n_bytes = static_cast(sanity_to_shadow_size(len)); if (n_bytes > 0) { static void *(*real_memset)(void *, int, size_t) = (__typeof__(real_memset)) dlsym(RTLD_NEXT, "memset"); diff --git a/deps/oblib/src/lib/allocator/ob_asan_allocator.h b/deps/oblib/src/lib/allocator/ob_asan_allocator.h index 2c32c7cf4b..1e9362c8c2 100644 --- a/deps/oblib/src/lib/allocator/ob_asan_allocator.h +++ b/deps/oblib/src/lib/allocator/ob_asan_allocator.h @@ -140,7 +140,7 @@ inline void *ObAsanAllocator::alloc(const int64_t size) void *buffer = ::malloc(real_size); if (OB_LIKELY(nullptr != buffer)) { AllocNode *new_node = new(buffer) AllocNode(this); - new_node->size_ = real_size; + new_node->size_ = static_cast(real_size); ret = (void *)new_node->data_; add_node(new_node); alloc_bytes_ += real_size; @@ -325,4 +325,4 @@ inline void ObParallelAsanAllocator::free(void *ptr) } } -#endif // OCEANBASE_COMMON_ASAN_ALLOCATOR_H_ \ No newline at end of file +#endif // OCEANBASE_COMMON_ASAN_ALLOCATOR_H_ diff --git a/src/share/backup/ob_archive_store.cpp b/src/share/backup/ob_archive_store.cpp index 6902b4130f..0e4ad5c7c7 100644 --- a/src/share/backup/ob_archive_store.cpp +++ b/src/share/backup/ob_archive_store.cpp @@ -1460,7 +1460,7 @@ static int is_piece_start_file_name_(ObString &file_name, bool &is_piece_start) int ret = OB_SUCCESS; char tmp_str[OB_MAX_BACKUP_DEST_LENGTH] = { 0 }; is_piece_start = false; - int32_t len = file_name.length() - strlen(OB_ARCHIVE_SUFFIX); + const int32_t len = static_cast(file_name.length() - strlen(OB_ARCHIVE_SUFFIX)); if (file_name.empty()) { ret = OB_INVALID_ARGUMENT; LOG_WARN("empty file name", K(ret), K(file_name)); diff --git a/src/share/backup/ob_backup_data_store.cpp b/src/share/backup/ob_backup_data_store.cpp index 17c2e84892..6bdd7c2ef6 100644 --- a/src/share/backup/ob_backup_data_store.cpp +++ b/src/share/backup/ob_backup_data_store.cpp @@ -939,7 +939,7 @@ int ObBackupDataStore::get_max_sys_ls_retry_id(const share::ObBackupPath &backup if (backup_path.is_empty() || !ls_id.is_valid()) { ret = OB_INVALID_ARGUMENT; LOG_WARN("get invalid args", K(ret), K(backup_path), K(ls_id)); - } else if (OB_FAIL(prefix_op.init(sys_data_prefix, strlen(sys_data_prefix)))) { + } else if (OB_FAIL(prefix_op.init(sys_data_prefix, static_cast(strlen(sys_data_prefix))))) { LOG_WARN("failed to init dir prefix", K(ret), K(sys_data_prefix)); } else if (OB_FAIL(util.list_directories(backup_path.get_obstr(), backup_set_dest_.get_storage_info(), prefix_op))) { LOG_WARN("failed to list files", K(ret), K(backup_path), K(backup_set_dest_)); diff --git a/src/share/inner_table/generate_inner_table_schema.py b/src/share/inner_table/generate_inner_table_schema.py index e158590dc8..e0ffb37a07 100755 --- a/src/share/inner_table/generate_inner_table_schema.py +++ b/src/share/inner_table/generate_inner_table_schema.py @@ -164,7 +164,7 @@ def print_default_column(column_name, rowkey_id, index_id, part_key_pos, column_ else: set_op = 'set_timestamp({0})'.format(default_value) elif column_type == 'ObLongTextType': - set_op = 'set_lob_value(ObLongTextType, "{0}", strlen("{0}"))'.format(default_value) + set_op = 'set_lob_value(ObLongTextType, "{0}", static_cast(strlen("{0}")))'.format(default_value) if column_collation_type == "CS_TYPE_BINARY": set_op += '; {0}_default.set_collation_type(CS_TYPE_BINARY);'.format(column_name.lower()) else: diff --git a/src/share/inner_table/ob_inner_table_schema.12301_12350.cpp b/src/share/inner_table/ob_inner_table_schema.12301_12350.cpp index 7d9ffeca97..931194fd8a 100644 --- a/src/share/inner_table/ob_inner_table_schema.12301_12350.cpp +++ b/src/share/inner_table/ob_inner_table_schema.12301_12350.cpp @@ -1550,7 +1550,7 @@ int ObInnerTableSchema::all_virtual_restore_job_schema(ObTableSchema &table_sche if (OB_SUCC(ret)) { ObObj value_default; - value_default.set_lob_value(ObLongTextType, "", strlen("")); + value_default.set_lob_value(ObLongTextType, "", static_cast(strlen(""))); ADD_COLUMN_SCHEMA_T("value", //column_name ++column_id, //column_id 0, //rowkey_id diff --git a/src/share/inner_table/ob_inner_table_schema.151_200.cpp b/src/share/inner_table/ob_inner_table_schema.151_200.cpp index 6e812f26c8..bcb49c9769 100644 --- a/src/share/inner_table/ob_inner_table_schema.151_200.cpp +++ b/src/share/inner_table/ob_inner_table_schema.151_200.cpp @@ -2901,7 +2901,7 @@ int ObInnerTableSchema::all_restore_job_schema(ObTableSchema &table_schema) if (OB_SUCC(ret)) { ObObj value_default; - value_default.set_lob_value(ObLongTextType, "", strlen("")); + value_default.set_lob_value(ObLongTextType, "", static_cast(strlen(""))); ADD_COLUMN_SCHEMA_T("value", //column_name ++column_id, //column_id 0, //rowkey_id diff --git a/src/share/inner_table/ob_inner_table_schema.401_450.cpp b/src/share/inner_table/ob_inner_table_schema.401_450.cpp index 08b710a76d..9783f1e948 100644 --- a/src/share/inner_table/ob_inner_table_schema.401_450.cpp +++ b/src/share/inner_table/ob_inner_table_schema.401_450.cpp @@ -5787,7 +5787,7 @@ int ObInnerTableSchema::all_tenant_rewrite_rules_schema(ObTableSchema &table_sch if (OB_SUCC(ret)) { ObObj fixed_param_infos_default; - fixed_param_infos_default.set_lob_value(ObLongTextType, "", strlen("")); + fixed_param_infos_default.set_lob_value(ObLongTextType, "", static_cast(strlen(""))); ADD_COLUMN_SCHEMA_T("fixed_param_infos", //column_name ++column_id, //column_id 0, //rowkey_id @@ -5806,7 +5806,7 @@ int ObInnerTableSchema::all_tenant_rewrite_rules_schema(ObTableSchema &table_sch if (OB_SUCC(ret)) { ObObj dynamic_param_infos_default; - dynamic_param_infos_default.set_lob_value(ObLongTextType, "", strlen("")); + dynamic_param_infos_default.set_lob_value(ObLongTextType, "", static_cast(strlen(""))); ADD_COLUMN_SCHEMA_T("dynamic_param_infos", //column_name ++column_id, //column_id 0, //rowkey_id @@ -5825,7 +5825,7 @@ int ObInnerTableSchema::all_tenant_rewrite_rules_schema(ObTableSchema &table_sch if (OB_SUCC(ret)) { ObObj def_name_ctx_str_default; - def_name_ctx_str_default.set_lob_value(ObLongTextType, "", strlen("")); + def_name_ctx_str_default.set_lob_value(ObLongTextType, "", static_cast(strlen(""))); ADD_COLUMN_SCHEMA_T("def_name_ctx_str", //column_name ++column_id, //column_id 0, //rowkey_id