diff --git a/frameworks/C++/paozhu/paozhu_benchmark/common/cost_define.h b/frameworks/C++/paozhu/paozhu_benchmark/common/cost_define.h index c4d1a48addf..36a3a013330 100755 --- a/frameworks/C++/paozhu/paozhu_benchmark/common/cost_define.h +++ b/frameworks/C++/paozhu/paozhu_benchmark/common/cost_define.h @@ -9,8 +9,12 @@ #define CONST_HTTP_BODY_POST_SIZE 33554432 #define CONST_HTTP_JSON_POST_SIZE 2097152 +#define CONST_HTTP2_SlEEP_MIN_TIME 1100000 + #define CONST_ORM_CLEAR_TIME 7200 #define CONST_ORM_CLEAR_NUMBER 1024 #define CONST_ORM_QUERY_CONNECT_TIMEOUT 30 +#define CONST_ORM_QUERY_LOG_TIME 30 +#define COOKIE_SESSION_NAME "PHPSESSID" #endif \ No newline at end of file diff --git a/frameworks/C++/paozhu/paozhu_benchmark/controller/src/techempower.cpp b/frameworks/C++/paozhu/paozhu_benchmark/controller/src/techempower.cpp index f3111732864..14fb3d3c71b 100755 --- a/frameworks/C++/paozhu/paozhu_benchmark/controller/src/techempower.cpp +++ b/frameworks/C++/paozhu/paozhu_benchmark/controller/src/techempower.cpp @@ -6,6 +6,7 @@ #include #include "httppeer.h" #include "techempower.h" +#include "request.h" #include "techempower_json.h" #include "datetime.h" #include "func.h" @@ -43,6 +44,7 @@ asio::awaitable techempowerdb(std::shared_ptr peer) myworld.where("id", rd_num); myworld.limit(1); co_await myworld.async_fetch_one(); + peer->output = myworld.data_tojson(); co_return ""; } @@ -64,6 +66,7 @@ asio::awaitable techempowerqueries(std::shared_ptr peer) } auto myworld = orm::World(); myworld.record.reserve(get_num); + myworld.lock_conn(); for (unsigned int i = 0; i < get_num; i++) { myworld.wheresql.clear(); @@ -71,7 +74,7 @@ asio::awaitable techempowerqueries(std::shared_ptr peer) myworld.where("id", rd_num); co_await myworld.async_fetch_append(); } - + myworld.unlock_conn(); peer->output = myworld.to_json(); co_return ""; } @@ -91,7 +94,7 @@ asio::awaitable techempowerfortunes(std::shared_ptr peer) std::sort(myfortune.record.begin(), myfortune.record.end(), [](const auto &lhs, const auto &rhs) { return lhs.message < rhs.message; }); peer->val["list"].set_array(); - OBJ_ARRAY item; + obj_val item; for (unsigned int i = 0; i < myfortune.record.size(); i++) { item["id"] = myfortune.record[i].id; @@ -126,6 +129,7 @@ asio::awaitable techempowerupdates(std::shared_ptr peer) auto myworld = orm::World(); myworld.record.clear(); myworld.record.reserve(get_num); + myworld.lock_conn(); for (unsigned int i = 0; i < get_num; i++) { myworld.wheresql.clear(); @@ -139,6 +143,7 @@ asio::awaitable techempowerupdates(std::shared_ptr peer) co_await myworld.async_update("randomnumber"); } } + myworld.unlock_conn(); peer->output = myworld.to_json(); co_return ""; } @@ -247,4 +252,4 @@ asio::awaitable techempowercached_db(std::shared_ptr peer co_return ""; } -}// namespace http \ No newline at end of file +}// namespace http diff --git a/frameworks/C++/paozhu/paozhu_benchmark/orm/include/fortune_mysql.h b/frameworks/C++/paozhu/paozhu_benchmark/orm/include/fortune_mysql.h index 2e403808c05..e0dc89630ee 100644 --- a/frameworks/C++/paozhu/paozhu_benchmark/orm/include/fortune_mysql.h +++ b/frameworks/C++/paozhu/paozhu_benchmark/orm/include/fortune_mysql.h @@ -141,9 +141,9 @@ namespace orm return 0; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -151,14 +151,14 @@ namespace orm else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(countsql); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -173,13 +173,13 @@ namespace orm unsigned int column_num = 0; unsigned int offset = 0; - unsigned int querysql_len = 0; + unsigned int querysql_len = 0; for (; is_sql_item == false;) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -188,10 +188,10 @@ namespace orm for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return 0; } @@ -252,28 +252,19 @@ namespace orm } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(countsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(countsql, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } - if (iscache) - { - if (exptime > 0) - { - save_cache(exptime); - exptime = 0; - iscache = false; - } - } return querysql_len; } catch (const std::exception &e) @@ -378,9 +369,9 @@ namespace orm co_return 0; } //auto conn = co_await conn_obj->async_get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = co_await conn_obj->async_get_select_conn(); } @@ -390,12 +381,12 @@ namespace orm select_conn = co_await conn_obj->async_get_select_conn(); } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(countsql); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -403,7 +394,6 @@ namespace orm } //std::size_t n = co_await asio::async_write(*conn->socket, asio::buffer(conn->send_data), asio::use_awaitable); - pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -418,7 +408,7 @@ namespace orm { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return 0; @@ -426,10 +416,10 @@ namespace orm for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return 0; } @@ -490,26 +480,17 @@ namespace orm } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(countsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(countsql, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } - if (iscache) - { - if (exptime > 0) - { - save_cache(exptime); - exptime = 0; - iscache = false; - } - } co_return querysql_len; } catch (const std::exception &e) @@ -655,9 +636,9 @@ namespace orm } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -667,12 +648,12 @@ namespace orm edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(countsql); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -681,7 +662,7 @@ namespace orm unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -690,12 +671,12 @@ namespace orm pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(countsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(countsql, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -707,9 +688,8 @@ namespace orm unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -726,7 +706,6 @@ namespace orm } catch (...) { - } return 0; } @@ -807,9 +786,9 @@ namespace orm co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -819,12 +798,12 @@ namespace orm edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(countsql); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -833,7 +812,7 @@ namespace orm unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -841,12 +820,12 @@ namespace orm pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(countsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(countsql, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -859,10 +838,10 @@ namespace orm unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return effect_num; } catch (const std::exception &e) @@ -876,7 +855,6 @@ namespace orm } catch (...) { - } co_return 0; } @@ -947,9 +925,9 @@ namespace orm } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -959,13 +937,13 @@ namespace orm edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(countsql); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -974,7 +952,7 @@ namespace orm unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -983,12 +961,12 @@ namespace orm pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(countsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(countsql, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -1001,7 +979,7 @@ namespace orm unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -1018,7 +996,6 @@ namespace orm } catch (...) { - } return 0; } @@ -4038,7 +4015,7 @@ M_MODEL& or_leMessage(T val) return *mod; } - M_MODEL &where(const std::string &wq, char bi, http::OBJ_VALUE &obj) + M_MODEL &where(const std::string &wq, char bi, http::obj_val &obj) { if (wheresql.empty()) { @@ -4076,7 +4053,7 @@ M_MODEL& or_leMessage(T val) } return *mod; } - M_MODEL &where(const std::string &wq, http::OBJ_VALUE &obj) + M_MODEL &where(const std::string &wq, http::obj_val &obj) { if (wheresql.empty()) { @@ -5169,9 +5146,9 @@ M_MODEL& or_leMessage(T val) return temprecord; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -5179,21 +5156,21 @@ M_MODEL& or_leMessage(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return temprecord; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -5208,7 +5185,7 @@ M_MODEL& or_leMessage(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -5217,10 +5194,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return temprecord; } @@ -5296,15 +5273,15 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } @@ -5379,18 +5356,18 @@ M_MODEL& or_leMessage(T val) { std::size_t sqlhashid = std::hash{}(sqlstring); - model_meta_cache> &temp_cache = - model_meta_cache>::getinstance(); + model_meta_cache>> &temp_cache = + model_meta_cache>>::getinstance(); temprecord = temp_cache.get(sqlhashid); if (temprecord.size() > 0) { - iscache = false; - model_meta_cache &table_cache = model_meta_cache::getinstance(); - table_fieldname = table_cache.get(sqlhashid); + iscache = false; + model_meta_cache> &table_cache = model_meta_cache>::getinstance(); + table_fieldname = table_cache.get(sqlhashid); model_meta_cache> &tablemap_cache = model_meta_cache>::getinstance(); - table_fieldmap = tablemap_cache.get_obj(sqlhashid); + table_fieldmap = tablemap_cache.get(sqlhashid); return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } @@ -5400,7 +5377,7 @@ M_MODEL& or_leMessage(T val) { return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } - + try { if (conn_empty()) @@ -5408,9 +5385,9 @@ M_MODEL& or_leMessage(T val) return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -5418,15 +5395,15 @@ M_MODEL& or_leMessage(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -5450,7 +5427,7 @@ M_MODEL& or_leMessage(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -5459,10 +5436,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } @@ -5495,7 +5472,7 @@ M_MODEL& or_leMessage(T val) for (unsigned int ii = 0; ii < field_array.size(); ii++) { field_pos.push_back(B_BASE::findcolpos(field_array[ii].org_name)); - table_fieldmap.insert({field_array[ii].org_name,table_fieldname.size()}); + table_fieldmap.emplace(field_array[ii].org_name, table_fieldname.size()); table_fieldname.push_back(field_array[ii].org_name); } } @@ -5505,7 +5482,7 @@ M_MODEL& or_leMessage(T val) unsigned int column_num = field_array.size(); unsigned int tempnum = 0; - std::vector temp_v_record; + std::vector temp_v_record; for (unsigned int ij = 0; ij < column_num; ij++) { unsigned long long name_length = 0; @@ -5531,15 +5508,15 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } @@ -5552,12 +5529,12 @@ M_MODEL& or_leMessage(T val) { std::size_t sqlhashid = std::hash{}(sqlstring); - model_meta_cache> &temp_cache = - model_meta_cache>::getinstance(); + model_meta_cache>> &temp_cache = + model_meta_cache>>::getinstance(); temp_cache.save(sqlhashid, temprecord, exptime); exptime += 1; - model_meta_cache &table_cache = model_meta_cache::getinstance(); + model_meta_cache> &table_cache = model_meta_cache>::getinstance(); table_cache.save(sqlhashid, table_fieldname, exptime); model_meta_cache> &tablemap_cache = @@ -5625,7 +5602,7 @@ M_MODEL& or_leMessage(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_record_cache(sqlhashid)) { iscache = false; return *mod; @@ -5645,9 +5622,9 @@ M_MODEL& or_leMessage(T val) return *mod; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -5655,20 +5632,20 @@ M_MODEL& or_leMessage(T val) else { select_conn = conn_obj->get_select_conn(); - } - if(select_conn->isdebug) + } + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return *mod; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -5685,9 +5662,9 @@ M_MODEL& or_leMessage(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { - iserror = true; + iserror = true; error_msg = select_conn->error_msg; select_conn.reset(); return *mod; @@ -5695,10 +5672,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return *mod; } @@ -5763,15 +5740,15 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } @@ -5843,7 +5820,7 @@ M_MODEL& or_leMessage(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_record_cache(sqlhashid)) { iscache = false; co_return 0; @@ -5863,9 +5840,9 @@ M_MODEL& or_leMessage(T val) co_return 0; } //auto conn = co_await conn_obj->async_get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = co_await conn_obj->async_get_select_conn(); } @@ -5874,20 +5851,20 @@ M_MODEL& or_leMessage(T val) { select_conn = co_await conn_obj->async_get_select_conn(); } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(sqlstring); - - if(n==0) + + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); co_return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -5904,7 +5881,7 @@ M_MODEL& or_leMessage(T val) { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return 0; @@ -5912,10 +5889,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return 0; } @@ -5980,17 +5957,17 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); - } + } if (iscache) { if (exptime > 0) @@ -6057,7 +6034,7 @@ M_MODEL& or_leMessage(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_record_cache(sqlhashid)) { iscache = false; return *mod; @@ -6068,18 +6045,18 @@ M_MODEL& or_leMessage(T val) { return *mod; } - + try { - + if (conn_empty()) { return 0; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -6087,20 +6064,20 @@ M_MODEL& or_leMessage(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -6117,7 +6094,7 @@ M_MODEL& or_leMessage(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -6126,10 +6103,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return 0; } @@ -6194,19 +6171,19 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } - + if (iscache) { if (exptime > 0) @@ -6274,7 +6251,7 @@ M_MODEL& or_leMessage(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_record_cache(sqlhashid)) { iscache = false; co_return 1; @@ -6295,9 +6272,9 @@ M_MODEL& or_leMessage(T val) co_return 0; } //auto conn = co_await conn_obj->async_get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = co_await conn_obj->async_get_select_conn(); } @@ -6307,18 +6284,18 @@ M_MODEL& or_leMessage(T val) select_conn = co_await conn_obj->async_get_select_conn(); } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); co_return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -6337,7 +6314,7 @@ M_MODEL& or_leMessage(T val) { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return 0; @@ -6345,10 +6322,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return 0; } @@ -6413,17 +6390,17 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); - } + } if (iscache) { if (exptime > 0) @@ -6488,7 +6465,7 @@ M_MODEL& or_leMessage(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_data_cache(sqlhashid)) { iscache = false; return 0; @@ -6509,9 +6486,9 @@ M_MODEL& or_leMessage(T val) return 0; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -6519,21 +6496,21 @@ M_MODEL& or_leMessage(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -6548,7 +6525,7 @@ M_MODEL& or_leMessage(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -6557,10 +6534,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return 0; } @@ -6640,15 +6617,15 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } @@ -6657,7 +6634,7 @@ M_MODEL& or_leMessage(T val) { if (exptime > 0) { - save_cache(exptime); + save_data_cache(exptime); exptime = 0; iscache = false; } @@ -6718,7 +6695,7 @@ M_MODEL& or_leMessage(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_data_cache(sqlhashid)) { iscache = false; co_return 0; @@ -6740,9 +6717,9 @@ M_MODEL& or_leMessage(T val) co_return 0; } //auto conn = co_await conn_obj->async_get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = co_await conn_obj->async_get_select_conn(); } @@ -6751,20 +6728,20 @@ M_MODEL& or_leMessage(T val) { select_conn = co_await conn_obj->async_get_select_conn(); } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(sqlstring); - - if (n==0) + + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); co_return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -6781,7 +6758,7 @@ M_MODEL& or_leMessage(T val) { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return 0; @@ -6789,10 +6766,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return 0; } @@ -6872,22 +6849,22 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); - } + } if (iscache) { if (exptime > 0) { - save_cache(exptime); + save_data_cache(exptime); exptime = 0; iscache = false; } @@ -6950,79 +6927,174 @@ M_MODEL& or_leMessage(T val) model_meta_cache &temp_cache = model_meta_cache::getinstance(); return temp_cache.check(cache_key_name); } - std::vector get_cache_data(std::size_t cache_key_name) - { - model_meta_cache &temp_cache = model_meta_cache::getinstance(); - auto cache_data = temp_cache.get(cache_key_name); - return cache_data; - } - typename B_BASE::meta get_cache_obj(std::size_t cache_key_name) - { - model_meta_cache &temp_cache = model_meta_cache::getinstance(); - auto cache_data = temp_cache.get_obj(cache_key_name); - return cache_data; - } - M_MODEL &get_cache(std::size_t cache_key_name) + + bool get_data_cache(std::size_t cache_key_name) { - model_meta_cache &temp_cache = model_meta_cache::getinstance(); - B_BASE::record = temp_cache.get(cache_key_name); - if (B_BASE::record.size() == 0) + try { - B_BASE::record_reset(); + model_meta_cache &temp_cache = model_meta_cache::getinstance(); + B_BASE::data = temp_cache.get(cache_key_name); + return true; } - else + catch (const std::exception &e) { - B_BASE::data = B_BASE::record[0]; + error_msg = std::string(e.what()); } - return *mod; + catch (const std::string &e) + { + error_msg = e; + } + catch (const char *e) + { + error_msg = e; + } + catch (...) + { + } + B_BASE::data_reset(); + return false; } int update_cache(int exp_time = 0) { - model_meta_cache &temp_cache = model_meta_cache::getinstance(); - std::size_t sqlhashid = std::hash{}(sqlstring); + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); + std::size_t sqlhashid = std::hash{}(sqlstring); return temp_cache.update(sqlhashid, exp_time); } int update_cache(std::size_t cache_key_name, int exp_time) { - model_meta_cache &temp_cache = model_meta_cache::getinstance(); + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); return temp_cache.update(cache_key_name, exp_time); } bool save_cache(int exp_time = 0) { - model_meta_cache &temp_cache = model_meta_cache::getinstance(); - std::size_t sqlhashid = std::hash{}(sqlstring); + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); + std::size_t sqlhashid = std::hash{}(sqlstring); temp_cache.save(sqlhashid, B_BASE::record, exp_time); return true; } - bool save_cache(std::size_t cache_key_name, typename B_BASE::meta &cache_data, int exp_time = 0) + bool save_data_cache(int exp_time = 0) { model_meta_cache &temp_cache = model_meta_cache::getinstance(); - temp_cache.save(cache_key_name, cache_data, exp_time); + std::size_t sqlhashid = std::hash{}(sqlstring); + temp_cache.save(sqlhashid, B_BASE::data, exp_time); return true; } - bool save_cache(std::size_t cache_key_name, std::vector &cache_data, int exp_time = 0) + bool save_data_cache(const std::string &cache_key_name, const typename B_BASE::meta &cache_data, int exp_time = 0) { model_meta_cache &temp_cache = model_meta_cache::getinstance(); + std::size_t sqlhashid = std::hash{}(cache_key_name); + temp_cache.save(sqlhashid, cache_data, exp_time); + return true; + } + + bool save_cache(std::size_t cache_key_name, const std::vector &cache_data, int exp_time = 0) + { + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); temp_cache.save(cache_key_name, cache_data, exp_time); return true; } - bool get_cacherecord(std::size_t cache_key_name) + bool save_cache(const std::string cache_key_name, const std::vector &cache_data, int exp_time = 0) + { + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); + std::size_t sqlhashid = std::hash{}(cache_key_name); + temp_cache.save(sqlhashid, cache_data, exp_time); + return true; + } + bool save_vector_cache(const std::string cache_key_name, const std::vector &cache_data, int exp_time = 0) + { + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); + std::size_t sqlhashid = std::hash{}(cache_key_name); + temp_cache.save(sqlhashid, cache_data, exp_time); + return true; + } + bool save_cache(const std::string cache_key_name, const typename B_BASE::meta &cache_data, int exp_time = 0) { model_meta_cache &temp_cache = model_meta_cache::getinstance(); - B_BASE::record = temp_cache.get(cache_key_name); - if (B_BASE::record.size() == 0) + std::size_t sqlhashid = std::hash{}(cache_key_name); + temp_cache.save(sqlhashid, cache_data, exp_time); + return true; + } + B_BASE::meta &get_cache(const std::string &cache_key_name) + { + try { - return false; + model_meta_cache &temp_cache = model_meta_cache::getinstance(); + std::size_t sqlhashid = std::hash{}(cache_key_name); + return temp_cache.get(sqlhashid); } - else + catch (const std::exception &e) + { + error_msg = std::string(e.what()); + } + catch (const std::string &e) + { + error_msg = e; + } + catch (const char *e) + { + error_msg = e; + } + catch (...) + { + } + throw "Not in cache"; + } + + std::vector &get_vector_cache(const std::string &cache_key_name) + { + try + { + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); + std::size_t sqlhashid = std::hash{}(cache_key_name); + return temp_cache.get(sqlhashid); + } + catch (const std::exception &e) { - B_BASE::data = B_BASE::record[0]; + error_msg = std::string(e.what()); + } + catch (const std::string &e) + { + error_msg = e; + } + catch (const char *e) + { + error_msg = e; + } + catch (...) + { + } + throw "Not in cache"; + } + + bool get_record_cache(std::size_t cache_key_name) + { + try + { + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); + B_BASE::record = temp_cache.get(cache_key_name); return true; } + catch (const std::exception &e) + { + error_msg = std::string(e.what()); + } + catch (const std::string &e) + { + error_msg = e; + } + catch (const char *e) + { + error_msg = e; + } + catch (...) + { + } + B_BASE::record.clear(); + return false; } - http::OBJ_VALUE fetch_json() + http::obj_val fetch_json() { effect_num = 0; if (selectsql.empty()) @@ -7060,14 +7132,14 @@ M_MODEL& or_leMessage(T val) sqlstring.append(limitsql); } - http::OBJ_VALUE valuetemp; + http::obj_val valuetemp; valuetemp.set_array(); if (iserror) { return valuetemp; } - + try { if (conn_empty()) @@ -7075,9 +7147,9 @@ M_MODEL& or_leMessage(T val) return 0; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -7085,26 +7157,25 @@ M_MODEL& or_leMessage(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; std::vector field_array; - unsigned char action_setup = 0; unsigned int column_num = 0; @@ -7115,7 +7186,7 @@ M_MODEL& or_leMessage(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -7124,10 +7195,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return 0; } @@ -7164,23 +7235,23 @@ M_MODEL& or_leMessage(T val) unsigned int column_num = field_array.size(); unsigned int tempnum = 0; - http::OBJ_VALUE json_temp_v; + http::obj_val json_temp_v; for (unsigned int ij = 0; ij < column_num; ij++) { unsigned long long name_length = 0; name_length = select_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], tempnum); - std::string temp_str; + std::string temp_str; temp_str.resize(name_length); std::memcpy(temp_str.data(), (unsigned char *)&temp_pack_data.data[tempnum], name_length); - if(field_array[ij].name.size()>0) + if (field_array[ij].name.size() > 0) { //or alias name - json_temp_v[field_array[ij].name]=std::move(temp_str); + json_temp_v[field_array[ij].name] = std::move(temp_str); } - else if(field_array[ij].org_name.size()>0) + else if (field_array[ij].org_name.size() > 0) { - json_temp_v[field_array[ij].org_name]=std::move(temp_str); + json_temp_v[field_array[ij].org_name] = std::move(temp_str); } tempnum = tempnum + name_length; } @@ -7199,18 +7270,17 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } - } catch (const std::exception &e) { @@ -7226,7 +7296,7 @@ M_MODEL& or_leMessage(T val) return valuetemp; } - asio::awaitable async_fetch_json() + asio::awaitable async_fetch_json() { effect_num = 0; if (selectsql.empty()) @@ -7264,14 +7334,14 @@ M_MODEL& or_leMessage(T val) sqlstring.append(limitsql); } - http::OBJ_VALUE valuetemp; + http::obj_val valuetemp; valuetemp.set_array(); if (iserror) { co_return valuetemp; } - + try { if (conn_empty()) @@ -7279,9 +7349,9 @@ M_MODEL& or_leMessage(T val) co_return valuetemp; } //auto conn = co_await conn_obj->async_get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = co_await conn_obj->async_get_select_conn(); } @@ -7289,25 +7359,24 @@ M_MODEL& or_leMessage(T val) else { select_conn = co_await conn_obj->async_get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); co_return valuetemp; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; std::vector field_array; - unsigned char action_setup = 0; unsigned int column_num = 0; @@ -7318,7 +7387,7 @@ M_MODEL& or_leMessage(T val) { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return valuetemp; @@ -7326,10 +7395,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return 0; } @@ -7366,23 +7435,23 @@ M_MODEL& or_leMessage(T val) unsigned int column_num = field_array.size(); unsigned int tempnum = 0; - http::OBJ_VALUE json_temp_v; + http::obj_val json_temp_v; for (unsigned int ij = 0; ij < column_num; ij++) { unsigned long long name_length = 0; name_length = select_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], tempnum); - std::string temp_str; + std::string temp_str; temp_str.resize(name_length); std::memcpy(temp_str.data(), (unsigned char *)&temp_pack_data.data[tempnum], name_length); - if(field_array[ij].name.size()>0) + if (field_array[ij].name.size() > 0) { //or alias name - json_temp_v[field_array[ij].name]=std::move(temp_str); + json_temp_v[field_array[ij].name] = std::move(temp_str); } - else if(field_array[ij].org_name.size()>0) + else if (field_array[ij].org_name.size() > 0) { - json_temp_v[field_array[ij].org_name]=std::move(temp_str); + json_temp_v[field_array[ij].org_name] = std::move(temp_str); } tempnum = tempnum + name_length; } @@ -7401,18 +7470,17 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } - } catch (const std::exception &e) { @@ -7452,7 +7520,7 @@ M_MODEL& or_leMessage(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_data_cache(sqlhashid)) { iscache = false; return 0; @@ -7465,7 +7533,7 @@ M_MODEL& or_leMessage(T val) { return 0; } - + try { if (conn_empty()) @@ -7473,9 +7541,9 @@ M_MODEL& or_leMessage(T val) return 0; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -7483,22 +7551,21 @@ M_MODEL& or_leMessage(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } - std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -7515,7 +7582,7 @@ M_MODEL& or_leMessage(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -7524,10 +7591,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return 0; } @@ -7576,7 +7643,7 @@ M_MODEL& or_leMessage(T val) assign_field_value(field_pos[ij], (unsigned char *)&temp_pack_data.data[tempnum], name_length, B_BASE::data); tempnum = tempnum + name_length; } - + effect_num++; } } @@ -7591,22 +7658,22 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { - conn_obj->back_select_conn(std::move(select_conn)); + conn_obj->back_select_conn(std::move(select_conn)); } if (iscache) { if (exptime > 0) { - save_cache(exptime); + save_data_cache(exptime); exptime = 0; iscache = false; } @@ -7652,7 +7719,7 @@ M_MODEL& or_leMessage(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_data_cache(sqlhashid)) { iscache = false; co_return 0; @@ -7665,7 +7732,7 @@ M_MODEL& or_leMessage(T val) { co_return 0; } - + try { if (conn_empty()) @@ -7673,9 +7740,9 @@ M_MODEL& or_leMessage(T val) co_return 0; } //auto conn = co_await conn_obj->async_get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = co_await conn_obj->async_get_select_conn(); } @@ -7685,18 +7752,18 @@ M_MODEL& or_leMessage(T val) select_conn = co_await conn_obj->async_get_select_conn(); } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); co_return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -7713,7 +7780,7 @@ M_MODEL& or_leMessage(T val) { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return 0; @@ -7721,10 +7788,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return 0; } @@ -7773,7 +7840,7 @@ M_MODEL& or_leMessage(T val) assign_field_value(field_pos[ij], (unsigned char *)&temp_pack_data.data[tempnum], name_length, B_BASE::data); tempnum = tempnum + name_length; } - + effect_num++; } } @@ -7788,22 +7855,22 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { - conn_obj->back_select_conn(std::move(select_conn)); + conn_obj->back_select_conn(std::move(select_conn)); } if (iscache) { if (exptime > 0) { - save_cache(exptime); + save_data_cache(exptime); exptime = 0; iscache = false; } @@ -7887,9 +7954,9 @@ M_MODEL& or_leMessage(T val) } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -7899,13 +7966,13 @@ M_MODEL& or_leMessage(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -7914,22 +7981,22 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); return 0; - } + } pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -7942,7 +8009,7 @@ M_MODEL& or_leMessage(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -7959,7 +8026,6 @@ M_MODEL& or_leMessage(T val) } catch (...) { - } return 0; } @@ -8018,7 +8084,7 @@ M_MODEL& or_leMessage(T val) { return 0; } - + try { if (conn_empty()) @@ -8026,9 +8092,9 @@ M_MODEL& or_leMessage(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -8037,13 +8103,13 @@ M_MODEL& or_leMessage(T val) { edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8052,7 +8118,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8062,12 +8128,12 @@ M_MODEL& or_leMessage(T val) temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -8080,7 +8146,7 @@ M_MODEL& or_leMessage(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -8097,7 +8163,6 @@ M_MODEL& or_leMessage(T val) } catch (...) { - } return 0; } @@ -8165,9 +8230,9 @@ M_MODEL& or_leMessage(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -8177,12 +8242,12 @@ M_MODEL& or_leMessage(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8191,7 +8256,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -8199,18 +8264,18 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - + if ((unsigned char)temp_pack_data.data[0] == 0xFF) { error_msg = temp_pack_data.data.substr(3); - iserror = true; + iserror = true; } else if ((unsigned char)temp_pack_data.data[0] == 0x00) { @@ -8218,10 +8283,10 @@ M_MODEL& or_leMessage(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return effect_num; } catch (const std::exception &e) @@ -8235,7 +8300,6 @@ M_MODEL& or_leMessage(T val) } catch (...) { - } co_return 0; } @@ -8302,9 +8366,9 @@ M_MODEL& or_leMessage(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -8314,12 +8378,12 @@ M_MODEL& or_leMessage(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8328,7 +8392,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -8336,18 +8400,18 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) { error_msg = temp_pack_data.data.substr(3); - iserror = true; + iserror = true; } else if ((unsigned char)temp_pack_data.data[0] == 0x00) { @@ -8355,10 +8419,10 @@ M_MODEL& or_leMessage(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return effect_num; } catch (const std::exception &e) @@ -8372,7 +8436,6 @@ M_MODEL& or_leMessage(T val) } catch (...) { - } co_return 0; } @@ -8397,7 +8460,7 @@ M_MODEL& or_leMessage(T val) { return 0; } - + try { if (conn_empty()) @@ -8406,9 +8469,9 @@ M_MODEL& or_leMessage(T val) } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -8418,12 +8481,12 @@ M_MODEL& or_leMessage(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8432,7 +8495,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8441,12 +8504,12 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -8459,7 +8522,7 @@ M_MODEL& or_leMessage(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -8476,7 +8539,6 @@ M_MODEL& or_leMessage(T val) } catch (...) { - } return 0; } @@ -8544,9 +8606,9 @@ M_MODEL& or_leMessage(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -8556,12 +8618,12 @@ M_MODEL& or_leMessage(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8570,7 +8632,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8579,12 +8641,12 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -8597,7 +8659,7 @@ M_MODEL& or_leMessage(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -8614,7 +8676,6 @@ M_MODEL& or_leMessage(T val) } catch (...) { - } return 0; } @@ -8683,9 +8744,9 @@ M_MODEL& or_leMessage(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -8695,21 +8756,21 @@ M_MODEL& or_leMessage(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); co_return 0; } - + unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -8717,12 +8778,12 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -8735,10 +8796,10 @@ M_MODEL& or_leMessage(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return effect_num; } catch (const std::exception &e) @@ -8752,7 +8813,6 @@ M_MODEL& or_leMessage(T val) } catch (...) { - } co_return 0; } @@ -8778,7 +8838,7 @@ M_MODEL& or_leMessage(T val) { return 0; } - + try { if (conn_empty()) @@ -8786,9 +8846,9 @@ M_MODEL& or_leMessage(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -8798,12 +8858,12 @@ M_MODEL& or_leMessage(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8812,7 +8872,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8821,12 +8881,12 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -8839,7 +8899,7 @@ M_MODEL& or_leMessage(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -8856,7 +8916,6 @@ M_MODEL& or_leMessage(T val) } catch (...) { - } return 0; } @@ -8890,9 +8949,9 @@ M_MODEL& or_leMessage(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -8902,21 +8961,21 @@ M_MODEL& or_leMessage(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); co_return 0; } - + unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -8924,12 +8983,12 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -8941,12 +9000,11 @@ M_MODEL& or_leMessage(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return effect_num; } catch (const std::exception &e) @@ -8960,7 +9018,6 @@ M_MODEL& or_leMessage(T val) } catch (...) { - } co_return 0; } @@ -9024,7 +9081,7 @@ M_MODEL& or_leMessage(T val) { return 0; } - + try { if (conn_empty()) @@ -9032,9 +9089,9 @@ M_MODEL& or_leMessage(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -9044,12 +9101,12 @@ M_MODEL& or_leMessage(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9058,7 +9115,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9067,12 +9124,12 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -9084,9 +9141,8 @@ M_MODEL& or_leMessage(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -9103,7 +9159,6 @@ M_MODEL& or_leMessage(T val) } catch (...) { - } return 0; } @@ -9174,7 +9229,7 @@ M_MODEL& or_leMessage(T val) { return 0; } - + try { if (conn_empty()) @@ -9183,9 +9238,9 @@ M_MODEL& or_leMessage(T val) } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -9195,12 +9250,12 @@ M_MODEL& or_leMessage(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9209,7 +9264,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9218,14 +9273,14 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - + if ((unsigned char)temp_pack_data.data[0] == 0xFF) { error_msg = temp_pack_data.data.substr(3); @@ -9236,7 +9291,7 @@ M_MODEL& or_leMessage(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -9253,7 +9308,6 @@ M_MODEL& or_leMessage(T val) } catch (...) { - } return 0; } @@ -9271,7 +9325,7 @@ M_MODEL& or_leMessage(T val) { return 0; } - + try { if (conn_empty()) @@ -9280,9 +9334,9 @@ M_MODEL& or_leMessage(T val) } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -9292,12 +9346,12 @@ M_MODEL& or_leMessage(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9306,7 +9360,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9315,12 +9369,12 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -9332,10 +9386,10 @@ M_MODEL& or_leMessage(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -9369,7 +9423,7 @@ M_MODEL& or_leMessage(T val) { co_return 0; } - + try { if (conn_empty()) @@ -9377,9 +9431,9 @@ M_MODEL& or_leMessage(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -9389,21 +9443,21 @@ M_MODEL& or_leMessage(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); co_return 0; } - + unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -9411,12 +9465,12 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -9428,13 +9482,13 @@ M_MODEL& or_leMessage(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return insert_last_id; } catch (const std::exception &e) @@ -9465,7 +9519,7 @@ M_MODEL& or_leMessage(T val) { return 0; } - + try { if (conn_empty()) @@ -9473,9 +9527,9 @@ M_MODEL& or_leMessage(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -9485,12 +9539,12 @@ M_MODEL& or_leMessage(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9499,7 +9553,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9508,12 +9562,12 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -9525,10 +9579,10 @@ M_MODEL& or_leMessage(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -9562,7 +9616,7 @@ M_MODEL& or_leMessage(T val) { co_return 0; } - + try { if (conn_empty()) @@ -9570,9 +9624,9 @@ M_MODEL& or_leMessage(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -9582,21 +9636,21 @@ M_MODEL& or_leMessage(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); co_return 0; } - + unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -9604,12 +9658,12 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -9620,13 +9674,13 @@ M_MODEL& or_leMessage(T val) else if ((unsigned char)temp_pack_data.data[0] == 0x00) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return insert_last_id; } catch (const std::exception &e) @@ -9657,7 +9711,7 @@ M_MODEL& or_leMessage(T val) { return 0; } - + try { if (conn_empty()) @@ -9665,9 +9719,9 @@ M_MODEL& or_leMessage(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -9677,12 +9731,12 @@ M_MODEL& or_leMessage(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9691,7 +9745,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9700,12 +9754,12 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -9716,13 +9770,13 @@ M_MODEL& or_leMessage(T val) else if ((unsigned char)temp_pack_data.data[0] == 0x00) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } return insert_last_id; } catch (const std::exception &e) @@ -9753,7 +9807,7 @@ M_MODEL& or_leMessage(T val) { co_return 0; } - + try { if (conn_empty()) @@ -9761,9 +9815,9 @@ M_MODEL& or_leMessage(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -9773,21 +9827,21 @@ M_MODEL& or_leMessage(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); co_return 0; } - + unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -9795,12 +9849,12 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -9812,13 +9866,13 @@ M_MODEL& or_leMessage(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return insert_last_id; } catch (const std::exception &e) @@ -9835,7 +9889,6 @@ M_MODEL& or_leMessage(T val) co_return 0; } - long long save(bool isrealnew = false) { effect_num = 0; @@ -9888,9 +9941,9 @@ M_MODEL& or_leMessage(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -9900,12 +9953,12 @@ M_MODEL& or_leMessage(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9914,7 +9967,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9923,14 +9976,14 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - + if ((unsigned char)temp_pack_data.data[0] == 0xFF) { error_msg = temp_pack_data.data.substr(3); @@ -9939,10 +9992,9 @@ M_MODEL& or_leMessage(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -9950,15 +10002,15 @@ M_MODEL& or_leMessage(T val) } else { - sqlstring = B_BASE::_makeinsertsql(); + sqlstring = B_BASE::_makeinsertsql(); if (conn_empty()) { return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -9968,12 +10020,12 @@ M_MODEL& or_leMessage(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9982,7 +10034,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9991,14 +10043,14 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - + long long insert_last_id = 0; if ((unsigned char)temp_pack_data.data[0] == 0xFF) { @@ -10008,10 +10060,10 @@ M_MODEL& or_leMessage(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -10075,9 +10127,9 @@ M_MODEL& or_leMessage(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -10087,12 +10139,12 @@ M_MODEL& or_leMessage(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -10101,7 +10153,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -10109,18 +10161,18 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); - } + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); + } if ((unsigned char)temp_pack_data.data[0] == 0xFF) { error_msg = temp_pack_data.data.substr(3); - iserror = true; + iserror = true; } else if ((unsigned char)temp_pack_data.data[0] == 0x00) { @@ -10128,7 +10180,7 @@ M_MODEL& or_leMessage(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -10151,16 +10203,16 @@ M_MODEL& or_leMessage(T val) } else { - sqlstring = B_BASE::_makeinsertsql(); + sqlstring = B_BASE::_makeinsertsql(); try { if (conn_empty()) { co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -10170,12 +10222,12 @@ M_MODEL& or_leMessage(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -10184,7 +10236,7 @@ M_MODEL& or_leMessage(T val) unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -10192,12 +10244,12 @@ M_MODEL& or_leMessage(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -10209,13 +10261,13 @@ M_MODEL& or_leMessage(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return insert_last_id; } catch (const std::exception &e) @@ -10242,32 +10294,33 @@ M_MODEL& or_leMessage(T val) std::vector table_fieldname; std::map table_fieldmap; - if(rawsql.size()>10) + if (rawsql.size() > 10) { - unsigned int i=0; - for(;iget_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -10292,20 +10345,20 @@ M_MODEL& or_leMessage(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(rawsql); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -10322,7 +10375,7 @@ M_MODEL& or_leMessage(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -10331,10 +10384,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } @@ -10367,7 +10420,7 @@ M_MODEL& or_leMessage(T val) for (unsigned int ii = 0; ii < field_array.size(); ii++) { field_pos.push_back(B_BASE::findcolpos(field_array[ii].org_name)); - table_fieldmap.insert({field_array[ii].org_name,table_fieldname.size()}); + table_fieldmap.emplace(field_array[ii].org_name, table_fieldname.size()); table_fieldname.push_back(field_array[ii].org_name); } } @@ -10377,7 +10430,7 @@ M_MODEL& or_leMessage(T val) unsigned int column_num = field_array.size(); unsigned int tempnum = 0; - std::vector temp_v_record; + std::vector temp_v_record; for (unsigned int ij = 0; ij < column_num; ij++) { unsigned long long name_length = 0; @@ -10403,14 +10456,14 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(rawsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(rawsql, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } @@ -10438,32 +10491,33 @@ M_MODEL& or_leMessage(T val) std::vector table_fieldname; std::map table_fieldmap; - if(rawsql.size()>10) + if (rawsql.size() > 10) { - unsigned int i=0; - for(;iasync_get_select_conn(); } @@ -10487,20 +10541,20 @@ M_MODEL& or_leMessage(T val) else { select_conn = co_await conn_obj->async_get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(rawsql); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); co_return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -10517,7 +10571,7 @@ M_MODEL& or_leMessage(T val) { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return std::make_tuple(table_fieldname, table_fieldmap, temprecord); @@ -10525,10 +10579,10 @@ M_MODEL& or_leMessage(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } @@ -10561,7 +10615,7 @@ M_MODEL& or_leMessage(T val) for (unsigned int ii = 0; ii < field_array.size(); ii++) { field_pos.push_back(B_BASE::findcolpos(field_array[ii].org_name)); - table_fieldmap.insert({field_array[ii].org_name,table_fieldname.size()}); + table_fieldmap.emplace(field_array[ii].org_name, table_fieldname.size()); table_fieldname.push_back(field_array[ii].org_name); } } @@ -10571,7 +10625,7 @@ M_MODEL& or_leMessage(T val) unsigned int column_num = field_array.size(); unsigned int tempnum = 0; - std::vector temp_v_record; + std::vector temp_v_record; for (unsigned int ij = 0; ij < column_num; ij++) { unsigned long long name_length = 0; @@ -10597,17 +10651,17 @@ M_MODEL& or_leMessage(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(rawsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(rawsql, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); - } + } co_return std::make_tuple(std::move(table_fieldname), std::move(table_fieldmap), std::move(temprecord)); } catch (const std::exception &e) @@ -10698,7 +10752,7 @@ M_MODEL& or_leMessage(T val) { if (conn_obj) { - return false; + return false; } error_msg = "conn_obj is null"; iserror = true; @@ -10706,23 +10760,24 @@ M_MODEL& or_leMessage(T val) } void lock_conn() { - islock_conn = true; + islock_conn = true; } void unlock_conn() { - islock_conn = false; + islock_conn = false; if (conn_obj) { - if(select_conn) + if (select_conn) { conn_obj->back_select_conn(std::move(select_conn)); } - if(edit_conn) + if (edit_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } } } + public: std::string selectsql; std::string wheresql; diff --git a/frameworks/C++/paozhu/paozhu_benchmark/orm/include/fortunebase.h b/frameworks/C++/paozhu/paozhu_benchmark/orm/include/fortunebase.h index 0c2957cb67b..4c4f331cfc5 100644 --- a/frameworks/C++/paozhu/paozhu_benchmark/orm/include/fortunebase.h +++ b/frameworks/C++/paozhu/paozhu_benchmark/orm/include/fortunebase.h @@ -2,7 +2,7 @@ #define ORM_DEFAULT_FORTUNEBASEMATA_H /* *This file is auto create from cli -*本文件为自动生成 Thu, 13 Mar 2025 08:50:20 GMT +*本文件为自动生成 Wed, 26 Mar 2025 14:12:09 GMT ***/ #include #include diff --git a/frameworks/C++/paozhu/paozhu_benchmark/orm/include/world_mysql.h b/frameworks/C++/paozhu/paozhu_benchmark/orm/include/world_mysql.h index 6d4f2b60aec..92e82f65391 100644 --- a/frameworks/C++/paozhu/paozhu_benchmark/orm/include/world_mysql.h +++ b/frameworks/C++/paozhu/paozhu_benchmark/orm/include/world_mysql.h @@ -141,9 +141,9 @@ namespace orm return 0; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -151,14 +151,14 @@ namespace orm else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(countsql); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -173,13 +173,13 @@ namespace orm unsigned int column_num = 0; unsigned int offset = 0; - unsigned int querysql_len = 0; + unsigned int querysql_len = 0; for (; is_sql_item == false;) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -188,10 +188,10 @@ namespace orm for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return 0; } @@ -252,28 +252,19 @@ namespace orm } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(countsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(countsql, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } - if (iscache) - { - if (exptime > 0) - { - save_cache(exptime); - exptime = 0; - iscache = false; - } - } return querysql_len; } catch (const std::exception &e) @@ -378,9 +369,9 @@ namespace orm co_return 0; } //auto conn = co_await conn_obj->async_get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = co_await conn_obj->async_get_select_conn(); } @@ -390,12 +381,12 @@ namespace orm select_conn = co_await conn_obj->async_get_select_conn(); } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(countsql); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -403,7 +394,6 @@ namespace orm } //std::size_t n = co_await asio::async_write(*conn->socket, asio::buffer(conn->send_data), asio::use_awaitable); - pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -418,7 +408,7 @@ namespace orm { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return 0; @@ -426,10 +416,10 @@ namespace orm for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return 0; } @@ -490,26 +480,17 @@ namespace orm } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(countsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(countsql, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } - if (iscache) - { - if (exptime > 0) - { - save_cache(exptime); - exptime = 0; - iscache = false; - } - } co_return querysql_len; } catch (const std::exception &e) @@ -655,9 +636,9 @@ namespace orm } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -667,12 +648,12 @@ namespace orm edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(countsql); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -681,7 +662,7 @@ namespace orm unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -690,12 +671,12 @@ namespace orm pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(countsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(countsql, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -707,9 +688,8 @@ namespace orm unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -726,7 +706,6 @@ namespace orm } catch (...) { - } return 0; } @@ -807,9 +786,9 @@ namespace orm co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -819,12 +798,12 @@ namespace orm edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(countsql); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -833,7 +812,7 @@ namespace orm unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -841,12 +820,12 @@ namespace orm pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(countsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(countsql, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -859,10 +838,10 @@ namespace orm unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return effect_num; } catch (const std::exception &e) @@ -876,7 +855,6 @@ namespace orm } catch (...) { - } co_return 0; } @@ -947,9 +925,9 @@ namespace orm } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -959,13 +937,13 @@ namespace orm edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(countsql); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -974,7 +952,7 @@ namespace orm unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -983,12 +961,12 @@ namespace orm pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(countsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(countsql, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -1001,7 +979,7 @@ namespace orm unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -1018,7 +996,6 @@ namespace orm } catch (...) { - } return 0; } @@ -3878,7 +3855,7 @@ M_MODEL& or_leRandomnumber(T val) return *mod; } - M_MODEL &where(const std::string &wq, char bi, http::OBJ_VALUE &obj) + M_MODEL &where(const std::string &wq, char bi, http::obj_val &obj) { if (wheresql.empty()) { @@ -3916,7 +3893,7 @@ M_MODEL& or_leRandomnumber(T val) } return *mod; } - M_MODEL &where(const std::string &wq, http::OBJ_VALUE &obj) + M_MODEL &where(const std::string &wq, http::obj_val &obj) { if (wheresql.empty()) { @@ -5009,9 +4986,9 @@ M_MODEL& or_leRandomnumber(T val) return temprecord; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -5019,21 +4996,21 @@ M_MODEL& or_leRandomnumber(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return temprecord; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -5048,7 +5025,7 @@ M_MODEL& or_leRandomnumber(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -5057,10 +5034,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return temprecord; } @@ -5136,15 +5113,15 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } @@ -5219,18 +5196,18 @@ M_MODEL& or_leRandomnumber(T val) { std::size_t sqlhashid = std::hash{}(sqlstring); - model_meta_cache> &temp_cache = - model_meta_cache>::getinstance(); + model_meta_cache>> &temp_cache = + model_meta_cache>>::getinstance(); temprecord = temp_cache.get(sqlhashid); if (temprecord.size() > 0) { - iscache = false; - model_meta_cache &table_cache = model_meta_cache::getinstance(); - table_fieldname = table_cache.get(sqlhashid); + iscache = false; + model_meta_cache> &table_cache = model_meta_cache>::getinstance(); + table_fieldname = table_cache.get(sqlhashid); model_meta_cache> &tablemap_cache = model_meta_cache>::getinstance(); - table_fieldmap = tablemap_cache.get_obj(sqlhashid); + table_fieldmap = tablemap_cache.get(sqlhashid); return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } @@ -5240,7 +5217,7 @@ M_MODEL& or_leRandomnumber(T val) { return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } - + try { if (conn_empty()) @@ -5248,9 +5225,9 @@ M_MODEL& or_leRandomnumber(T val) return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -5258,15 +5235,15 @@ M_MODEL& or_leRandomnumber(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -5290,7 +5267,7 @@ M_MODEL& or_leRandomnumber(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -5299,10 +5276,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } @@ -5335,7 +5312,7 @@ M_MODEL& or_leRandomnumber(T val) for (unsigned int ii = 0; ii < field_array.size(); ii++) { field_pos.push_back(B_BASE::findcolpos(field_array[ii].org_name)); - table_fieldmap.insert({field_array[ii].org_name,table_fieldname.size()}); + table_fieldmap.emplace(field_array[ii].org_name, table_fieldname.size()); table_fieldname.push_back(field_array[ii].org_name); } } @@ -5345,7 +5322,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int column_num = field_array.size(); unsigned int tempnum = 0; - std::vector temp_v_record; + std::vector temp_v_record; for (unsigned int ij = 0; ij < column_num; ij++) { unsigned long long name_length = 0; @@ -5371,15 +5348,15 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } @@ -5392,12 +5369,12 @@ M_MODEL& or_leRandomnumber(T val) { std::size_t sqlhashid = std::hash{}(sqlstring); - model_meta_cache> &temp_cache = - model_meta_cache>::getinstance(); + model_meta_cache>> &temp_cache = + model_meta_cache>>::getinstance(); temp_cache.save(sqlhashid, temprecord, exptime); exptime += 1; - model_meta_cache &table_cache = model_meta_cache::getinstance(); + model_meta_cache> &table_cache = model_meta_cache>::getinstance(); table_cache.save(sqlhashid, table_fieldname, exptime); model_meta_cache> &tablemap_cache = @@ -5465,7 +5442,7 @@ M_MODEL& or_leRandomnumber(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_record_cache(sqlhashid)) { iscache = false; return *mod; @@ -5485,9 +5462,9 @@ M_MODEL& or_leRandomnumber(T val) return *mod; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -5495,20 +5472,20 @@ M_MODEL& or_leRandomnumber(T val) else { select_conn = conn_obj->get_select_conn(); - } - if(select_conn->isdebug) + } + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return *mod; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -5525,9 +5502,9 @@ M_MODEL& or_leRandomnumber(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { - iserror = true; + iserror = true; error_msg = select_conn->error_msg; select_conn.reset(); return *mod; @@ -5535,10 +5512,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return *mod; } @@ -5603,15 +5580,15 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } @@ -5683,7 +5660,7 @@ M_MODEL& or_leRandomnumber(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_record_cache(sqlhashid)) { iscache = false; co_return 0; @@ -5703,9 +5680,9 @@ M_MODEL& or_leRandomnumber(T val) co_return 0; } //auto conn = co_await conn_obj->async_get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = co_await conn_obj->async_get_select_conn(); } @@ -5714,20 +5691,20 @@ M_MODEL& or_leRandomnumber(T val) { select_conn = co_await conn_obj->async_get_select_conn(); } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(sqlstring); - - if(n==0) + + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); co_return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -5744,7 +5721,7 @@ M_MODEL& or_leRandomnumber(T val) { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return 0; @@ -5752,10 +5729,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return 0; } @@ -5820,17 +5797,17 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); - } + } if (iscache) { if (exptime > 0) @@ -5897,7 +5874,7 @@ M_MODEL& or_leRandomnumber(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_record_cache(sqlhashid)) { iscache = false; return *mod; @@ -5908,18 +5885,18 @@ M_MODEL& or_leRandomnumber(T val) { return *mod; } - + try { - + if (conn_empty()) { return 0; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -5927,20 +5904,20 @@ M_MODEL& or_leRandomnumber(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -5957,7 +5934,7 @@ M_MODEL& or_leRandomnumber(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -5966,10 +5943,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return 0; } @@ -6034,19 +6011,19 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } - + if (iscache) { if (exptime > 0) @@ -6114,7 +6091,7 @@ M_MODEL& or_leRandomnumber(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_record_cache(sqlhashid)) { iscache = false; co_return 1; @@ -6135,9 +6112,9 @@ M_MODEL& or_leRandomnumber(T val) co_return 0; } //auto conn = co_await conn_obj->async_get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = co_await conn_obj->async_get_select_conn(); } @@ -6147,18 +6124,18 @@ M_MODEL& or_leRandomnumber(T val) select_conn = co_await conn_obj->async_get_select_conn(); } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); co_return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -6177,7 +6154,7 @@ M_MODEL& or_leRandomnumber(T val) { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return 0; @@ -6185,10 +6162,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return 0; } @@ -6253,17 +6230,17 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); - } + } if (iscache) { if (exptime > 0) @@ -6328,7 +6305,7 @@ M_MODEL& or_leRandomnumber(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_data_cache(sqlhashid)) { iscache = false; return 0; @@ -6349,9 +6326,9 @@ M_MODEL& or_leRandomnumber(T val) return 0; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -6359,21 +6336,21 @@ M_MODEL& or_leRandomnumber(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -6388,7 +6365,7 @@ M_MODEL& or_leRandomnumber(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -6397,10 +6374,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return 0; } @@ -6480,15 +6457,15 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } @@ -6497,7 +6474,7 @@ M_MODEL& or_leRandomnumber(T val) { if (exptime > 0) { - save_cache(exptime); + save_data_cache(exptime); exptime = 0; iscache = false; } @@ -6558,7 +6535,7 @@ M_MODEL& or_leRandomnumber(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_data_cache(sqlhashid)) { iscache = false; co_return 0; @@ -6580,9 +6557,9 @@ M_MODEL& or_leRandomnumber(T val) co_return 0; } //auto conn = co_await conn_obj->async_get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = co_await conn_obj->async_get_select_conn(); } @@ -6591,20 +6568,20 @@ M_MODEL& or_leRandomnumber(T val) { select_conn = co_await conn_obj->async_get_select_conn(); } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(sqlstring); - - if (n==0) + + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); co_return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -6621,7 +6598,7 @@ M_MODEL& or_leRandomnumber(T val) { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return 0; @@ -6629,10 +6606,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return 0; } @@ -6712,22 +6689,22 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); - } + } if (iscache) { if (exptime > 0) { - save_cache(exptime); + save_data_cache(exptime); exptime = 0; iscache = false; } @@ -6790,79 +6767,174 @@ M_MODEL& or_leRandomnumber(T val) model_meta_cache &temp_cache = model_meta_cache::getinstance(); return temp_cache.check(cache_key_name); } - std::vector get_cache_data(std::size_t cache_key_name) - { - model_meta_cache &temp_cache = model_meta_cache::getinstance(); - auto cache_data = temp_cache.get(cache_key_name); - return cache_data; - } - typename B_BASE::meta get_cache_obj(std::size_t cache_key_name) - { - model_meta_cache &temp_cache = model_meta_cache::getinstance(); - auto cache_data = temp_cache.get_obj(cache_key_name); - return cache_data; - } - M_MODEL &get_cache(std::size_t cache_key_name) + + bool get_data_cache(std::size_t cache_key_name) { - model_meta_cache &temp_cache = model_meta_cache::getinstance(); - B_BASE::record = temp_cache.get(cache_key_name); - if (B_BASE::record.size() == 0) + try { - B_BASE::record_reset(); + model_meta_cache &temp_cache = model_meta_cache::getinstance(); + B_BASE::data = temp_cache.get(cache_key_name); + return true; } - else + catch (const std::exception &e) { - B_BASE::data = B_BASE::record[0]; + error_msg = std::string(e.what()); } - return *mod; + catch (const std::string &e) + { + error_msg = e; + } + catch (const char *e) + { + error_msg = e; + } + catch (...) + { + } + B_BASE::data_reset(); + return false; } int update_cache(int exp_time = 0) { - model_meta_cache &temp_cache = model_meta_cache::getinstance(); - std::size_t sqlhashid = std::hash{}(sqlstring); + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); + std::size_t sqlhashid = std::hash{}(sqlstring); return temp_cache.update(sqlhashid, exp_time); } int update_cache(std::size_t cache_key_name, int exp_time) { - model_meta_cache &temp_cache = model_meta_cache::getinstance(); + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); return temp_cache.update(cache_key_name, exp_time); } bool save_cache(int exp_time = 0) { - model_meta_cache &temp_cache = model_meta_cache::getinstance(); - std::size_t sqlhashid = std::hash{}(sqlstring); + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); + std::size_t sqlhashid = std::hash{}(sqlstring); temp_cache.save(sqlhashid, B_BASE::record, exp_time); return true; } - bool save_cache(std::size_t cache_key_name, typename B_BASE::meta &cache_data, int exp_time = 0) + bool save_data_cache(int exp_time = 0) { model_meta_cache &temp_cache = model_meta_cache::getinstance(); - temp_cache.save(cache_key_name, cache_data, exp_time); + std::size_t sqlhashid = std::hash{}(sqlstring); + temp_cache.save(sqlhashid, B_BASE::data, exp_time); return true; } - bool save_cache(std::size_t cache_key_name, std::vector &cache_data, int exp_time = 0) + bool save_data_cache(const std::string &cache_key_name, const typename B_BASE::meta &cache_data, int exp_time = 0) { model_meta_cache &temp_cache = model_meta_cache::getinstance(); + std::size_t sqlhashid = std::hash{}(cache_key_name); + temp_cache.save(sqlhashid, cache_data, exp_time); + return true; + } + + bool save_cache(std::size_t cache_key_name, const std::vector &cache_data, int exp_time = 0) + { + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); temp_cache.save(cache_key_name, cache_data, exp_time); return true; } - bool get_cacherecord(std::size_t cache_key_name) + bool save_cache(const std::string cache_key_name, const std::vector &cache_data, int exp_time = 0) + { + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); + std::size_t sqlhashid = std::hash{}(cache_key_name); + temp_cache.save(sqlhashid, cache_data, exp_time); + return true; + } + bool save_vector_cache(const std::string cache_key_name, const std::vector &cache_data, int exp_time = 0) + { + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); + std::size_t sqlhashid = std::hash{}(cache_key_name); + temp_cache.save(sqlhashid, cache_data, exp_time); + return true; + } + bool save_cache(const std::string cache_key_name, const typename B_BASE::meta &cache_data, int exp_time = 0) { model_meta_cache &temp_cache = model_meta_cache::getinstance(); - B_BASE::record = temp_cache.get(cache_key_name); - if (B_BASE::record.size() == 0) + std::size_t sqlhashid = std::hash{}(cache_key_name); + temp_cache.save(sqlhashid, cache_data, exp_time); + return true; + } + B_BASE::meta &get_cache(const std::string &cache_key_name) + { + try { - return false; + model_meta_cache &temp_cache = model_meta_cache::getinstance(); + std::size_t sqlhashid = std::hash{}(cache_key_name); + return temp_cache.get(sqlhashid); } - else + catch (const std::exception &e) + { + error_msg = std::string(e.what()); + } + catch (const std::string &e) + { + error_msg = e; + } + catch (const char *e) + { + error_msg = e; + } + catch (...) + { + } + throw "Not in cache"; + } + + std::vector &get_vector_cache(const std::string &cache_key_name) + { + try + { + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); + std::size_t sqlhashid = std::hash{}(cache_key_name); + return temp_cache.get(sqlhashid); + } + catch (const std::exception &e) { - B_BASE::data = B_BASE::record[0]; + error_msg = std::string(e.what()); + } + catch (const std::string &e) + { + error_msg = e; + } + catch (const char *e) + { + error_msg = e; + } + catch (...) + { + } + throw "Not in cache"; + } + + bool get_record_cache(std::size_t cache_key_name) + { + try + { + model_meta_cache> &temp_cache = model_meta_cache>::getinstance(); + B_BASE::record = temp_cache.get(cache_key_name); return true; } + catch (const std::exception &e) + { + error_msg = std::string(e.what()); + } + catch (const std::string &e) + { + error_msg = e; + } + catch (const char *e) + { + error_msg = e; + } + catch (...) + { + } + B_BASE::record.clear(); + return false; } - http::OBJ_VALUE fetch_json() + http::obj_val fetch_json() { effect_num = 0; if (selectsql.empty()) @@ -6900,14 +6972,14 @@ M_MODEL& or_leRandomnumber(T val) sqlstring.append(limitsql); } - http::OBJ_VALUE valuetemp; + http::obj_val valuetemp; valuetemp.set_array(); if (iserror) { return valuetemp; } - + try { if (conn_empty()) @@ -6915,9 +6987,9 @@ M_MODEL& or_leRandomnumber(T val) return 0; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -6925,26 +6997,25 @@ M_MODEL& or_leRandomnumber(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; std::vector field_array; - unsigned char action_setup = 0; unsigned int column_num = 0; @@ -6955,7 +7026,7 @@ M_MODEL& or_leRandomnumber(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -6964,10 +7035,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return 0; } @@ -7004,23 +7075,23 @@ M_MODEL& or_leRandomnumber(T val) unsigned int column_num = field_array.size(); unsigned int tempnum = 0; - http::OBJ_VALUE json_temp_v; + http::obj_val json_temp_v; for (unsigned int ij = 0; ij < column_num; ij++) { unsigned long long name_length = 0; name_length = select_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], tempnum); - std::string temp_str; + std::string temp_str; temp_str.resize(name_length); std::memcpy(temp_str.data(), (unsigned char *)&temp_pack_data.data[tempnum], name_length); - if(field_array[ij].name.size()>0) + if (field_array[ij].name.size() > 0) { //or alias name - json_temp_v[field_array[ij].name]=std::move(temp_str); + json_temp_v[field_array[ij].name] = std::move(temp_str); } - else if(field_array[ij].org_name.size()>0) + else if (field_array[ij].org_name.size() > 0) { - json_temp_v[field_array[ij].org_name]=std::move(temp_str); + json_temp_v[field_array[ij].org_name] = std::move(temp_str); } tempnum = tempnum + name_length; } @@ -7039,18 +7110,17 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } - } catch (const std::exception &e) { @@ -7066,7 +7136,7 @@ M_MODEL& or_leRandomnumber(T val) return valuetemp; } - asio::awaitable async_fetch_json() + asio::awaitable async_fetch_json() { effect_num = 0; if (selectsql.empty()) @@ -7104,14 +7174,14 @@ M_MODEL& or_leRandomnumber(T val) sqlstring.append(limitsql); } - http::OBJ_VALUE valuetemp; + http::obj_val valuetemp; valuetemp.set_array(); if (iserror) { co_return valuetemp; } - + try { if (conn_empty()) @@ -7119,9 +7189,9 @@ M_MODEL& or_leRandomnumber(T val) co_return valuetemp; } //auto conn = co_await conn_obj->async_get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = co_await conn_obj->async_get_select_conn(); } @@ -7129,25 +7199,24 @@ M_MODEL& or_leRandomnumber(T val) else { select_conn = co_await conn_obj->async_get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); co_return valuetemp; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; std::vector field_array; - unsigned char action_setup = 0; unsigned int column_num = 0; @@ -7158,7 +7227,7 @@ M_MODEL& or_leRandomnumber(T val) { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return valuetemp; @@ -7166,10 +7235,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return 0; } @@ -7206,23 +7275,23 @@ M_MODEL& or_leRandomnumber(T val) unsigned int column_num = field_array.size(); unsigned int tempnum = 0; - http::OBJ_VALUE json_temp_v; + http::obj_val json_temp_v; for (unsigned int ij = 0; ij < column_num; ij++) { unsigned long long name_length = 0; name_length = select_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], tempnum); - std::string temp_str; + std::string temp_str; temp_str.resize(name_length); std::memcpy(temp_str.data(), (unsigned char *)&temp_pack_data.data[tempnum], name_length); - if(field_array[ij].name.size()>0) + if (field_array[ij].name.size() > 0) { //or alias name - json_temp_v[field_array[ij].name]=std::move(temp_str); + json_temp_v[field_array[ij].name] = std::move(temp_str); } - else if(field_array[ij].org_name.size()>0) + else if (field_array[ij].org_name.size() > 0) { - json_temp_v[field_array[ij].org_name]=std::move(temp_str); + json_temp_v[field_array[ij].org_name] = std::move(temp_str); } tempnum = tempnum + name_length; } @@ -7241,18 +7310,17 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } - } catch (const std::exception &e) { @@ -7292,7 +7360,7 @@ M_MODEL& or_leRandomnumber(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_data_cache(sqlhashid)) { iscache = false; return 0; @@ -7305,7 +7373,7 @@ M_MODEL& or_leRandomnumber(T val) { return 0; } - + try { if (conn_empty()) @@ -7313,9 +7381,9 @@ M_MODEL& or_leRandomnumber(T val) return 0; } //auto conn = conn_obj->get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -7323,22 +7391,21 @@ M_MODEL& or_leRandomnumber(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } - std::size_t n = select_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -7355,7 +7422,7 @@ M_MODEL& or_leRandomnumber(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -7364,10 +7431,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return 0; } @@ -7416,7 +7483,7 @@ M_MODEL& or_leRandomnumber(T val) assign_field_value(field_pos[ij], (unsigned char *)&temp_pack_data.data[tempnum], name_length, B_BASE::data); tempnum = tempnum + name_length; } - + effect_num++; } } @@ -7431,22 +7498,22 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { - conn_obj->back_select_conn(std::move(select_conn)); + conn_obj->back_select_conn(std::move(select_conn)); } if (iscache) { if (exptime > 0) { - save_cache(exptime); + save_data_cache(exptime); exptime = 0; iscache = false; } @@ -7492,7 +7559,7 @@ M_MODEL& or_leRandomnumber(T val) if (iscache) { std::size_t sqlhashid = std::hash{}(sqlstring); - if (get_cacherecord(sqlhashid)) + if (get_data_cache(sqlhashid)) { iscache = false; co_return 0; @@ -7505,7 +7572,7 @@ M_MODEL& or_leRandomnumber(T val) { co_return 0; } - + try { if (conn_empty()) @@ -7513,9 +7580,9 @@ M_MODEL& or_leRandomnumber(T val) co_return 0; } //auto conn = co_await conn_obj->async_get_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = co_await conn_obj->async_get_select_conn(); } @@ -7525,18 +7592,18 @@ M_MODEL& or_leRandomnumber(T val) select_conn = co_await conn_obj->async_get_select_conn(); } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); co_return 0; } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -7553,7 +7620,7 @@ M_MODEL& or_leRandomnumber(T val) { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return 0; @@ -7561,10 +7628,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return 0; } @@ -7613,7 +7680,7 @@ M_MODEL& or_leRandomnumber(T val) assign_field_value(field_pos[ij], (unsigned char *)&temp_pack_data.data[tempnum], name_length, B_BASE::data); tempnum = tempnum + name_length; } - + effect_num++; } } @@ -7628,22 +7695,22 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { - conn_obj->back_select_conn(std::move(select_conn)); + conn_obj->back_select_conn(std::move(select_conn)); } if (iscache) { if (exptime > 0) { - save_cache(exptime); + save_data_cache(exptime); exptime = 0; iscache = false; } @@ -7727,9 +7794,9 @@ M_MODEL& or_leRandomnumber(T val) } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -7739,13 +7806,13 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -7754,22 +7821,22 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); return 0; - } + } pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -7782,7 +7849,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -7799,7 +7866,6 @@ M_MODEL& or_leRandomnumber(T val) } catch (...) { - } return 0; } @@ -7858,7 +7924,7 @@ M_MODEL& or_leRandomnumber(T val) { return 0; } - + try { if (conn_empty()) @@ -7866,9 +7932,9 @@ M_MODEL& or_leRandomnumber(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -7877,13 +7943,13 @@ M_MODEL& or_leRandomnumber(T val) { edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -7892,7 +7958,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -7902,12 +7968,12 @@ M_MODEL& or_leRandomnumber(T val) temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -7920,7 +7986,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -7937,7 +8003,6 @@ M_MODEL& or_leRandomnumber(T val) } catch (...) { - } return 0; } @@ -8005,9 +8070,9 @@ M_MODEL& or_leRandomnumber(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -8017,12 +8082,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8031,7 +8096,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -8039,18 +8104,18 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - + if ((unsigned char)temp_pack_data.data[0] == 0xFF) { error_msg = temp_pack_data.data.substr(3); - iserror = true; + iserror = true; } else if ((unsigned char)temp_pack_data.data[0] == 0x00) { @@ -8058,10 +8123,10 @@ M_MODEL& or_leRandomnumber(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return effect_num; } catch (const std::exception &e) @@ -8075,7 +8140,6 @@ M_MODEL& or_leRandomnumber(T val) } catch (...) { - } co_return 0; } @@ -8142,9 +8206,9 @@ M_MODEL& or_leRandomnumber(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -8154,12 +8218,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8168,7 +8232,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -8176,18 +8240,18 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) { error_msg = temp_pack_data.data.substr(3); - iserror = true; + iserror = true; } else if ((unsigned char)temp_pack_data.data[0] == 0x00) { @@ -8195,10 +8259,10 @@ M_MODEL& or_leRandomnumber(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return effect_num; } catch (const std::exception &e) @@ -8212,7 +8276,6 @@ M_MODEL& or_leRandomnumber(T val) } catch (...) { - } co_return 0; } @@ -8237,7 +8300,7 @@ M_MODEL& or_leRandomnumber(T val) { return 0; } - + try { if (conn_empty()) @@ -8246,9 +8309,9 @@ M_MODEL& or_leRandomnumber(T val) } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -8258,12 +8321,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8272,7 +8335,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8281,12 +8344,12 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -8299,7 +8362,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -8316,7 +8379,6 @@ M_MODEL& or_leRandomnumber(T val) } catch (...) { - } return 0; } @@ -8384,9 +8446,9 @@ M_MODEL& or_leRandomnumber(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -8396,12 +8458,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8410,7 +8472,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8419,12 +8481,12 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -8437,7 +8499,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -8454,7 +8516,6 @@ M_MODEL& or_leRandomnumber(T val) } catch (...) { - } return 0; } @@ -8523,9 +8584,9 @@ M_MODEL& or_leRandomnumber(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -8535,21 +8596,21 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); co_return 0; } - + unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -8557,12 +8618,12 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -8575,10 +8636,10 @@ M_MODEL& or_leRandomnumber(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return effect_num; } catch (const std::exception &e) @@ -8592,7 +8653,6 @@ M_MODEL& or_leRandomnumber(T val) } catch (...) { - } co_return 0; } @@ -8618,7 +8678,7 @@ M_MODEL& or_leRandomnumber(T val) { return 0; } - + try { if (conn_empty()) @@ -8626,9 +8686,9 @@ M_MODEL& or_leRandomnumber(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -8638,12 +8698,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8652,7 +8712,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8661,12 +8721,12 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -8679,7 +8739,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -8696,7 +8756,6 @@ M_MODEL& or_leRandomnumber(T val) } catch (...) { - } return 0; } @@ -8730,9 +8789,9 @@ M_MODEL& or_leRandomnumber(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -8742,21 +8801,21 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); co_return 0; } - + unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -8764,12 +8823,12 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -8781,12 +8840,11 @@ M_MODEL& or_leRandomnumber(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return effect_num; } catch (const std::exception &e) @@ -8800,7 +8858,6 @@ M_MODEL& or_leRandomnumber(T val) } catch (...) { - } co_return 0; } @@ -8864,7 +8921,7 @@ M_MODEL& or_leRandomnumber(T val) { return 0; } - + try { if (conn_empty()) @@ -8872,9 +8929,9 @@ M_MODEL& or_leRandomnumber(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -8884,12 +8941,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8898,7 +8955,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -8907,12 +8964,12 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } if ((unsigned char)temp_pack_data.data[0] == 0xFF) @@ -8924,9 +8981,8 @@ M_MODEL& or_leRandomnumber(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -8943,7 +8999,6 @@ M_MODEL& or_leRandomnumber(T val) } catch (...) { - } return 0; } @@ -9014,7 +9069,7 @@ M_MODEL& or_leRandomnumber(T val) { return 0; } - + try { if (conn_empty()) @@ -9023,9 +9078,9 @@ M_MODEL& or_leRandomnumber(T val) } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -9035,12 +9090,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9049,7 +9104,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9058,14 +9113,14 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - + if ((unsigned char)temp_pack_data.data[0] == 0xFF) { error_msg = temp_pack_data.data.substr(3); @@ -9076,7 +9131,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -9093,7 +9148,6 @@ M_MODEL& or_leRandomnumber(T val) } catch (...) { - } return 0; } @@ -9111,7 +9165,7 @@ M_MODEL& or_leRandomnumber(T val) { return 0; } - + try { if (conn_empty()) @@ -9120,9 +9174,9 @@ M_MODEL& or_leRandomnumber(T val) } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -9132,12 +9186,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9146,7 +9200,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9155,12 +9209,12 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -9172,10 +9226,10 @@ M_MODEL& or_leRandomnumber(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -9209,7 +9263,7 @@ M_MODEL& or_leRandomnumber(T val) { co_return 0; } - + try { if (conn_empty()) @@ -9217,9 +9271,9 @@ M_MODEL& or_leRandomnumber(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -9229,21 +9283,21 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); co_return 0; } - + unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -9251,12 +9305,12 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -9268,13 +9322,13 @@ M_MODEL& or_leRandomnumber(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return insert_last_id; } catch (const std::exception &e) @@ -9305,7 +9359,7 @@ M_MODEL& or_leRandomnumber(T val) { return 0; } - + try { if (conn_empty()) @@ -9313,9 +9367,9 @@ M_MODEL& or_leRandomnumber(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -9325,12 +9379,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9339,7 +9393,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9348,12 +9402,12 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -9365,10 +9419,10 @@ M_MODEL& or_leRandomnumber(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -9402,7 +9456,7 @@ M_MODEL& or_leRandomnumber(T val) { co_return 0; } - + try { if (conn_empty()) @@ -9410,9 +9464,9 @@ M_MODEL& or_leRandomnumber(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -9422,21 +9476,21 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); co_return 0; } - + unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -9444,12 +9498,12 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -9460,13 +9514,13 @@ M_MODEL& or_leRandomnumber(T val) else if ((unsigned char)temp_pack_data.data[0] == 0x00) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return insert_last_id; } catch (const std::exception &e) @@ -9497,7 +9551,7 @@ M_MODEL& or_leRandomnumber(T val) { return 0; } - + try { if (conn_empty()) @@ -9505,9 +9559,9 @@ M_MODEL& or_leRandomnumber(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -9517,12 +9571,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9531,7 +9585,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9540,12 +9594,12 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -9556,13 +9610,13 @@ M_MODEL& or_leRandomnumber(T val) else if ((unsigned char)temp_pack_data.data[0] == 0x00) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } return insert_last_id; } catch (const std::exception &e) @@ -9593,7 +9647,7 @@ M_MODEL& or_leRandomnumber(T val) { co_return 0; } - + try { if (conn_empty()) @@ -9601,9 +9655,9 @@ M_MODEL& or_leRandomnumber(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -9613,21 +9667,21 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); co_return 0; } - + unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -9635,12 +9689,12 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -9652,13 +9706,13 @@ M_MODEL& or_leRandomnumber(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return insert_last_id; } catch (const std::exception &e) @@ -9675,7 +9729,6 @@ M_MODEL& or_leRandomnumber(T val) co_return 0; } - long long save(bool isrealnew = false) { effect_num = 0; @@ -9728,9 +9781,9 @@ M_MODEL& or_leRandomnumber(T val) return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -9740,12 +9793,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9754,7 +9807,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9763,14 +9816,14 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - + if ((unsigned char)temp_pack_data.data[0] == 0xFF) { error_msg = temp_pack_data.data.substr(3); @@ -9779,10 +9832,9 @@ M_MODEL& or_leRandomnumber(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -9790,15 +9842,15 @@ M_MODEL& or_leRandomnumber(T val) } else { - sqlstring = B_BASE::_makeinsertsql(); + sqlstring = B_BASE::_makeinsertsql(); if (conn_empty()) { return 0; } //auto conn = conn_obj->get_edit_conn(); - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = conn_obj->get_edit_conn(); } @@ -9808,12 +9860,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = conn_obj->get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = edit_conn->write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9822,7 +9874,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = edit_conn->read_loop(); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9831,14 +9883,14 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } - + long long insert_last_id = 0; if ((unsigned char)temp_pack_data.data[0] == 0xFF) { @@ -9848,10 +9900,10 @@ M_MODEL& or_leRandomnumber(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -9915,9 +9967,9 @@ M_MODEL& or_leRandomnumber(T val) co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -9927,12 +9979,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -9941,7 +9993,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -9949,18 +10001,18 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); - } + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); + } if ((unsigned char)temp_pack_data.data[0] == 0xFF) { error_msg = temp_pack_data.data.substr(3); - iserror = true; + iserror = true; } else if ((unsigned char)temp_pack_data.data[0] == 0x00) { @@ -9968,7 +10020,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int d_offset = 1; effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } @@ -9991,16 +10043,16 @@ M_MODEL& or_leRandomnumber(T val) } else { - sqlstring = B_BASE::_makeinsertsql(); + sqlstring = B_BASE::_makeinsertsql(); try { if (conn_empty()) { co_return 0; } - if(islock_conn) + if (islock_conn) { - if(!edit_conn) + if (!edit_conn) { edit_conn = co_await conn_obj->async_get_edit_conn(); } @@ -10010,12 +10062,12 @@ M_MODEL& or_leRandomnumber(T val) edit_conn = co_await conn_obj->async_get_edit_conn(); } - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->begin_time(); } std::size_t n = co_await edit_conn->async_write_sql(sqlstring); - if(n==0) + if (n == 0) { error_msg = edit_conn->error_msg; edit_conn.reset(); @@ -10024,7 +10076,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int offset = 0; n = co_await edit_conn->async_read_loop(); - if (n==0) + if (n == 0) { edit_conn.reset(); co_return 0; @@ -10032,12 +10084,12 @@ M_MODEL& or_leRandomnumber(T val) pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; edit_conn->read_field_pack(edit_conn->_cache_data, n, offset, temp_pack_data); - if(edit_conn->isdebug) + if (edit_conn->isdebug) { edit_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= edit_conn->count_time(); - conn_mar.push_log(sqlstring,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = edit_conn->count_time(); + conn_mar.push_log(sqlstring, std::to_string(du_time)); } long long insert_last_id = 0; @@ -10049,13 +10101,13 @@ M_MODEL& or_leRandomnumber(T val) { unsigned int d_offset = 1; - effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); - insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + effect_num = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); + insert_last_id = edit_conn->pack_real_num((unsigned char *)&temp_pack_data.data[0], d_offset); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); - } + } co_return insert_last_id; } catch (const std::exception &e) @@ -10082,32 +10134,33 @@ M_MODEL& or_leRandomnumber(T val) std::vector table_fieldname; std::map table_fieldmap; - if(rawsql.size()>10) + if (rawsql.size() > 10) { - unsigned int i=0; - for(;iget_select_conn(); - if(islock_conn) + if (islock_conn) { - if(!select_conn) + if (!select_conn) { select_conn = conn_obj->get_select_conn(); } @@ -10132,20 +10185,20 @@ M_MODEL& or_leRandomnumber(T val) else { select_conn = conn_obj->get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = select_conn->write_sql(rawsql); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -10162,7 +10215,7 @@ M_MODEL& or_leRandomnumber(T val) { n = select_conn->read_loop(); offset = 0; - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); @@ -10171,10 +10224,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } @@ -10207,7 +10260,7 @@ M_MODEL& or_leRandomnumber(T val) for (unsigned int ii = 0; ii < field_array.size(); ii++) { field_pos.push_back(B_BASE::findcolpos(field_array[ii].org_name)); - table_fieldmap.insert({field_array[ii].org_name,table_fieldname.size()}); + table_fieldmap.emplace(field_array[ii].org_name, table_fieldname.size()); table_fieldname.push_back(field_array[ii].org_name); } } @@ -10217,7 +10270,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int column_num = field_array.size(); unsigned int tempnum = 0; - std::vector temp_v_record; + std::vector temp_v_record; for (unsigned int ij = 0; ij < column_num; ij++) { unsigned long long name_length = 0; @@ -10243,14 +10296,14 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(rawsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(rawsql, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); } @@ -10278,32 +10331,33 @@ M_MODEL& or_leRandomnumber(T val) std::vector table_fieldname; std::map table_fieldmap; - if(rawsql.size()>10) + if (rawsql.size() > 10) { - unsigned int i=0; - for(;iasync_get_select_conn(); } @@ -10327,20 +10381,20 @@ M_MODEL& or_leRandomnumber(T val) else { select_conn = co_await conn_obj->async_get_select_conn(); - } + } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->begin_time(); } std::size_t n = co_await select_conn->async_write_sql(rawsql); - if(n==0) + if (n == 0) { error_msg = select_conn->error_msg; select_conn.reset(); co_return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } - + pack_info_t temp_pack_data; temp_pack_data.seq_id = 1; bool is_sql_item = false; @@ -10357,7 +10411,7 @@ M_MODEL& or_leRandomnumber(T val) { n = co_await select_conn->async_read_loop(); offset = 0; - if (n==0) + if (n == 0) { select_conn.reset(); co_return std::make_tuple(table_fieldname, table_fieldmap, temprecord); @@ -10365,10 +10419,10 @@ M_MODEL& or_leRandomnumber(T val) for (; offset < n;) { select_conn->read_field_pack(select_conn->_cache_data, n, offset, temp_pack_data); - if(temp_pack_data.error > 0) + if (temp_pack_data.error > 0) { - iserror = true; - error_msg =temp_pack_data.data; + iserror = true; + error_msg = temp_pack_data.data; select_conn.reset(); co_return std::make_tuple(table_fieldname, table_fieldmap, temprecord); } @@ -10401,7 +10455,7 @@ M_MODEL& or_leRandomnumber(T val) for (unsigned int ii = 0; ii < field_array.size(); ii++) { field_pos.push_back(B_BASE::findcolpos(field_array[ii].org_name)); - table_fieldmap.insert({field_array[ii].org_name,table_fieldname.size()}); + table_fieldmap.emplace(field_array[ii].org_name, table_fieldname.size()); table_fieldname.push_back(field_array[ii].org_name); } } @@ -10411,7 +10465,7 @@ M_MODEL& or_leRandomnumber(T val) unsigned int column_num = field_array.size(); unsigned int tempnum = 0; - std::vector temp_v_record; + std::vector temp_v_record; for (unsigned int ij = 0; ij < column_num; ij++) { unsigned long long name_length = 0; @@ -10437,17 +10491,17 @@ M_MODEL& or_leRandomnumber(T val) } } } - if(select_conn->isdebug) + if (select_conn->isdebug) { select_conn->finish_time(); - auto &conn_mar = get_orm_connect_mar(); - long long du_time= select_conn->count_time(); - conn_mar.push_log(rawsql,std::to_string(du_time)); + auto &conn_mar = get_orm_connect_mar(); + long long du_time = select_conn->count_time(); + conn_mar.push_log(rawsql, std::to_string(du_time)); } - if(!islock_conn) + if (!islock_conn) { conn_obj->back_select_conn(std::move(select_conn)); - } + } co_return std::make_tuple(std::move(table_fieldname), std::move(table_fieldmap), std::move(temprecord)); } catch (const std::exception &e) @@ -10538,7 +10592,7 @@ M_MODEL& or_leRandomnumber(T val) { if (conn_obj) { - return false; + return false; } error_msg = "conn_obj is null"; iserror = true; @@ -10546,23 +10600,24 @@ M_MODEL& or_leRandomnumber(T val) } void lock_conn() { - islock_conn = true; + islock_conn = true; } void unlock_conn() { - islock_conn = false; + islock_conn = false; if (conn_obj) { - if(select_conn) + if (select_conn) { conn_obj->back_select_conn(std::move(select_conn)); } - if(edit_conn) + if (edit_conn) { conn_obj->back_edit_conn(std::move(edit_conn)); } } } + public: std::string selectsql; std::string wheresql; diff --git a/frameworks/C++/paozhu/paozhu_benchmark/orm/include/worldbase.h b/frameworks/C++/paozhu/paozhu_benchmark/orm/include/worldbase.h index 0fee4b832c8..dd15e43112e 100644 --- a/frameworks/C++/paozhu/paozhu_benchmark/orm/include/worldbase.h +++ b/frameworks/C++/paozhu/paozhu_benchmark/orm/include/worldbase.h @@ -2,7 +2,7 @@ #define ORM_DEFAULT_WORLDBASEMATA_H /* *This file is auto create from cli -*本文件为自动生成 Thu, 13 Mar 2025 08:50:20 GMT +*本文件为自动生成 Wed, 26 Mar 2025 14:12:09 GMT ***/ #include #include diff --git a/frameworks/C++/paozhu/paozhu_benchmark/view/techempower/fortunes.html b/frameworks/C++/paozhu/paozhu_benchmark/view/techempower/fortunes.html index b9079541143..49eba6d9cb6 100755 --- a/frameworks/C++/paozhu/paozhu_benchmark/view/techempower/fortunes.html +++ b/frameworks/C++/paozhu/paozhu_benchmark/view/techempower/fortunes.html @@ -1,5 +1,5 @@ Fortunes<%c for(auto &a:obj["list"].as_array()){ -%><%c +%><%c } %>
idmessage
<%c echo<<%c echo<
<%c echo<<%c echo<
\ No newline at end of file diff --git a/frameworks/C++/paozhu/paozhu_benchmark/viewsrc/include/regviewmethod.hpp b/frameworks/C++/paozhu/paozhu_benchmark/viewsrc/include/regviewmethod.hpp index 98a52eeada1..de0d64c6dc9 100755 --- a/frameworks/C++/paozhu/paozhu_benchmark/viewsrc/include/regviewmethod.hpp +++ b/frameworks/C++/paozhu/paozhu_benchmark/viewsrc/include/regviewmethod.hpp @@ -17,7 +17,7 @@ namespace http { void _initview_method_regto(VIEW_REG &_viewmetholdreg) { - //create time: Mon, 30 Dec 2024 15:45:45 GMT + //create time: Thu, 27 Mar 2025 01:00:54 GMT _viewmetholdreg.emplace("techempower/fortunes",http::view::techempower::fortunes); diff --git a/frameworks/C++/paozhu/paozhu_benchmark/viewsrc/include/viewsrc.h b/frameworks/C++/paozhu/paozhu_benchmark/viewsrc/include/viewsrc.h index 8991765bf19..cb67a0bc66a 100755 --- a/frameworks/C++/paozhu/paozhu_benchmark/viewsrc/include/viewsrc.h +++ b/frameworks/C++/paozhu/paozhu_benchmark/viewsrc/include/viewsrc.h @@ -16,7 +16,7 @@ namespace view { namespace techempower{ - std::string fortunes(const struct view_param &vinfo,http::OBJ_VALUE &obj); + std::string fortunes(const struct view_param &vinfo,http::obj_val &obj); } diff --git a/frameworks/C++/paozhu/paozhu_benchmark/viewsrc/view/techempower/fortunes.cpp b/frameworks/C++/paozhu/paozhu_benchmark/viewsrc/view/techempower/fortunes.cpp index b29f89356b5..caada3e2e47 100755 --- a/frameworks/C++/paozhu/paozhu_benchmark/viewsrc/view/techempower/fortunes.cpp +++ b/frameworks/C++/paozhu/paozhu_benchmark/viewsrc/view/techempower/fortunes.cpp @@ -21,7 +21,7 @@ namespace http { namespace view { namespace techempower{ - std::string fortunes([[maybe_unused]] const struct view_param &vinfo,[[maybe_unused]] http::OBJ_VALUE &obj) + std::string fortunes([[maybe_unused]] const struct view_param &vinfo,[[maybe_unused]] http::obj_val &obj) { std::ostringstream echo; @@ -32,9 +32,9 @@ namespace view { for(auto &a:obj["list"].as_array()){ echo<<""; - echo<"; - echo<"; }