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

[CP][to #46200224]support unsigned type for execute

Browse Source
This commit is contained in:
LiuYoung00
2023-07-19 06:42:34 +00:00
committed by ob-robot
parent 13ebc1f959
commit 2e8d3edd50
5 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/observer/mysql/obmp_stmt_execute.cpp
View File

@ -631,6 +631,7 @@ int ObMPStmtExecute::parse_request_type(const char* &pos,
for (int i = 0; OB_SUCC(ret) && i < num_of_params; ++i) { for (int i = 0; OB_SUCC(ret) && i < num_of_params; ++i) {
uint8_t type = 0; uint8_t type = 0;
int8_t flag = 0; int8_t flag = 0;
TypeInfo &type_name_info = param_type_infos.at(i);
if (1 == new_param_bound_flag) { if (1 == new_param_bound_flag) {
PS_DEFENSE_CHECK(2) // type(1) + flag(1) PS_DEFENSE_CHECK(2) // type(1) + flag(1)
{ {
@ -638,6 +639,16 @@ int ObMPStmtExecute::parse_request_type(const char* &pos,
ObMySQLUtil::get_int1(pos, flag); ObMySQLUtil::get_int1(pos, flag);
if (OB_FAIL(param_types.push_back(static_cast<EMySQLFieldType>(type)))) { if (OB_FAIL(param_types.push_back(static_cast<EMySQLFieldType>(type)))) {
LOG_WARN("fail to push back", K(type), K(i)); LOG_WARN("fail to push back", K(type), K(i));
} else if (EMySQLFieldType::MYSQL_TYPE_COMPLEX != type) {
int16_t unsigned_flag = 128;
ObObjType ob_elem_type;
if (OB_FAIL(ObSMUtils::get_ob_type(ob_elem_type,
static_cast<EMySQLFieldType>(type),
flag & unsigned_flag ? true : false))) {
LOG_WARN("get ob type fail. ", K(type));
} else {
type_name_info.elem_type_.set_obj_type(ob_elem_type);
}
} }
} }
} else { } else {
@ -651,7 +662,7 @@ int ObMPStmtExecute::parse_request_type(const char* &pos,
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
TypeInfo &type_name_info = param_type_infos.at(i);
uint8_t elem_type = 0; uint8_t elem_type = 0;
if (EMySQLFieldType::MYSQL_TYPE_COMPLEX == type) { if (EMySQLFieldType::MYSQL_TYPE_COMPLEX == type) {
type_name_info.is_basic_type_ = false; type_name_info.is_basic_type_ = false;
@ -2068,7 +2079,8 @@ int ObMPStmtExecute::parse_basic_param_value(ObIAllocator &allocator,
const common::ObTimeZoneInfo *tz_info, const common::ObTimeZoneInfo *tz_info,
ObObj &param, ObObj &param,
bool is_complex_element, bool is_complex_element,
ObPSAnalysisChecker *checker) ObPSAnalysisChecker *checker,
bool is_unsigned)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
UNUSED(charset); UNUSED(charset);
@ -2077,7 +2089,7 @@ int ObMPStmtExecute::parse_basic_param_value(ObIAllocator &allocator,
case MYSQL_TYPE_SHORT: case MYSQL_TYPE_SHORT:
case MYSQL_TYPE_LONG: case MYSQL_TYPE_LONG:
case MYSQL_TYPE_LONGLONG: { case MYSQL_TYPE_LONGLONG: {
if (OB_FAIL(parse_integer_value(type, data, param, allocator, is_complex_element, checker))) { if (OB_FAIL(parse_integer_value(type, data, param, allocator, is_complex_element, checker, is_unsigned))) {
LOG_WARN("parse integer value from client failed", K(ret)); LOG_WARN("parse integer value from client failed", K(ret));
} }
break; break;
@ -2441,8 +2453,9 @@ int ObMPStmtExecute::parse_param_value(ObIAllocator &allocator,
OX (param.set_param_meta()); OX (param.set_param_meta());
} }
} else { } else {
bool is_unsigned = NULL == type_info || !type_info->elem_type_.get_meta_type().is_unsigned_integer() ? false : true;
if (OB_FAIL(parse_basic_param_value(allocator, type, charset, cs_type, ncs_type, if (OB_FAIL(parse_basic_param_value(allocator, type, charset, cs_type, ncs_type,
data, tz_info, param, false, &analysis_checker_))) { data, tz_info, param, false, &analysis_checker_, is_unsigned))) {
LOG_WARN("failed to parse basic param value", K(ret)); LOG_WARN("failed to parse basic param value", K(ret));
} else { } else {
param.set_param_meta(); param.set_param_meta();
@ -2531,8 +2544,9 @@ int ObMPStmtExecute::parse_param_value(ObIAllocator &allocator,
LOG_WARN("store string fail.", K(ret), K(stmt_id_), K(param_id)); LOG_WARN("store string fail.", K(ret), K(stmt_id_), K(param_id));
} else { } else {
const char* src = tmp; const char* src = tmp;
bool is_unsigned = NULL == type_info || !type_info->elem_type_.get_meta_type().is_unsigned_integer() ? false : true;
if (OB_FAIL(parse_basic_param_value(allocator, type, charset, cs_type, ncs_type, if (OB_FAIL(parse_basic_param_value(allocator, type, charset, cs_type, ncs_type,
src, tz_info, param, false))) { src, tz_info, param, false, NULL ,is_unsigned))) {
LOG_WARN("failed to parse basic param value", K(ret)); LOG_WARN("failed to parse basic param value", K(ret));
} else { } else {
param.set_param_meta(); param.set_param_meta();
@ -2608,18 +2622,20 @@ int ObMPStmtExecute::parse_integer_value(const uint32_t type,
ObObj &param, ObObj &param,
ObIAllocator &allocator, ObIAllocator &allocator,
bool is_complex_element, bool is_complex_element,
ObPSAnalysisChecker *checker) ObPSAnalysisChecker *checker,
bool is_unsigned) // oracle unsigned need
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
bool cast_to_number = !(lib::is_mysql_mode() || is_complex_element || MYSQL_TYPE_TINY == type); bool cast_to_number = !(lib::is_mysql_mode() || is_complex_element || MYSQL_TYPE_TINY == type);
int64_t res_val = 0; int64_t res_val = 0;
ObObjType unsigned_type = is_unsigned ? ObUInt64Type : ObNumberType;
switch(type) { switch(type) {
case MYSQL_TYPE_TINY: { case MYSQL_TYPE_TINY: {
PS_STATIC_DEFENSE_CHECK(checker, 1) PS_STATIC_DEFENSE_CHECK(checker, 1)
{ {
int8_t value; int8_t value;
ObMySQLUtil::get_int1(data, value); ObMySQLUtil::get_int1(data, value);
param.set_tinyint(value); is_unsigned ? param.set_utinyint(value) : param.set_tinyint(value);
} }
break; break;
} }
@ -2629,8 +2645,11 @@ int ObMPStmtExecute::parse_integer_value(const uint32_t type,
int16_t value = 0; int16_t value = 0;
ObMySQLUtil::get_int2(data, value); ObMySQLUtil::get_int2(data, value);
if (!cast_to_number) { if (!cast_to_number) {
param.set_smallint(value); is_unsigned ? param.set_usmallint(value) : param.set_smallint(value);
} else { } else {
if (is_unsigned) {
unsigned_type = ObUSmallIntType;
}
res_val = static_cast<int64_t>(value); res_val = static_cast<int64_t>(value);
} }
} }
@ -2642,8 +2661,11 @@ int ObMPStmtExecute::parse_integer_value(const uint32_t type,
int32_t value = 0; int32_t value = 0;
ObMySQLUtil::get_int4(data, value); ObMySQLUtil::get_int4(data, value);
if (!cast_to_number) { if (!cast_to_number) {
param.set_int32(value); is_unsigned ? param.set_uint32(value) : param.set_int32(value);
} else { } else {
if (is_unsigned) {
unsigned_type = ObUInt32Type;
}
res_val = static_cast<int64_t>(value); res_val = static_cast<int64_t>(value);
} }
} }
@ -2655,8 +2677,11 @@ int ObMPStmtExecute::parse_integer_value(const uint32_t type,
int64_t value = 0; int64_t value = 0;
ObMySQLUtil::get_int8(data, value); ObMySQLUtil::get_int8(data, value);
if (!cast_to_number) { if (!cast_to_number) {
param.set_int(value); is_unsigned ? param.set_uint(ObUInt64Type, value) : param.set_int(value);
} else { } else {
if (is_unsigned) {
unsigned_type = ObUInt64Type;
}
res_val = value; res_val = value;
} }
} }
@ -2672,10 +2697,14 @@ int ObMPStmtExecute::parse_integer_value(const uint32_t type,
number::ObNumber nb; number::ObNumber nb;
if (OB_FAIL(nb.from(res_val, allocator))) { if (OB_FAIL(nb.from(res_val, allocator))) {
LOG_WARN("decode param to number failed", K(ret), K(res_val)); LOG_WARN("decode param to number failed", K(ret), K(res_val));
} else {
if (is_unsigned) {
param.set_number(unsigned_type, nb);
} else { } else {
param.set_number(nb); param.set_number(nb);
} }
} }
}
return ret; return ret;
} }

6
src/observer/mysql/obmp_stmt_execute.h
View File

@ -103,7 +103,8 @@ public:
const common::ObTimeZoneInfo *tz_info, const common::ObTimeZoneInfo *tz_info,
ObObj &param, ObObj &param,
bool is_complex_element = false, bool is_complex_element = false,
ObPSAnalysisChecker *checker = nullptr); ObPSAnalysisChecker *checker = nullptr,
bool is_unsigned = false);
static int parse_mysql_timestamp_value(const obmysql::EMySQLFieldType field_type, static int parse_mysql_timestamp_value(const obmysql::EMySQLFieldType field_type,
const char *&data, const char *&data,
ObObj &param, ObObj &param,
@ -114,7 +115,8 @@ public:
ObObj &param, ObObj &param,
ObIAllocator &allocator, ObIAllocator &allocator,
bool is_complex_element = false, bool is_complex_element = false,
ObPSAnalysisChecker *checker = nullptr); ObPSAnalysisChecker *checker = nullptr,
bool is_unsigned = false);
static int parse_oracle_timestamp_value(const obmysql::EMySQLFieldType field_type, const char *&data, static int parse_oracle_timestamp_value(const obmysql::EMySQLFieldType field_type, const char *&data,
const ObTimeConvertCtx &cvrt_ctx, ObObj &param, const ObTimeConvertCtx &cvrt_ctx, ObObj &param,
ObPSAnalysisChecker *checker = nullptr); ObPSAnalysisChecker *checker = nullptr);

10
src/observer/mysql/obsm_utils.cpp
View File

@ -404,7 +404,7 @@ int ObSMUtils::get_mysql_type(ObObjType ob_type, EMySQLFieldType &mysql_type,
return ret; return ret;
} }
int ObSMUtils::get_ob_type(ObObjType &ob_type, EMySQLFieldType mysql_type) int ObSMUtils::get_ob_type(ObObjType &ob_type, EMySQLFieldType mysql_type, const bool is_unsigned)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
switch (mysql_type) { switch (mysql_type) {
@ -412,16 +412,16 @@ int ObSMUtils::get_ob_type(ObObjType &ob_type, EMySQLFieldType mysql_type)
ob_type = ObNullType; ob_type = ObNullType;
break; break;
case EMySQLFieldType::MYSQL_TYPE_TINY: case EMySQLFieldType::MYSQL_TYPE_TINY:
ob_type = ObTinyIntType; ob_type = is_unsigned ? ObUTinyIntType : ObTinyIntType;
break; break;
case EMySQLFieldType::MYSQL_TYPE_SHORT: case EMySQLFieldType::MYSQL_TYPE_SHORT:
ob_type = ObSmallIntType; ob_type = is_unsigned ? ObUSmallIntType : ObSmallIntType;
break; break;
case EMySQLFieldType::MYSQL_TYPE_LONG: case EMySQLFieldType::MYSQL_TYPE_LONG:
ob_type = ObInt32Type; ob_type = is_unsigned ? ObUInt32Type : ObInt32Type;
break; break;
case EMySQLFieldType::MYSQL_TYPE_LONGLONG: case EMySQLFieldType::MYSQL_TYPE_LONGLONG:
ob_type = ObIntType; ob_type = is_unsigned ? ObUInt64Type : ObIntType;
break; break;
case EMySQLFieldType::MYSQL_TYPE_FLOAT: case EMySQLFieldType::MYSQL_TYPE_FLOAT:
ob_type = ObFloatType; ob_type = ObFloatType;

3
src/observer/mysql/obsm_utils.h
View File

@ -66,7 +66,8 @@ public:
static int get_mysql_type(ObObjType ob_type, obmysql::EMySQLFieldType &mysql_type, static int get_mysql_type(ObObjType ob_type, obmysql::EMySQLFieldType &mysql_type,
uint16_t &flags, ObScale &num_decimals); uint16_t &flags, ObScale &num_decimals);
static int get_ob_type(ObObjType &ob_type, obmysql::EMySQLFieldType mysql_type); static int get_ob_type(ObObjType &ob_type, obmysql::EMySQLFieldType mysql_type,
const bool is_unsigned = false);
}; };
} // end of namespace common } // end of namespace common

4
src/pl/ob_pl_type.cpp
View File

@ -873,7 +873,9 @@ int ObPLDataType::deserialize(ObSchemaGetterGuard &schema_guard,
} else if (OB_FAIL(ObSMUtils::get_mysql_type(get_obj_type(), mysql_type, flags, num_decimals))) { } else if (OB_FAIL(ObSMUtils::get_mysql_type(get_obj_type(), mysql_type, flags, num_decimals))) {
LOG_WARN("get mysql type failed", K(ret)); LOG_WARN("get mysql type failed", K(ret));
} else if (OB_FAIL(ObMPStmtExecute::parse_basic_param_value( } else if (OB_FAIL(ObMPStmtExecute::parse_basic_param_value(
allocator, (uint8_t)mysql_type, charset, cs_type, ncs_type, src, tz_info, param, true))) { allocator, (uint8_t)mysql_type, charset, cs_type, ncs_type, src, tz_info, param, true, NULL,
NULL == get_data_type() ? false : get_data_type()->get_meta_type().is_unsigned_integer()))) {
// get_data_type() is null, its a extend type, unsigned need false.
LOG_WARN("failed to parse basic param value", K(ret)); LOG_WARN("failed to parse basic param value", K(ret));
} else { } else {
ObObj *obj = reinterpret_cast<ObObj *>(dst + dst_pos); ObObj *obj = reinterpret_cast<ObObj *>(dst + dst_pos);