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

[to #52003940]fixed param_id type convert

Browse Source
This commit is contained in:
LiuYoung00
2023-09-08 11:29:29 +08:00
committed by ob-robot
parent 30fc23a236
commit 14782ab746
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2476,7 +2476,7 @@ int ObMPStmtExecute::parse_param_value(ObIAllocator &allocator,
TypeInfo *type_info, TypeInfo *type_info,
ObObjParam &param, ObObjParam &param,
const char *bitmap, const char *bitmap,
int16_t param_id) int64_t param_id)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
uint64_t length = 0; uint64_t length = 0;

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

@ -307,7 +307,7 @@ private:
sql::TypeInfo *type_info, sql::TypeInfo *type_info,
ObObjParam &param, ObObjParam &param,
const char *bitmap, const char *bitmap,
int16_t param_id = OB_INVALID_INDEX); int64_t param_id);
int parse_complex_param_value(ObIAllocator &allocator, int parse_complex_param_value(ObIAllocator &allocator,
const ObCharsetType charset, const ObCharsetType charset,
const ObCollationType cs_type, const ObCollationType cs_type,

16
src/observer/mysql/obmp_stmt_send_piece_data.cpp
View File

@ -74,7 +74,7 @@ int ObMPStmtSendPieceData::before_process()
const char* pos = pkt.get_cdata(); const char* pos = pkt.get_cdata();
// stmt_id // stmt_id
ObMySQLUtil::get_int4(pos, stmt_id_); ObMySQLUtil::get_int4(pos, stmt_id_);
ObMySQLUtil::get_int2(pos, param_id_); ObMySQLUtil::get_uint2(pos, param_id_);
ObMySQLUtil::get_int1(pos, piece_mode_); ObMySQLUtil::get_int1(pos, piece_mode_);
int8_t is_null = 0; int8_t is_null = 0;
ObMySQLUtil::get_int1(pos, is_null); ObMySQLUtil::get_int1(pos, is_null);
@ -358,7 +358,7 @@ int64_t ObPieceBuffer::to_string(char *buffer, int64_t len) const
int ObPiece::piece_init(ObSQLSessionInfo &session, int ObPiece::piece_init(ObSQLSessionInfo &session,
int32_t stmt_id, int32_t stmt_id,
int16_t param_id) { uint16_t param_id) {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
set_stmt_id(stmt_id); set_stmt_id(stmt_id);
set_param_id(param_id); set_param_id(param_id);
@ -408,7 +408,7 @@ int ObPieceCache::init_piece_cache(ObSQLSessionInfo &session)
} }
int ObPieceCache::make_piece(int32_t stmt_id, int ObPieceCache::make_piece(int32_t stmt_id,
int16_t param_id, uint16_t param_id,
ObPiece *&piece, ObPiece *&piece,
ObSQLSessionInfo &session) ObSQLSessionInfo &session)
{ {
@ -508,7 +508,7 @@ int ObPieceCache::close_all(ObSQLSessionInfo &session)
return ret; return ret;
} }
int ObPieceCache::get_piece(int32_t stmt_id, int16_t param_id, ObPiece *&piece) int ObPieceCache::get_piece(int32_t stmt_id, uint16_t param_id, ObPiece *&piece)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
piece = NULL; piece = NULL;
@ -537,7 +537,7 @@ int ObPieceCache::get_piece(int32_t stmt_id, int16_t param_id, ObPiece *&piece)
*/ */
// for fetch // for fetch
int ObPieceCache::get_piece_buffer(int32_t stmt_id, int ObPieceCache::get_piece_buffer(int32_t stmt_id,
int16_t param_id, uint16_t param_id,
int32_t offset, int32_t offset,
uint64_t piece_size, uint64_t piece_size,
ObPieceBuffer &piece_buf, ObPieceBuffer &piece_buf,
@ -605,7 +605,7 @@ int ObPieceCache::get_piece_buffer(int32_t stmt_id,
// for execute // for execute
// buf needs to allocate memory in the outer layer ！！！ // buf needs to allocate memory in the outer layer ！！！
int ObPieceCache::get_buffer(int32_t stmt_id, int ObPieceCache::get_buffer(int32_t stmt_id,
int16_t param_id, uint16_t param_id,
uint64_t count, uint64_t count,
uint64_t &length, uint64_t &length,
common::ObFixedArray<ObSqlString, ObIAllocator> &str_buf, common::ObFixedArray<ObSqlString, ObIAllocator> &str_buf,
@ -617,7 +617,7 @@ int ObPieceCache::get_buffer(int32_t stmt_id,
} }
int ObPieceCache::get_oracle_buffer(int32_t stmt_id, int ObPieceCache::get_oracle_buffer(int32_t stmt_id,
int16_t param_id, uint16_t param_id,
uint64_t count, uint64_t count,
uint64_t &length, uint64_t &length,
common::ObFixedArray<ObSqlString, ObIAllocator> &str_buf, common::ObFixedArray<ObSqlString, ObIAllocator> &str_buf,
@ -651,7 +651,7 @@ int ObPieceCache::get_oracle_buffer(int32_t stmt_id,
} }
int ObPieceCache::get_mysql_buffer(int32_t stmt_id, int ObPieceCache::get_mysql_buffer(int32_t stmt_id,
int16_t param_id, uint16_t param_id,
uint64_t &length, uint64_t &length,
ObSqlString &str_buf) ObSqlString &str_buf)
{ {

24
src/observer/mysql/obmp_stmt_send_piece_data.h
View File

@ -74,7 +74,7 @@ private:
int64_t exec_start_timestamp_; int64_t exec_start_timestamp_;
int64_t exec_end_timestamp_; int64_t exec_end_timestamp_;
int32_t stmt_id_; int32_t stmt_id_;
int16_t param_id_; uint16_t param_id_;
int64_t buffer_len_; int64_t buffer_len_;
common::ObString buffer_; common::ObString buffer_;
int8_t piece_mode_; int8_t piece_mode_;
@ -188,8 +188,8 @@ public:
} }
void set_stmt_id(int32_t stmt_id) { stmt_id_ = stmt_id; } void set_stmt_id(int32_t stmt_id) { stmt_id_ = stmt_id; }
int32_t get_stmt_id() { return stmt_id_; } int32_t get_stmt_id() { return stmt_id_; }
void set_param_id(int16_t param_id) { param_id_ = param_id; } void set_param_id(uint16_t param_id) { param_id_ = param_id; }
int16_t get_param_id() { return param_id_; } uint16_t get_param_id() { return param_id_; }
void set_position(uint64_t pos) { pos_ = pos; } void set_position(uint64_t pos) { pos_ = pos; }
uint64_t get_position() { return pos_; } uint64_t get_position() { return pos_; }
void add_position() { pos_++; } void add_position() { pos_++; }
@ -205,12 +205,12 @@ public:
} }
ObPieceBufferArray *get_buffer_array() { return buffer_array_; } ObPieceBufferArray *get_buffer_array() { return buffer_array_; }
void set_buffer_array(ObPieceBufferArray *array) { buffer_array_ = array; } void set_buffer_array(ObPieceBufferArray *array) { buffer_array_ = array; }
int piece_init(sql::ObSQLSessionInfo &session, int32_t stmt_id, int16_t param_id); int piece_init(sql::ObSQLSessionInfo &session, int32_t stmt_id, uint16_t param_id);
void set_error_ret(int err_ret) { err_ret_ = err_ret; } void set_error_ret(int err_ret) { err_ret_ = err_ret; }
int get_error_ret() { return err_ret_; } int get_error_ret() { return err_ret_; }
private: private:
int32_t stmt_id_; int32_t stmt_id_;
int16_t param_id_; uint16_t param_id_;
uint64_t pos_; uint64_t pos_;
ObPieceBufferArray *buffer_array_; ObPieceBufferArray *buffer_array_;
ObIAllocator *allocator_; ObIAllocator *allocator_;
@ -250,36 +250,36 @@ class ObPieceCache {
} }
// piece // piece
int make_piece(int32_t stmt_id, int make_piece(int32_t stmt_id,
int16_t param_id, uint16_t param_id,
ObPiece *&piece, ObPiece *&piece,
sql::ObSQLSessionInfo &session); sql::ObSQLSessionInfo &session);
int remove_piece(int64_t key, sql::ObSQLSessionInfo &session); int remove_piece(int64_t key, sql::ObSQLSessionInfo &session);
int add_piece(ObPiece *piece); int add_piece(ObPiece *piece);
int get_piece(int32_t stmt_id, int16_t param_id, ObPiece *&piece); int get_piece(int32_t stmt_id, uint16_t param_id, ObPiece *&piece);
int get_piece_buffer(int32_t stmt_id, int get_piece_buffer(int32_t stmt_id,
int16_t param_id, uint16_t param_id,
int32_t offset, int32_t offset,
uint64_t piece_size, uint64_t piece_size,
ObPieceBuffer &piece_buf, ObPieceBuffer &piece_buf,
sql::ObSQLSessionInfo &session); sql::ObSQLSessionInfo &session);
//merge //merge
int get_buffer(int32_t stmt_id, int get_buffer(int32_t stmt_id,
int16_t param_id, uint16_t param_id,
uint64_t count, uint64_t count,
uint64_t &length, uint64_t &length,
common::ObFixedArray<ObSqlString, ObIAllocator> &str_buf, common::ObFixedArray<ObSqlString, ObIAllocator> &str_buf,
char *is_null_map); char *is_null_map);
int get_oracle_buffer(int32_t stmt_id, int get_oracle_buffer(int32_t stmt_id,
int16_t param_id, uint16_t param_id,
uint64_t count, uint64_t count,
uint64_t &length, uint64_t &length,
common::ObFixedArray<ObSqlString, ObIAllocator> &str_buf, common::ObFixedArray<ObSqlString, ObIAllocator> &str_buf,
char *is_null_map); char *is_null_map);
int get_mysql_buffer(int32_t stmt_id, int get_mysql_buffer(int32_t stmt_id,
int16_t param_id, uint16_t param_id,
uint64_t &length, uint64_t &length,
ObSqlString &str_buf); ObSqlString &str_buf);
inline int64_t get_piece_key(int32_t stmt_id, int16_t param_id) inline int64_t get_piece_key(int32_t stmt_id, uint16_t param_id)
{ {
return (((static_cast<int64_t>(stmt_id)) << 32) | param_id); return (((static_cast<int64_t>(stmt_id)) << 32) | param_id);
} }