Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
oceanbase
obproxy
提交
5d57e2ad
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看板
提交
5d57e2ad
编写于
6月 05, 2021
作者:
S
shenchai
提交者:
guangshu.wgs
6月 07, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix coverity problem
上级
de1c5e36
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
33 addition
and
9 deletion
+33
-9
src/common/ob_obj_cast.cpp
src/common/ob_obj_cast.cpp
+1
-1
src/lib/compress/zlib/compress.c
src/lib/compress/zlib/compress.c
+1
-1
src/lib/compress/zlib/uncompr.c
src/lib/compress/zlib/uncompr.c
+1
-0
src/lib/objectpool/ob_concurrency_objpool.h
src/lib/objectpool/ob_concurrency_objpool.h
+3
-0
src/lib/oblog/ob_log.cpp
src/lib/oblog/ob_log.cpp
+2
-2
src/lib/utility/utility.cpp
src/lib/utility/utility.cpp
+1
-1
src/obproxy/engine/ob_proxy_operator_sort.cpp
src/obproxy/engine/ob_proxy_operator_sort.cpp
+11
-1
src/obproxy/engine/ob_proxy_operator_sort.h
src/obproxy/engine/ob_proxy_operator_sort.h
+1
-1
src/obproxy/iocore/net/ob_connection.cpp
src/obproxy/iocore/net/ob_connection.cpp
+1
-1
src/obproxy/iocore/net/ob_inet.h
src/obproxy/iocore/net/ob_inet.h
+11
-1
未找到文件。
src/common/ob_obj_cast.cpp
浏览文件 @
5d57e2ad
...
...
@@ -107,7 +107,7 @@ static int copy_string(const ObObjCastParams ¶ms,
}
else
{
int64_t
zf
=
params
.
zf_info_
->
max_length_
-
len
;
if
(
zf
>
0
)
{
MEMSET
(
buf
,
'0'
,
zf
);
MEMSET
(
buf
,
0
,
zf
);
MEMCPY
(
buf
+
zf
,
str
,
len
);
len
=
str_len
;
// set string length
}
else
{
...
...
src/lib/compress/zlib/compress.c
浏览文件 @
5d57e2ad
...
...
@@ -28,7 +28,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
{
z_stream
stream
;
int
err
;
stream
.
total_out
=
0
;
stream
.
next_in
=
(
z_const
Bytef
*
)
source
;
stream
.
avail_in
=
(
uInt
)
sourceLen
;
#ifdef MAXSEG_64K
...
...
src/lib/compress/zlib/uncompr.c
浏览文件 @
5d57e2ad
...
...
@@ -30,6 +30,7 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen)
z_stream
stream
;
int
err
;
stream
.
total_out
=
0
;
stream
.
next_in
=
(
z_const
Bytef
*
)
source
;
stream
.
avail_in
=
(
uInt
)
sourceLen
;
/* Check for source > 64K on 16-bit machine: */
...
...
src/lib/objectpool/ob_concurrency_objpool.h
浏览文件 @
5d57e2ad
...
...
@@ -417,6 +417,9 @@ public:
instance
=
NULL
;
ATOMIC_BCAS
(
&
once_
,
1
,
0
);
}
else
{
if
(
instance_
!=
NULL
)
{
delete
instance_
;
}
instance_
=
instance
;
(
void
)
ATOMIC_BCAS
(
&
once_
,
1
,
2
);
}
...
...
src/lib/oblog/ob_log.cpp
浏览文件 @
5d57e2ad
...
...
@@ -1528,10 +1528,10 @@ void ObLogger::do_async_flush_to_file(ObLogItem **log_item, const int64_t count)
}
}
struct
iovec
vec
[
MAX_FD_FILE
][
GROUP_COMMIT_MAX_ITEM_COUNT
];
struct
iovec
vec
[
MAX_FD_FILE
][
GROUP_COMMIT_MAX_ITEM_COUNT
]
=
{
0
}
;
int
iovcnt
[
MAX_FD_FILE
]
=
{
0
};
int
large_iovcnt
[
MAX_FD_FILE
]
=
{
0
};
struct
iovec
wf_vec
[
MAX_FD_FILE
][
GROUP_COMMIT_MAX_ITEM_COUNT
];
struct
iovec
wf_vec
[
MAX_FD_FILE
][
GROUP_COMMIT_MAX_ITEM_COUNT
]
=
{
0
}
;
int
wf_iovcnt
[
MAX_FD_FILE
]
=
{
0
};
ObLogFDType
fd_type
=
MAX_FD_FILE
;
...
...
src/lib/utility/utility.cpp
浏览文件 @
5d57e2ad
...
...
@@ -1230,7 +1230,7 @@ static int read_pid(const char *pidfile, long &pid)
pid
=
strtol
(
buf
,
NULL
,
10
);
}
if
(
fd
>
0
)
{
if
(
fd
>
=
0
)
{
close
(
fd
);
}
...
...
src/obproxy/engine/ob_proxy_operator_sort.cpp
浏览文件 @
5d57e2ad
...
...
@@ -370,7 +370,17 @@ ObBaseSort::ObBaseSort(SortColumnArray &sort_columns, common::ObIAllocator &allo
*
err_
=
common
::
OB_SUCCESS
;
*
sort_err_
=
common
::
OB_SUCCESS
;
}
ObBaseSort
::~
ObBaseSort
()
{
if
(
err_
!=
NULL
)
{
delete
err_
;
err_
=
NULL
;
}
if
(
sort_err_
!=
NULL
)
{
delete
sort_err_
;
sort_err_
=
NULL
;
}
}
bool
ObBaseSort
::
compare_row
(
ResultRow
&
row1
,
ResultRow
&
row2
,
int
&
ret
)
//row1 <= row2 true, row1 > row2 false
{
*
err_
=
common
::
OB_SUCCESS
;
...
...
src/obproxy/engine/ob_proxy_operator_sort.h
浏览文件 @
5d57e2ad
...
...
@@ -141,7 +141,7 @@ class ObBaseSort
{
public:
ObBaseSort
(
SortColumnArray
&
sort_columns
,
common
::
ObIAllocator
&
allocator_
,
ResultRows
&
sort_rows
);
virtual
~
ObBaseSort
()
{}
;
virtual
~
ObBaseSort
();
virtual
void
set_sort_columns
(
SortColumnArray
&
sort_columns
)
{
...
...
src/obproxy/iocore/net/ob_connection.cpp
浏览文件 @
5d57e2ad
...
...
@@ -358,7 +358,7 @@ int ObServerConnection::accept(ObConnection *c)
ret
=
OB_INVALID_ARGUMENT
;
PROXY_SOCK_LOG
(
WARN
,
"invalid argument conn"
,
K
(
c
),
K
(
ret
));
}
else
{
int64_t
sz
=
sizeof
(
c
->
addr_
);
int64_t
sz
=
sizeof
(
c
->
addr_
.
sa_
);
if
(
OB_FAIL
(
ObSocketManager
::
accept
(
fd_
,
&
c
->
addr_
.
sa_
,
&
sz
,
c
->
fd_
)))
{
if
(
OB_SYS_EAGAIN
!=
ret
)
{
PROXY_SOCK_LOG
(
WARN
,
"fail to accept"
,
K
(
fd_
),
K
(
ret
));
...
...
src/obproxy/iocore/net/ob_inet.h
浏览文件 @
5d57e2ad
...
...
@@ -544,6 +544,7 @@ inline bool ops_is_ip_any(const sockaddr &ip)
inline
bool
ops_ip_copy
(
sockaddr
&
dst
,
const
sockaddr
&
src
)
{
int64_t
n
=
0
;
int64_t
n2
=
0
;
switch
(
src
.
sa_family
)
{
case
AF_INET
:
n
=
sizeof
(
sockaddr_in
);
...
...
@@ -553,7 +554,16 @@ inline bool ops_ip_copy(sockaddr &dst, const sockaddr &src)
n
=
sizeof
(
sockaddr_in6
);
break
;
}
if
(
n
)
{
switch
(
dst
.
sa_family
)
{
case
AF_INET
:
n2
=
sizeof
(
sockaddr_in
);
break
;
case
AF_INET6
:
n2
=
sizeof
(
sockaddr_in6
);
break
;
}
if
(
n
&&
n
<=
n2
)
{
MEMCPY
(
&
dst
,
&
src
,
n
);
#if HAVE_STRUCT_SOCKADDR_SA_LEN
dst
.
sa_len
=
n
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录