Merge pull request #22 from TechEmpower/master

aa

Author: smthing

frameworks/CSharp/fastendpoints/.gitignore

@@ -0,0 +1,37 @@
+[Oo]bj/
+[Bb]in/
+TestResults/
+.nuget/
+*.sln.ide/
+_ReSharper.*/
+.idea/
+packages/
+artifacts/
+PublishProfiles/
+.vs/
+*.user
+*.suo
+*.cache
+*.docstates
+_ReSharper.*
+nuget.exe
+*net45.csproj
+*net451.csproj
+*k10.csproj
+*.psess
+*.vsp
+*.pidb
+*.userprefs
+*DS_Store
+*.ncrunchsolution
+*.*sdf
+*.ipch
+*.swp
+*~
+.build/
+.testPublish/
+launchSettings.json
+BenchmarkDotNet.Artifacts/
+BDN.Generated/
+binaries/
+global.json

frameworks/CSharp/fastendpoints/Benchmarks/Benchmarks.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <NoWarn>CA2016;IDE1006</NoWarn>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="FastEndpoints" Version="2.17.0" />
+    </ItemGroup>
+
+</Project>

frameworks/CSharp/fastendpoints/Benchmarks/Benchmarks.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32002.185
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks", "Benchmarks.csproj", "{95F15ACC-FFB8-4C45-BF4E-6E2B602C1EBA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{95F15ACC-FFB8-4C45-BF4E-6E2B602C1EBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95F15ACC-FFB8-4C45-BF4E-6E2B602C1EBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95F15ACC-FFB8-4C45-BF4E-6E2B602C1EBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95F15ACC-FFB8-4C45-BF4E-6E2B602C1EBA}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {975848F3-00CE-49FC-A82F-86DDC0A3CC6F}
+	EndGlobalSection
+EndGlobal

frameworks/CSharp/fastendpoints/Benchmarks/Endpoints/JsonEndpoint.cs

@@ -0,0 +1,21 @@
+namespace Benchmarks.Endpoints;
+
+public class Response
+{
+    public string message => "Hello, World!";
+}
+
+public class JsonEndpoint : Endpoint<EmptyRequest, Response>
+{
+    public override void Configure()
+    {
+        Get("/json");
+        AllowAnonymous();
+    }
+
+    public override Task HandleAsync(EmptyRequest r, CancellationToken ct)
+    {
+        HttpContext.Response.ContentLength = 27;
+        return SendAsync(Response);
+    }
+}

frameworks/CSharp/fastendpoints/Benchmarks/Endpoints/PlainTextEndpoint.cs

@@ -0,0 +1,17 @@
+namespace Benchmarks.Endpoints;
+
+public class PlainTextEndpoint : Endpoint<EmptyRequest, object>
+{
+    private static readonly byte[] payload = System.Text.Encoding.UTF8.GetBytes("Hello, World!");
+
+    public override void Configure()
+    {
+        Get("/plaintext");
+        AllowAnonymous();
+    }
+
+    public override Task HandleAsync(EmptyRequest r, CancellationToken ct)
+    {
+        return SendBytesAsync(payload, contentType: "text/plain");
+    }
+}

frameworks/CSharp/fastendpoints/Benchmarks/Program.cs

@@ -0,0 +1,9 @@
+global using FastEndpoints;
+
+var builder = WebApplication.CreateBuilder();
+builder.Services.AddFastEndpoints();
+
+var app = builder.Build();
+app.UseAuthorization();
+app.UseFastEndpoints();
+app.Run();

frameworks/CSharp/fastendpoints/Benchmarks/appsettings.Development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

frameworks/CSharp/fastendpoints/Benchmarks/appsettings.json

@@ -0,0 +1,15 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Warning"
+    }
+  },
+  "AllowedHosts": "*",
+  "Kestrel": {
+    "Endpoints": {
+      "Http": {
+        "Url": "http://*:8080"
+      }
+    }
+  }
+}

frameworks/CSharp/fastendpoints/README.md

