Skip to content

Commit f625749

Browse files
smthingsmthing
authored
Merge pull request #44 from TechEmpower/master
aa
2 parents 09b1eaf + b9f7af6 commit f625749

File tree

176 files changed

+2545
-4131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+2545
-4131
lines changed

‎Dockerfile‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ RUN apt-get -yqq update && \
1313
gcc \
1414
git-core \
1515
gosu \
16+
iproute2 \
1617
# Needed for mysqlclient
1718
libmysqlclient-dev \
1819
libpq-dev \
@@ -43,17 +44,12 @@ RUN curl -LSs "https://github.com/scottchiefbaker/dool/archive/${DOOL_VERSION}.t
4344
tar --strip-components=1 -xz && \
4445
./install.py
4546

46-
# Check if the group ID is already created
47+
# create group and user
4748
ARG GROUP_ID
48-
RUN if ! getent group "$GROUP_ID"; then \
49-
addgroup --gid "$GROUP_ID" user; \
50-
fi
51-
52-
# Check if the user ID is already created
5349
ARG USER_ID
54-
RUN if ! getent passwd "$USER_ID"; then \
55-
adduser --disabled-password --gecos '' --gid "$GROUP_ID" --uid "$USER_ID" user; \
56-
fi
50+
51+
RUN groupadd -g "$GROUP_ID" user || true && \
52+
useradd -m -u "$USER_ID" -g "$GROUP_ID" -s /bin/bash user || true
5753

5854
ENV FWROOT=/FrameworkBenchmarks USER_ID="$USER_ID"
5955
ENV PYTHONPATH="$FWROOT"

‎frameworks/CSharp/aspnetcore/benchmark_config.json‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"framework": "aspnetcore",
3+
"maintainers": ["DamianEdwards", "sebastienros"],
34
"tests": [
45
{
56
"default": {
@@ -14,15 +15,15 @@
1415
"approach": "Realistic",
1516
"classification": "Platform",
1617
"database": "Postgres",
17-
"framework": "ASP.NET Core",
18+
"framework": "ASP.NET Core [Platform]",
1819
"language": "C#",
1920
"orm": "Raw",
2021
"platform": ".NET",
2122
"flavor": "CoreCLR",
2223
"webserver": "Kestrel",
2324
"os": "Linux",
2425
"database_os": "Linux",
25-
"display_name": "ASP.NET Core [Platform, Pg]",
26+
"display_name": "ASP.NET Core [Platform]",
2627
"notes": ""
2728
},
2829
"aot": {
@@ -37,15 +38,15 @@
3738
"approach": "Realistic",
3839
"classification": "Platform",
3940
"database": "Postgres",
40-
"framework": "ASP.NET Core",
41+
"framework": "ASP.NET Core [Platform]",
4142
"language": "C#",
4243
"orm": "Raw",
4344
"platform": ".NET",
4445
"flavor": "NativeAOT",
4546
"webserver": "Kestrel",
4647
"os": "Linux",
4748
"database_os": "Linux",
48-
"display_name": "ASP.NET Core [Platform, Pg, AOT]",
49+
"display_name": "ASP.NET Core [Platform, AOT]",
4950
"notes": ""
5051
},
5152
"minimal": {
@@ -67,7 +68,7 @@
6768
"webserver": "Kestrel",
6869
"os": "Linux",
6970
"database_os": "Linux",
70-
"display_name": "ASP.NET Core [Minimal APIs, Pg, Dapper]",
71+
"display_name": "ASP.NET Core [Minimal APIs]",
7172
"notes": "",
7273
"versus": "aspnetcore"
7374
},
@@ -89,7 +90,7 @@
8990
"webserver": "Kestrel",
9091
"os": "Linux",
9192
"database_os": "Linux",
92-
"display_name": "ASP.NET Core [MVC, Pg, EF]",
93+
"display_name": "ASP.NET Core [MVC]",
9394
"notes": "",
9495
"versus": "aspnetcore"
9596
},
@@ -103,16 +104,17 @@
103104
"approach": "Realistic",
104105
"classification": "Platform",
105106
"database": "MySQL",
106-
"framework": "ASP.NET Core",
107+
"framework": "ASP.NET Core [Platform]",
107108
"language": "C#",
108109
"orm": "Raw",
109110
"platform": ".NET",
110111
"flavor": "CoreCLR",
111112
"webserver": "Kestrel",
112113
"os": "Linux",
113114
"database_os": "Linux",
114-
"display_name": "ASP.NET Core [Platform, My]",
115-
"notes": ""
115+
"display_name": "ASP.NET Core [Platform, MySQL]",
116+
"notes": "",
117+
"versus": "aspnetcore"
116118
}
117119
}
118120
]

‎frameworks/Go/gin/gin-src/hello.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ func fortunes(c *gin.Context) {
9999
c.AbortWithError(500, err)
100100
return
101101
}
102+
defer rows.Close() // Ensure rows are closed
102103

