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

Fix the compilation bug when download obdeploy

Browse Source
This commit is contained in:
LINxiansheng
2022-11-14 03:10:44 +00:00
committed by wangzelin.wzl
parent 610919b622
commit ae36be9c5b
5 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,10 @@ 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/
[deps]
devdeps-gtest-1.8.0-132022101316.el7.aarch64.rpm
@ -35,5 +39,5 @@ devdeps-oblogmsg-1.0-42022101823.el7.aarch64.rpm
devdeps-rocksdb-6.22.1.1-52022100420.el7.aarch64.rpm
[test-utils]
ob-deploy-1.6.0-41.el7.aarch64.rpm
obclient-2.0.2-3.el7.aarch64.rpm
ob-deploy-1.6.0-41.el7.aarch64.rpm target=community
obclient-2.0.2-3.el7.aarch64.rpm target=community

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

@ -4,6 +4,11 @@ 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
devdeps-isa-l-static-2.22.0-22022092915.el7.x86_64.rpm
@ -36,5 +41,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
ob-deploy-1.6.0-41.el7.x86_64.rpm target=community
obclient-2.0.2-3.el7.x86_64.rpm target=community

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

@ -3,6 +3,10 @@ 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
@ -35,5 +39,5 @@ devdeps-oblogmsg-1.0-42022101823.el8.aarch64.rpm
devdeps-rocksdb-6.22.1.1-52022100420.el8.aarch64.rpm
[test-utils]
ob-deploy-1.6.0-41.el8.aarch64.rpm
obclient-2.0.2-3.el8.aarch64.rpm
ob-deploy-1.6.0-41.el8.aarch64.rpm target=community
obclient-2.0.2-3.el8.aarch64.rpm target=community

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

@ -3,6 +3,10 @@ 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
@ -36,5 +40,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.6.0-41.el8.x86_64.rpm
obclient-2.0.2-3.el8.x86_64.rpm
ob-deploy-1.6.0-41.el8.x86_64.rpm target=community
obclient-2.0.2-3.el8.x86_64.rpm target=community

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

@ -49,9 +49,9 @@ int ObExprToOutfileRow::calc_result_typeN(ObExprResType &type,
//objs[5:] params
int ret = OB_SUCCESS;
UNUSED(type_ctx);
if (OB_UNLIKELY(param_num <= PARAM_SELECT_ITEM)) {
ret = OB_INVALID_ARGUMENT_NUM;
LOG_WARN("invalid argument number", K(ret), K(param_num));
if (OB_UNLIKELY(param_num <= PARAM_SELECT_ITEM)) {
ret = OB_INVALID_ARGUMENT_NUM;
LOG_WARN("invalid argument number", K(ret), K(param_num));
} else {
// deduce type and length
type.set_varbinary();
@ -84,9 +84,9 @@ int ObExprToOutfileRow::cg_expr(ObExprCGCtx &, const ObRawExpr &, ObExpr &expr)
if (!expr.args_[i]->is_static_const_) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("non-const format not supported", K(ret));
}
}
expr.eval_func_ = &to_outfile_str;
}
}
expr.eval_func_ = &to_outfile_str;
}
return ret;
}
@ -166,9 +166,9 @@ int ObExprToOutfileRow::to_outfile_str(const ObExpr &expr, ObEvalCtx &ctx, ObDat
if (OB_FAIL(ctx.exec_ctx_.create_expr_op_ctx(rt_ctx_id, out_info))) {
LOG_WARN("failed to create operator ctx", K(ret));
} else if (OB_FAIL(calc_outfile_info(expr, ctx,
ctx.exec_ctx_.get_allocator(), *out_info))) {
LOG_WARN("fail calc outfile info", K(ret));
}
ctx.exec_ctx_.get_allocator(), *out_info))) {
LOG_WARN("fail calc outfile info", K(ret));
}
}
if (OB_SUCC(ret)) {
do {