@@ -0,0 +1,26 @@
+# FastEndpoints Tests on Windows and Linux
+This includes tests for plaintext and json serialization.
+
+## Infrastructure Software Versions
+
+**Language**
+
+* C# 10.0
+
+**Platforms**
+
+* .NET Core (Windows and Linux)
+
+**Web Servers**
+
+* [Kestrel](https://github.com/dotnet/aspnetcore/tree/main/src/Servers/Kestrel)
+
+**Web Stack**
+
+* [FastEndpoints](https://fast-endpoints.com/)
+* ASP.Net 6
+
+## Paths & Source for Tests
+
+* [Plaintext](Benchmarks/Endpoints/PlainTextEndpoint.cs): "http://localhost:8080/plaintext"
+* [JSON Serialization](Benchmarks/Endpoints/JsonEndpoint.cs): "http://localhost:8080/json"

frameworks/CSharp/fastendpoints/benchmark_config.json

@@ -0,0 +1,26 @@
+{
+  "framework": "fastendpoints",
+  "tests": [
+    {
+      "default": {
+        "plaintext_url": "/plaintext",
+        "json_url": "/json",
+        "port": 8080,
+        "approach": "Realistic",
+        "classification": "Micro",
+        "database": "None",
+        "framework": "FastEndpoints",
+        "language": "C#",
+        "orm": "Raw",
+        "platform": ".NET",
+        "flavor": "CoreCLR",
+        "webserver": "Kestrel",
+        "os": "Linux",
+        "database_os": "Linux",
+        "display_name": "FastEndpoints",
+        "notes": "",
+        "versus": "aspcore"
+      }
+    }
+  ]
+}

frameworks/CSharp/fastendpoints/config.toml

@@ -0,0 +1,15 @@
+[framework]
+name = "fastendpoints"
+
+[main]
+urls.plaintext = "/plaintext"
+urls.json = "/json"
+approach = "Realistic"
+classification = "Micro"
+database = "None"
+database_os = "Linux"
+os = "Linux"
+orm = "Raw"
+platform = ".NET"
+webserver = "Kestrel"
+versus = "aspcore"

frameworks/CSharp/fastendpoints/fastendpoints.dockerfile

@@ -0,0 +1,12 @@
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+WORKDIR /app
+COPY Benchmarks .
+RUN dotnet publish -c Release -o out
+
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS runtime
+WORKDIR /app
+COPY --from=build /app/out ./
+
+EXPOSE 8080
+
+ENTRYPOINT ["dotnet", "Benchmarks.dll"]

frameworks/Dart/angel3/.gitignore

@@ -0,0 +1,4 @@
+.factorypath
+.packages
+.dart_tool
+.metals

frameworks/Dart/angel3/README.md

@@ -44,7 +44,7 @@ http://localhost:8080/query?queries=
 
 ### UPDATE
 
-http://localhost:8080/update?queries=
+http://localhost:8080/updates?queries=
 
 ### FORTUNES
 

frameworks/Dart/angel3/angel3.dockerfile

@@ -18,4 +18,4 @@ RUN dart pub get
 # Set environment, start server
 ENV ANGEL_ENV=production
 EXPOSE 8080
-CMD dart ./run/prod.dart -p 8080 -a 0.0.0.0
+CMD dart ./run/prod.dart -p 8080 -a 0.0.0.0 -j 20

frameworks/Dart/angel3/orm/config/default.yaml

@@ -3,6 +3,7 @@ jwt_secret: INSECURE_DEFAULT_SECRET
 host: 127.0.0.1
 port: 8080
 postgres:
+  #host: localhost
   host: tfb-database
   port: 5432
   database_name: hello_world

frameworks/Dart/angel3/orm/config/development.yaml

@@ -0,0 +1,2 @@
+# Development-only server configuration.
+debug: true

frameworks/Dart/angel3/orm/lib/src/config/config.dart

@@ -2,6 +2,7 @@
 import 'package:angel3_configuration/angel3_configuration.dart';
 import 'package:angel3_framework/angel3_framework.dart';
 import 'package:angel3_jael/angel3_jael.dart';
+import 'package:jael3/jael3.dart';
 import 'package:file/file.dart';
 import 'plugins/plugins.dart' as plugins;
 
@@ -16,7 +17,10 @@ AngelConfigurer configureServer(FileSystem fileSystem) {
     // Configure our application to render Jael templates from the `views/` directory.
     //
     // See: https://github.com/angel-dart/jael
-    await app.configure(jael(fileSystem.directory('views'), minified: true));
+    var viewsDirectory = fileSystem.directory('views');
+    var viewCache = <String, Document>{};
+    jaelTemplatePreload(viewsDirectory, viewCache);
+    await app.configure(jael(viewsDirectory, cache: viewCache));
 
     // Apply another plug-ins, i.e. ones that *you* have written.
     //

frameworks/Dart/angel3/orm/lib/src/config/plugins/orm.dart

@@ -4,17 +4,21 @@ import 'package:angel3_framework/angel3_framework.dart';
 import 'package:angel3_orm/angel3_orm.dart';
 import 'package:angel3_orm_postgres/angel3_orm_postgres.dart';
 import 'package:postgres/postgres.dart';
+import 'package:postgres_pool/postgres_pool.dart';
 
 Future<void> configureServer(Angel app) async {
+  var logger = app.environment.isProduction ? null : app.logger;
+
   var connection = await connectToPostgres(app.configuration);
   await connection.open();
-
-  var logger = app.environment.isProduction ? null : app.logger;
   var executor = PostgreSqlExecutor(connection, logger: logger);
 
+  //var executor = await connectToPostgresPool(app.configuration, logger);
+
   app
     ..container!.registerSingleton<QueryExecutor>(executor)
     ..shutdownHooks.add((_) => connection.close());
+//    ..shutdownHooks.add((_) => executor.close());
 }
 
 Future<PostgreSQLConnection> connectToPostgres(Map configuration) async {
@@ -33,3 +37,31 @@ Future<PostgreSQLConnection> connectToPostgres(Map configuration) async {
       useSSL: postgresConfig['use_ssl'] as bool? ?? false);
   return connection;
 }
+
+Future<PostgreSqlPoolExecutor> connectToPostgresPool(
+    Map configuration, dynamic logger) async {
+  var postgresConfig = configuration['postgres'] as Map? ?? {};
+  var _pool = PgPool(
+    PgEndpoint(
+        host: postgresConfig['host'] as String? ?? 'localhost',
+        port: postgresConfig['port'] as int? ?? 5432,
+        database: postgresConfig['database_name'] as String? ??
+            Platform.environment['USER'] ??
+            Platform.environment['USERNAME'] ??
+            '',
+        username: postgresConfig['username'] as String?,
+        password: postgresConfig['password'] as String?),
+    settings: PgPoolSettings()
+      ..maxConnectionAge = Duration(hours: 1)
+      ..concurrency = 10,
+  );
+
+  // Run sql to create the tables in a transaction
+  //await _pool.runTx((conn) async {
+  //  for (var s in schemas) {
+  //    await conn.execute(await File('test/migrations/$s.sql').readAsString());
+  //  }
+  //});
+
+  return PostgreSqlPoolExecutor(_pool, logger: logger);
+}