103104
fortunes := make(Fortunes, 0)
104105
for rows.Next() { //Fetch rows

‎frameworks/Go/gin/gin-std/main.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ func fortunes(c *gin.Context) {
9999
c.AbortWithError(500, err)
100100
return
101101
}
102+
defer rows.Close() // Ensure rows are closed
102103

103104
fortunes := make(Fortunes, 0)
104105
for rows.Next() { //Fetch rows

‎frameworks/Go/goravel/src/fiber/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ require (
6666
github.com/gofiber/template/html/v2 v2.1.1 // indirect
6767
github.com/gofiber/utils v1.1.0 // indirect
6868
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
69-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
69+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
7070
github.com/golang-migrate/migrate/v4 v4.17.1 // indirect
7171
github.com/golang-module/carbon/v2 v2.3.12 // indirect
7272
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect

‎frameworks/Go/goravel/src/fiber/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w
289289
github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
290290
github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
291291
github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
292-
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
293-
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
292+
github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
293+
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
294294
github.com/golang-migrate/migrate/v4 v4.17.1 h1:4zQ6iqL6t6AiItphxJctQb3cFqWiSpMnX7wLTPnnYO4=
295295
github.com/golang-migrate/migrate/v4 v4.17.1/go.mod h1:m8hinFyWBn0SA4QKHuKh175Pm9wjmxj3S2Mia7dbXzM=
296296
github.com/golang-module/carbon/v2 v2.3.12 h1:VC1DwN1kBwJkh5MjXmTFryjs5g4CWyoM8HAHffZPX/k=

‎frameworks/Go/goravel/src/gin/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ require (
6565
github.com/go-sql-driver/mysql v1.8.1 // indirect
6666
github.com/go-stack/stack v1.8.0 // indirect
6767
github.com/goccy/go-json v0.10.2 // indirect
68-
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
68+
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
6969
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
7070
github.com/golang-migrate/migrate/v4 v4.17.1 // indirect
7171
github.com/golang-module/carbon/v2 v2.3.12 // indirect
@@ -122,7 +122,7 @@ require (
122122
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
123123
github.com/pterm/pterm v0.12.79 // indirect
124124
github.com/rabbitmq/amqp091-go v1.9.0 // indirect
125-
github.com/redis/go-redis/v9 v9.5.3 // indirect
125+
github.com/redis/go-redis/v9 v9.5.5 // indirect
126126
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
127127
github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 // indirect
128128
github.com/rivo/uniseg v0.4.7 // indirect

‎frameworks/Go/goravel/src/gin/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
288288
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
289289
github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
290290
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
291-
github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
292-
github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
291+
github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
292+
github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
293293
github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
294294
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
295295
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
@@ -566,8 +566,8 @@ github.com/rabbitmq/amqp091-go v1.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc
566566
github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
567567
github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
568568
github.com/redis/go-redis/v9 v9.0.5/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
569-
github.com/redis/go-redis/v9 v9.5.3 h1:fOAp1/uJG+ZtcITgZOfYFmTKPE7n4Vclj1wZFgRciUU=
570-
github.com/redis/go-redis/v9 v9.5.3/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
569+
github.com/redis/go-redis/v9 v9.5.5 h1:51VEyMF8eOO+NUHFm8fpg+IOc1xFuFOhxs3R+kPu1FM=
570+
github.com/redis/go-redis/v9 v9.5.5/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
571571
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
572572
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
573573
github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=

‎frameworks/Haskell/ihp/ihp.dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
FROM nixos/nix
22

3-
COPY ./src /ihp
4-
WORKDIR /ihp
5-
63
# Add build dependencies
7-
RUN nix-env -i cachix
4+
RUN nix-env -f https://github.com/NixOS/nixpkgs/archive/54b4bb956f9891b872904abdb632cea85a033ff2.tar.gz -iA cachix
85
RUN cachix use digitallyinduced
96

7+
COPY ./src /ihp
8+
WORKDIR /ihp
9+
1010
# Build
11-
RUN nix-build -j auto --cores 0
11+
RUN nix --extra-experimental-features "nix-command flakes" build -j auto --cores 0 .#optimized-prod-server
1212

1313
# Setup
1414
ENV DATABASE_URL=postgres://benchmarkdbuser:benchmarkdbpass@tfb-database:5432/hello_world

‎frameworks/Haskell/ihp/src/.envrc‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
2+
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
3+
fi
4+
5+
use flake . --impure --accept-flake-config
6+
7+
# Include .env file if it exists locally. Use the .env file to load env vars that you don't want to commit to git
8+
if [ -f .env ]
9+
then
10+
set -o allexport
11+
source .env
12+
set +o allexport
13+
fi
14+
# Add your env vars here
15+
#
16+
# E.g. export AWS_ACCESS_KEY_ID="XXXXX"

0 commit comments

Comments
 (0)