Merge pull request #31 from xiaoleizi2016/issue_29

fix annotation error 1019

src/obproxy/iocore/eventsystem/ob_ethread.cpp

@@ -289,7 +289,7 @@ inline void ObEThread::process_event(ObEvent *e, const int calling_code)
         if (OB_UNLIKELY(e->in_the_priority_queue_)) {
           LOG_WARN("event should not in in_the_priority_queue here", K(*e));
         } else if (OB_UNLIKELY(c_temp != e->continuation_)) {
-          LOG_WARN("event should not in in_the_priority_queue here", K(*e));
+          LOG_WARN("c_temp should equal e->continuation_", K(*e));
         } else {/*do nothing*/}
         MUTEX_RELEASE(lock);
 

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 {

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()) {

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));
     }

src/obproxy/proxy/client/ob_client_vc.cpp

@@ -665,7 +665,7 @@ int ObMysqlClient::do_post_request()
     }
     case CLIENT_ACTION_READ_NORMAL_RESP: {
      if (OB_FAIL(setup_read_normal_resp())) {
-        LOG_WARN("fail to setup read handshake", K(ret));
+        LOG_WARN("fail to setup read normal resp", K(ret));
       } else if (OB_FAIL(schedule_active_timeout())) {
         LOG_WARN("fail to schedule_active_timeout", K(ret));
       } else if (OB_FAIL(forward_mysql_request())) {