Browse Source

Read the id column in the queries or db tests (#5191)

An Tao 5 years ago
parent
commit
411dc29da1

+ 1 - 1
frameworks/C++/drogon/drogon-core.dockerfile

@@ -44,7 +44,7 @@ RUN git clone https://github.com/an-tao/drogon
 
 
 WORKDIR $DROGON_ROOT
 WORKDIR $DROGON_ROOT
 
 
-RUN git checkout df82728a452ce9dab568d975991e9a0afb41a98f
+RUN git checkout ac377bd650e2fd80f3d5db522c876332edb65dc1
 RUN git submodule update --init
 RUN git submodule update --init
 RUN mkdir build
 RUN mkdir build
 
 

+ 1 - 1
frameworks/C++/drogon/drogon.dockerfile

@@ -44,7 +44,7 @@ RUN git clone https://github.com/an-tao/drogon
 
 
 WORKDIR $DROGON_ROOT
 WORKDIR $DROGON_ROOT
 
 
-RUN git checkout df82728a452ce9dab568d975991e9a0afb41a98f
+RUN git checkout ac377bd650e2fd80f3d5db522c876332edb65dc1
 RUN git submodule update --init
 RUN git submodule update --init
 RUN mkdir build
 RUN mkdir build
 
 

+ 2 - 2
frameworks/C++/drogon/drogon_benchmark/controllers/DbCtrlRaw.cc

@@ -19,14 +19,14 @@ void DbCtrlRaw::asyncHandleHttpRequest(
         std::make_shared<std::function<void(const HttpResponsePtr &)>>(
         std::make_shared<std::function<void(const HttpResponsePtr &)>>(
             std::move(callback));
             std::move(callback));
 
 
-    *client << "select randomnumber from world where id=$1" << id >>
+    *client << "select * from world where id=$1" << id >>
         [callbackPtr, id](const Result &rows) {
         [callbackPtr, id](const Result &rows) {
             auto resp = HttpResponse::newHttpResponse();
             auto resp = HttpResponse::newHttpResponse();
             char json[64];
             char json[64];
             auto size = sprintf(json,
             auto size = sprintf(json,
                                 "{\"id\":%d,\"randomnumber\":%s}",
                                 "{\"id\":%d,\"randomnumber\":%s}",
                                 id,
                                 id,
-                                rows[0]["randomnumber"].c_str());
+                                rows[0][1ul].c_str());
             resp->setBody(std::string(json, size));
             resp->setBody(std::string(json, size));
             resp->setContentTypeCode(CT_APPLICATION_JSON);
             resp->setContentTypeCode(CT_APPLICATION_JSON);
             (*callbackPtr)(resp);
             (*callbackPtr)(resp);

+ 2 - 2
frameworks/C++/drogon/drogon_benchmark/controllers/FortuneCtrlRaw.cc

@@ -17,8 +17,8 @@ void FortuneCtrlRaw::asyncHandleHttpRequest(
         std::vector<std::pair<string_view, string_view>> rows;
         std::vector<std::pair<string_view, string_view>> rows;
         for (auto const &row : r)
         for (auto const &row : r)
         {
         {
-            rows.emplace_back(row["id"].as<string_view>(),
-                              row["message"].as<string_view>());
+            rows.emplace_back(row[0ul].as<string_view>(),  // id
+                              row[1ul].as<string_view>()); // message
         }
         }
         rows.emplace_back("0", "Additional fortune added at request time.");
         rows.emplace_back("0", "Additional fortune added at request time.");
         std::sort(rows.begin(),
         std::sort(rows.begin(),

+ 2 - 2
frameworks/C++/drogon/drogon_benchmark/controllers/QueriesCtrlRaw.cc

@@ -28,7 +28,7 @@ void QueriesCtrlRaw::asyncHandleHttpRequest(
     for (int i = 0; i < queries; i++)
     for (int i = 0; i < queries; i++)
     {
     {
         int id = rand() % 10000 + 1;
         int id = rand() % 10000 + 1;
-        *client << "select randomnumber from world where id=$1" << id >>
+        *client << "select * from world where id=$1" << id >>
             [callbackPtr, counter, jsonStr, id](const Result &r) mutable {
             [callbackPtr, counter, jsonStr, id](const Result &r) mutable {
                 (*counter)--;
                 (*counter)--;
                 if (r.size() > 0)
                 if (r.size() > 0)
@@ -37,7 +37,7 @@ void QueriesCtrlRaw::asyncHandleHttpRequest(
                     auto size = sprintf(json,
                     auto size = sprintf(json,
                                         "{\"id\":%d,\"randomnumber\":%s}",
                                         "{\"id\":%d,\"randomnumber\":%s}",
                                         id,
                                         id,
-                                        r[0]["randomnumber"].c_str());
+                                        r[0][1ul].c_str());
                     jsonStr->append(json, size);
                     jsonStr->append(json, size);
                 }
                 }
                 if ((*counter) == 0)
                 if ((*counter) == 0)