aa

.github/workflows/build.yml

@@ -1,13 +1,20 @@
 name: build
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [ push, pull_request ]
 jobs:
   setup:
     runs-on: ubuntu-20.04
     steps:
+      # Required for workflow triggers like the auto-label for failing PRs
+      - name: Save PR number
+        if: github.event_name == 'pull_request'
+        run: |
+          mkdir -p ./pr
+          echo ${{ github.event.number }} > ./pr/NR
+      - uses: actions/upload-artifact@v2
+        if: github.event_name == 'pull_request'
+        with:
+          name: pr
+          path: pr/
       # Commit branch/name extraction from:
       # https://github.community/t/accessing-commit-message-in-pull-request-event/17158/8
       #
@@ -26,16 +33,35 @@ jobs:
           echo "COMMIT_MESSAGE<<EOF" >> $GITHUB_ENV
           echo "$(git log --format=%B -n 1 HEAD)" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
+          echo "PREVIOUS_COMMIT=$(git log --format=%H -n 1 HEAD~1)" >> $GITHUB_ENV
       # In case of a pull_request event, the commit we care about is HEAD^2, that
       # is, the second parent of the pull request merge commit.
       # The current branch name is directly given by GITHUB_HEAD_REF
       - name: Get commit branch and commit message from PR
         if: github.event_name == 'pull_request'
         run: |
           echo "BRANCH_NAME=$GITHUB_HEAD_REF" >> $GITHUB_ENV
+          echo "TARGET_BRANCH_NAME=$(echo ${GITHUB_BASE_REF##*/})" >> $GITHUB_ENV
           echo "COMMIT_MESSAGE<<EOF" >> $GITHUB_ENV
           echo "$(git log --format=%B -n 1 HEAD^2)" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
+          echo "PREVIOUS_COMMIT=$(git log --format=%H -n 1 HEAD^2~1)" >> $GITHUB_ENV
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '2.7'
+          architecture: 'x64'
+      - name: Get all changes vs master
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          echo "DIFF<<EOF" >> $GITHUB_ENV
+          echo "$(./toolset/github_actions/github_actions_diff.py)" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+      - name: Determine which (if any) tests need to be run
+        run: |
+          echo "RUN_TESTS<<EOF" >> $GITHUB_ENV
+          echo "$(grep -oP "github-actions-run-tests \K(.*)" <<< $DIFF || true)" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
       - id: event_out
         name: Write event outputs
         run: |
@@ -45,6 +71,8 @@ jobs:
           COMMIT_MESSAGE="${COMMIT_MESSAGE//$'\r'/'%0D'}"
           echo "::set-output name=commit_message::$COMMIT_MESSAGE"
           echo "::set-output name=branch_name::$BRANCH_NAME"
+          echo "::set-output name=target_branch_name::$TARGET_BRANCH_NAME"
+          echo "::set-output name=previous_commit::$PREVIOUS_COMMIT"
       - id: verify_out
         name: Write verify job matrix
         run: |
@@ -53,15 +81,18 @@ jobs:
           # include:
           #   - TESTLANG: {lang}
           # with a TESTLANG object in the include array for each language under frameworks
-          VERIFY_MATRIX=$(ls -1 frameworks | jq -R | jq -sc "{include: map({TESTLANG: .})}")
+          VERIFY_MATRIX=$(ls -1 frameworks | jq -Rc '.+"/" | select(inside(env.RUN_TESTS))  | rtrimstr("/")' | jq -sc '{include: map({TESTLANG: .})}')
           echo "::set-output name=verify_matrix::$VERIFY_MATRIX"
     outputs:
       commit_message: ${{ steps.event_out.outputs.commit_message }}
       branch_name: ${{ steps.event_out.outputs.branch_name }}
+      target_branch_name: ${{ steps.event_out.outputs.target_branch_name }}
+      previous_commit: ${{ steps.event_out.outputs.previous_commit }}
       verify_matrix: ${{ steps.verify_out.outputs.verify_matrix }}
   verify:
     needs: setup
-    if: ${{ !contains(needs.setup.outputs.commit_message, '[ci skip]') }}
+    # The matrix check is necessary because an empty job matrix is otherwise considered a workflow failure
+    if: ${{ !contains(needs.setup.outputs.commit_message, '[ci skip]') && contains(needs.setup.outputs.verify_matrix, 'TESTLANG') }}
     runs-on: ubuntu-18.04
     strategy:
       matrix: ${{ fromJSON(needs.setup.outputs.verify_matrix) }}
