Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
oceanbase
obproxy
提交
ff0d6448
O
obproxy
项目概览
oceanbase
/
obproxy
1 年多 前同步成功
通知
11
Star
100
Fork
70
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obproxy
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
未验证
提交
ff0d6448
编写于
11月 11, 2022
作者:
LINGuanRen
提交者:
GitHub
11月 11, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #31 from xiaoleizi2016/issue_29
fix annotation error 1019
上级
9d5c90e5
a585d2d0
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
6 addition
and
6 deletion
+6
-6
src/obproxy/iocore/eventsystem/ob_ethread.cpp
src/obproxy/iocore/eventsystem/ob_ethread.cpp
+1
-1
src/obproxy/ob_proxy_main.cpp
src/obproxy/ob_proxy_main.cpp
+1
-1
src/obproxy/obutils/ob_config_server_processor.cpp
src/obproxy/obutils/ob_config_server_processor.cpp
+1
-1
src/obproxy/obutils/ob_log_file_processor.cpp
src/obproxy/obutils/ob_log_file_processor.cpp
+2
-2
src/obproxy/proxy/client/ob_client_vc.cpp
src/obproxy/proxy/client/ob_client_vc.cpp
+1
-1
未找到文件。
src/obproxy/iocore/eventsystem/ob_ethread.cpp
浏览文件 @
ff0d6448
...
@@ -289,7 +289,7 @@ inline void ObEThread::process_event(ObEvent *e, const int calling_code)
...
@@ -289,7 +289,7 @@ inline void ObEThread::process_event(ObEvent *e, const int calling_code)
if
(
OB_UNLIKELY
(
e
->
in_the_priority_queue_
))
{
if
(
OB_UNLIKELY
(
e
->
in_the_priority_queue_
))
{
LOG_WARN
(
"event should not in in_the_priority_queue here"
,
K
(
*
e
));
LOG_WARN
(
"event should not in in_the_priority_queue here"
,
K
(
*
e
));
}
else
if
(
OB_UNLIKELY
(
c_temp
!=
e
->
continuation_
))
{
}
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*/
}
}
else
{
/*do nothing*/
}
MUTEX_RELEASE
(
lock
);
MUTEX_RELEASE
(
lock
);
...
...
src/obproxy/ob_proxy_main.cpp
浏览文件 @
ff0d6448
...
@@ -311,7 +311,7 @@ int ObProxyMain::parse_cmd_line(const int argc, char *const argv[], ObProxyOptio
...
@@ -311,7 +311,7 @@ int ObProxyMain::parse_cmd_line(const int argc, char *const argv[], ObProxyOptio
if
(
0
==
c
)
{
if
(
0
==
c
)
{
if
(
OB_FAIL
(
parse_short_opt
(
long_opts
[
long_opts_idx
].
val
,
optarg
,
opts
)))
{
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
;
break
;
}
}
}
else
{
}
else
{
...
...
src/obproxy/obutils/ob_config_server_processor.cpp
浏览文件 @
ff0d6448
...
@@ -1868,7 +1868,7 @@ int ObConfigServerProcessor::parse_json_config_info(const ObString &json, const
...
@@ -1868,7 +1868,7 @@ int ObConfigServerProcessor::parse_json_config_info(const ObString &json, const
bool
is_metadb_changed
=
false
;
bool
is_metadb_changed
=
false
;
if
(
OB_ISNULL
(
json_info
=
op_alloc
(
ObProxyJsonConfigInfo
)))
{
if
(
OB_ISNULL
(
json_info
=
op_alloc
(
ObProxyJsonConfigInfo
)))
{
ret
=
OB_ALLOCATE_MEMORY_FAILED
;
ret
=
OB_ALLOCATE_MEMORY_FAILED
;
LOG_ERROR
(
"fail to alloc mem fo
t
json config info"
,
K
(
ret
));
LOG_ERROR
(
"fail to alloc mem fo
r
json config info"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
json_info
->
parse
(
root
)))
{
}
else
if
(
OB_FAIL
(
json_info
->
parse
(
root
)))
{
LOG_WARN
(
"fail to parse json info"
,
K
(
ret
));
LOG_WARN
(
"fail to parse json info"
,
K
(
ret
));
}
else
if
(
!
json_info
->
is_valid
())
{
}
else
if
(
!
json_info
->
is_valid
())
{
...
...
src/obproxy/obutils/ob_log_file_processor.cpp
浏览文件 @
ff0d6448
...
@@ -90,7 +90,7 @@ int ObLogFileProcessor::start_cleanup_log_file()
...
@@ -90,7 +90,7 @@ int ObLogFileProcessor::start_cleanup_log_file()
LOG_WARN
(
"log file processor is not inited"
,
K
(
ret
));
LOG_WARN
(
"log file processor is not inited"
,
K
(
ret
));
}
else
if
(
OB_UNLIKELY
(
NULL
!=
cleanup_cont_
))
{
}
else
if
(
OB_UNLIKELY
(
NULL
!=
cleanup_cont_
))
{
ret
=
OB_ERR_UNEXPECTED
;
ret
=
OB_ERR_UNEXPECTED
;
LOG_WARN
(
"log file cleanup task has already been sch
u
duled"
,
K_
(
cleanup_cont
),
K
(
ret
));
LOG_WARN
(
"log file cleanup task has already been sch
e
duled"
,
K_
(
cleanup_cont
),
K
(
ret
));
}
else
{
}
else
{
int64_t
interval_us
=
get_global_proxy_config
().
log_cleanup_interval
;
int64_t
interval_us
=
get_global_proxy_config
().
log_cleanup_interval
;
if
(
OB_ISNULL
(
cleanup_cont_
=
ObAsyncCommonTask
::
create_and_start_repeat_task
(
interval_us
,
if
(
OB_ISNULL
(
cleanup_cont_
=
ObAsyncCommonTask
::
create_and_start_repeat_task
(
interval_us
,
...
@@ -98,7 +98,7 @@ int ObLogFileProcessor::start_cleanup_log_file()
...
@@ -98,7 +98,7 @@ int ObLogFileProcessor::start_cleanup_log_file()
ObLogFileProcessor
::
do_repeat_task
,
ObLogFileProcessor
::
do_repeat_task
,
ObLogFileProcessor
::
update_interval
)))
{
ObLogFileProcessor
::
update_interval
)))
{
ret
=
OB_ERR_UNEXPECTED
;
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
{
}
else
{
LOG_INFO
(
"succ to create and start log cleanup task"
,
K
(
interval_us
));
LOG_INFO
(
"succ to create and start log cleanup task"
,
K
(
interval_us
));
}
}
...
...
src/obproxy/proxy/client/ob_client_vc.cpp
浏览文件 @
ff0d6448
...
@@ -665,7 +665,7 @@ int ObMysqlClient::do_post_request()
...
@@ -665,7 +665,7 @@ int ObMysqlClient::do_post_request()
}
}
case
CLIENT_ACTION_READ_NORMAL_RESP
:
{
case
CLIENT_ACTION_READ_NORMAL_RESP
:
{
if
(
OB_FAIL
(
setup_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
()))
{
}
else
if
(
OB_FAIL
(
schedule_active_timeout
()))
{
LOG_WARN
(
"fail to schedule_active_timeout"
,
K
(
ret
));
LOG_WARN
(
"fail to schedule_active_timeout"
,
K
(
ret
));
}
else
if
(
OB_FAIL
(
forward_mysql_request
()))
{
}
else
if
(
OB_FAIL
(
forward_mysql_request
()))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录