hcq/oceanbase
hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add ob-deploy and obclient logic when public

Browse Source
This commit is contained in:
LINxiansheng 2022-11-13 02:42:49 +08:00 committed by wangzelin.wzl
parent d67fe0af6e
commit 589a5e707b
5 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deps/init/oceanbase.el7.aarch64.deps vendored
View File

@ -3,15 +3,6 @@ os=7
arch=aarch64
repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/7/aarch64/
[target-community]
os=7
arch=aarch64
repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/7/aarch64/
[target-tbsite]
os=7
arch=aarch64
repo=http://yum.tbsite.net/taobao/7/aarch64/test/ob-deploy/
[deps]
devdeps-gtest-1.8.0-132022101316.el7.aarch64.rpm
@ -44,4 +35,5 @@ devdeps-oblogmsg-1.0-42022101823.el7.aarch64.rpm
devdeps-rocksdb-6.22.1.1-52022100420.el7.aarch64.rpm
[test-utils]
#ob-deploy-1.5.0-12.el7.aarch64.rpm target=community
ob-deploy-1.6.0-41.el7.aarch64.rpm
obclient-2.0.2-3.el7.aarch64.rpm

7
deps/init/oceanbase.el7.x86_64.deps vendored
View File

@ -3,10 +3,6 @@ os=7
arch=x86_64
repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/7/x86_64/
[target-community]
os=7
arch=x86_64
repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/7/x86_64/
[deps]
devdeps-gtest-1.8.0-132022101316.el7.x86_64.rpm
@ -40,4 +36,5 @@ devdeps-oblogmsg-1.0-42022101823.el7.x86_64.rpm
devdeps-rocksdb-6.22.1.1-52022100420.el7.x86_64.rpm
[test-utils]
ob-deploy-1.6.0-41.el7.x86_64.rpm
obclient-2.0.2-3.el7.x86_64.rpm

7
deps/init/oceanbase.el8.aarch64.deps vendored
View File

@ -3,10 +3,6 @@ os=8
arch=aarch64
repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/8/aarch64/
[target-community]
os=8
arch=aarch64
repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/8/aarch64/
[deps]
devdeps-gtest-1.8.0-132022101316.el8.aarch64.rpm
@ -39,4 +35,5 @@ devdeps-oblogmsg-1.0-42022101823.el8.aarch64.rpm
devdeps-rocksdb-6.22.1.1-52022100420.el8.aarch64.rpm
[test-utils]
#ob-deploy-1.5.0-12.el8.aarch64.rpm target=community
ob-deploy-1.6.0-41.el8.aarch64.rpm
obclient-2.0.2-3.el8.aarch64.rpm

7
deps/init/oceanbase.el8.x86_64.deps vendored
View File

@ -3,10 +3,6 @@ os=8
arch=x86_64
repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/8/x86_64/
[target-community]
os=8
arch=x86_64
repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/8/x86_64/
[deps]
devdeps-gtest-1.8.0-132022101316.el8.x86_64.rpm
@ -40,4 +36,5 @@ devdeps-oblogmsg-1.0-42022101823.el8.x86_64.rpm
devdeps-rocksdb-6.22.1.1-52022100420.el8.x86_64.rpm
[test-utils]
#ob-deploy-1.5.0-12.el8.x86_64.rpm target=community
ob-deploy-1.6.0-41.el8.x86_64.rpm
obclient-2.0.2-3.el8.x86_64.rpm

18
src/sql/engine/expr/ob_expr_to_outfile_row.cpp
View File

@ -37,9 +37,9 @@ ObExprToOutfileRow::~ObExprToOutfileRow()
}
int ObExprToOutfileRow::calc_result_typeN(ObExprResType &type,
ObExprResType *types,
int64_t param_num,
ObExprTypeCtx &type_ctx) const
ObExprResType *types,
int64_t param_num,
ObExprTypeCtx &type_ctx) const
{
//objs[0] field_str varchar
//objs[1] line_str varchar
@ -96,9 +96,9 @@ int ObExprToOutfileRow::extend_buffer(ObExprOutFileInfo &out_info,
{
int ret = OB_SUCCESS;
int64_t old_len = out_info.buf_len_;
int64_t new_len = (old_len == 0) ? OB_MALLOC_MIDDLE_BLOCK_SIZE : old_len * 2;
if (OB_ISNULL(out_info.buf_ = static_cast<char*>(allocator.alloc(new_len)))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
int64_t new_len = (old_len == 0) ? OB_MALLOC_MIDDLE_BLOCK_SIZE : old_len * 2;
if (OB_ISNULL(out_info.buf_ = static_cast<char*>(allocator.alloc(new_len)))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("fail to allocate memory", K(ret), K(old_len), K(new_len));
} else if (OB_ISNULL(out_info.tmp_buf_ = static_cast<char*>(allocator.alloc(new_len)))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
@ -154,9 +154,9 @@ int ObExprToOutfileRow::to_outfile_str(const ObExpr &expr, ObEvalCtx &ctx, ObDat
{
int ret = OB_SUCCESS;
if (OB_UNLIKELY(expr.arg_cnt_ <= PARAM_SELECT_ITEM)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("Invalid argument", K(ret));
} else if (OB_FAIL(expr.eval_param_value(ctx))) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("Invalid argument", K(ret));
} else if (OB_FAIL(expr.eval_param_value(ctx))) {
LOG_WARN("evaluate parameters values failed", K(ret));
} else {
ObExprOutFileInfo *out_info = NULL;