@@ -73,6 +104,8 @@ jobs:
       TESTDIR: ${{ matrix.TESTDIR }}
       COMMIT_MESSAGE: ${{ needs.setup.outputs.commit_message }}
       BRANCH_NAME: ${{ needs.setup.outputs.branch_name }}
+      TARGET_BRANCH_NAME: ${{ needs.setup.outputs.target_branch_name }}
+      PREVIOUS_COMMIT: ${{ needs.setup.outputs.previous_commit }}
       PR_NUMBER: ${{ github.event.pull_request.number }}
     steps:
       - uses: actions/checkout@v2
@@ -82,8 +115,7 @@ jobs:
         with:
           python-version: '2.7'
           architecture: 'x64'
-      - id: get_diff
-        name: Get all changes vs master
+      - name: Get all changes vs master
         # Runs github_actions_diff, with the the output accessible in later steps
         run: |
           # Write the result to env.DIFF for later steps

.github/workflows/label-failing-pr.yml

@@ -0,0 +1,46 @@
+name: Label PR if failed
+on:
+  workflow_run:
+    workflows: [ "build" ]
+    types:
+      - completed
+jobs:
+  apply_label:
+    if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'failure' }}
+    runs-on: ubuntu-20.04
+    steps:
+      - name: 'Download artifact'
+        uses: actions/github-script@v3.1.0
+        with:
+          # scripts lightly modified from https://securitylab.github.com/research/github-actions-preventing-pwn-requests
+          script: |
+            var artifacts = await github.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: ${{github.event.workflow_run.id }},
+            });
+            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "pr"
+            })[0];
+            var download = await github.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            var fs = require('fs');
+            fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data));
+      - run: unzip pr.zip
+      - name: Label PR
+        uses: actions/github-script@v3
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            var fs = require('fs');
+            var issue_number = Number(fs.readFileSync('./NR'));
+            await github.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: issue_number,
+              labels: ['PR: Please Update']
+            });

frameworks/C++/cutelyst/build.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-export ASQL_VER=0.19.0
+export ASQL_VER=0.26.0
 export CUTELEE_VER=5.3.0
-export CUTELYST_VER=2.13.0
+export CUTELYST_VER=2.14.0
 
 apt update -qq && \
     apt install -yqq --no-install-recommends \

frameworks/C++/cutelyst/src/CMakeLists.txt

@@ -2,9 +2,14 @@ cmake_minimum_required(VERSION 3.6.0 FATAL_ERROR)
 
 project(cutelyst_benchmarks LANGUAGES CXX)
 
+cmake_policy(SET CMP0069 NEW)
+
 find_package(Qt5 5.6.0 REQUIRED COMPONENTS Core Network Sql)
 find_package(ASqlQt5 0.15.0 REQUIRED)
 find_package(Cutelyst2Qt5 2.12 REQUIRED)
+find_package(Cutelee5 REQUIRED)
+find_package(PostgreSQL REQUIRED)
+find_package(mimalloc 1.0)
 
 # Auto generate moc files
 set(CMAKE_AUTOMOC ON)
@@ -53,10 +58,18 @@ target_link_libraries(cutelyst_benchmarks
     ASqlQt5::Core
 )
 
-add_executable(cutelyst-benchmarks main.cpp)
+add_executable(cutelyst-benchmarks ${cutelyst_benchmarks_SRCS} main.cpp)
 target_link_libraries(cutelyst-benchmarks
+    PUBLIC
     Cutelyst::Core
     Cutelyst::WSGI
+    Cutelyst::Utils::Sql
+    Cutelyst::View::Cutelee
+    Qt5::Core
     Qt5::Network
-    cutelyst_benchmarks
+    Qt5::Sql
+    ASqlQt5::Core
 )
+if (mimalloc_FOUND)
+    target_link_libraries(cutelyst-benchmarks PUBLIC mimalloc)
+endif ()

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

@@ -12,6 +12,8 @@
 #include <QJsonObject>
 #include <QJsonArray>
 
