Cutelyst 2 4 0 (#3797)

* Fix framework platform

* update cutelyst version

* cutelyst: update to Cytelyst 2.4.1

* cutelyst: use a more performing structure

frameworks/C++/cutelyst/benchmark_config.json

@@ -11,7 +11,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -31,7 +31,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -51,7 +51,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -69,7 +69,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -89,7 +89,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -106,7 +106,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -126,7 +126,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -143,7 +143,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -161,7 +161,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -181,7 +181,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -201,7 +201,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -219,7 +219,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -239,7 +239,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -259,7 +259,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "CutelystWSGI",
                 "webserver": "None",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -277,7 +277,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "uWSGI",
                 "webserver": "nginx",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -297,7 +297,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "uWSGI",
                 "webserver": "nginx",
                 "os": "Linux",
                 "database_os": "Linux",
@@ -317,7 +317,7 @@
                 "framework": "cutelyst",
                 "language": "C++",
                 "orm": "Raw",
-                "platform": "Qt",
+                "platform": "uWSGI",
                 "webserver": "nginx",
                 "os": "Linux",
                 "database_os": "Linux",

frameworks/C++/cutelyst/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export CUTELYST_VER=2.3.0
+export CUTELYST_VER=2.4.1
 
 apt update -qq && \
     apt install -yqq --no-install-recommends \

frameworks/C++/cutelyst/src/fortunes.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr>{% for fortune in fortunes %}<tr><td>{{fortune.id}}</td><td>{{fortune.message}}</td></tr>{% endfor %}</table></body></html>
+<!DOCTYPE html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr>{% for fortune in fortunes %}<tr><td>{{fortune.0}}</td><td>{{fortune.1}}</td></tr>{% endfor %}</table></body></html>

frameworks/C++/cutelyst/src/fortunetest.cpp

@@ -34,13 +34,12 @@ void FortuneTest::fortunes_grantlee_postgres(Context *c)
                 QLatin1String("SELECT id, message FROM fortune"),
                 QStringLiteral("postgres"));
     if (query.exec()) {
-        QVariantList fortunes = Sql::queryToMapList(query);
-        fortunes.append(QVariantMap{
-                            {QStringLiteral("id"), 0},
-                            {QStringLiteral("message"), QStringLiteral("Additional fortune added at request time.")},
-                        });
+        QVariantList fortunes = Sql::queryToList(query);
+        fortunes.append(QVariant::fromValue(QVariantList{
+                            {0, QStringLiteral("Additional fortune added at request time.")},
+                        }));
         std::sort(fortunes.begin(), fortunes.end(), [] (const QVariant &a1, const QVariant &a2) {
-            return a1.toMap()[QStringLiteral("message")].toString() < a2.toMap()[QStringLiteral("message")].toString();
+            return a1.toList()[1].toString() < a2.toList()[1].toString();
         });
         c->setStash(QStringLiteral("template"), QStringLiteral("fortunes.html"));
         c->setStash(QStringLiteral("fortunes"), fortunes);
@@ -56,13 +55,12 @@ void FortuneTest::fortunes_grantlee_mysql(Context *c)
                 QLatin1String("SELECT id, message FROM fortune"),
                 QStringLiteral("mysql"));
     if (query.exec()) {
-        QVariantList fortunes = Sql::queryToMapList(query);
-        fortunes.append(QVariantMap{
-                            {QStringLiteral("id"), 0},
-                            {QStringLiteral("message"), QStringLiteral("Additional fortune added at request time.")},
-                        });
+        QVariantList fortunes = Sql::queryToList(query);
+        fortunes.append(QVariant::fromValue(QVariantList{
+                            {0, QStringLiteral("Additional fortune added at request time.")},
+                        }));
         std::sort(fortunes.begin(), fortunes.end(), [] (const QVariant &a1, const QVariant &a2) {
-            return a1.toMap()[QStringLiteral("message")].toString() < a2.toMap()[QStringLiteral("message")].toString();
+            return a1.toList()[1].toString() < a2.toList()[1].toString();
         });
         c->setStash(QStringLiteral("template"), QStringLiteral("fortunes.html"));
         c->setStash(QStringLiteral("fortunes"), fortunes);