Merge branch 'TechEmpower:master' into master

Author: jkuhn1

frameworks/C++/cutelyst/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export ASQL_VER=0.43.0
+export ASQL_VER=0.46.0
 export CUTELEE_VER=6.0.0
 export CUTELYST_VER=3.1.0
 

frameworks/C++/ffead-cpp/benchmark_config.json

@@ -1,35 +1,38 @@
 {
 	"framework": "ffead-cpp",
 	"tests": [{
-		"p3-b": {
-			"db_url": "/te-benchmark-um-pq-async/db",
-			"query_url": "/te-benchmark-um-pq-async/queries?queries=",
-			"fortune_url": "/te-benchmark-um-pq-async/fortunes",
-			"update_url": "/te-benchmark-um-pq-async/updates?queries=",
+		"default": {
+			"json_url": "/t1/j",
+			"plaintext_url": "/plaintext",
+			"db_url": "/t1/d",
+			"query_url": "/t1/quer?queries=",
+			"fortune_url": "/t1/fortu",
+			"update_url": "/t1/updt?queries=",
+			"cached_query_url": "/t1/cached-wld?count=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
-			"database": "postgres",
+			"database": "mongodb",
 			"framework": "ffead-cpp",
 			"language": "C++",
-			"orm": "Raw",
+			"orm": "Full",
 			"platform": "None",
 			"webserver": "ffead-cpp",
 			"os": "Linux",
 			"database_os": "Linux",
-			"display_name": "p3-b",
-			"notes": "async memory libpq batch patch profiled",
+			"display_name": "ffead-cpp-mongo",
+			"notes": "mongodb redis",
 			"versus": "",
 			"tags": []
 		},
 		"v-picov": {
-			"json_url": "/te-benchmark-um-pq/json",
+			"json_url": "/t3/j",
 			"plaintext_url": "/plaintext",
-			"db_url": "/te-benchmark-um-pq/db",
-			"query_url": "/te-benchmark-um-pq/queries?queries=",
-			"fortune_url": "/te-benchmark-um-pq/fortunes",
-			"update_url": "/te-benchmark-um-pq/updates?queries=",
-			"cached_query_url": "/te-benchmark-um-pq/cached-worlds?count=",
+			"db_url": "/t3/d",
+			"query_url": "/t3/quer?queries=",
+			"fortune_url": "/t3/fortu",
+			"update_url": "/t3/updt?queries=",
+			"cached_query_url": "/t3/cached-wld?count=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -41,19 +44,19 @@
 			"webserver": "picov",
 			"os": "Linux",
 			"database_os": "Linux",
-			"display_name": "v",
+			"display_name": "ffead-cpp [v]",
 			"notes": "",
 			"versus": "",
 			"tags": []
 		},
 		"v-picov-raw-profiled": {
-			"json_url": "/te-benchmark-um-pq/json",
+			"json_url": "/t3/j",
 			"plaintext_url": "/plaintext",
-			"db_url": "/te-benchmark-um-pq/db",
-			"query_url": "/te-benchmark-um-pq/queries?queries=",
-			"fortune_url": "/te-benchmark-um-pq/fortunes",
-			"update_url": "/te-benchmark-um-pq/updates?queries=",
-			"cached_query_url": "/te-benchmark-um-pq/cached-worlds?count=",
+			"db_url": "/t3/d",
+			"query_url": "/t3/quer?queries=",
+			"fortune_url": "/t3/fortu",
+			"update_url": "/t3/updt?queries=",
+			"cached_query_url": "/t3/cached-wld?count=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -65,19 +68,19 @@
 			"webserver": "picov",
 			"os": "Linux",
 			"database_os": "Linux",
-			"display_name": "v-prof",
+			"display_name": "ffead-cpp [v-prof]",
 			"notes": "",
 			"versus": "",
 			"tags": []
 		},
 		"v-picov-raw-clibpqb-profiled": {
-			"json_url": "/te-benchmark-um-pq/json",
+			"json_url": "/t3/j",
 			"plaintext_url": "/plaintext",
-			"db_url": "/te-benchmark-um-pq/db",
-			"query_url": "/te-benchmark-um-pq/queries?queries=",
-			"fortune_url": "/te-benchmark-um-pq/fortunes",
-			"update_url": "/te-benchmark-um-pq/updates?queries=",
-			"cached_query_url": "/te-benchmark-um-pq/cached-worlds?count=",
+			"db_url": "/t3/d",
+			"query_url": "/t3/quer?queries=",
+			"fortune_url": "/t3/fortu",
+			"update_url": "/t3/updt?queries=",
+			"cached_query_url": "/t3/cached-wld?count=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -89,16 +92,16 @@
 			"webserver": "picov",
 			"os": "Linux",
 			"database_os": "Linux",
-			"display_name": "v-prof-b",
+			"display_name": "ffead-cpp [v-prof-b]",
 			"notes": "",
 			"versus": "",
 			"tags": []
 		},
 		"postgresql-raw-profiled": {
-			"db_url": "/te-benchmark-um-pq/db",
-			"query_url": "/te-benchmark-um-pq/queries?queries=",
-			"fortune_url": "/te-benchmark-um-pq/fortunes",
-			"update_url": "/te-benchmark-um-pq/updates?queries=",
+			"db_url": "/t3/d",
+			"query_url": "/t3/quer?queries=",
+			"fortune_url": "/t3/fortu",
+			"update_url": "/t3/updt?queries=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -110,16 +113,16 @@
 			"webserver": "ffead-cpp",
 			"os": "Linux",
 			"database_os": "Linux",
-			"display_name": "pg-raw-prof",
+			"display_name": "ffead-cpp [pg-raw-prof]",
 			"notes": "memory profiled",
 			"versus": "",
 			"tags": []
 		},
 		"postgresql-raw-clibpqb-profiled": {
-			"db_url": "/te-benchmark-um-pq/db",
-			"query_url": "/te-benchmark-um-pq/queries?queries=",
-			"fortune_url": "/te-benchmark-um-pq/fortunes",
-			"update_url": "/te-benchmark-um-pq/updates?queries=",
+			"db_url": "/t3/d",
+			"query_url": "/t3/quer?queries=",
+			"fortune_url": "/t3/fortu",
+			"update_url": "/t3/updt?queries=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -131,16 +134,16 @@
 			"webserver": "ffead-cpp",
 			"os": "Linux",
 			"database_os": "Linux",
-			"display_name": "pg-raw-prof-b",
+			"display_name": "ffead-cpp [pg-raw-prof-b]",
 			"notes": "memory libpq batch patch profiled",
 			"versus": "",
 			"tags": []
 		},
 		"postgresql-raw-async-profiled": {
-			"db_url": "/te-benchmark-um-pq-async/db",
-			"query_url": "/te-benchmark-um-pq-async/queries?queries=",
-			"fortune_url": "/te-benchmark-um-pq-async/fortunes",
-			"update_url": "/te-benchmark-um-pq-async/updates?queries=",
+			"db_url": "/t4/d",
+			"query_url": "/t4/quer?queries=",
+			"fortune_url": "/t4/fortu",
+			"update_url": "/t4/updt?queries=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -152,16 +155,16 @@
 			"webserver": "ffead-cpp",
 			"os": "Linux",
 			"database_os": "Linux",
-			"display_name": "pg-raw-async-prof",
+			"display_name": "ffead-cpp [pg-raw-async-prof]",
 			"notes": "async memory profiled",
 			"versus": "",
 			"tags": []
 		},
 		"postgresql-raw-async-pool-profiled": {
-			"db_url": "/te-benchmark-um-pq-async/db",
-			"query_url": "/te-benchmark-um-pq-async/queries?queries=",
-			"fortune_url": "/te-benchmark-um-pq-async/fortunes",
-			"update_url": "/te-benchmark-um-pq-async/updates?queries=",
+			"db_url": "/t4/d",
+			"query_url": "/t4/quer?queries=",
+			"fortune_url": "/t4/fortu",
+			"update_url": "/t4/updt?queries=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -173,14 +176,14 @@
 			"webserver": "ffead-cpp",
 			"os": "Linux",
 			"database_os": "Linux",
-			"display_name": "pg-raw-async-prof-pool",
+			"display_name": "ffead-cpp [pg-raw-async-prof-pool]",
 			"notes": "async memory profiled",
 			"versus": "",
 			"tags": []
 		},
 		"postgresql-raw-async-pool-profiled-m": {
-			"query_url": "/te-benchmark-um-pq-async/queriem?queries=",
-			"update_url": "/te-benchmark-um-pq-async/updatem?queries=",
+			"query_url": "/t4/quem?queries=",
+			"update_url": "/t4/updm?queries=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -192,16 +195,16 @@
 			"webserver": "ffead-cpp",
 			"os": "Linux",
 			"database_os": "Linux",
-			"display_name": "pg-raw-async-prof-pool-m",
+			"display_name": "ffead-cpp [pg-raw-async-prof-pool-m]",
 			"notes": "async memory profiled",
 			"versus": "",
 			"tags": []
 		},
 		"postgresql-raw-async-clibpqb-profiled": {
-			"db_url": "/te-benchmark-um-pq-async/db",
-			"query_url": "/te-benchmark-um-pq-async/queries?queries=",
-			"fortune_url": "/te-benchmark-um-pq-async/fortunes",
-			"update_url": "/te-benchmark-um-pq-async/updates?queries=",
+			"db_url": "/t4/d",
+			"query_url": "/t4/quer?queries=",
+			"fortune_url": "/t4/fortu",
+			"update_url": "/t4/updt?queries=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -213,16 +216,16 @@
 			"webserver": "ffead-cpp",
 			"os": "Linux",
 			"database_os": "Linux",
-			"display_name": "pg-raw-async-prof-b",
+			"display_name": "ffead-cpp [pg-raw-async-prof-b]",
 			"notes": "async memory libpq batch patch profiled",
 			"versus": "",
 			"tags": []
 		},
 		"postgresql-raw-async-clibpqb-pool-profiled": {
-			"db_url": "/te-benchmark-um-pq-async/db",
-			"query_url": "/te-benchmark-um-pq-async/queries?queries=",
-			"fortune_url": "/te-benchmark-um-pq-async/fortunes",
-			"update_url": "/te-benchmark-um-pq-async/updates?queries=",
+			"db_url": "/t4/d",
+			"query_url": "/t4/quer?queries=",
+			"fortune_url": "/t4/fortu",
+			"update_url": "/t4/updt?queries=",
 			"port": 8080,
 			"approach": "Realistic",
 			"classification": "Fullstack",
@@ -234,10 +237,71 @@
 			"webserver": "ffead-cpp",
 			"os": "Linux",
 			"database_os": "Linux",
-			"display_name": "pg-raw-async-prof-b-pool",
+			"display_name": "ffead-cpp [pg-raw-async-prof-b-pool]",
 			"notes": "async memory libpq batch patch profiled",
 			"versus": "",
 			"tags": []
+		},
+		"postgresql-raw-async-qw-profiled": {
+			"db_url": "/t5/d",
+			"query_url": "/t5/quer?queries=",
+			"fortune_url": "/t5/fortu",
+			"update_url": "/t5/updt?queries=",
+			"port": 8080,
+			"approach": "Realistic",
+			"classification": "Fullstack",
+			"database": "postgres",
+			"framework": "ffead-cpp",
+			"language": "C++",
+			"orm": "Raw",
+			"platform": "None",
+			"webserver": "ffead-cpp",
+			"os": "Linux",
+			"database_os": "Linux",
+			"display_name": "ffead-cpp [pg-raw-async-qw-prof]",
+			"notes": "async memory profiled",
+			"versus": "",
+			"tags": []
+		},
+		"postgresql-raw-async-qw-clibpqb-profiled": {
+			"db_url": "/t5/d",
+			"query_url": "/t5/quer?queries=",
+			"fortune_url": "/t5/fortu",
+			"update_url": "/t5/updt?queries=",
+			"port": 8080,
+			"approach": "Realistic",
+			"classification": "Fullstack",
+			"database": "postgres",
+			"framework": "ffead-cpp",
+			"language": "C++",
+			"orm": "Raw",
+			"platform": "None",
+			"webserver": "ffead-cpp",
+			"os": "Linux",
+			"database_os": "Linux",
+			"display_name": "ffead-cpp [pg-raw-async-qw-prof-b]",
+			"notes": "async memory libpq batch patch profiled",
+			"versus": "",
+			"tags": []
+		},
+		"postgresql-raw-async-qw-pool-profiled-m": {
+			"query_url": "/t5/quem?queries=",
+			"update_url": "/t5/updm?queries=",
+			"port": 8080,
+			"approach": "Realistic",
+			"classification": "Fullstack",
+			"database": "postgres",
+			"framework": "ffead-cpp",
+			"language": "C++",
+			"orm": "Raw",
+			"platform": "None",
+			"webserver": "ffead-cpp",
+			"os": "Linux",
+			"database_os": "Linux",
+			"display_name": "ffead-cpp [pg-raw-async-qw-prof-pool-m]",
+			"notes": "async memory profiled",
+			"versus": "",
+			"tags": []
 		}
 	}]
 }