[C++/Paozhu]Clear libs directory (#9022)

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* [C++] add new paozhu

* update benchmark to v1.5.8

* update benchmark to v1.5.8

* Add benchmark files

* Add benchmark files

* use local file

* use git clone

* add conf

* add conf

* add conf

* add conf

* add conf

* use local files

* use local files

* use local files

* use local files

* Remove files

* Fix files

* Clear libs directory

* Clear libs directory

* Clear libs directory

* Clear libs directory

* Clear libs and controller directory

* Fix copy file

* Fix copy file

* Fix copy file

* Fix copy file

frameworks/C++/paozhu/paozhu.dockerfile

@@ -19,11 +19,24 @@ WORKDIR /
 RUN git clone https://github.com/hggq/paozhu
 # RUN unzip benchmark.zip
 RUN rm -Rf ./paozhu/controller
- 
-COPY ./paozhu_benchmark/controller ./paozhu/
+RUN rm -Rf ./paozhu/libs
+RUN mkdir ./paozhu/libs
+RUN mkdir ./paozhu/libs/types
+
+RUN mkdir ./paozhu/controller
+RUN mkdir ./paozhu/controller/include
+RUN mkdir ./paozhu/controller/src
+
+COPY ./paozhu_benchmark/controller/include/techempower.h ./paozhu/controller/include/
+COPY ./paozhu_benchmark/controller/src/techempower.cpp ./paozhu/controller/src/
+
+COPY ./paozhu_benchmark/libs/types/techempower_json.h ./paozhu/libs/types/
+COPY ./paozhu_benchmark/libs/types/techempower_json_jsonreflect.cpp ./paozhu/libs/types/
+
 COPY ./paozhu_benchmark/common/autocontrolmethod.hpp ./paozhu/common/
 COPY ./paozhu_benchmark/common/reghttpmethod_pre.hpp ./paozhu/common/
 COPY ./paozhu_benchmark/common/reghttpmethod.hpp ./paozhu/common/
+COPY ./paozhu_benchmark/common/json_reflect_headers.h ./paozhu/common/
 
 COPY ./paozhu_benchmark/conf/server.conf ./paozhu/conf/server.conf
 COPY ./paozhu_benchmark/conf/orm.conf ./paozhu/conf/orm.conf

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

@@ -6,236 +6,236 @@
 #include <chrono>
 #include "httppeer.h"
 #include "techempower.h"
-#include "techempower_json.h"
 #include "datetime.h"
 #include "func.h"
 #include "pzcache.h"
 #include "json_reflect_headers.h"
+#include "techempower_json.h"
 namespace http
 {
-//@urlpath(null,plaintext)
-std::string techempowerplaintext(std::shared_ptr<httppeer> peer)
-{
-    peer->type("text/plain; charset=UTF-8");
-    peer->set_header("Date", get_gmttime());
-    peer->output = "Hello, World!";
-    return "";
-}
-
-//@urlpath(null,json)
-std::string techempowerjson(std::shared_ptr<httppeer> peer)
-{
-    peer->type("application/json; charset=UTF-8");
-    peer->set_header("Date", get_gmttime());
-    struct techempower_outjson_t a;
-    a.message    = "Hello, World!";
-    peer->output = json_encode(a);
-    return "";
-}
-
-//@urlpath(null,db)
-std::string techempowerdb(std::shared_ptr<httppeer> peer)
-{
-    peer->type("application/json; charset=UTF-8");
-    peer->set_header("Date", get_gmttime());
-    auto myworld        = orm::World();
-    unsigned int rd_num = rand_range(1, 10000);
-    myworld.get_one(rd_num);
-
-    peer->output = myworld.data_tojson();
-    return "";
-}
-
-//@urlpath(null,queries)
-std::string techempowerqueries(std::shared_ptr<httppeer> peer)
-{
-    peer->type("application/json; charset=UTF-8");
-    peer->set_header("Date", get_gmttime());
-
-    unsigned int get_num = peer->get["queries"].to_int();
-    if (get_num == 0)
+    //@urlpath(null,plaintext)
+    std::string techempowerplaintext(std::shared_ptr<httppeer> peer)
     {
-        get_num = 1;
+        peer->type("text/plain; charset=UTF-8");
+        peer->set_header("Date", get_gmttime());
+        peer->output = "Hello, World!";
+        return "";
     }
-    else if (get_num > 500)
+
+    //@urlpath(null,json)
+    std::string techempowerjson(std::shared_ptr<httppeer> peer)
     {
-        get_num = 500;
+        peer->type("application/json; charset=UTF-8");
+        peer->set_header("Date", get_gmttime());
+        struct techempower_outjson_t a;
+        a.message = "Hello, World!";
+        peer->output = json_encode(a);
+        return "";
     }
-    auto myworld = orm::World();
-    myworld.record.reserve(get_num);
-    for (unsigned int i = 0; i < get_num; i++)
+
+    //@urlpath(null,db)
+    std::string techempowerdb(std::shared_ptr<httppeer> peer)
     {
-        myworld.wheresql.clear();
+        peer->type("application/json; charset=UTF-8");
+        peer->set_header("Date", get_gmttime());
+        auto myworld = orm::World();
         unsigned int rd_num = rand_range(1, 10000);
-        myworld.where("id", rd_num).fetch_append();
-    }
-
-    peer->output = myworld.to_json();
-    return "";
-}
+        myworld.get_one(rd_num);
 
-//@urlpath(null,fortunes)
-std::string techempowerfortunes(std::shared_ptr<httppeer> peer)
-{
-    peer->type("text/html; charset=UTF-8");
-    peer->set_header("Date", get_gmttime());
-
-    auto myfortune = orm::Fortune();
-    myfortune.fetch();
-    myfortune.data.id      = 0;
-    myfortune.data.message = "Additional fortune added at request time.";
-    myfortune.record.push_back(myfortune.data);
-
-    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;
-    for (unsigned int i = 0; i < myfortune.record.size(); i++)
-    {
-        item["id"]      = myfortune.record[i].id;
-        item["message"] = html_encode(myfortune.record[i].message);
-        peer->val["list"].push(item);
+        peer->output = myworld.data_tojson();
+        return "";
     }
 
-    peer->view("techempower/fortunes");
-    return "";
-}
+    //@urlpath(null,queries)
+    std::string techempowerqueries(std::shared_ptr<httppeer> peer)
+    {
+        peer->type("application/json; charset=UTF-8");
+        peer->set_header("Date", get_gmttime());
 
-//@urlpath(null,updates)
-std::string techempowerupdates(std::shared_ptr<httppeer> peer)
-{
-    peer->type("application/json; charset=UTF-8");
-    peer->set_header("Date", get_gmttime());
-    unsigned int get_num = peer->get["queries"].to_int();
+        unsigned int get_num = peer->get["queries"].to_int();
+        if (get_num == 0)
+        {
+            get_num = 1;
+        }
+        else if (get_num > 500)
+        {
+            get_num = 500;
+        }
+        auto myworld = orm::World();
+        myworld.record.reserve(get_num);
+        for (unsigned int i = 0; i < get_num; i++)
+        {
+            myworld.wheresql.clear();
+            unsigned int rd_num = rand_range(1, 10000);
+            myworld.where("id", rd_num).fetch_append();
+        }
 
-    if (get_num == 0)
-    {
-        get_num = 1;
-    }
-    else if (get_num > 500)
-    {
-        get_num = 500;
+        peer->output = myworld.to_json();
+        return "";
     }
-    auto myworld = orm::World();
-    myworld.record.clear();
-    myworld.record.reserve(get_num);
-    for (unsigned int i = 0; i < get_num; i++)
+
+    //@urlpath(null,fortunes)
+    std::string techempowerfortunes(std::shared_ptr<httppeer> peer)
     {
-        myworld.wheresql.clear();
-        myworld.where("id", rand_range(1, 10000)).fetch_append();
-        if (myworld.effect() > 0)
+        peer->type("text/html; charset=UTF-8");
+        peer->set_header("Date", get_gmttime());
+
+        auto myfortune = orm::Fortune();
+        myfortune.fetch();
+        myfortune.data.id = 0;
+        myfortune.data.message = "Additional fortune added at request time.";
+        myfortune.record.push_back(myfortune.data);
+
+        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;
+        for (unsigned int i = 0; i < myfortune.record.size(); i++)
         {
-            unsigned int j                 = myworld.record.size() - 1;
-            myworld.data.randomnumber      = rand_range(1, 10000);
-            myworld.record[j].randomnumber = myworld.data.randomnumber;
-            myworld.update("randomnumber");
+            item["id"] = myfortune.record[i].id;
+            item["message"] = html_encode(myfortune.record[i].message);
+            peer->val["list"].push(item);
         }
-    }
-    peer->output = myworld.to_json();
-    return "";
-}
 
-//@urlpath(null,cached-queries)
-std::string techempowercached_queries(std::shared_ptr<httppeer> peer)
-{
-    peer->type("application/json; charset=UTF-8");
-    peer->set_header("Date", get_gmttime());
+        peer->view("techempower/fortunes");
+        return "";
+    }
 
-    unsigned int get_num = peer->get["count"].to_int();
-    if (get_num == 0)
+    //@urlpath(null,updates)
+    std::string techempowerupdates(std::shared_ptr<httppeer> peer)
     {
-        get_num = 1;
+        peer->type("application/json; charset=UTF-8");
+        peer->set_header("Date", get_gmttime());
+        unsigned int get_num = peer->get["queries"].to_int();
+
+        if (get_num == 0)
+        {
+            get_num = 1;
+        }
+        else if (get_num > 500)
+        {
+            get_num = 500;
+        }
+        auto myworld = orm::World();
+        myworld.record.clear();
+        myworld.record.reserve(get_num);
+        for (unsigned int i = 0; i < get_num; i++)
+        {
+            myworld.wheresql.clear();
+            myworld.where("id", rand_range(1, 10000)).fetch_append();
+            if (myworld.effect() > 0)
+            {
+                unsigned int j = myworld.record.size() - 1;
+                myworld.data.randomnumber = rand_range(1, 10000);
+                myworld.record[j].randomnumber = myworld.data.randomnumber;
+                myworld.update("randomnumber");
+            }
+        }
+        peer->output = myworld.to_json();
+        return "";
     }
-    else if (get_num > 500)
+
+    //@urlpath(null,cached-queries)
+    std::string techempowercached_queries(std::shared_ptr<httppeer> peer)
     {
-        get_num = 500;
-    }
-    auto myworld          = orm::World();
-    std::string mycacheid = "alldatacache";
+        peer->type("application/json; charset=UTF-8");
+        peer->set_header("Date", get_gmttime());
 
-    pzcache<std::vector<orm::worldbase::meta>> &temp_cache = pzcache<std::vector<orm::worldbase::meta>>::conn();
+        unsigned int get_num = peer->get["count"].to_int();
+        if (get_num == 0)
+        {
+            get_num = 1;
+        }
+        else if (get_num > 500)
+        {
+            get_num = 500;
+        }
+        auto myworld = orm::World();
+        std::string mycacheid = "alldatacache";
 
-    std::vector<orm::worldbase::meta> allcachedata_array;
-    allcachedata_array.reserve(10000);
-    //create rand data to cache
-    if (temp_cache.check(mycacheid) > -1)
-    {
-        allcachedata_array = temp_cache.get(mycacheid);
-    }
-    else
-    {
-        allcachedata_array.resize(10000);
-        for (unsigned int i = 0; i < 10000; i++)
+        pzcache<std::vector<orm::worldbase::meta>> &temp_cache = pzcache<std::vector<orm::worldbase::meta>>::conn();
+
+        std::vector<orm::worldbase::meta> allcachedata_array;
+        allcachedata_array.reserve(10000);
+        // create rand data to cache
+        if (temp_cache.check(mycacheid) > -1)
         {
-            allcachedata_array[i].id           = i + 1;
-            allcachedata_array[i].randomnumber = rand_range(1, 10000);
+            allcachedata_array = temp_cache.get(mycacheid);
         }
-        temp_cache.save(mycacheid, allcachedata_array, 120);
-    }
-    //get rand data from cache
-    mycacheid = "my" + std::to_string(get_num);
-    myworld.record.reserve(get_num);
-    if (temp_cache.check(mycacheid) > -1)
-    {
-        myworld.record = temp_cache.get(mycacheid);
-    }
-    else
-    {
-        if (allcachedata_array.size() == 10000)
+        else
         {
-            for (unsigned int i = 0; i < get_num; i++)
+            allcachedata_array.resize(10000);
+            for (unsigned int i = 0; i < 10000; i++)
             {
-                unsigned int temp_rid = rand_range(0, 9999);
-                myworld.record.push_back(allcachedata_array[temp_rid]);
+                allcachedata_array[i].id = i + 1;
+                allcachedata_array[i].randomnumber = rand_range(1, 10000);
             }
+            temp_cache.save(mycacheid, allcachedata_array, 120);
+        }
+        // get rand data from cache
+        mycacheid = "my" + std::to_string(get_num);
+        myworld.record.reserve(get_num);
+        if (temp_cache.check(mycacheid) > -1)
+        {
+            myworld.record = temp_cache.get(mycacheid);
+        }
+        else
+        {
+            if (allcachedata_array.size() == 10000)
+            {
+                for (unsigned int i = 0; i < get_num; i++)
+                {
+                    unsigned int temp_rid = rand_range(0, 9999);
+                    myworld.record.push_back(allcachedata_array[temp_rid]);
+                }
+            }
+            temp_cache.save(mycacheid, myworld.record, 120);
         }
-        temp_cache.save(mycacheid, myworld.record, 120);
-    }
-
-    peer->output = myworld.to_json();
-    return "";
-}
 
-//@urlpath(null,cached-db)
-std::string techempowercached_db(std::shared_ptr<httppeer> peer)
-{
-    peer->type("application/json; charset=UTF-8");
-    peer->set_header("Date", get_gmttime());
-    //this test from database to cache
-    unsigned int get_num = peer->get["count"].to_int();
-    if (get_num == 0)
-    {
-        get_num = 1;
+        peer->output = myworld.to_json();
+        return "";
     }
-    else if (get_num > 500)
+
+    //@urlpath(null,cached-db)
+    std::string techempowercached_db(std::shared_ptr<httppeer> peer)
     {
-        get_num = 500;
-    }
-    auto myworld          = orm::World();
-    std::string mycacheid = "my" + std::to_string(get_num);
+        peer->type("application/json; charset=UTF-8");
+        peer->set_header("Date", get_gmttime());
+        // this test from database to cache
+        unsigned int get_num = peer->get["count"].to_int();
+        if (get_num == 0)
+        {
+            get_num = 1;
+        }
+        else if (get_num > 500)
+        {
+            get_num = 500;
+        }
+        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::worldbase::meta>> &temp_cache = pzcache<std::vector<orm::worldbase::meta>>::conn();
 
-    myworld.record.reserve(get_num);
-    if (temp_cache.check(mycacheid) > -1)
-    {
-        myworld.record = temp_cache.get(mycacheid);
-    }
-    else
-    {
-        std::vector<unsigned int> cacheid;
-        for (unsigned int i = 0; i < get_num; i++)
+        myworld.record.reserve(get_num);
+        if (temp_cache.check(mycacheid) > -1)
+        {
+            myworld.record = temp_cache.get(mycacheid);
+        }
+        else
         {
-            cacheid.push_back(rand_range(1, 10000));
+            std::vector<unsigned int> cacheid;
+            for (unsigned int i = 0; i < get_num; i++)
+            {
+                cacheid.push_back(rand_range(1, 10000));
+            }
+
+            std::string sqlstr = array_to_sql(cacheid);
+            myworld.whereIn("id", sqlstr).fetch();
+            temp_cache.save(mycacheid, myworld.record, 120);
         }
 
-        std::string sqlstr = array_to_sql(cacheid);
-        myworld.whereIn("id", sqlstr).fetch();
-        temp_cache.save(mycacheid, myworld.record, 120);
+        peer->output = myworld.to_json();
+        return "";
     }
 
-    peer->output = myworld.to_json();
-    return "";
-}
-
-}// namespace http
+} // namespace http

frameworks/C++/paozhu/paozhu_benchmark/libs/types/techempower_json.h

@@ -6,6 +6,7 @@
 #include "json_reflect_headers.h"
 #include "unicode.h"
 #include "func.h"
+//This file is automatically created, do not edit it
 
 namespace http
 {