From 31023a936186d7cfcde6591bea698f44ad2c1720 Mon Sep 17 00:00:00 2001 From: xiaoleizi2016 Date: Wed, 19 Oct 2022 10:03:27 +0800 Subject: [PATCH] fix annotation error 1019 --- src/obproxy/dbconfig/ob_proxy_db_config_processor.cpp | 2 +- src/obproxy/ob_proxy_main.cpp | 2 +- src/obproxy/obutils/ob_config_server_processor.cpp | 2 +- src/obproxy/obutils/ob_log_file_processor.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/obproxy/dbconfig/ob_proxy_db_config_processor.cpp b/src/obproxy/dbconfig/ob_proxy_db_config_processor.cpp index 34a5fc1..2de2cc6 100644 --- a/src/obproxy/dbconfig/ob_proxy_db_config_processor.cpp +++ b/src/obproxy/dbconfig/ob_proxy_db_config_processor.cpp @@ -76,7 +76,7 @@ int ObDbConfigProcessor::init(const int64_t client_count, int64_t startup_time_u if (OB_SUCC(ret)) { if (get_global_proxy_config().use_local_dbconfig && OB_FAIL(get_global_inotify_processor().init())) { - LOG_WARN("fail to init initify processor", K(ret)); + LOG_WARN("fail to init inotify processor", K(ret)); } } return ret; diff --git a/src/obproxy/ob_proxy_main.cpp b/src/obproxy/ob_proxy_main.cpp index ceb8739..340b7b8 100644 --- a/src/obproxy/ob_proxy_main.cpp +++ b/src/obproxy/ob_proxy_main.cpp @@ -311,7 +311,7 @@ int ObProxyMain::parse_cmd_line(const int argc, char *const argv[], ObProxyOptio if (0 == c) { if (OB_FAIL(parse_short_opt(long_opts[long_opts_idx].val, optarg, opts))) { - MPRINT("fail to parse long opt, ret=%d", ret); + MPRINT("fail to parse short opt, ret=%d", ret); break; } } else { diff --git a/src/obproxy/obutils/ob_config_server_processor.cpp b/src/obproxy/obutils/ob_config_server_processor.cpp index f35d0a9..38d158f 100644 --- a/src/obproxy/obutils/ob_config_server_processor.cpp +++ b/src/obproxy/obutils/ob_config_server_processor.cpp @@ -1868,7 +1868,7 @@ int ObConfigServerProcessor::parse_json_config_info(const ObString &json, const bool is_metadb_changed = false; if (OB_ISNULL(json_info = op_alloc(ObProxyJsonConfigInfo))) { ret = OB_ALLOCATE_MEMORY_FAILED; - LOG_ERROR("fail to alloc mem fot json config info", K(ret)); + LOG_ERROR("fail to alloc mem for json config info", K(ret)); } else if (OB_FAIL(json_info->parse(root))) { LOG_WARN("fail to parse json info", K(ret)); } else if (!json_info->is_valid()) { diff --git a/src/obproxy/obutils/ob_log_file_processor.cpp b/src/obproxy/obutils/ob_log_file_processor.cpp index 29e741a..21b46ca 100644 --- a/src/obproxy/obutils/ob_log_file_processor.cpp +++ b/src/obproxy/obutils/ob_log_file_processor.cpp @@ -90,7 +90,7 @@ int ObLogFileProcessor::start_cleanup_log_file() LOG_WARN("log file processor is not inited", K(ret)); } else if (OB_UNLIKELY(NULL != cleanup_cont_)) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("log file cleanup task has already been schuduled", K_(cleanup_cont), K(ret)); + LOG_WARN("log file cleanup task has already been scheduled", K_(cleanup_cont), K(ret)); } else { int64_t interval_us = get_global_proxy_config().log_cleanup_interval; if (OB_ISNULL(cleanup_cont_ = ObAsyncCommonTask::create_and_start_repeat_task(interval_us, @@ -98,7 +98,7 @@ int ObLogFileProcessor::start_cleanup_log_file() ObLogFileProcessor::do_repeat_task, ObLogFileProcessor::update_interval))) { ret = OB_ERR_UNEXPECTED; - LOG_WARN("fail to create and start cleanup task", K(interval_us), K(ret)); + LOG_WARN("fail to create and start log cleanup task", K(interval_us), K(ret)); } else { LOG_INFO("succ to create and start log cleanup task", K(interval_us)); } -- GitLab