+#include <QLoggingCategory>
+
 DatabaseUpdatesTest::DatabaseUpdatesTest(QObject *parent) : Controller(parent)
 {
 
@@ -41,14 +43,14 @@ void DatabaseUpdatesTest::updatep(Context *c)
 
         db.execPrepared(APreparedQueryLiteral("SELECT randomNumber, id FROM world WHERE id=$1"),
                                {id}, [c, async] (AResult &result) {
-            if (Q_UNLIKELY(result.error() && !result.size())) {
+            if (Q_UNLIKELY(result.error() || !result.size())) {
                 c->res()->setStatus(Response::InternalServerError);
                 return;
             }
         }, c);
         db.execPrepared(APreparedQueryLiteral("UPDATE world SET randomNumber=$1 WHERE id=$2"),
                                {randomNumber, id}, [c, async] (AResult &result) {
-            if (Q_UNLIKELY(result.error() && !result.size())) {
+            if (Q_UNLIKELY(result.error())) {
                 c->res()->setStatus(Response::InternalServerError);
                 return;
             }
@@ -89,7 +91,7 @@ void DatabaseUpdatesTest::updateb(Context *c)
 
         db.execPrepared(APreparedQueryLiteral("SELECT randomNumber, id FROM world WHERE id=$1"),
                                {id}, [c, async] (AResult &result) {
-            if (Q_UNLIKELY(result.error() && !result.size())) {
+            if (Q_UNLIKELY(result.error() || !result.size())) {
                 c->res()->setStatus(Response::InternalServerError);
                 return;
             }
@@ -99,7 +101,7 @@ void DatabaseUpdatesTest::updateb(Context *c)
 
     const APreparedQuery pq = getSql(queries);
     db.execPrepared(pq, args, [c, async] (AResult &result) {
-        if (Q_UNLIKELY(result.error() && !result.size())) {
+        if (Q_UNLIKELY(result.error())) {
             c->res()->setStatus(Response::InternalServerError);
             return;
         }
@@ -189,9 +191,13 @@ APreparedQuery DatabaseUpdatesTest::getSql(int count)
     sql.append(QStringLiteral("ELSE randomnumber END WHERE id IN ("));
 
     for (int i = 0; i < count; i++) {
-        sql.append(QLatin1Char('$') + QString::number(placeholdersCounter));
+        sql.append(QLatin1Char('$') + QString::number(placeholdersCounter) + QLatin1Char(','));
         ++placeholdersCounter;
     }
+
+    if (count) {
+        sql.remove(sql.size() - 1, 1);
+    }
     sql.append(QLatin1Char(')'));
     m_sqlMap.insert(count, sql);
 

frameworks/C++/lithium/benchmark_config.json

@@ -94,6 +94,28 @@
         "display_name": "Lithium-postgres-batch",
         "notes": "",
         "versus": "None"
+      },
+
+      "postgres-batch-beta": {
+        "db_url"         : "/db",
+        "query_url"      : "/queries?N=",
+        "fortune_url"    : "/fortunes",
+        "update_url"     : "/updates?N=",
+        "port": 8080,
+        "approach": "Realistic",
+        "classification": "Micro",
+        "database": "Postgres",
+        "framework": "Lithium",
+        "language": "C++",
+        "flavor": "None",
+        "orm": "Full",
+        "platform": "None",
+        "webserver": "None",
+        "os": "Linux",
+        "database_os": "Linux",
+        "display_name": "Lithium-postgres-batch-beta",
+        "notes": "",
+        "versus": "None"
       }
 
     }

frameworks/C++/lithium/compile-batch.sh

@@ -2,7 +2,11 @@
 
 DB_FLAG=$1
 COMMIT=10b72ad8ce16528ff642f802e266a975964d06f9
-MONOTHREAD=$2
+COMMIT="$2"
+MONOTHREAD=$2	
+if [ "$COMMIT" = "" ]; then
+  COMMIT="10b72ad8ce16528ff642f802e266a975964d06f9"
+fi
 
 if [ $DB_FLAG = "TFB_MYSQL" ]; then
   echo "ERROR: Only Postgres has pipelining support for now."
@@ -17,9 +21,9 @@ fi
 
 wget https://raw.githubusercontent.com/matt-42/lithium/$COMMIT/single_headers/lithium_http_backend.hh
 
-clang++ -fprofile-instr-generate=./profile.prof -flto -DLITHIUM_SERVER_NAME=l -DPROFILE_MODE -DN_SQL_CONNECTIONS=1  -DMONOTHREAD=$MONOTHREAD -DNDEBUG -D$DB_FLAG -O3 -march=native -std=c++17 ./lithium_batch.cc $CXX_FLAGS -lpthread -lboost_context -lssl -lcrypto -o /lithium_tbf
+clang++ -fprofile-instr-generate=./profile.prof -flto -DLITHIUM_SERVER_NAME=l -DPROFILE_MODE -DN_SQL_CONNECTIONS=1 -DNDEBUG -D$DB_FLAG -O3 -march=native -std=c++17 ./lithium_batch.cc $CXX_FLAGS -lpthread -lboost_context -lssl -lcrypto -o /lithium_tbf
 /lithium_tbf tfb-database 8081
 llvm-profdata-10 merge -output=./profile.pgo  ./profile.prof
-clang++ -fprofile-instr-use=./profile.pgo -flto -DLITHIUM_SERVER_NAME=l -DNDEBUG -D$DB_FLAG -DN_SQL_CONNECTIONS=1  -DMONOTHREAD=$MONOTHREAD -O3 -march=native -std=c++17 ./lithium_batch.cc $CXX_FLAGS -lpthread -lboost_context -lssl -lcrypto -o /lithium_tbf
+clang++ -fprofile-instr-use=./profile.pgo -flto -DLITHIUM_SERVER_NAME=l -DNDEBUG -D$DB_FLAG -DN_SQL_CONNECTIONS=1 -O3 -march=native -std=c++17 ./lithium_batch.cc $CXX_FLAGS -lpthread -lboost_context -lssl -lcrypto -o /lithium_tbf
 
 /lithium_tbf tfb-database 8080

frameworks/C++/lithium/compile.sh

@@ -4,7 +4,7 @@ DB_FLAG=$1
 COMMIT="$2"
 
 if [ "$COMMIT" = "" ]; then
-  COMMIT="e199537f15abce7cf25c0b4de0f14461a1f426ec"
+  COMMIT="a046b3345098157849d9e2ab49a475aaabf4a90f"
 fi
 
 if [ $DB_FLAG = "TFB_MYSQL" ]; then

frameworks/C++/lithium/config.toml

@@ -1,5 +1,7 @@
 [framework]
 name = "lithium"
+authors = ["Matthieu Garrigues <matthieu.garrigues@gmail.com>"]
+github = "https://github.com/matt-42/lithium"
 
 [main]
 urls.plaintext = "/plaintext"
@@ -69,3 +71,18 @@ orm = "Full"
 platform = "None"
 webserver = "None"
 versus = "None"
+
+[postgres-batch-beta]
+urls.db = "/db"
+urls.query = "/queries?N="
+urls.update = "/updates?N="
+urls.fortune = "/fortunes"
+approach = "Realistic"
+classification = "Micro"
+database = "Postgres"
+database_os = "Linux"
+os = "Linux"
+orm = "Full"
+platform = "None"
+webserver = "None"
+versus = "None"

frameworks/C++/lithium/lithium-postgres-batch-beta.dockerfile

@@ -0,0 +1,13 @@
+
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq clang libboost-context-dev libboost-dev wget
+RUN apt-get install -yqq bison flex
+
+COPY ./ ./
+
+RUN ./compile_libpq.sh batchmode
+ENV LD_LIBRARY_PATH=/usr/lib
+
+CMD ./compile-batch.sh TFB_PGSQL  16b3f43a2b292e5349b7b528fa9410b3239c15cb

frameworks/C++/lithium/lithium-postgres-batch.dockerfile

@@ -11,4 +11,4 @@ ENV LD_LIBRARY_PATH=/usr/lib
 
 EXPOSE 8080
 
-CMD ./compile-batch.sh TFB_PGSQL 0
+CMD ./compile-batch.sh TFB_PGSQL 

frameworks/C++/lithium/lithium-postgres-beta.dockerfile

@@ -11,4 +11,4 @@ ENV LD_LIBRARY_PATH=/usr/lib
 
 EXPOSE 8080
 
-CMD ./compile.sh TFB_PGSQL 667f439040821d981923492e59749b87005268e4
+CMD ./compile.sh TFB_PGSQL a046b3345098157849d9e2ab49a475aaabf4a90f

frameworks/C/lwan/Makefile

@@ -6,8 +6,7 @@ CFLAGS = -mtune=native -march=native -O3 -fno-plt -flto -ffat-lto-objects -DNDEB
 	-I /lwan/src/lib \
 	`pkg-config mariadb --cflags` \
 	`pkg-config sqlite3 --cflags` \
-	`pkg-config luajit --cflags` \
-	-fauto-profile=/lwan/src/gcda/techempower.gcov
+	`pkg-config luajit --cflags`
 
 LDFLAGS = -mtune=native -march=native -O3 -flto -ffat-lto-objects -Wl,-z,now,-z,relro \
 	-Wl,-whole-archive /lwan/build/src/lib/liblwan.a -Wl,-no-whole-archive \