Merge remote-tracking branch 'upstream/master'

Author: eastspire

frameworks/C++/paozhu/paozhu.dockerfile

@@ -94,8 +94,8 @@ RUN mkdir ./paozhu/orm/include
 
 
 COPY ./paozhu_benchmark/orm/orm.h ./paozhu/orm/
-COPY ./paozhu_benchmark/orm/include/fortunebase.h ./paozhu/orm/include/
-COPY ./paozhu_benchmark/orm/include/worldbase.h ./paozhu/orm/include/
+COPY ./paozhu_benchmark/orm/include/fortune_base.h ./paozhu/orm/include/
+COPY ./paozhu_benchmark/orm/include/world_base.h ./paozhu/orm/include/
 COPY ./paozhu_benchmark/orm/include/fortune_mysql.h ./paozhu/orm/include/
 COPY ./paozhu_benchmark/orm/include/world_mysql.h ./paozhu/orm/include/
 

frameworks/C++/paozhu/paozhu_benchmark/controller/src/techempower.cpp

@@ -166,9 +166,9 @@ asio::awaitable<std::string> techempowercached_queries(std::shared_ptr<httppeer>
     auto myworld          = orm::World();
     std::string mycacheid = "alldatacache";
 
-    pzcache<std::vector<orm::worldbase::meta>> &temp_cache = pzcache<std::vector<orm::worldbase::meta>>::conn();
+    pzcache<std::vector<orm::world_base::meta>> &temp_cache = pzcache<std::vector<orm::world_base::meta>>::conn();
 
-    std::vector<orm::worldbase::meta> allcachedata_array;
+    std::vector<orm::world_base::meta> allcachedata_array;
     allcachedata_array.reserve(10000);
     //create rand data to cache
     if (temp_cache.check(mycacheid) > -1)
@@ -227,7 +227,7 @@ asio::awaitable<std::string> techempowercached_db(std::shared_ptr<httppeer> peer
     auto myworld          = orm::World();
     std::string mycacheid = "my" + std::to_string(get_num);
 
-    pzcache<std::vector<orm::worldbase::meta>> &temp_cache = pzcache<std::vector<orm::worldbase::meta>>::conn();
+    pzcache<std::vector<orm::world_base::meta>> &temp_cache = pzcache<std::vector<orm::world_base::meta>>::conn();
 
     myworld.record.reserve(get_num);
     if (temp_cache.check(mycacheid) > -1)

frameworks/C++/paozhu/paozhu_benchmark/models/Fortune.cpp

@@ -1,6 +1,6 @@
 
 #include "fortune_mysql.h"
-#include "fortunebase.h"
+#include "fortune_base.h"
 #include "Fortune.h"
 
 /* 如果此文件存在不会自动覆盖，没有则会自动生成。

frameworks/C++/paozhu/paozhu_benchmark/models/World.cpp

@@ -1,6 +1,6 @@
 
 #include "world_mysql.h"
-#include "worldbase.h"
+#include "world_base.h"
 #include "World.h"
 
 /* 如果此文件存在不会自动覆盖，没有则会自动生成。

frameworks/C++/paozhu/paozhu_benchmark/models/include/Fortune.h

@@ -1,13 +1,13 @@
 #ifndef ORM_DEFAULT_FORTUNE_H
 #define ORM_DEFAULT_FORTUNE_H
 #include "fortune_mysql.h" 
-#include "fortunebase.h"
+#include "fortune_base.h"
 
 /* 如果此文件存在不会自动覆盖，没有则会自动生成。
 *If this file exists, it will not be overwritten automatically. If not, it will be generated automatically. */
 
  namespace orm {
-		class Fortune : public fortune_mysql<Fortune,fortunebase>{
+		class Fortune : public fortune_mysql<Fortune,fortune_base>{
 		 public:
 		 Fortune(std::string dbtag);
 		 Fortune();

frameworks/C++/paozhu/paozhu_benchmark/models/include/World.h

@@ -1,13 +1,13 @@
 #ifndef ORM_DEFAULT_WORLD_H
 #define ORM_DEFAULT_WORLD_H
 #include "world_mysql.h" 
-#include "worldbase.h"
+#include "world_base.h"
 
 /* 如果此文件存在不会自动覆盖，没有则会自动生成。
 *If this file exists, it will not be overwritten automatically. If not, it will be generated automatically. */
 
  namespace orm {
-		class World : public world_mysql<World,worldbase>{
+		class World : public world_mysql<World,world_base>{
 		 public:
 		 World(std::string dbtag);
 		 World();

frameworks/C++/paozhu/paozhu_benchmark/orm/include/fortunebase.h renamed to frameworks/C++/paozhu/paozhu_benchmark/orm/include/fortune_base.h

@@ -2,7 +2,7 @@
 #define ORM_DEFAULT_FORTUNEBASEMATA_H
 /*
 *This file is auto create from paozhu_cli
-*本文件为自动生成 Tue, 08 Apr 2025 07:55:59 GMT
+*本文件为自动生成 Sat, 26 Apr 2025 15:58:21 GMT
 ***/
 #include <iostream>
 #include <cstdio>
@@ -19,19 +19,19 @@
 namespace orm { 
 
 
-struct fortunebase
+struct fortune_base
 {
     struct meta{
      unsigned  int  id = 0; ///**/
  std::string  message = ""; ///**/
  } data;
- std::vector<fortunebase::meta> record;
+ std::vector<fortune_base::meta> record;
 std::string _rmstag="default";//this value must be default or tag value, tag in mysqlconnect config file .
 unsigned int _offset=0;
-std::vector<fortunebase::meta>::iterator begin(){     return record.begin(); }
-std::vector<fortunebase::meta>::iterator end(){     return record.end(); }
-std::vector<fortunebase::meta>::const_iterator begin() const{     return record.begin(); }
-std::vector<fortunebase::meta>::const_iterator end() const{     return record.end(); }
+std::vector<fortune_base::meta>::iterator begin(){     return record.begin(); }
+std::vector<fortune_base::meta>::iterator end(){     return record.end(); }
+std::vector<fortune_base::meta>::const_iterator begin() const{     return record.begin(); }
+std::vector<fortune_base::meta>::const_iterator end() const{     return record.end(); }
 static constexpr std::array<std::string_view,2> col_names={"id","message"};
 static constexpr std::array<unsigned char,2> col_types={3,253};
 static constexpr std::array<unsigned char,2> col_length={0,0};
@@ -75,7 +75,7 @@ break;
             record.clear();     
       }
       void data_reset(){
-     fortunebase::meta metatemp;    
+     fortune_base::meta metatemp;    
             data = metatemp; 
       }
 
@@ -610,7 +610,7 @@ tempsql<<"\"message\":\""<<http::utf8_to_jsonstring(data.message)<<"\"";
     void from_json(const std::string &json_content)
    {
         record.clear();
-        fortunebase::meta metatemp; 
+        fortune_base::meta metatemp; 
         data=metatemp;
         unsigned int json_offset=0;
         bool isarray=false;
@@ -1057,14 +1057,14 @@ tempsql<<"\"message\":\""<<http::utf8_to_jsonstring(record[n].message)<<"\"";
  void setMessage( std::string  &val){  data.message=val;} 
  void setMessage(std::string_view val){  data.message=val;} 
 
-fortunebase::meta getnewData(){
+fortune_base::meta getnewData(){
  	 struct meta newdata;
 	 return newdata; 
 } 
-fortunebase::meta getData(){
+fortune_base::meta getData(){
  	 return data; 
 } 
-std::vector<fortunebase::meta> getRecord(){
+std::vector<fortune_base::meta> getRecord(){
  	 return record; 
 } 
 
@@ -1145,7 +1145,7 @@ std::vector<fortunebase::meta> getRecord(){
             }  
 
         template<typename T, typename std::enable_if<std::is_integral_v<T>,bool>::type = true > 
-        T getVal([[maybe_unused]] fortunebase::meta & iter,[[maybe_unused]] std::string keyname)
+        T getVal([[maybe_unused]] fortune_base::meta & iter,[[maybe_unused]] std::string keyname)
         {
 
 
@@ -1179,7 +1179,7 @@ std::vector<fortunebase::meta> getRecord(){
             }  
 
             template<typename T, typename std::enable_if<std::is_floating_point_v<T>,bool>::type = true > 
-            T getVal([[maybe_unused]] fortunebase::meta & iter,std::string keyname)
+            T getVal([[maybe_unused]] fortune_base::meta & iter,std::string keyname)
             {
                 unsigned char kpos;
                 kpos=findcolpos(keyname);
@@ -1211,7 +1211,7 @@ std::vector<fortunebase::meta> getRecord(){
             }  
 
             template<typename T, typename std::enable_if<std::is_same<T,std::string>::value,bool>::type = true > 
-            std::string getVal([[maybe_unused]] fortunebase::meta & iter,std::string keyname)
+            std::string getVal([[maybe_unused]] fortune_base::meta & iter,std::string keyname)
             {
 
                 unsigned char kpos;