From 017032ba312d9681856aaa716378a043e7201b37 Mon Sep 17 00:00:00 2001 From: msmith-techempower Date: Thu, 24 Mar 2016 14:12:12 -0700 Subject: [PATCH 01/11] Attempting to clean up PHP metadata --- .travis.yml | 2 +- frameworks/PHP/cakephp/benchmark_config.json | 5 +- frameworks/PHP/clancats/benchmark_config.json | 5 +- .../PHP/codeigniter/benchmark_config.json | 20 ++-- .../.gitignore | 0 .../.htaccess | 0 .../.travis.yml | 0 .../LICENSE | 0 .../README.md | 0 .../apps/.htaccess | 0 .../apps/components/authentication/.gitkeep | 0 .../apps/components/form/.gitkeep | 0 .../apps/configs/application.php | 0 .../apps/configs/autoload.php | 0 .../apps/configs/database.php | 0 .../configs/definitions/DefinitionManager.php | 0 .../apps/configs/migration.php | 0 .../apps/configs/services.php | 0 .../apps/configs/session.php | 0 .../apps/controllers/BenchController.php | 0 .../apps/controllers/HomeController.php | 0 .../apps/database/.gitkeep | 0 .../apps/database/migrations/.gitkeep | 0 .../apps/extensions/.gitkeep | 0 .../apps/languages/english/.gitkeep | 0 .../apps/models/Fortune.php | 0 .../apps/models/World.php | 0 .../apps/modules/admin/Controllers/.gitkeep | 0 .../apps/modules/admin/Models/.gitkeep | 0 .../apps/modules/admin/Views/.gitkeep | 0 .../apps/routerconfig.php | 0 .../apps/routes.php | 0 .../apps/services/Payment/.gitkeep | 0 .../apps/temp/cache/.gitkeep | 0 .../apps/temp/database/.gitkeep | 0 .../apps/temp/logs/.gitkeep | 0 .../apps/temp/sessions/.gitkeep | 0 .../apps/temp/twig/tmp/cache/.gitkeep | 0 .../apps/views/bench/fortunes.view.php | 0 .../apps/views/home/welcome.view.php | 0 .../apps/views/layout/home.view.php | 0 .../assets/css/.gitkeep | 0 .../assets/img/.gitkeep | 0 .../assets/img/cygnite/favicon.ico | Bin .../assets/img/cygnite/fevicon.png | Bin .../assets/js/.gitkeep | 0 .../benchmark_config.json | 12 ++- .../boot/initialize.php | 0 .../boot/start.php | 0 .../composer.json | 0 .../deploy/cygnite-php-framework | 4 +- .../deploy/nginx.conf | 2 +- .../index.php | 0 .../setup.sh | 2 +- frameworks/PHP/fat-free/benchmark_config.json | 10 +- .../PHP/fat-free/benchmark_config_bak.json | 91 ------------------ frameworks/PHP/fat-free/setup_php5.sh | 20 ---- frameworks/PHP/fuel/benchmark_config.json | 7 +- frameworks/PHP/hhvm/benchmark_config.json | 5 +- frameworks/PHP/kohana/benchmark_config.json | 10 +- frameworks/PHP/laravel/benchmark_config.json | 28 +++--- frameworks/PHP/limonade/benchmark_config.json | 6 +- frameworks/PHP/lithium/benchmark_config.json | 5 +- frameworks/PHP/lumen/benchmark_config.json | 6 +- frameworks/PHP/micromvc/benchmark_config.json | 5 +- .../PHP/phalcon-micro/benchmark_config.json | 5 +- frameworks/PHP/phalcon/benchmark_config.json | 10 +- frameworks/PHP/php/benchmark_config.json | 36 ++++--- frameworks/PHP/phpixie/benchmark_config.json | 5 +- frameworks/PHP/phreeze/benchmark_config.json | 5 +- frameworks/PHP/pimf/benchmark_config.json | 10 +- .../PHP/silex-orm/benchmark_config.json | 5 +- frameworks/PHP/silex/benchmark_config.json | 10 +- frameworks/PHP/slim/benchmark_config.json | 15 +-- .../symfony2-stripped/benchmark_config.json | 15 +-- frameworks/PHP/symfony2/benchmark_config.json | 20 ++-- frameworks/PHP/yaf/benchmark_config.json | 5 +- frameworks/PHP/yii2/benchmark_config.json | 12 ++- frameworks/PHP/zend/benchmark_config.json | 5 +- frameworks/PHP/zend1/benchmark_config.json | 5 +- 80 files changed, 176 insertions(+), 232 deletions(-) rename frameworks/PHP/{cygnite-php-framework => cygnite}/.gitignore (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/.htaccess (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/.travis.yml (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/LICENSE (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/README.md (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/.htaccess (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/components/authentication/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/components/form/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/configs/application.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/configs/autoload.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/configs/database.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/configs/definitions/DefinitionManager.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/configs/migration.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/configs/services.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/configs/session.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/controllers/BenchController.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/controllers/HomeController.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/database/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/database/migrations/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/extensions/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/languages/english/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/models/Fortune.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/models/World.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/modules/admin/Controllers/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/modules/admin/Models/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/modules/admin/Views/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/routerconfig.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/routes.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/services/Payment/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/temp/cache/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/temp/database/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/temp/logs/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/temp/sessions/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/temp/twig/tmp/cache/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/views/bench/fortunes.view.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/views/home/welcome.view.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/apps/views/layout/home.view.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/assets/css/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/assets/img/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/assets/img/cygnite/favicon.ico (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/assets/img/cygnite/fevicon.png (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/assets/js/.gitkeep (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/benchmark_config.json (84%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/boot/initialize.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/boot/start.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/composer.json (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/deploy/cygnite-php-framework (53%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/deploy/nginx.conf (97%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/index.php (100%) rename frameworks/PHP/{cygnite-php-framework => cygnite}/setup.sh (74%) delete mode 100644 frameworks/PHP/fat-free/benchmark_config_bak.json delete mode 100644 frameworks/PHP/fat-free/setup_php5.sh diff --git a/.travis.yml b/.travis.yml index bf9d9ac19b9..409e79c7619 100755 --- a/.travis.yml +++ b/.travis.yml @@ -130,7 +130,7 @@ env: - "TESTDIR=PHP/cakephp" - "TESTDIR=PHP/hhvm" - "TESTDIR=PHP/php" - - "TESTDIR=PHP/cygnite-php-framework" + - "TESTDIR=PHP/cygnite" - "TESTDIR=PHP/codeigniter" - "TESTDIR=PHP/clancats" - "TESTDIR=PHP/fat-free" diff --git a/frameworks/PHP/cakephp/benchmark_config.json b/frameworks/PHP/cakephp/benchmark_config.json index 749aec360ec..0b11b7992aa 100644 --- a/frameworks/PHP/cakephp/benchmark_config.json +++ b/frameworks/PHP/cakephp/benchmark_config.json @@ -14,14 +14,15 @@ "database": "MySQL", "framework": "cakephp", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "CakePHP", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/clancats/benchmark_config.json b/frameworks/PHP/clancats/benchmark_config.json index e03626f1e39..f55f1ce5f22 100644 --- a/frameworks/PHP/clancats/benchmark_config.json +++ b/frameworks/PHP/clancats/benchmark_config.json @@ -15,14 +15,15 @@ "database": "MySQL", "framework": "clancatsframework", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "clancatsframework", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/codeigniter/benchmark_config.json b/frameworks/PHP/codeigniter/benchmark_config.json index 5c81450661f..6f3651fb6e8 100644 --- a/frameworks/PHP/codeigniter/benchmark_config.json +++ b/frameworks/PHP/codeigniter/benchmark_config.json @@ -10,14 +10,15 @@ "database": "None", "framework": "codeigniter", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "codeigniter", "notes": "", - "versus": "php" + "versus": "php-php5" }, "hhvm": { "setup_file": "setup_hhvm", @@ -28,14 +29,15 @@ "database": "None", "framework": "codeigniter", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "HPHP", + "platform": "HHVM", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "codeigniter_hhvm", "notes": "", - "versus": "php" + "versus": "php-php5" }, "raw": { "setup_file": "setup", @@ -48,14 +50,15 @@ "database": "MySQL", "framework": "codeigniter", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "codeigniter", "notes": "", - "versus": "php" + "versus": "php-php5" }, "raw_hhvm": { "setup_file": "setup_hhvm", @@ -68,14 +71,15 @@ "database": "MySQL", "framework": "codeigniter", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "HPHP", + "platform": "HHVM", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "codeigniter_hhvm", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/cygnite-php-framework/.gitignore b/frameworks/PHP/cygnite/.gitignore similarity index 100% rename from frameworks/PHP/cygnite-php-framework/.gitignore rename to frameworks/PHP/cygnite/.gitignore diff --git a/frameworks/PHP/cygnite-php-framework/.htaccess b/frameworks/PHP/cygnite/.htaccess similarity index 100% rename from frameworks/PHP/cygnite-php-framework/.htaccess rename to frameworks/PHP/cygnite/.htaccess diff --git a/frameworks/PHP/cygnite-php-framework/.travis.yml b/frameworks/PHP/cygnite/.travis.yml similarity index 100% rename from frameworks/PHP/cygnite-php-framework/.travis.yml rename to frameworks/PHP/cygnite/.travis.yml diff --git a/frameworks/PHP/cygnite-php-framework/LICENSE b/frameworks/PHP/cygnite/LICENSE similarity index 100% rename from frameworks/PHP/cygnite-php-framework/LICENSE rename to frameworks/PHP/cygnite/LICENSE diff --git a/frameworks/PHP/cygnite-php-framework/README.md b/frameworks/PHP/cygnite/README.md similarity index 100% rename from frameworks/PHP/cygnite-php-framework/README.md rename to frameworks/PHP/cygnite/README.md diff --git a/frameworks/PHP/cygnite-php-framework/apps/.htaccess b/frameworks/PHP/cygnite/apps/.htaccess similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/.htaccess rename to frameworks/PHP/cygnite/apps/.htaccess diff --git a/frameworks/PHP/cygnite-php-framework/apps/components/authentication/.gitkeep b/frameworks/PHP/cygnite/apps/components/authentication/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/components/authentication/.gitkeep rename to frameworks/PHP/cygnite/apps/components/authentication/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/components/form/.gitkeep b/frameworks/PHP/cygnite/apps/components/form/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/components/form/.gitkeep rename to frameworks/PHP/cygnite/apps/components/form/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/configs/application.php b/frameworks/PHP/cygnite/apps/configs/application.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/configs/application.php rename to frameworks/PHP/cygnite/apps/configs/application.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/configs/autoload.php b/frameworks/PHP/cygnite/apps/configs/autoload.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/configs/autoload.php rename to frameworks/PHP/cygnite/apps/configs/autoload.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/configs/database.php b/frameworks/PHP/cygnite/apps/configs/database.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/configs/database.php rename to frameworks/PHP/cygnite/apps/configs/database.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/configs/definitions/DefinitionManager.php b/frameworks/PHP/cygnite/apps/configs/definitions/DefinitionManager.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/configs/definitions/DefinitionManager.php rename to frameworks/PHP/cygnite/apps/configs/definitions/DefinitionManager.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/configs/migration.php b/frameworks/PHP/cygnite/apps/configs/migration.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/configs/migration.php rename to frameworks/PHP/cygnite/apps/configs/migration.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/configs/services.php b/frameworks/PHP/cygnite/apps/configs/services.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/configs/services.php rename to frameworks/PHP/cygnite/apps/configs/services.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/configs/session.php b/frameworks/PHP/cygnite/apps/configs/session.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/configs/session.php rename to frameworks/PHP/cygnite/apps/configs/session.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/controllers/BenchController.php b/frameworks/PHP/cygnite/apps/controllers/BenchController.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/controllers/BenchController.php rename to frameworks/PHP/cygnite/apps/controllers/BenchController.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/controllers/HomeController.php b/frameworks/PHP/cygnite/apps/controllers/HomeController.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/controllers/HomeController.php rename to frameworks/PHP/cygnite/apps/controllers/HomeController.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/database/.gitkeep b/frameworks/PHP/cygnite/apps/database/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/database/.gitkeep rename to frameworks/PHP/cygnite/apps/database/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/database/migrations/.gitkeep b/frameworks/PHP/cygnite/apps/database/migrations/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/database/migrations/.gitkeep rename to frameworks/PHP/cygnite/apps/database/migrations/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/extensions/.gitkeep b/frameworks/PHP/cygnite/apps/extensions/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/extensions/.gitkeep rename to frameworks/PHP/cygnite/apps/extensions/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/languages/english/.gitkeep b/frameworks/PHP/cygnite/apps/languages/english/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/languages/english/.gitkeep rename to frameworks/PHP/cygnite/apps/languages/english/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/models/Fortune.php b/frameworks/PHP/cygnite/apps/models/Fortune.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/models/Fortune.php rename to frameworks/PHP/cygnite/apps/models/Fortune.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/models/World.php b/frameworks/PHP/cygnite/apps/models/World.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/models/World.php rename to frameworks/PHP/cygnite/apps/models/World.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/modules/admin/Controllers/.gitkeep b/frameworks/PHP/cygnite/apps/modules/admin/Controllers/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/modules/admin/Controllers/.gitkeep rename to frameworks/PHP/cygnite/apps/modules/admin/Controllers/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/modules/admin/Models/.gitkeep b/frameworks/PHP/cygnite/apps/modules/admin/Models/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/modules/admin/Models/.gitkeep rename to frameworks/PHP/cygnite/apps/modules/admin/Models/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/modules/admin/Views/.gitkeep b/frameworks/PHP/cygnite/apps/modules/admin/Views/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/modules/admin/Views/.gitkeep rename to frameworks/PHP/cygnite/apps/modules/admin/Views/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/routerconfig.php b/frameworks/PHP/cygnite/apps/routerconfig.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/routerconfig.php rename to frameworks/PHP/cygnite/apps/routerconfig.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/routes.php b/frameworks/PHP/cygnite/apps/routes.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/routes.php rename to frameworks/PHP/cygnite/apps/routes.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/services/Payment/.gitkeep b/frameworks/PHP/cygnite/apps/services/Payment/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/services/Payment/.gitkeep rename to frameworks/PHP/cygnite/apps/services/Payment/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/temp/cache/.gitkeep b/frameworks/PHP/cygnite/apps/temp/cache/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/temp/cache/.gitkeep rename to frameworks/PHP/cygnite/apps/temp/cache/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/temp/database/.gitkeep b/frameworks/PHP/cygnite/apps/temp/database/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/temp/database/.gitkeep rename to frameworks/PHP/cygnite/apps/temp/database/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/temp/logs/.gitkeep b/frameworks/PHP/cygnite/apps/temp/logs/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/temp/logs/.gitkeep rename to frameworks/PHP/cygnite/apps/temp/logs/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/temp/sessions/.gitkeep b/frameworks/PHP/cygnite/apps/temp/sessions/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/temp/sessions/.gitkeep rename to frameworks/PHP/cygnite/apps/temp/sessions/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/temp/twig/tmp/cache/.gitkeep b/frameworks/PHP/cygnite/apps/temp/twig/tmp/cache/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/temp/twig/tmp/cache/.gitkeep rename to frameworks/PHP/cygnite/apps/temp/twig/tmp/cache/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/apps/views/bench/fortunes.view.php b/frameworks/PHP/cygnite/apps/views/bench/fortunes.view.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/views/bench/fortunes.view.php rename to frameworks/PHP/cygnite/apps/views/bench/fortunes.view.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/views/home/welcome.view.php b/frameworks/PHP/cygnite/apps/views/home/welcome.view.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/views/home/welcome.view.php rename to frameworks/PHP/cygnite/apps/views/home/welcome.view.php diff --git a/frameworks/PHP/cygnite-php-framework/apps/views/layout/home.view.php b/frameworks/PHP/cygnite/apps/views/layout/home.view.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/apps/views/layout/home.view.php rename to frameworks/PHP/cygnite/apps/views/layout/home.view.php diff --git a/frameworks/PHP/cygnite-php-framework/assets/css/.gitkeep b/frameworks/PHP/cygnite/assets/css/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/assets/css/.gitkeep rename to frameworks/PHP/cygnite/assets/css/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/assets/img/.gitkeep b/frameworks/PHP/cygnite/assets/img/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/assets/img/.gitkeep rename to frameworks/PHP/cygnite/assets/img/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/assets/img/cygnite/favicon.ico b/frameworks/PHP/cygnite/assets/img/cygnite/favicon.ico similarity index 100% rename from frameworks/PHP/cygnite-php-framework/assets/img/cygnite/favicon.ico rename to frameworks/PHP/cygnite/assets/img/cygnite/favicon.ico diff --git a/frameworks/PHP/cygnite-php-framework/assets/img/cygnite/fevicon.png b/frameworks/PHP/cygnite/assets/img/cygnite/fevicon.png similarity index 100% rename from frameworks/PHP/cygnite-php-framework/assets/img/cygnite/fevicon.png rename to frameworks/PHP/cygnite/assets/img/cygnite/fevicon.png diff --git a/frameworks/PHP/cygnite-php-framework/assets/js/.gitkeep b/frameworks/PHP/cygnite/assets/js/.gitkeep similarity index 100% rename from frameworks/PHP/cygnite-php-framework/assets/js/.gitkeep rename to frameworks/PHP/cygnite/assets/js/.gitkeep diff --git a/frameworks/PHP/cygnite-php-framework/benchmark_config.json b/frameworks/PHP/cygnite/benchmark_config.json similarity index 84% rename from frameworks/PHP/cygnite-php-framework/benchmark_config.json rename to frameworks/PHP/cygnite/benchmark_config.json index 3076bbb6e29..64cdea89e87 100644 --- a/frameworks/PHP/cygnite-php-framework/benchmark_config.json +++ b/frameworks/PHP/cygnite/benchmark_config.json @@ -1,5 +1,5 @@ { - "framework": "cygnite-php-framework", + "framework": "cygnite", "tests": [{ "default": { "setup_file": "setup", @@ -11,14 +11,15 @@ "database": "None", "framework": "cygnite", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "cygnite", "notes": "", - "versus": "php" + "versus": "php-php5" }, "raw": { "setup_file": "setup", @@ -31,14 +32,15 @@ "database": "MySQL", "framework": "cygnite", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "cygnite", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } \ No newline at end of file diff --git a/frameworks/PHP/cygnite-php-framework/boot/initialize.php b/frameworks/PHP/cygnite/boot/initialize.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/boot/initialize.php rename to frameworks/PHP/cygnite/boot/initialize.php diff --git a/frameworks/PHP/cygnite-php-framework/boot/start.php b/frameworks/PHP/cygnite/boot/start.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/boot/start.php rename to frameworks/PHP/cygnite/boot/start.php diff --git a/frameworks/PHP/cygnite-php-framework/composer.json b/frameworks/PHP/cygnite/composer.json similarity index 100% rename from frameworks/PHP/cygnite-php-framework/composer.json rename to frameworks/PHP/cygnite/composer.json diff --git a/frameworks/PHP/cygnite-php-framework/deploy/cygnite-php-framework b/frameworks/PHP/cygnite/deploy/cygnite-php-framework similarity index 53% rename from frameworks/PHP/cygnite-php-framework/deploy/cygnite-php-framework rename to frameworks/PHP/cygnite/deploy/cygnite-php-framework index 78fd7eefc12..41c3c6f809c 100644 --- a/frameworks/PHP/cygnite-php-framework/deploy/cygnite-php-framework +++ b/frameworks/PHP/cygnite/deploy/cygnite-php-framework @@ -1,6 +1,6 @@ - Alias /cygnite-php-framework/ "/home/ubuntu/FrameworkBenchmarks/cygnite-php-framework/" - + Alias /cygnite/ "/home/ubuntu/FrameworkBenchmarks/cygnite/" + Options Indexes FollowSymLinks MultiViews #AllowOverride None Order allow,deny diff --git a/frameworks/PHP/cygnite-php-framework/deploy/nginx.conf b/frameworks/PHP/cygnite/deploy/nginx.conf similarity index 97% rename from frameworks/PHP/cygnite-php-framework/deploy/nginx.conf rename to frameworks/PHP/cygnite/deploy/nginx.conf index ddae791d15e..7fcaa70f35b 100644 --- a/frameworks/PHP/cygnite-php-framework/deploy/nginx.conf +++ b/frameworks/PHP/cygnite/deploy/nginx.conf @@ -65,7 +65,7 @@ http { # proxy_pass http://127.0.0.1; #} - root /home/ubuntu/FrameworkBenchmarks/cygnite-php-framework/; + root /home/ubuntu/FrameworkBenchmarks/cygnite/; index index.php; location / { diff --git a/frameworks/PHP/cygnite-php-framework/index.php b/frameworks/PHP/cygnite/index.php similarity index 100% rename from frameworks/PHP/cygnite-php-framework/index.php rename to frameworks/PHP/cygnite/index.php diff --git a/frameworks/PHP/cygnite-php-framework/setup.sh b/frameworks/PHP/cygnite/setup.sh similarity index 74% rename from frameworks/PHP/cygnite-php-framework/setup.sh rename to frameworks/PHP/cygnite/setup.sh index bc56aa6a96a..b7fc216d7fa 100644 --- a/frameworks/PHP/cygnite-php-framework/setup.sh +++ b/frameworks/PHP/cygnite/setup.sh @@ -3,7 +3,7 @@ fw_depends php nginx composer sed -i 's|127.0.0.1|'"${DBHOST}"'|g' apps/configs/database.php -sed -i 's|root .*/FrameworkBenchmarks/cygnite-php-framework|root '"${TROOT}"'|g' deploy/nginx.conf +sed -i 's|root .*/FrameworkBenchmarks/cygnite|root '"${TROOT}"'|g' deploy/nginx.conf sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid diff --git a/frameworks/PHP/fat-free/benchmark_config.json b/frameworks/PHP/fat-free/benchmark_config.json index 391a5101712..ece0891514c 100644 --- a/frameworks/PHP/fat-free/benchmark_config.json +++ b/frameworks/PHP/fat-free/benchmark_config.json @@ -12,10 +12,11 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "Fat Free Framework", + "framework": "Fat Free", "language": "PHP", + "flavor": "PHP7", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", @@ -33,10 +34,11 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "Fat Free Framework", + "framework": "Fat Free", "language": "PHP", + "flavor": "PHP7", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/PHP/fat-free/benchmark_config_bak.json b/frameworks/PHP/fat-free/benchmark_config_bak.json deleted file mode 100644 index 8ab6e795716..00000000000 --- a/frameworks/PHP/fat-free/benchmark_config_bak.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "framework": "fat-free", - "tests": [{ - "default": { - "setup_file": "setup", - "json_url": "/json", - "plaintext_url": "/plaintext", - "db_url": "/db-orm", - "query_url": "/db-orm-multiple/", - "update_url": "/update-orm/", - "port": 8080, - "approach": "Realistic", - "classification": "Fullstack", - "database": "MySQL", - "framework": "Fat Free Framework", - "language": "PHP", - "orm": "Full", - "platform": "PHP-FPM", - "webserver": "nginx", - "os": "Linux", - "database_os": "Linux", - "display_name": "fat-free", - "notes": "", - "versus": "php" - }, - "raw": { - "setup_file": "setup", - "db_url": "/db", - "query_url": "/db-multiple/", - "fortune_url": "/fortune", - "update_url": "/update-raw/", - "port": 8080, - "approach": "Realistic", - "classification": "Fullstack", - "database": "MySQL", - "framework": "Fat Free Framework", - "language": "PHP", - "orm": "Raw", - "platform": "PHP-FPM", - "webserver": "nginx", - "os": "Linux", - "database_os": "Linux", - "display_name": "fat-free", - "notes": "", - "versus": "php" - }, - "php5": { - "setup_file": "setup_php5", - "json_url": "/json", - "plaintext_url": "/plaintext", - "db_url": "/db-orm", - "query_url": "/db-orm-multiple/", - "update_url": "/update-orm/", - "port": 8080, - "approach": "Realistic", - "classification": "Fullstack", - "database": "MySQL", - "framework": "Fat Free Framework", - "language": "PHP5", - "orm": "Full", - "platform": "PHP-FPM", - "webserver": "nginx", - "os": "Linux", - "database_os": "Linux", - "display_name": "fat-free", - "notes": "", - "versus": "php" - }, - "php5-raw": { - "setup_file": "setup_php5", - "db_url": "/db", - "query_url": "/db-multiple/", - "fortune_url": "/fortune", - "update_url": "/update-raw/", - "port": 8080, - "approach": "Realistic", - "classification": "Fullstack", - "database": "MySQL", - "framework": "Fat Free Framework", - "language": "PHP5", - "orm": "Raw", - "platform": "PHP-FPM", - "webserver": "nginx", - "os": "Linux", - "database_os": "Linux", - "display_name": "fat-free", - "notes": "", - "versus": "php" - } - }] -} diff --git a/frameworks/PHP/fat-free/setup_php5.sh b/frameworks/PHP/fat-free/setup_php5.sh deleted file mode 100644 index 9e7ef08333b..00000000000 --- a/frameworks/PHP/fat-free/setup_php5.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -fw_depends php nginx - -sed -i 's|localhost|'"${DBHOST}"'|g' index.php -sed -i 's|root .*/FrameworkBenchmarks/fat-free|root '"${TROOT}"'|g' deploy/nginx.conf -sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf - - -F3DIR="$TROOT/src" - -[[ ! -e "$F3DIR" ]] || rm -rf "$F3DIR" - -git clone "https://github.com/bcosca/fatfree-core.git" "$F3DIR" -pushd "$F3DIR" > /dev/null -git checkout -q "069ccd84afd2461c7ebb67f660c142f97577e661" # v3.5.2-dev -popd > /dev/null - -php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid -nginx -c $TROOT/deploy/nginx.conf \ No newline at end of file diff --git a/frameworks/PHP/fuel/benchmark_config.json b/frameworks/PHP/fuel/benchmark_config.json index 770854743f7..298bd49d101 100644 --- a/frameworks/PHP/fuel/benchmark_config.json +++ b/frameworks/PHP/fuel/benchmark_config.json @@ -11,16 +11,17 @@ "approach": "Realistic", "classification": "Micro", "database": "MySQL", - "framework": "fuel", + "framework": "Fuel", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "fuel", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/hhvm/benchmark_config.json b/frameworks/PHP/hhvm/benchmark_config.json index a145dca907e..b068f71d152 100644 --- a/frameworks/PHP/hhvm/benchmark_config.json +++ b/frameworks/PHP/hhvm/benchmark_config.json @@ -16,9 +16,10 @@ "database" : "MySQL", "framework" : "hhvm", "language" : "PHP", + "flavor" : "HHVM", "orm" : "Raw", - "platform" : "hhvm", - "webserver" : "HPHP", + "platform" : "None", + "webserver" : "nginx", "os" : "Linux", "database_os" : "Linux", "display_name" : "hhvm", diff --git a/frameworks/PHP/kohana/benchmark_config.json b/frameworks/PHP/kohana/benchmark_config.json index b4fc643a779..d69e8861115 100644 --- a/frameworks/PHP/kohana/benchmark_config.json +++ b/frameworks/PHP/kohana/benchmark_config.json @@ -10,14 +10,15 @@ "database": "None", "framework": "kohana", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "kohana", "notes": "", - "versus": "php" + "versus": "php-php5" }, "raw": { "setup_file": "setup", @@ -30,14 +31,15 @@ "database": "MySQL", "framework": "kohana", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "kohana", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/laravel/benchmark_config.json b/frameworks/PHP/laravel/benchmark_config.json index afddc553b09..751d21ff84b 100644 --- a/frameworks/PHP/laravel/benchmark_config.json +++ b/frameworks/PHP/laravel/benchmark_config.json @@ -11,8 +11,9 @@ "database": "None", "framework": "laravel", "language": "PHP", + "flavor": "PHP7", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", @@ -31,8 +32,9 @@ "database": "MySQL", "framework": "laravel", "language": "PHP", + "flavor": "PHP7", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", @@ -50,12 +52,13 @@ "database": "None", "framework": "laravel", "language": "PHP", + "flavor": "HHVM", "orm": "Raw", - "platform": "HPHP", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "laravel_hhvm", + "display_name": "laravel", "notes": "", "versus": "php" }, @@ -70,12 +73,13 @@ "database": "MySQL", "framework": "laravel", "language": "PHP", + "flavor": "HHVM", "orm": "Raw", - "platform": "HPHP", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "laravel_hhvm", + "display_name": "laravel-raw", "notes": "", "versus": "php" }, @@ -89,14 +93,15 @@ "database": "None", "framework": "laravel", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "laravel", "notes": "", - "versus": "php" + "versus": "php-php5" }, "php5-raw": { "setup_file": "setup_php5", @@ -108,13 +113,14 @@ "classification": "Fullstack", "database": "MySQL", "framework": "laravel", - "language": "PHP5", + "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "laravel-php5-raw", + "display_name": "laravel-raw", "notes": "", "versus": "php" } diff --git a/frameworks/PHP/limonade/benchmark_config.json b/frameworks/PHP/limonade/benchmark_config.json index a817b3beb2e..3d45050c94a 100644 --- a/frameworks/PHP/limonade/benchmark_config.json +++ b/frameworks/PHP/limonade/benchmark_config.json @@ -15,12 +15,14 @@ "database": "MySQL", "framework": "Limonade", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "Limonade" + "display_name": "Limonade", + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/lithium/benchmark_config.json b/frameworks/PHP/lithium/benchmark_config.json index 216cf250610..300f62893f2 100644 --- a/frameworks/PHP/lithium/benchmark_config.json +++ b/frameworks/PHP/lithium/benchmark_config.json @@ -12,14 +12,15 @@ "database": "MySQL", "framework": "lithium", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "lithium", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/lumen/benchmark_config.json b/frameworks/PHP/lumen/benchmark_config.json index 29e82e9496b..2679d1563cb 100644 --- a/frameworks/PHP/lumen/benchmark_config.json +++ b/frameworks/PHP/lumen/benchmark_config.json @@ -16,12 +16,14 @@ "database": "MySQL", "framework": "Lumen", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "Lumen" + "display_name": "Lumen", + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/micromvc/benchmark_config.json b/frameworks/PHP/micromvc/benchmark_config.json index 2f663b59706..59dced309ab 100644 --- a/frameworks/PHP/micromvc/benchmark_config.json +++ b/frameworks/PHP/micromvc/benchmark_config.json @@ -12,14 +12,15 @@ "database": "MySQL", "framework": "micromvc", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "micromvc", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/phalcon-micro/benchmark_config.json b/frameworks/PHP/phalcon-micro/benchmark_config.json index ab8e8b84cc2..43009d3b365 100644 --- a/frameworks/PHP/phalcon-micro/benchmark_config.json +++ b/frameworks/PHP/phalcon-micro/benchmark_config.json @@ -13,14 +13,15 @@ "database": "MySQL", "framework": "phalcon", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "phalcon", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/phalcon/benchmark_config.json b/frameworks/PHP/phalcon/benchmark_config.json index 2ba64cb86ca..0c651c6f774 100644 --- a/frameworks/PHP/phalcon/benchmark_config.json +++ b/frameworks/PHP/phalcon/benchmark_config.json @@ -14,14 +14,15 @@ "database": "MySQL", "framework": "phalcon", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "phalcon", "notes": "", - "versus": "php" + "versus": "php-php5" }, "mongodb": { "setup_file": "setup", @@ -34,14 +35,15 @@ "database": "MongoDB", "framework": "phalcon", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "phalcon", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/php/benchmark_config.json b/frameworks/PHP/php/benchmark_config.json index b49244c1e63..460ee90dba0 100644 --- a/frameworks/PHP/php/benchmark_config.json +++ b/frameworks/PHP/php/benchmark_config.json @@ -11,14 +11,15 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "php", + "framework": "None", "language": "PHP", + "flavor": "PHP7", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "php", + "display_name": "PHP", "notes": "", "versus": "php" }, @@ -32,14 +33,15 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "php", + "framework": "None", "language": "PHP", + "flavor": "PHP7", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "php", + "display_name": "PHP-raw", "notes": "", "versus": "php" }, @@ -53,16 +55,17 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "php", - "language": "PHP5", + "framework": "None", + "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "php5", + "display_name": "PHP", "notes": "", - "versus": "php" + "versus": "php-php5" }, "php5-raw": { "setup_file": "setup", @@ -74,16 +77,17 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "php", - "language": "PHP5", + "framework": "None", + "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "php5-raw", + "display_name": "PHP-raw", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/phpixie/benchmark_config.json b/frameworks/PHP/phpixie/benchmark_config.json index 4a9608e2875..4c1a9d5e857 100755 --- a/frameworks/PHP/phpixie/benchmark_config.json +++ b/frameworks/PHP/phpixie/benchmark_config.json @@ -15,14 +15,15 @@ "database": "MySQL", "framework": "phpixie", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "phpixie", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/phreeze/benchmark_config.json b/frameworks/PHP/phreeze/benchmark_config.json index 3ebd24a1d9c..afd71dd0060 100644 --- a/frameworks/PHP/phreeze/benchmark_config.json +++ b/frameworks/PHP/phreeze/benchmark_config.json @@ -15,14 +15,15 @@ "database": "MySQL", "framework": "phreeze", "language": "PHP", + "flavor": "PHP5", "orm": "Micro", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "phreeze", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/pimf/benchmark_config.json b/frameworks/PHP/pimf/benchmark_config.json index c442e1f0489..c070e1b721d 100644 --- a/frameworks/PHP/pimf/benchmark_config.json +++ b/frameworks/PHP/pimf/benchmark_config.json @@ -11,14 +11,15 @@ "database": "MySQL", "framework": "pimf", "language": "PHP", + "flavor": "PHP5", "orm": "Micro", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "pimf", "notes": "", - "versus": "php" + "versus": "php-php5" }, "raw": { "setup_file": "setup_raw", @@ -34,14 +35,15 @@ "database": "MySQL", "framework": "pimf", "language": "PHP", + "flavor": "PHP5", "orm": "Micro", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "pimf", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/silex-orm/benchmark_config.json b/frameworks/PHP/silex-orm/benchmark_config.json index af8de61ee32..280e57aab8e 100644 --- a/frameworks/PHP/silex-orm/benchmark_config.json +++ b/frameworks/PHP/silex-orm/benchmark_config.json @@ -12,14 +12,15 @@ "database": "MySQL", "framework": "silex", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "silex", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/silex/benchmark_config.json b/frameworks/PHP/silex/benchmark_config.json index dfb99f0dc67..067dd2d35fe 100644 --- a/frameworks/PHP/silex/benchmark_config.json +++ b/frameworks/PHP/silex/benchmark_config.json @@ -12,14 +12,15 @@ "database": "MySQL", "framework": "silex", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "silex", "notes": "", - "versus": "php" + "versus": "php-php5" }, "raw": { "setup_file": "setup_raw", @@ -35,14 +36,15 @@ "database": "MySQL", "framework": "silex", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "silex", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/slim/benchmark_config.json b/frameworks/PHP/slim/benchmark_config.json index f335bedd46d..42a741a1bb5 100644 --- a/frameworks/PHP/slim/benchmark_config.json +++ b/frameworks/PHP/slim/benchmark_config.json @@ -12,8 +12,9 @@ "database": "MySQL", "framework": "slim", "language": "PHP", + "flavor": "PHP7", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", @@ -32,12 +33,13 @@ "database": "MySQL", "framework": "slim", "language": "PHP", + "flavor": "HHVM", "orm": "Raw", - "platform": "HPHP", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "slim_hhvm", + "display_name": "slim", "notes": "", "versus": "php" }, @@ -52,14 +54,15 @@ "database": "MySQL", "framework": "slim", "language": "PHP5", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "slim-php5", + "display_name": "slim", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/symfony2-stripped/benchmark_config.json b/frameworks/PHP/symfony2-stripped/benchmark_config.json index da12a180462..332502cd04f 100644 --- a/frameworks/PHP/symfony2-stripped/benchmark_config.json +++ b/frameworks/PHP/symfony2-stripped/benchmark_config.json @@ -13,14 +13,15 @@ "database": "MySQL", "framework": "symfony2", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "symfony2", "notes": "", - "versus": "php" + "versus": "php-php5" }, "php-templates": { "setup_file": "setup", @@ -31,14 +32,15 @@ "database": "MySQL", "framework": "symfony2", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "symfony2", "notes": "", - "versus": "php" + "versus": "php-php5" }, "raw": { "setup_file": "setup", @@ -51,14 +53,15 @@ "database": "MySQL", "framework": "symfony2", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "symfony2", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/symfony2/benchmark_config.json b/frameworks/PHP/symfony2/benchmark_config.json index 94385560732..58a2f1f9226 100644 --- a/frameworks/PHP/symfony2/benchmark_config.json +++ b/frameworks/PHP/symfony2/benchmark_config.json @@ -13,14 +13,15 @@ "database": "MySQL", "framework": "symfony2", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "symfony2", "notes": "", - "versus": "php" + "versus": "php-php5" }, "php-templates": { "setup_file": "setup", @@ -31,14 +32,15 @@ "database": "MySQL", "framework": "symfony2", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "symfony2", "notes": "", - "versus": "php" + "versus": "php-php5" }, "raw": { "setup_file": "setup", @@ -51,14 +53,15 @@ "database": "MySQL", "framework": "symfony2", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "symfony2", "notes": "", - "versus": "php" + "versus": "php-php5" }, "hhvm": { "setup_file": "setup_hhvm", @@ -72,9 +75,10 @@ "database": "MySQL", "framework": "symfony2", "language": "PHP", + "flavor": "HHVM", "orm": "Full", - "platform": "hhvm", - "webserver": "HPHP", + "platform": "None", + "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "symfony2-hhvm", diff --git a/frameworks/PHP/yaf/benchmark_config.json b/frameworks/PHP/yaf/benchmark_config.json index 1b1917f05ed..e6c113f625d 100644 --- a/frameworks/PHP/yaf/benchmark_config.json +++ b/frameworks/PHP/yaf/benchmark_config.json @@ -13,14 +13,15 @@ "database": "MySQL", "framework": "yaf", "language": "PHP", + "flavor": "PHP5", "orm": "Raw", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "yaf", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/yii2/benchmark_config.json b/frameworks/PHP/yii2/benchmark_config.json index 438b213cf67..007e195d993 100644 --- a/frameworks/PHP/yii2/benchmark_config.json +++ b/frameworks/PHP/yii2/benchmark_config.json @@ -14,14 +14,15 @@ "database": "MySQL", "framework": "yii2", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "yii2", "notes": "", - "versus": "php" + "versus": "php-php5" }, "hhvm": { "setup_file": "setup_hhvm", @@ -36,12 +37,13 @@ "database": "MySQL", "framework": "yii2", "language": "PHP", + "flavor": "HHVM", "orm": "Full", - "platform": "PHP-FPM", - "webserver": "HPHP", + "platform": "None", + "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "yii2-hhvm", + "display_name": "yii2", "notes": "", "versus": "php" } diff --git a/frameworks/PHP/zend/benchmark_config.json b/frameworks/PHP/zend/benchmark_config.json index 6503480db01..36d9ca19107 100644 --- a/frameworks/PHP/zend/benchmark_config.json +++ b/frameworks/PHP/zend/benchmark_config.json @@ -12,14 +12,15 @@ "database": "MySQL", "framework": "Zend", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "zend", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } diff --git a/frameworks/PHP/zend1/benchmark_config.json b/frameworks/PHP/zend1/benchmark_config.json index 7686ef64fac..3859cd25afe 100644 --- a/frameworks/PHP/zend1/benchmark_config.json +++ b/frameworks/PHP/zend1/benchmark_config.json @@ -12,14 +12,15 @@ "database": "MySQL", "framework": "ZendFramework1", "language": "PHP", + "flavor": "PHP5", "orm": "Full", - "platform": "PHP-FPM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "ZendFramework1", "notes": "", - "versus": "php" + "versus": "php-php5" } }] } From 176e321a266746b4e1fa1fae8a93fbc65a4765bd Mon Sep 17 00:00:00 2001 From: msmith-techempower Date: Thu, 24 Mar 2016 14:15:48 -0700 Subject: [PATCH 02/11] Fixed an issue with HHVM --- frameworks/PHP/codeigniter/benchmark_config.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frameworks/PHP/codeigniter/benchmark_config.json b/frameworks/PHP/codeigniter/benchmark_config.json index 6f3651fb6e8..1d2bff396bb 100644 --- a/frameworks/PHP/codeigniter/benchmark_config.json +++ b/frameworks/PHP/codeigniter/benchmark_config.json @@ -29,9 +29,9 @@ "database": "None", "framework": "codeigniter", "language": "PHP", - "flavor": "PHP5", + "flavor": "HHVM", "orm": "Raw", - "platform": "HHVM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", @@ -71,9 +71,9 @@ "database": "MySQL", "framework": "codeigniter", "language": "PHP", - "flavor": "PHP5", + "flavor": "HHVM", "orm": "Raw", - "platform": "HHVM", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", From ef8ba5d2742a2ad223efb329e878bc4ed1f7836d Mon Sep 17 00:00:00 2001 From: msmith-techempower Date: Wed, 15 Jun 2016 08:11:57 -0700 Subject: [PATCH 03/11] Cleaned up a lot of stuff --- .../C++/cpoll_cppsp/benchmark_config.json | 22 ++- .../C++/ffead-cpp/benchmark_config.json | 7 +- frameworks/C++/poco/benchmark_config.json | 7 +- frameworks/C++/silicon/benchmark_config.json | 15 +- frameworks/C++/treefrog/benchmark_config.json | 10 +- frameworks/C++/wt/benchmark_config.json | 12 +- frameworks/C/duda/benchmark_config.json | 9 +- frameworks/C/haywire/benchmark_config.json | 7 +- frameworks/C/libreactor/benchmark_config.json | 5 +- frameworks/C/lwan/benchmark_config.json | 21 ++- frameworks/C/onion/benchmark_config.json | 10 +- .../CSharp/HttpListener/benchmark_config.json | 46 ++--- .../aspnet-stripped/benchmark_config.json | 45 +++-- .../CSharp/aspnet/benchmark_config.json | 178 ++++++++++-------- .../CSharp/evhttp-sharp/benchmark_config.json | 5 +- frameworks/CSharp/nancy/benchmark_config.json | 10 +- .../CSharp/revenj/benchmark_config.json | 28 +-- .../CSharp/servicestack/benchmark_config.json | 102 +++++----- .../Clojure/aleph/benchmark_config.json | 3 +- .../Clojure/compojure/benchmark_config.json | 2 + .../Clojure/http-kit/benchmark_config.json | 10 +- .../Clojure/luminus/benchmark_config.json | 7 +- .../Clojure/pedestal/benchmark_config.json | 7 +- .../benchmark_config.json | 9 +- .../{crystal-raw => crystal}/server.cr | 0 .../Crystal/{crystal-raw => crystal}/setup.sh | 0 .../Crystal/kemal/benchmark_config.json | 10 +- .../Crystal/moonshine/benchmark_config.json | 5 +- frameworks/D/vibed/benchmark_config.json | 7 +- .../Dart/dart-raw/benchmark_config.json | 7 +- .../Dart/redstone/benchmark_config.json | 10 +- frameworks/Dart/start/benchmark_config.json | 6 +- frameworks/Dart/stream/benchmark_config.json | 6 +- .../Elixir/cowboy/benchmark_config.json | 13 +- .../Elixir/phoenix/benchmark_config.json | 7 +- .../Erlang/chicagoboss/benchmark_config.json | 7 +- .../Erlang/cowboy/benchmark_config.json | 9 +- frameworks/Erlang/elli/benchmark_config.json | 7 +- .../Erlang/misultin/benchmark_config.json | 7 +- .../Erlang/mochiweb/benchmark_config.json | 7 +- frameworks/Go/beego/benchmark_config.json | 3 +- frameworks/Go/echo/benchmark_config.json | 9 +- frameworks/Go/falcore/benchmark_config.json | 7 +- .../Go/fasthttp-mysql/benchmark_config.json | 14 +- .../fasthttp-postgresql/benchmark_config.json | 7 +- frameworks/Go/gin/benchmark_config.json | 5 +- .../Go/go-std-mongodb/benchmark_config.json | 9 +- .../Go/go-std-mysql/benchmark_config.json | 25 +-- .../go-std-postgresql/benchmark_config.json | 9 +- frameworks/Go/goji/benchmark_config.json | 5 +- frameworks/Go/kami/benchmark_config.json | 5 +- frameworks/Go/revel-jet/benchmark_config.json | 9 +- frameworks/Go/revel-qbs/benchmark_config.json | 9 +- frameworks/Go/revel/benchmark_config.json | 7 +- frameworks/Go/webgo/benchmark_config.json | 9 +- .../Groovy/grails/benchmark_config.json | 7 +- frameworks/Haskell/snap/benchmark_config.json | 5 +- .../Haskell/spock/benchmark_config.json | 5 +- frameworks/Haskell/wai/benchmark_config.json | 7 +- .../Haskell/yesod/benchmark_config.json | 2 + .../Java/activeweb/benchmark_config.json | 10 +- .../Java/baratine/benchmark_config.json | 10 +- frameworks/Java/bayou/benchmark_config.json | 7 +- frameworks/Java/beyondj/benchmark_config.json | 3 +- .../Java/comsat-servlet/benchmark_config.json | 9 +- .../comsat-webactors/benchmark_config.json | 9 +- frameworks/Java/curacao/benchmark_config.json | 9 +- .../Java/dropwizard/benchmark_config.json | 21 ++- frameworks/Java/gemini/benchmark_config.json | 11 +- .../Java/grizzly-bm/benchmark_config.json | 7 +- .../Java/grizzly-jersey/benchmark_config.json | 10 +- 71 files changed, 541 insertions(+), 408 deletions(-) rename frameworks/Crystal/{crystal-raw => crystal}/benchmark_config.json (74%) rename frameworks/Crystal/{crystal-raw => crystal}/server.cr (100%) rename frameworks/Crystal/{crystal-raw => crystal}/setup.sh (100%) diff --git a/frameworks/C++/cpoll_cppsp/benchmark_config.json b/frameworks/C++/cpoll_cppsp/benchmark_config.json index 4636225cb2a..2eb05bf98d4 100644 --- a/frameworks/C++/cpoll_cppsp/benchmark_config.json +++ b/frameworks/C++/cpoll_cppsp/benchmark_config.json @@ -7,18 +7,19 @@ "plaintext_url": "/plaintext", "port": 16969, "approach": "Realistic", - "classification": "Micro", + "classification": "Platform", "database": "None", "framework": "cpoll-cppsp", "language": "C++", + "flavor": "C++14", "orm": "Raw", - "platform": "CPoll", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "cpoll-cppsp", "notes": "", - "versus": "" + "versus": "cpoll_cppsp" }, "raw": { "setup_file": "setup", @@ -32,14 +33,15 @@ "database": "MySQL", "framework": "cpoll-cppsp", "language": "C++", + "flavor": "C++14", "orm": "Raw", - "platform": "CPoll", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "cpoll-cppsp-raw", "notes": "", - "versus": "" + "versus": "cpoll_cppsp" }, "postgres-raw": { "setup_file": "setup", @@ -51,14 +53,15 @@ "database": "Postgres", "framework": "cpoll-cppsp", "language": "C++", + "flavor": "C++14", "orm": "Raw", - "platform": "CPoll", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "cpoll-cppsp-raw", "notes": "", - "versus": "" + "versus": "cpoll_cppsp" }, "postgres-raw-threadpool": { "setup_file": "setup", @@ -70,14 +73,15 @@ "database": "Postgres", "framework": "cpoll-cppsp", "language": "C++", + "flavor": "C++14", "orm": "Raw", - "platform": "CPoll", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "cpoll-pool", "notes": "Threadpool", - "versus": "" + "versus": "cpoll_cppsp" } }] } diff --git a/frameworks/C++/ffead-cpp/benchmark_config.json b/frameworks/C++/ffead-cpp/benchmark_config.json index 57e46c13b93..7d75d691d7c 100644 --- a/frameworks/C++/ffead-cpp/benchmark_config.json +++ b/frameworks/C++/ffead-cpp/benchmark_config.json @@ -11,18 +11,19 @@ "update_url": "/te-benchmark/updates?queries=", "port": 8080, "approach": "Realistic", - "classification": "Fullstack", + "classification": "Framework", "database": "MongoDB", "framework": "ffead-cpp", "language": "C++", + "flavor": "C++14", "orm": "Full", - "platform": "ffead-cpp", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "ffead-cpp", "notes": "", - "versus": "" + "versus": "ffead-cpp" } }] } diff --git a/frameworks/C++/poco/benchmark_config.json b/frameworks/C++/poco/benchmark_config.json index daa9cbe01e5..b31abd4927e 100644 --- a/frameworks/C++/poco/benchmark_config.json +++ b/frameworks/C++/poco/benchmark_config.json @@ -8,16 +8,17 @@ "approach": "Realistic", "classification": "Platform", "database": "none", - "framework": "POCO", + "framework": "None", "language": "C++", + "flavor": "C++14", "orm": "Raw", "platform": "POCO", - "webserver": "poco", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "POCO", "notes": "", - "versus": "" + "versus": "poco" } }] } diff --git a/frameworks/C++/silicon/benchmark_config.json b/frameworks/C++/silicon/benchmark_config.json index 40fae6ea8ad..f8b8a8b518b 100644 --- a/frameworks/C++/silicon/benchmark_config.json +++ b/frameworks/C++/silicon/benchmark_config.json @@ -15,14 +15,15 @@ "database": "MySQL", "framework": "silicon", "language": "C++", + "flavor": "C++14", "orm": "Full", - "platform": "Silicon", + "platform": "None", "webserver": "microhttpd", "os": "Linux", "database_os": "Linux", "display_name": "silicon-tpc-mysql", "notes": "", - "versus": "" + "versus": "silicon" }, "epoll-mysql": { "setup_file": "setup_mhd_epoll_mysql", @@ -38,14 +39,15 @@ "database": "MySQL", "framework": "silicon", "language": "C++", + "flavor": "C++14", "orm": "Full", - "platform": "Silicon", + "platform": "None", "webserver": "microhttpd", "os": "Linux", "database_os": "Linux", "display_name": "silicon-epoll-mysql", "notes": "", - "versus": "" + "versus": "silicon" }, "lwan-mysql": { "setup_file": "setup_lwan_mysql", @@ -61,14 +63,15 @@ "database": "MySQL", "framework": "silicon", "language": "C++", + "flavor": "C++14", "orm": "Full", - "platform": "Silicon", + "platform": "None", "webserver": "Lwan", "os": "Linux", "database_os": "Linux", "display_name": "silicon-lwan-mysql", "notes": "", - "versus": "" + "versus": "silicon" } }] diff --git a/frameworks/C++/treefrog/benchmark_config.json b/frameworks/C++/treefrog/benchmark_config.json index 2238663855e..d71cfb49160 100644 --- a/frameworks/C++/treefrog/benchmark_config.json +++ b/frameworks/C++/treefrog/benchmark_config.json @@ -15,14 +15,15 @@ "database": "MySQL", "framework": "treefrog", "language": "C++", + "flavor": "C++14", "orm": "Micro", - "platform": "Treefrog", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "treefrog-hybrid", "notes": "", - "versus": "" + "versus": "treefrog" }, "thread": { "setup_file": "setup-thread", @@ -38,14 +39,15 @@ "database": "MySQL", "framework": "treefrog", "language": "C++", + "flavor": "C++14", "orm": "Micro", - "platform": "Treefrog", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "treefrog-thread", "notes": "", - "versus": "" + "versus": "treefrog" } }] } diff --git a/frameworks/C++/wt/benchmark_config.json b/frameworks/C++/wt/benchmark_config.json index d4d5d892766..3b8a9f0cf03 100644 --- a/frameworks/C++/wt/benchmark_config.json +++ b/frameworks/C++/wt/benchmark_config.json @@ -15,13 +15,15 @@ "database": "MySQL", "framework": "wt", "language": "C++", + "flavor": "C++14", "orm": "Full", - "platform": "Wt", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "wt", - "notes": "" + "notes": "", + "versus": "wt" }, "postgres": { "setup_file": "setup_postgres", @@ -35,13 +37,15 @@ "database": "Postgres", "framework": "wt", "language": "C++", + "flavor": "C++14", "orm": "Full", - "platform": "Wt", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "wt-postgres", - "notes": "" + "notes": "", + "versus": "wt" } }] } diff --git a/frameworks/C/duda/benchmark_config.json b/frameworks/C/duda/benchmark_config.json index 616698cef75..9740aca8562 100644 --- a/frameworks/C/duda/benchmark_config.json +++ b/frameworks/C/duda/benchmark_config.json @@ -8,17 +8,18 @@ "port": 2001, "approach": "Realistic", "classification": "Platform", - "database": "none", - "framework": "Duda", + "database": "None", + "framework": "None", "language": "C", + "flavor": "C11", "orm": "Raw", - "platform": "Duda I/O", + "platform": "duda", "webserver": "Monkey", "os": "Linux", "database_os": "Linux", "display_name": "Duda I/O", "notes": "", - "versus": "" + "versus": "duda" } }] } diff --git a/frameworks/C/haywire/benchmark_config.json b/frameworks/C/haywire/benchmark_config.json index 167d429c545..d31f0f7211c 100644 --- a/frameworks/C/haywire/benchmark_config.json +++ b/frameworks/C/haywire/benchmark_config.json @@ -6,17 +6,18 @@ "plaintext_url": "/plaintext", "port": 8000, "approach": "Realistic", - "classification": "Micro", + "classification": "Platform", "database": "None", - "framework": "haywire", + "framework": "None", "language": "C", + "flavor": "C11", "orm": "Raw", "platform": "haywire", "webserver": "None", "os": "Linux", "database_os": "Linux", "notes": "", - "versus": "" + "versus": "haywire" } }] } diff --git a/frameworks/C/libreactor/benchmark_config.json b/frameworks/C/libreactor/benchmark_config.json index 3b07d7cf4f1..3e836b1b0db 100644 --- a/frameworks/C/libreactor/benchmark_config.json +++ b/frameworks/C/libreactor/benchmark_config.json @@ -9,15 +9,16 @@ "approach": "Realistic", "classification": "Platform", "database": "None", - "framework": "libreactor", + "framework": "None", "language": "C", + "flavor": "C11", "orm": "Raw", "platform": "libreactor", "webserver": "None", "os": "Linux", "database_os": "Linux", "notes": "", - "versus": "" + "versus": "libreactor" } }] } diff --git a/frameworks/C/lwan/benchmark_config.json b/frameworks/C/lwan/benchmark_config.json index af7a8db0e84..557c415bc9d 100644 --- a/frameworks/C/lwan/benchmark_config.json +++ b/frameworks/C/lwan/benchmark_config.json @@ -9,16 +9,17 @@ "approach": "Realistic", "classification": "Platform", "database": "None", - "framework": "lwan", + "framework": "None", "language": "C", + "flavor": "C11", "orm": "Raw", "platform": "Lwan", - "webserver": "Lwan", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "Lwan", "notes": "", - "versus": "" + "versus": "lwan" }, "sqlite": { "setup_file": "setup", @@ -29,16 +30,17 @@ "approach": "Realistic", "classification": "Platform", "database": "SQLite", - "framework": "lwan", + "framework": "None", "language": "C", + "flavor": "C11", "orm": "Raw", "platform": "Lwan", - "webserver": "Lwan", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "Lwan", "notes": "", - "versus": "" + "versus": "lwan" }, "mysql": { "setup_file": "setup-mysql", @@ -49,16 +51,17 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "lwan", + "framework": "None", "language": "C", + "flavor": "C11", "orm": "Raw", "platform": "Lwan", - "webserver": "Lwan", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "Lwan", "notes": "", - "versus": "" + "versus": "lwan" } }] } diff --git a/frameworks/C/onion/benchmark_config.json b/frameworks/C/onion/benchmark_config.json index 9b6f65df71e..686d6a9b586 100644 --- a/frameworks/C/onion/benchmark_config.json +++ b/frameworks/C/onion/benchmark_config.json @@ -8,8 +8,9 @@ "approach": "Realistic", "classification": "Platform", "database": "None", - "framework": "onion", + "framework": "None", "language": "C", + "flavor": "C11", "orm": "Raw", "platform": "Onion", "webserver": "None", @@ -17,7 +18,7 @@ "database_os": "Linux", "display_name": "onion", "notes": "", - "versus": "" + "versus": "onion" }, "raw": { "setup_file": "setup", @@ -28,8 +29,9 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "onion", + "framework": "None", "language": "C", + "flavor": "C11", "orm": "Raw", "platform": "Onion", "webserver": "None", @@ -37,7 +39,7 @@ "database_os": "Linux", "display_name": "onion", "notes": "", - "versus": "" + "versus": "onion" } }] } diff --git a/frameworks/CSharp/HttpListener/benchmark_config.json b/frameworks/CSharp/HttpListener/benchmark_config.json index d72cfc13dba..c03715f0d6a 100644 --- a/frameworks/CSharp/HttpListener/benchmark_config.json +++ b/frameworks/CSharp/HttpListener/benchmark_config.json @@ -6,19 +6,20 @@ "json_url": "/json", "plaintext_url": "/plaintext", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "None", - "framework": "http-listener", + "framework": "None", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", - "webserver": "HTTP.sys", + "platform": "None", + "webserver": "None", "os": "Windows", "database_os": "Linux", "display_name": "http-listener", "notes": "", - "versus": "" + "versus": "HttpListener" }, "mysql-raw": { "setup_file": "setup", @@ -27,14 +28,15 @@ "fortune_url": "/fortunes?provider=mysql", "update_url": "/updates?provider=mysql&queries=", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "MySQL", - "framework": "http-listener", + "framework": "None", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", - "webserver": "HTTP.sys", + "platform": "None", + "webserver": "None", "os": "Windows", "database_os": "Linux", "display_name": "http-listener", @@ -48,14 +50,14 @@ "fortune_url": "/fortunes?provider=postgresql", "update_url": "/updates?provider=postgresql&queries=", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "Postgres", - "framework": "http-listener", + "framework": "None", "language": "C#", "orm": "Raw", - "platform": "NET", - "webserver": "HTTP.sys", + "platform": "None", + "webserver": "None", "os": "Windows", "database_os": "Linux", "display_name": "http-listener", @@ -69,14 +71,15 @@ "fortune_url": "/mongodbfortunes", "update_url": "/mongodbupdates?queries=", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "MongoDB", - "framework": "http-listener", + "framework": "None", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", - "webserver": "HTTP.sys", + "platform": "None", + "webserver": "None", "os": "Windows", "database_os": "Linux", "display_name": "http-listener", @@ -90,14 +93,15 @@ "fortune_url": "/fortunes?provider=sqlserver", "update_url": "/updates?provider=sqlserver&queries=", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "SQLServer", - "framework": "http-listener", + "framework": "None", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", - "webserver": "HTTP.sys", + "platform": "None", + "webserver": "None", "os": "Windows", "database_os": "Windows", "display_name": "http-listener", diff --git a/frameworks/CSharp/aspnet-stripped/benchmark_config.json b/frameworks/CSharp/aspnet-stripped/benchmark_config.json index 47ab990dad5..f77dba364c1 100644 --- a/frameworks/CSharp/aspnet-stripped/benchmark_config.json +++ b/frameworks/CSharp/aspnet-stripped/benchmark_config.json @@ -9,16 +9,17 @@ "approach": "Stripped", "classification": "Fullstack", "database": "None", - "framework": "aspnet", + "framework": "ASP.NET", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Linux", - "display_name": "aspnet-stripped", + "display_name": "asp.net-stripped", "notes": "", - "versus": "" + "versus": "aspnet-stripped" }, "mysql-raw": { "setup_file": "setup_iis", @@ -30,16 +31,17 @@ "approach": "Stripped", "classification": "Fullstack", "database": "MySQL", - "framework": "aspnet", + "framework": "ASP.NET", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Linux", - "display_name": "aspnet-stripped-raw", + "display_name": "asp.net-stripped-raw", "notes": "", - "versus": "" + "versus": "aspnet-stripped" }, "postgresql-raw": { "setup_file": "setup_iis", @@ -51,16 +53,17 @@ "approach": "Stripped", "classification": "Fullstack", "database": "Postgres", - "framework": "aspnet", + "framework": "ASP.NET", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Linux", - "display_name": "aspnet-stripped-raw", + "display_name": "asp.net-stripped-raw", "notes": "", - "versus": "" + "versus": "asnet-stripped" }, "mongodb-raw": { "setup_file": "setup_iis", @@ -72,16 +75,17 @@ "approach": "Stripped", "classification": "Fullstack", "database": "MongoDB", - "framework": "aspnet", + "framework": "ASP.NET", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Linux", - "display_name": "aspnet-stripped-raw", + "display_name": "asp.net-stripped-raw", "notes": "", - "versus": "" + "versus": "aspnet-stripped" }, "sqlserver-raw": { "setup_file": "setup_iis", @@ -93,16 +97,17 @@ "approach": "Stripped", "classification": "Fullstack", "database": "SQLServer", - "framework": "aspnet", + "framework": "ASP.NET", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Windows", - "display_name": "aspnet-stripped-raw", + "display_name": "asp.net-stripped-raw", "notes": "", - "versus": "" + "versus": "aspnet-stripped" } }] } diff --git a/frameworks/CSharp/aspnet/benchmark_config.json b/frameworks/CSharp/aspnet/benchmark_config.json index 9255498ca62..a4d54c17159 100644 --- a/frameworks/CSharp/aspnet/benchmark_config.json +++ b/frameworks/CSharp/aspnet/benchmark_config.json @@ -9,52 +9,55 @@ "approach": "Realistic", "classification": "Fullstack", "database": "None", - "framework": "aspnet-mvc", + "framework": "asp.net", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Linux", - "display_name": "aspnet", + "display_name": "asp.net", "notes": "", - "versus": "" + "versus": "aspnet" }, "jsonnet": { "setup_file": "setup_iis", "json_url": "/json/jsonnet", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "None", - "framework": "aspnet", + "framework": "asp.net", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Linux", - "display_name": "aspnet-jsonnet", + "display_name": "jsonnet", "notes": "", - "versus": "" + "versus": "aspnet" }, "servicestack": { "setup_file": "setup_iis", "json_url": "/json/servicestack", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "None", - "framework": "aspnet", + "framework": "asp.net", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Linux", - "display_name": "aspnet-svcstk", + "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "aspnet" }, "mysql-raw": { "setup_file": "setup_iis", @@ -66,16 +69,17 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "aspnet-mvc", + "framework": "asp.net", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Linux", - "display_name": "aspnet-mvc-raw", + "display_name": "asp.net-raw", "notes": "", - "versus": "" + "versus": "aspnet" }, "postgresql-raw": { "setup_file": "setup_iis", @@ -87,16 +91,17 @@ "approach": "Realistic", "classification": "Fullstack", "database": "Postgres", - "framework": "aspnet-mvc", + "framework": "asp.net", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Linux", - "display_name": "aspnet-mvc-raw", + "display_name": "asp.net-raw", "notes": "", - "versus": "" + "versus": "aspnet" }, "mongodb-raw": { "setup_file": "setup_iis", @@ -108,16 +113,17 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MongoDB", - "framework": "aspnet-mvc", + "framework": "asp.net", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Linux", - "display_name": "aspnet-mvc-raw", + "display_name": "asp.net-raw", "notes": "", - "versus": "" + "versus": "aspnet" }, "sqlserver-raw": { "setup_file": "setup_iis", @@ -129,16 +135,17 @@ "approach": "Realistic", "classification": "Fullstack", "database": "SQLServer", - "framework": "aspnet-mvc", + "framework": "asp.net-mvc", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Windows", - "display_name": "aspnet-mvc-raw", + "display_name": "aspnet-raw", "notes": "", - "versus": "" + "versus": "aspnet" }, "mysql-entityframework": { "setup_file": "setup_iis", @@ -150,16 +157,17 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "aspnet-mvc", + "framework": "EntityFramework", "language": "C#", + "flavor": "Microsoft", "orm": "Full", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Linux", - "display_name": "aspnet-mvc", + "display_name": "EntityFramework", "notes": "", - "versus": "" + "versus": "aspnet" }, "postgresql-entityframework": { "setup_file": "setup_iis", @@ -171,16 +179,17 @@ "approach": "Realistic", "classification": "Fullstack", "database": "Postgres", - "framework": "aspnet-mvc", + "framework": "EntityFramework", "language": "C#", + "flavor": "Microsoft", "orm": "Full", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Linux", - "display_name": "aspnet-mvc", + "display_name": "EntityFramework", "notes": "", - "versus": "" + "versus": "aspnet" }, "sqlserver-entityframework": { "setup_file": "setup_iis", @@ -192,16 +201,17 @@ "approach": "Realistic", "classification": "Fullstack", "database": "SQLServer", - "framework": "aspnet-mvc", + "framework": "EntityFramework", "language": "C#", + "flavor": "Microsoft", "orm": "Full", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Windows", - "display_name": "aspnet-mvc", + "display_name": "EntityFramework", "notes": "", - "versus": "" + "versus": "aspnet" }, "mono": { "setup_file": "setup_nginx", @@ -209,54 +219,57 @@ "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", - "classification": "Fullstack", + "classification": "Platform", "database": "None", - "framework": "aspnet-mvc", + "framework": "None", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "ASP.NET", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "aspnet-mvc-mono", + "display_name": "ASP.NET", "notes": "", - "versus": "" + "versus": "aspnet-mono" }, "mono-jsonnet": { "setup_file": "setup_nginx", "json_url": "/json/jsonnet", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "None", - "framework": "aspnet", + "framework": "JSONNet", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "ASP.NET", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "aspnet-jsonnet-mono", + "display_name": "JSONNet", "notes": "", - "versus": "" + "versus": "aspnet-mono" }, "mono-servicestack": { "setup_file": "setup_nginx", "json_url": "/json/servicestack", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "None", - "framework": "aspnet", + "framework": "ServiceStack", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "ASP.NET", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "aspnet-svcstk-mono", + "display_name": "ServiceStack", "notes": "", - "versus": "" + "versus": "aspnet-mono" }, "mono-mysql-raw": { "setup_file": "setup_nginx", @@ -268,18 +281,19 @@ "update_url": "/ado/mysql/update?queries=", "port": 8080, "approach": "Realistic", - "classification": "Fullstack", + "classification": "Platform", "database": "MySQL", - "framework": "aspnet-mvc", + "framework": "None", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "ASP.NET", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "aspnet-mvc-mono-raw", + "display_name": "ASP.NET-raw", "notes": "", - "versus": "" + "versus": "aspnet" }, "mono-postgresql-raw": { "setup_file": "setup_nginx", @@ -289,18 +303,19 @@ "update_url": "/ado/postgresql/update?queries=", "port": 8080, "approach": "Realistic", - "classification": "Fullstack", + "classification": "Platform", "database": "Postgres", - "framework": "aspnet-mvc", + "framework": "None", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "ASP.NET", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "aspnet-mvc-mono-raw", + "display_name": "ASP.NET-raw", "notes": "", - "versus": "" + "versus": "aspnet" }, "mono-mongodb-raw": { "setup_file": "setup_nginx", @@ -310,18 +325,19 @@ "update_url": "/mongodb/update?queries=", "port": 8080, "approach": "Realistic", - "classification": "Fullstack", + "classification": "Platform", "database": "MongoDB", - "framework": "aspnet-mvc", + "framework": "None", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "ASP.NET", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "aspnet-mvc-mono-raw", + "display_name": "aspnet-raw", "notes": "", - "versus": "" + "versus": "aspnet" }, "mono-mysql-entityframework": { "setup_file": "setup_nginx", @@ -333,16 +349,17 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "aspnet-mvc", + "framework": "EntityFramework", "language": "C#", + "flavor": "Mono", "orm": "Full", - "platform": "Mono", + "platform": "ASP.NET", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "aspnet-mvc-mono", + "display_name": "EntityFramework", "notes": "Entity framework", - "versus": "" + "versus": "aspnet" }, "mono-postgresql-entityframework": { "setup_file": "setup_nginx", @@ -354,16 +371,17 @@ "approach": "Realistic", "classification": "Fullstack", "database": "Postgres", - "framework": "aspnet-mvc", + "framework": "EntityFramework", "language": "C#", + "flavor": "Mono", "orm": "Full", - "platform": "Mono", + "platform": "ASP.NET", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "aspnet-mvc-mono", + "display_name": "EntityFramework", "notes": "Entity framework", - "versus": "" + "versus": "aspnet" } }] } diff --git a/frameworks/CSharp/evhttp-sharp/benchmark_config.json b/frameworks/CSharp/evhttp-sharp/benchmark_config.json index f824b9155e4..13dc31fb23d 100644 --- a/frameworks/CSharp/evhttp-sharp/benchmark_config.json +++ b/frameworks/CSharp/evhttp-sharp/benchmark_config.json @@ -11,14 +11,15 @@ "database": "None", "framework": "evhttp-sharp", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "evhttp-sharp", "notes": "", - "versus": "" + "versus": "evhttp-sharp" } }] } diff --git a/frameworks/CSharp/nancy/benchmark_config.json b/frameworks/CSharp/nancy/benchmark_config.json index 92339cd8983..7630dad1355 100644 --- a/frameworks/CSharp/nancy/benchmark_config.json +++ b/frameworks/CSharp/nancy/benchmark_config.json @@ -13,14 +13,15 @@ "database": "MySQL", "framework": "nancy", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": ".NET", "webserver": "IIS", "os": "Windows", "database_os": "Linux", "display_name": "nancy", "notes": "", - "versus": "" + "versus": "nancy" }, "mono": { "setup_file": "setup_nginx", @@ -34,14 +35,15 @@ "database": "MySQL", "framework": "nancy", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": ".NET", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "nancy", "notes": "", - "versus": "" + "versus": "nancy" } }] diff --git a/frameworks/CSharp/revenj/benchmark_config.json b/frameworks/CSharp/revenj/benchmark_config.json index 7124bee64ee..dcd7980da10 100644 --- a/frameworks/CSharp/revenj/benchmark_config.json +++ b/frameworks/CSharp/revenj/benchmark_config.json @@ -1,5 +1,5 @@ { - "framework": "Revenj.NET", + "framework": "Revenj", "tests": [{ "windows": { "setup_file": "setup", @@ -10,18 +10,19 @@ "update_url": "/bench/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "Postgres", "database_os": "Linux", - "framework": "Revenj.NET", + "framework": "Revenj", "language": "C#", + "flavor": "Microsoft", "orm": "Full", - "platform": ".NET", - "webserver": "Revenj.NET", + "platform": "None", + "webserver": "None", "os": "Windows", - "display_name": "Revenj.NET", + "display_name": "Revenj", "notes": "", - "versus": "" + "versus": "Revenj" }, "default": { "setup_file": "setup", @@ -32,18 +33,19 @@ "update_url": "/bench/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "Postgres", "database_os": "Linux", - "framework": "Revenj.NET", + "framework": "Revenj", "language": "C#", + "flavor": "Mono", "orm": "Full", - "platform": "Mono", - "webserver": "Revenj.NET", + "platform": "None", + "webserver": "None", "os": "Linux", - "display_name": "Revenj.NET", + "display_name": "Revenj", "notes": "", - "versus": "" + "versus": "Revenj" } }] } diff --git a/frameworks/CSharp/servicestack/benchmark_config.json b/frameworks/CSharp/servicestack/benchmark_config.json index 438d420da1f..da99ca8ec0c 100644 --- a/frameworks/CSharp/servicestack/benchmark_config.json +++ b/frameworks/CSharp/servicestack/benchmark_config.json @@ -7,18 +7,19 @@ "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "None", "framework": "servicestack", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": "None", "webserver": "IIS", "os": "Windows", "database_os": "Linux", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" }, "iis-sqlserver": { "setup_file": "setup_iis", @@ -28,18 +29,19 @@ "update_url": "/sqlserver/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "SQLServer", "framework": "servicestack", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": "None", "webserver": "IIS", "os": "Windows", "database_os": "Windows", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" }, "iis-mysql": { "setup_file": "setup_iis", @@ -49,18 +51,19 @@ "update_url": "/mysql/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "MySQL", "framework": "servicestack", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": "None", "webserver": "IIS", "os": "Windows", "database_os": "Linux", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" }, "iis-postgresql": { "setup_file": "setup_iis", @@ -70,18 +73,19 @@ "update_url": "/postgresql/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "Postgres", "framework": "servicestack", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": "None", "webserver": "IIS", "os": "Windows", "database_os": "Linux", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" }, "iis-mongodb": { "setup_file": "setup_iis", @@ -92,18 +96,19 @@ "update_url": "/mongodb/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "MongoDB", "framework": "servicestack", "language": "C#", + "flavor": "Microsoft", "orm": "Raw", - "platform": "NET", + "platform": "None", "webserver": "IIS", "os": "Windows", "database_os": "Linux", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" }, "nginx-default": { "setup_file": "setup_nginx", @@ -111,18 +116,19 @@ "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "None", "framework": "servicestack", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" }, "nginx-sqlserver": { "setup_file": "setup_nginx", @@ -132,12 +138,13 @@ "update_url": "/sqlserver/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "SQLServer", "framework": "servicestack", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Windows", @@ -153,18 +160,19 @@ "update_url": "/mysql/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "MySQL", "framework": "servicestack", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" }, "nginx-postgresql": { "setup_file": "setup_nginx", @@ -174,18 +182,19 @@ "update_url": "/postgresql/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "Postgres", "framework": "servicestack", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" }, "nginx-mongodb": { "setup_file": "setup_nginx", @@ -195,18 +204,19 @@ "update_url": "/mongodb/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "MongoDB", "framework": "servicestack", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" }, "xsp-default": { "setup_file": "setup_xsp", @@ -214,18 +224,19 @@ "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "None", "framework": "servicestack", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "None", "webserver": "XSP", "os": "Linux", "database_os": "Linux", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" }, "xsp-sqlserver": { "setup_file": "setup_xsp", @@ -235,18 +246,19 @@ "update_url": "/sqlserver/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "SQLServer", "framework": "servicestack", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "None", "webserver": "XSP", "os": "Linux", "database_os": "Windows", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" }, "xsp-mysql": { "setup_file": "setup_xsp", @@ -256,18 +268,18 @@ "update_url": "/mysql/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "MySQL", "framework": "servicestack", "language": "C#", "orm": "Raw", - "platform": "Mono", + "platform": "None", "webserver": "XSP", "os": "Linux", "database_os": "Linux", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" }, "xsp-postgresql": { "setup_file": "setup_xsp", @@ -277,18 +289,19 @@ "update_url": "/postgresql/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "Postgres", "framework": "servicestack", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "None", "webserver": "XSP", "os": "Linux", "database_os": "Linux", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" }, "xsp-mongodb": { "setup_file": "setup_xsp", @@ -298,18 +311,19 @@ "update_url": "/mongodb/updates/", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "MongoDB", "framework": "servicestack", "language": "C#", + "flavor": "Mono", "orm": "Raw", - "platform": "Mono", + "platform": "None", "webserver": "XSP", "os": "Linux", "database_os": "Linux", "display_name": "servicestack", "notes": "", - "versus": "" + "versus": "servicestack" } }] } diff --git a/frameworks/Clojure/aleph/benchmark_config.json b/frameworks/Clojure/aleph/benchmark_config.json index 71a10c489c2..23b1a217ea6 100755 --- a/frameworks/Clojure/aleph/benchmark_config.json +++ b/frameworks/Clojure/aleph/benchmark_config.json @@ -7,10 +7,11 @@ "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Micro", "database": "None", "framework": "aleph", "language": "Clojure", + "flavor": "Java8", "orm": "Raw", "platform": "Netty", "webserver": "None", diff --git a/frameworks/Clojure/compojure/benchmark_config.json b/frameworks/Clojure/compojure/benchmark_config.json index 20884ac7bc6..b29c418a99e 100644 --- a/frameworks/Clojure/compojure/benchmark_config.json +++ b/frameworks/Clojure/compojure/benchmark_config.json @@ -15,6 +15,7 @@ "database": "MySQL", "framework": "compojure", "language": "Clojure", + "flavor": "Java8", "orm": "Micro", "platform": "Servlet", "webserver": "Resin", @@ -36,6 +37,7 @@ "database": "MySQL", "framework": "compojure", "language": "Clojure", + "flavor": "Java8", "orm": "Raw", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Clojure/http-kit/benchmark_config.json b/frameworks/Clojure/http-kit/benchmark_config.json index 03f448a1a71..1dcd562dc72 100644 --- a/frameworks/Clojure/http-kit/benchmark_config.json +++ b/frameworks/Clojure/http-kit/benchmark_config.json @@ -13,8 +13,9 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "http-kit", + "framework": "None", "language": "Clojure", + "flavor": "Java8", "orm": "Micro", "platform": "http-kit", "webserver": "None", @@ -22,7 +23,7 @@ "database_os": "Linux", "display_name": "http-kit", "notes": "", - "versus": "" + "versus": "http-kit" }, "raw": { "setup_file": "setup", @@ -34,8 +35,9 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "http-kit", + "framework": "None", "language": "Clojure", + "flavor": "Java8", "orm": "Raw", "platform": "http-kit", "webserver": "None", @@ -43,7 +45,7 @@ "database_os": "Linux", "display_name": "http-kit", "notes": "", - "versus": "" + "versus": "http-kit" } }] } diff --git a/frameworks/Clojure/luminus/benchmark_config.json b/frameworks/Clojure/luminus/benchmark_config.json index 89deec95f28..ec18805cff2 100644 --- a/frameworks/Clojure/luminus/benchmark_config.json +++ b/frameworks/Clojure/luminus/benchmark_config.json @@ -11,18 +11,19 @@ "update_url": "/updates/", "port": 3000, "approach": "Realistic", - "classification": "Platform", + "classification": "Micro", "database": "Postgres", "framework": "luminus", "language": "Clojure", + "flavor": "Java8", "orm": "Raw", - "platform": "Immutant", + "platform": "Undertow", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "luminus", "notes": "", - "versus": "servlet" + "versus": "undertow" } }] } diff --git a/frameworks/Clojure/pedestal/benchmark_config.json b/frameworks/Clojure/pedestal/benchmark_config.json index 07dfa2d30b6..7639f0d911f 100644 --- a/frameworks/Clojure/pedestal/benchmark_config.json +++ b/frameworks/Clojure/pedestal/benchmark_config.json @@ -16,12 +16,13 @@ "orm": "micro", "framework": "pedestal", "language": "Clojure", - "platform": "Servlet", - "webserver": "Jetty", + "flavor": "Java8", + "platform": "Undertow", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "pedestal", - "notes": "servlet" + "notes": "undertow" } }] } diff --git a/frameworks/Crystal/crystal-raw/benchmark_config.json b/frameworks/Crystal/crystal/benchmark_config.json similarity index 74% rename from frameworks/Crystal/crystal-raw/benchmark_config.json rename to frameworks/Crystal/crystal/benchmark_config.json index 38cf366f041..3976ee347b2 100644 --- a/frameworks/Crystal/crystal-raw/benchmark_config.json +++ b/frameworks/Crystal/crystal/benchmark_config.json @@ -7,18 +7,19 @@ "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", - "classification": "Micro", + "classification": "Platform", "database": "Postgres", - "framework": "crystal", + "framework": "None", "language": "Crystal", + "flavor": "Crystal12", "orm": "Raw", - "platform": "Crystal", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "Crystal", "notes": "", - "versus": "ruby" + "versus": "crystal" } }] } diff --git a/frameworks/Crystal/crystal-raw/server.cr b/frameworks/Crystal/crystal/server.cr similarity index 100% rename from frameworks/Crystal/crystal-raw/server.cr rename to frameworks/Crystal/crystal/server.cr diff --git a/frameworks/Crystal/crystal-raw/setup.sh b/frameworks/Crystal/crystal/setup.sh similarity index 100% rename from frameworks/Crystal/crystal-raw/setup.sh rename to frameworks/Crystal/crystal/setup.sh diff --git a/frameworks/Crystal/kemal/benchmark_config.json b/frameworks/Crystal/kemal/benchmark_config.json index 34a96a3680f..4fccda21d2f 100644 --- a/frameworks/Crystal/kemal/benchmark_config.json +++ b/frameworks/Crystal/kemal/benchmark_config.json @@ -15,14 +15,15 @@ "database": "Redis", "framework": "kemal", "language": "Crystal", + "flavor": "Crystal12", "orm": "micro", - "platform": "Crystal", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "Kemal", "notes": "", - "versus": "ruby" + "versus": "crystal" }, "postgres": { "setup_file": "setup-postgres", @@ -38,14 +39,15 @@ "database": "Postgres", "framework": "kemal", "language": "Crystal", + "flavor": "Crystal12", "orm": "micro", - "platform": "Crystal", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "Kemal", "notes": "", - "versus": "ruby" + "versus": "crystal" } }] } diff --git a/frameworks/Crystal/moonshine/benchmark_config.json b/frameworks/Crystal/moonshine/benchmark_config.json index 215e9ae95fd..17021f03b30 100644 --- a/frameworks/Crystal/moonshine/benchmark_config.json +++ b/frameworks/Crystal/moonshine/benchmark_config.json @@ -15,14 +15,15 @@ "database": "Postgres", "framework": "moonshine", "language": "Crystal", + "flavor": "Crystal12", "orm": "micro", - "platform": "Crystal", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "Moonshine", "notes": "", - "versus": "ruby" + "versus": "crystal" } }] } diff --git a/frameworks/D/vibed/benchmark_config.json b/frameworks/D/vibed/benchmark_config.json index a7b54c41b0d..a6fb8c49d32 100644 --- a/frameworks/D/vibed/benchmark_config.json +++ b/frameworks/D/vibed/benchmark_config.json @@ -11,12 +11,13 @@ "update_url": "/updates?queries=", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Micro", "database": "MongoDB", - "framework": "vibed", + "framework": "vibe.d", "language": "D", + "flavor": "DLang2", "orm": "Micro", - "platform": "D", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Dart/dart-raw/benchmark_config.json b/frameworks/Dart/dart-raw/benchmark_config.json index 164a6759153..2990fdfcc69 100644 --- a/frameworks/Dart/dart-raw/benchmark_config.json +++ b/frameworks/Dart/dart-raw/benchmark_config.json @@ -10,13 +10,14 @@ "update_url": "/updates?queries=", "plaintext_url": "/plaintext", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "Postgres", - "framework": "dart", + "framework": "None", "language": "Dart", + "flavor": "Dart1", "orm": "Raw", - "platform": "Dart", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Dart/redstone/benchmark_config.json b/frameworks/Dart/redstone/benchmark_config.json index 0a7b63934e1..bd633ca2e74 100644 --- a/frameworks/Dart/redstone/benchmark_config.json +++ b/frameworks/Dart/redstone/benchmark_config.json @@ -15,12 +15,13 @@ "database": "Postgres", "framework": "redstone", "language": "Dart", + "flavor": "Dart1", "orm": "Micro", - "platform": "Dart", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "redstone-postgresql", + "display_name": "redstone", "notes": "", "versus": "dart" }, @@ -36,12 +37,13 @@ "database": "MongoDB", "framework": "redstone", "language": "Dart", + "flavor": "Dart1", "orm": "Micro", - "platform": "Dart", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "redstone-mongodb", + "display_name": "redstone", "notes": "", "versus": "dart" } diff --git a/frameworks/Dart/start/benchmark_config.json b/frameworks/Dart/start/benchmark_config.json index 22189e339c4..37d6f04ed06 100644 --- a/frameworks/Dart/start/benchmark_config.json +++ b/frameworks/Dart/start/benchmark_config.json @@ -15,8 +15,9 @@ "database": "Postgres", "framework": "start", "language": "Dart", + "flavor": "Dart1", "orm": "Raw", - "platform": "Dart", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", @@ -36,8 +37,9 @@ "database": "MongoDB", "framework": "start", "language": "Dart", + "flavor": "Dart1", "orm": "Raw", - "platform": "Dart", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Dart/stream/benchmark_config.json b/frameworks/Dart/stream/benchmark_config.json index 82b15c9eb50..c22b0ca3f81 100644 --- a/frameworks/Dart/stream/benchmark_config.json +++ b/frameworks/Dart/stream/benchmark_config.json @@ -15,8 +15,9 @@ "database": "Postgres", "framework": "stream", "language": "Dart", + "flavor": "Dart1", "orm": "Raw", - "platform": "Dart", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", @@ -36,8 +37,9 @@ "database": "MongoDB", "framework": "stream", "language": "Dart", + "flavor": "Dart1", "orm": "Raw", - "platform": "Dart", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Elixir/cowboy/benchmark_config.json b/frameworks/Elixir/cowboy/benchmark_config.json index dd835ba3865..2659c75cd14 100644 --- a/frameworks/Elixir/cowboy/benchmark_config.json +++ b/frameworks/Elixir/cowboy/benchmark_config.json @@ -6,17 +6,18 @@ "json_url": "/json", "plaintext_url": "/plaintext", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "None", - "framework": "cowboy", - "language": "elixir", + "framework": "None", + "language": "Elixir", + "flavor": "Elixir1", "orm": "raw", - "platform": "Erlang/OTP", - "webserver": "cowboy", + "platform": "None", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "elixir-cowboy", + "display_name": "Cowboy", "notes": "", "versus": "" } diff --git a/frameworks/Elixir/phoenix/benchmark_config.json b/frameworks/Elixir/phoenix/benchmark_config.json index 5242ddbc962..f284f7e5ad4 100644 --- a/frameworks/Elixir/phoenix/benchmark_config.json +++ b/frameworks/Elixir/phoenix/benchmark_config.json @@ -14,10 +14,11 @@ "classification": "Micro", "database": "Postgres", "framework": "Phoenix", - "language": "elixir", + "language": "Elixir", + "flavor": "Elixir1", "orm": "full", - "platform": "Erlang/OTP", - "webserver": "cowboy", + "platform": "Cowboy", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "Phoenix", diff --git a/frameworks/Erlang/chicagoboss/benchmark_config.json b/frameworks/Erlang/chicagoboss/benchmark_config.json index 5a634ef23a3..22a891445be 100755 --- a/frameworks/Erlang/chicagoboss/benchmark_config.json +++ b/frameworks/Erlang/chicagoboss/benchmark_config.json @@ -9,11 +9,12 @@ "approach": "Realistic", "classification": "Fullstack", "database": "None", - "framework": "chicagoboss", + "framework": "ChicagoBoss", "language": "Erlang", + "flavor": "Erlang18", "orm": "raw", - "platform": "cowboy", - "webserver": "cowboy", + "platform": "Cowboy", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "ChicagoBoss", diff --git a/frameworks/Erlang/cowboy/benchmark_config.json b/frameworks/Erlang/cowboy/benchmark_config.json index 6ac1cea48d6..9d6e3167a78 100644 --- a/frameworks/Erlang/cowboy/benchmark_config.json +++ b/frameworks/Erlang/cowboy/benchmark_config.json @@ -8,17 +8,18 @@ "db_url": "/db", "query_url": "/query?queries=", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "MySQL", - "framework": "cowboy", + "framework": "None", "language": "Erlang", + "flavor": "Erlang18", "orm": "Raw", - "platform": "Cowboy", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "cowboy", + "display_name": "Cowboy", "notes": "", "versus": "" }}] diff --git a/frameworks/Erlang/elli/benchmark_config.json b/frameworks/Erlang/elli/benchmark_config.json index eee695986c5..7f6c8da639b 100644 --- a/frameworks/Erlang/elli/benchmark_config.json +++ b/frameworks/Erlang/elli/benchmark_config.json @@ -7,13 +7,14 @@ "json_url": "/json", "db_url": "/db", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "MySQL", - "framework": "elli", + "framework": "None", "language": "Erlang", + "flavor": "Erlang18", "orm": "Raw", - "platform": "elli", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Erlang/misultin/benchmark_config.json b/frameworks/Erlang/misultin/benchmark_config.json index 8630a2d3b5b..bad72a36923 100644 --- a/frameworks/Erlang/misultin/benchmark_config.json +++ b/frameworks/Erlang/misultin/benchmark_config.json @@ -6,13 +6,14 @@ "json_url": "/json", "plaintext_url": "/plaintext", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "MySQL", - "framework": "Misultin", + "framework": "None", "language": "Erlang", + "flavor": "Erlang18", "orm": "Raw", - "platform": "Erlang", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Erlang/mochiweb/benchmark_config.json b/frameworks/Erlang/mochiweb/benchmark_config.json index ec5df2773d9..929d51d4707 100644 --- a/frameworks/Erlang/mochiweb/benchmark_config.json +++ b/frameworks/Erlang/mochiweb/benchmark_config.json @@ -6,13 +6,14 @@ "json_url": "/json", "plaintext_url": "/plaintext", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "MySQL", - "framework": "Mochiweb", + "framework": "None", "language": "Erlang", + "flavor": "Erlang18", "orm": "Raw", - "platform": "Erlang", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Go/beego/benchmark_config.json b/frameworks/Go/beego/benchmark_config.json index ccd96c73a79..450618aaf6e 100644 --- a/frameworks/Go/beego/benchmark_config.json +++ b/frameworks/Go/beego/benchmark_config.json @@ -12,8 +12,9 @@ "database": "MySQL", "framework": "beego", "language": "Go", + "flavor": "Go1", "orm": "Micro", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Go/echo/benchmark_config.json b/frameworks/Go/echo/benchmark_config.json index 8ac2d0b9286..61f362ee761 100644 --- a/frameworks/Go/echo/benchmark_config.json +++ b/frameworks/Go/echo/benchmark_config.json @@ -11,16 +11,17 @@ "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Micro", "database": "MySQL", - "framework": "ECHO", + "framework": "Echo", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "ECHO", + "display_name": "Echo", "notes": "", "versus": "go" } diff --git a/frameworks/Go/falcore/benchmark_config.json b/frameworks/Go/falcore/benchmark_config.json index 6346e911e01..3adea8e2570 100644 --- a/frameworks/Go/falcore/benchmark_config.json +++ b/frameworks/Go/falcore/benchmark_config.json @@ -13,14 +13,15 @@ "approach": "Realistic", "classification": "Micro", "database": "MySQL", - "framework": "falcore", + "framework": "Falcore", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "falcore", + "display_name": "Falcore", "notes": "", "versus": "go" } diff --git a/frameworks/Go/fasthttp-mysql/benchmark_config.json b/frameworks/Go/fasthttp-mysql/benchmark_config.json index 19417403af5..f188ace3889 100644 --- a/frameworks/Go/fasthttp-mysql/benchmark_config.json +++ b/frameworks/Go/fasthttp-mysql/benchmark_config.json @@ -13,14 +13,15 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "fasthttp", + "framework": "None", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "fasthttp-mysql", + "display_name": "fasthttp", "notes": "", "versus": "go" }, @@ -36,14 +37,15 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "fasthttp", + "framework": "None", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "fasthttp-mysql-prefork", + "display_name": "fasthttp-prefork", "notes": "", "versus": "go" } diff --git a/frameworks/Go/fasthttp-postgresql/benchmark_config.json b/frameworks/Go/fasthttp-postgresql/benchmark_config.json index 7ddc2d87660..92dd3bdb396 100644 --- a/frameworks/Go/fasthttp-postgresql/benchmark_config.json +++ b/frameworks/Go/fasthttp-postgresql/benchmark_config.json @@ -13,14 +13,15 @@ "approach": "Realistic", "classification": "Platform", "database": "Postgres", - "framework": "fasthttp", + "framework": "None", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "fasthttp-postgresql", + "display_name": "fasthttp", "notes": "", "versus": "go" }, diff --git a/frameworks/Go/gin/benchmark_config.json b/frameworks/Go/gin/benchmark_config.json index 8184f273355..9ac52db2e74 100644 --- a/frameworks/Go/gin/benchmark_config.json +++ b/frameworks/Go/gin/benchmark_config.json @@ -11,12 +11,13 @@ "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Micro", "database": "MySQL", "framework": "gin", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Go/go-std-mongodb/benchmark_config.json b/frameworks/Go/go-std-mongodb/benchmark_config.json index 989ed69d214..7ac223bf2d9 100644 --- a/frameworks/Go/go-std-mongodb/benchmark_config.json +++ b/frameworks/Go/go-std-mongodb/benchmark_config.json @@ -10,17 +10,18 @@ "update_url": "/update?queries=", "plaintext_url": "/plaintext", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "MongoDB", - "framework": "go", + "framework": "None", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "go-std-mongodb", + "display_name": "Go", "notes": "mongodb implementation for go net/http", "versus": "go" } diff --git a/frameworks/Go/go-std-mysql/benchmark_config.json b/frameworks/Go/go-std-mysql/benchmark_config.json index bd5ac925708..b5257172789 100644 --- a/frameworks/Go/go-std-mysql/benchmark_config.json +++ b/frameworks/Go/go-std-mysql/benchmark_config.json @@ -10,17 +10,18 @@ "update_url": "/update?queries=", "plaintext_url": "/plaintext", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "MySQL", "framework": "go", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "go-std-mysql", + "display_name": "Go", "notes": "", "versus": "go" }, @@ -31,17 +32,18 @@ "fortune_url": "/fortuneInterpolate", "update_url": "/updateInterpolate?queries=", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "MySQL", - "framework": "go", + "framework": "None", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "go-std-mysql-interpolate", + "display_name": "Go-interpolate", "notes": "", "versus": "go" }, @@ -54,17 +56,18 @@ "update_url": "/update?queries=", "plaintext_url": "/plaintext", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "MySQL", - "framework": "go", + "framework": "None", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "go-std-prefork-mysql", + "display_name": "Go-prefork", "notes": "", "versus": "go" } diff --git a/frameworks/Go/go-std-postgresql/benchmark_config.json b/frameworks/Go/go-std-postgresql/benchmark_config.json index 12538190271..f05da0f26cc 100644 --- a/frameworks/Go/go-std-postgresql/benchmark_config.json +++ b/frameworks/Go/go-std-postgresql/benchmark_config.json @@ -8,17 +8,18 @@ "fortune_url": "/fortune", "update_url": "/update?queries=", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "Postgres", - "framework": "go", + "framework": "None", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "go-std-postgresql", + "display_name": "Go", "notes": "", "versus": "go" } diff --git a/frameworks/Go/goji/benchmark_config.json b/frameworks/Go/goji/benchmark_config.json index 44a97068c84..997836551dd 100644 --- a/frameworks/Go/goji/benchmark_config.json +++ b/frameworks/Go/goji/benchmark_config.json @@ -11,12 +11,13 @@ "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Micro", "database": "MySQL", "framework": "Goji", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Go/kami/benchmark_config.json b/frameworks/Go/kami/benchmark_config.json index 7d29698e43d..1c27536c546 100644 --- a/frameworks/Go/kami/benchmark_config.json +++ b/frameworks/Go/kami/benchmark_config.json @@ -11,12 +11,13 @@ "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Micro", "database": "MySQL", "framework": "kami", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Go/revel-jet/benchmark_config.json b/frameworks/Go/revel-jet/benchmark_config.json index 6e5b3ff4992..48ab91e617e 100644 --- a/frameworks/Go/revel-jet/benchmark_config.json +++ b/frameworks/Go/revel-jet/benchmark_config.json @@ -11,14 +11,15 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "revel", + "framework": "Revel", "language": "Go", - "orm": "Raw", - "platform": "Go", + "flavor": "Go1", + "orm": "Micro", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "revel-jet", + "display_name": "Revel-jet", "notes": "", "versus": "go" } diff --git a/frameworks/Go/revel-qbs/benchmark_config.json b/frameworks/Go/revel-qbs/benchmark_config.json index 8e7d22d6ae2..d98bb44cf67 100644 --- a/frameworks/Go/revel-qbs/benchmark_config.json +++ b/frameworks/Go/revel-qbs/benchmark_config.json @@ -11,14 +11,15 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "revel", + "framework": "Revel", "language": "Go", - "orm": "Raw", - "platform": "Go", + "flavor": "Go1", + "orm": "Micro", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "revel-qbs", + "display_name": "Revel-qbs", "notes": "", "versus": "go" } diff --git a/frameworks/Go/revel/benchmark_config.json b/frameworks/Go/revel/benchmark_config.json index 8d6263133e1..084d200b09a 100644 --- a/frameworks/Go/revel/benchmark_config.json +++ b/frameworks/Go/revel/benchmark_config.json @@ -13,14 +13,15 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "revel", + "framework": "Revel", "language": "Go", + "flavor": "Go1", "orm": "Raw", - "platform": "Go", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "revel", + "display_name": "Revel", "notes": "", "versus": "go" } diff --git a/frameworks/Go/webgo/benchmark_config.json b/frameworks/Go/webgo/benchmark_config.json index 8b3bdf9f51a..f9439759223 100644 --- a/frameworks/Go/webgo/benchmark_config.json +++ b/frameworks/Go/webgo/benchmark_config.json @@ -8,14 +8,15 @@ "approach": "Realistic", "classification": "Micro", "database": "None", - "framework": "webgo", + "framework": "Webgo", "language": "Go", - "orm": "Full", - "platform": "Go", + "flavor": "Go1", + "orm": "Raw", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "webgo", + "display_name": "Webgo", "notes": "", "versus": "go" } diff --git a/frameworks/Groovy/grails/benchmark_config.json b/frameworks/Groovy/grails/benchmark_config.json index 6e1365f255a..de8ceb4c3fd 100644 --- a/frameworks/Groovy/grails/benchmark_config.json +++ b/frameworks/Groovy/grails/benchmark_config.json @@ -13,14 +13,15 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "grails", + "framework": "Grails", "language": "Groovy", + "flavor": "Groovy2", "orm": "Full", "platform": "Servlet", - "webserver": "Resin", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "grails", + "display_name": "Grails", "notes": "", "versus": "servlet" } diff --git a/frameworks/Haskell/snap/benchmark_config.json b/frameworks/Haskell/snap/benchmark_config.json index 06c81c409bf..734060355b1 100644 --- a/frameworks/Haskell/snap/benchmark_config.json +++ b/frameworks/Haskell/snap/benchmark_config.json @@ -11,14 +11,15 @@ "approach": "Realistic", "classification": "Micro", "database": "MySQL", - "framework": "snap", + "framework": "Snap", "language": "Haskell", + "flavor": "GHC78", "orm": "Full", "platform": "Snap", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "snap", + "display_name": "Snap", "notes": "", "versus": "" } diff --git a/frameworks/Haskell/spock/benchmark_config.json b/frameworks/Haskell/spock/benchmark_config.json index 807fc6e3b98..743ad7d20de 100644 --- a/frameworks/Haskell/spock/benchmark_config.json +++ b/frameworks/Haskell/spock/benchmark_config.json @@ -13,14 +13,15 @@ "approach": "Realistic", "classification": "Micro", "database": "Postgres", - "framework": "spock", + "framework": "Spock", "language": "Haskell", + "flavor": "GHC710", "orm": "Raw", "platform": "Wai", "webserver": "Warp", "os": "Linux", "database_os": "Linux", - "display_name": "spock", + "display_name": "Spock", "notes": "", "versus": "" } diff --git a/frameworks/Haskell/wai/benchmark_config.json b/frameworks/Haskell/wai/benchmark_config.json index 6a917cebd56..dbc28632ef9 100644 --- a/frameworks/Haskell/wai/benchmark_config.json +++ b/frameworks/Haskell/wai/benchmark_config.json @@ -6,13 +6,14 @@ "json_url": "/json", "plaintext_url": "/plaintext", "port": 8000, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "None", - "framework": "wai", + "framework": "None", "language": "Haskell", + "flavor": "GHC78", "orm": "Full", - "platform": "Wai", + "platform": "None", "webserver": "Warp", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Haskell/yesod/benchmark_config.json b/frameworks/Haskell/yesod/benchmark_config.json index ae8deaa9cd9..5a44e96ca98 100644 --- a/frameworks/Haskell/yesod/benchmark_config.json +++ b/frameworks/Haskell/yesod/benchmark_config.json @@ -15,6 +15,7 @@ "database": "MySQL", "framework": "yesod", "language": "Haskell", + "flavor": "GHC710", "orm": "Raw", "platform": "Wai", "webserver": "Warp", @@ -34,6 +35,7 @@ "database": "MongoDB", "framework": "yesod", "language": "Haskell", + "flavor": "GHC710", "orm": "Raw", "platform": "Wai", "webserver": "Warp", diff --git a/frameworks/Java/activeweb/benchmark_config.json b/frameworks/Java/activeweb/benchmark_config.json index dd6bd82282a..abaa933184b 100644 --- a/frameworks/Java/activeweb/benchmark_config.json +++ b/frameworks/Java/activeweb/benchmark_config.json @@ -13,11 +13,12 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "activeweb", + "framework": "ActiveWeb", "language": "Java", + "flavor": "Java8", "orm": "Micro", "platform": "Servlet", - "webserver": "Resin", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "ActiveWeb", @@ -34,11 +35,12 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "activeweb", + "framework": "ActiveWeb", "language": "Java", + "flavor": "Java8", "orm": "Micro", "platform": "Servlet", - "webserver": "Resin", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "ActiveWeb", diff --git a/frameworks/Java/baratine/benchmark_config.json b/frameworks/Java/baratine/benchmark_config.json index a7f05f92eb2..72f4bedfe24 100644 --- a/frameworks/Java/baratine/benchmark_config.json +++ b/frameworks/Java/baratine/benchmark_config.json @@ -6,17 +6,17 @@ "json_url": "/json", "plaintext_url": "/plaintext", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "None", - "framework": "baratine", + "framework": "None", "language": "Java", "orm": "Raw", - "platform": "Baratine", - "webserver": "Baratine", + "platform": "None", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "baratine", + "display_name": "Baratine", "notes": "", "versus": "baratine" } diff --git a/frameworks/Java/bayou/benchmark_config.json b/frameworks/Java/bayou/benchmark_config.json index 215af245204..6ba9091cfc8 100644 --- a/frameworks/Java/bayou/benchmark_config.json +++ b/frameworks/Java/bayou/benchmark_config.json @@ -6,13 +6,14 @@ "json_url": "/json", "plaintext_url": "/plaintext", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "None", - "framework": "bayou.io", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", - "platform": "bayou.io", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Java/beyondj/benchmark_config.json b/frameworks/Java/beyondj/benchmark_config.json index 74165e47b6a..3411487e626 100755 --- a/frameworks/Java/beyondj/benchmark_config.json +++ b/frameworks/Java/beyondj/benchmark_config.json @@ -13,8 +13,9 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "beyondj", + "framework": "BeyondJ", "language": "Java", + "flavor": "Java8", "orm": "Full", "platform": "Servlet", "webserver": "None", diff --git a/frameworks/Java/comsat-servlet/benchmark_config.json b/frameworks/Java/comsat-servlet/benchmark_config.json index 76e67ff6eea..3eb7f140d03 100644 --- a/frameworks/Java/comsat-servlet/benchmark_config.json +++ b/frameworks/Java/comsat-servlet/benchmark_config.json @@ -10,14 +10,15 @@ "approach": "Realistic", "classification": "Platform", "database": "None", - "framework": "comsat-servlet", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", - "platform": "Comsat Servlet", - "webserver": "Undertow", + "platform": "Servlet", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "comsat-servlet-undertow", + "display_name": "Comsat", "notes": "Comsat servlet on embedded Undertow", "versus": "" } diff --git a/frameworks/Java/comsat-webactors/benchmark_config.json b/frameworks/Java/comsat-webactors/benchmark_config.json index 6673283f23e..4af7a7fef99 100644 --- a/frameworks/Java/comsat-webactors/benchmark_config.json +++ b/frameworks/Java/comsat-webactors/benchmark_config.json @@ -10,14 +10,15 @@ "approach": "Realistic", "classification": "Platform", "database": "None", - "framework": "comsat-webactors", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", - "platform": "Comsat Web Actors", - "webserver": "Undertow", + "platform": "WebActors", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "comsat-actors-netty", + "display_name": "Comsat", "notes": "Comsat Web Actors run as Netty handler", "versus": "" } diff --git a/frameworks/Java/curacao/benchmark_config.json b/frameworks/Java/curacao/benchmark_config.json index 1f6a97cb804..499586ef81b 100644 --- a/frameworks/Java/curacao/benchmark_config.json +++ b/frameworks/Java/curacao/benchmark_config.json @@ -7,16 +7,17 @@ "plaintext_url": "/curacao/plaintext", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Micro", "database": "None", - "framework": "curacao", + "framework": "Curacao", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Servlet", - "webserver": "Resin", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "curacao", + "display_name": "Curacao", "notes": "", "versus": "servlet" } diff --git a/frameworks/Java/dropwizard/benchmark_config.json b/frameworks/Java/dropwizard/benchmark_config.json index f239f8b0e77..61f9142514b 100644 --- a/frameworks/Java/dropwizard/benchmark_config.json +++ b/frameworks/Java/dropwizard/benchmark_config.json @@ -13,14 +13,15 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "dropwizard", + "framework": "Dropwizard", "language": "Java", + "flavor": "Java8", "orm": "Full", - "platform": "Jetty", - "webserver": "Jetty", + "platform": "JAX-RS", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "dropwizard", + "display_name": "Dropwizard", "notes": "dropwizard mysql using hibernate", "versus": "servlet" }, @@ -36,12 +37,13 @@ "database": "MongoDB", "framework": "dropwizard", "language": "Java", + "flavor": "Java8", "orm": "Full", - "platform": "Jetty", - "webserver": "Jetty", + "platform": "JAX-RS", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "dropwizard", + "display_name": "Dropwizard", "notes": "dropwizard mongodb using mongojack", "versus": "" }, @@ -57,9 +59,10 @@ "database": "Postgres", "framework": "dropwizard", "language": "Java", + "flavor": "Java8", "orm": "Full", - "platform": "Jetty", - "webserver": "Jetty", + "platform": "JAX-RS", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "dropwizard", diff --git a/frameworks/Java/gemini/benchmark_config.json b/frameworks/Java/gemini/benchmark_config.json index 422df1b59f5..4c6f4f0f8eb 100644 --- a/frameworks/Java/gemini/benchmark_config.json +++ b/frameworks/Java/gemini/benchmark_config.json @@ -9,14 +9,15 @@ "approach": "Realistic", "classification": "Fullstack", "database": "None", - "framework": "gemini", + "framework": "Gemini", "language": "Java", + "flavor": "Java8", "orm": "Micro", "platform": "Servlet", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "gemini", + "display_name": "Gemini", "notes": "", "versus": "servlet" }, @@ -32,12 +33,13 @@ "database": "MySQL", "framework": "gemini", "language": "Java", + "flavor": "Java8", "orm": "Micro", "platform": "Servlet", "webserver": "Resin", "os": "Linux", "database_os": "Linux", - "display_name": "gemini-mysql", + "display_name": "Gemini", "notes": "", "versus": "servlet" }, @@ -53,12 +55,13 @@ "database": "Postgres", "framework": "gemini", "language": "Java", + "flavor": "Java8", "orm": "Micro", "platform": "Servlet", "webserver": "Resin", "os": "Linux", "database_os": "Linux", - "display_name": "gemini-postgres", + "display_name": "Gemini", "notes": "", "versus": "servlet" } diff --git a/frameworks/Java/grizzly-bm/benchmark_config.json b/frameworks/Java/grizzly-bm/benchmark_config.json index 5f583ae5f97..2dae46fd8aa 100644 --- a/frameworks/Java/grizzly-bm/benchmark_config.json +++ b/frameworks/Java/grizzly-bm/benchmark_config.json @@ -9,14 +9,15 @@ "approach": "Realistic", "classification": "Micro", "database": "None", - "framework": "grizzly", + "framework": "Grizzly", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Servlet", - "webserver": "Grizzly", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "grizzly", + "display_name": "Grizzly", "notes": "", "versus": "" } diff --git a/frameworks/Java/grizzly-jersey/benchmark_config.json b/frameworks/Java/grizzly-jersey/benchmark_config.json index 92bfad09495..fe697065b6e 100644 --- a/frameworks/Java/grizzly-jersey/benchmark_config.json +++ b/frameworks/Java/grizzly-jersey/benchmark_config.json @@ -11,16 +11,16 @@ "approach": "Realistic", "classification": "Micro", "database": "MySQL", - "framework": "grizzly-jersey", + "framework": "Grizzly", "language": "Java", "orm": "Full", - "platform": "Servlet", - "webserver": "Grizzly", + "platform": "JAX-RS", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "grizzly-jersey", + "display_name": "Grizzly", "notes": "", - "versus": "grizzly" + "versus": "" } }] } From 1cfff5900914dcc7a971a0f02bc9ad7674cea9b1 Mon Sep 17 00:00:00 2001 From: msmith-techempower Date: Thu, 15 Sep 2016 10:30:03 -0700 Subject: [PATCH 04/11] WIP --- .../CSharp/aspnetcore/benchmark_config.json | 1 + frameworks/D/vibed/benchmark_config.json | 3 +- .../Haskell/servant/benchmark_config.json | 3 +- frameworks/Haskell/snap/benchmark_config.json | 2 +- .../Java/baratine/benchmark_config.json | 3 +- frameworks/Java/bayou/benchmark_config.json | 2 +- .../Java/comsat-servlet/benchmark_config.json | 7 +++-- .../comsat-webactors/benchmark_config.json | 4 +-- frameworks/Java/gemini/benchmark_config.json | 2 +- .../Java/grizzly-jersey/benchmark_config.json | 1 + frameworks/Java/jawn/benchmark_config.json | 1 + .../Java/jetty-servlet/benchmark_config.json | 9 +++--- frameworks/Java/jetty/benchmark_config.json | 7 +++-- frameworks/Java/jlhttp/benchmark_config.json | 2 +- frameworks/Java/jooby/benchmark_config.json | 5 ++-- frameworks/Java/netty/benchmark_config.json | 1 + .../ninja-standalone/benchmark_config.json | 7 +++-- .../Java/officefloor/benchmark_config.json | 5 ++-- .../Java/permeagility/benchmark_config.json | 5 ++-- frameworks/Java/play1/benchmark_config.json | 1 + .../Java/play2-java/benchmark_config.json | 3 ++ .../Java/rapidoid/benchmark_config.json | 5 ++-- .../Java/restexpress/benchmark_config.json | 3 ++ frameworks/Java/revenj/benchmark_config.json | 3 +- frameworks/Java/sabina/benchmark_config.json | 4 +++ frameworks/Java/servlet/benchmark_config.json | 9 ++++-- .../Java/servlet3-cass/benchmark_config.json | 9 +++--- frameworks/Java/spark/benchmark_config.json | 1 + frameworks/Java/spring/benchmark_config.json | 1 + .../Java/tapestry/benchmark_config.json | 1 + .../Java/undertow-edge/benchmark_config.json | 28 +++++++++-------- .../benchmark_config.json | 11 +++---- .../benchmark_config.json | 10 +++---- .../Java/undertow/benchmark_config.json | 12 +++++--- .../Java/vertx-web/benchmark_config.json | 10 +++++-- frameworks/Java/vertx/benchmark_config.json | 3 +- frameworks/Java/wicket/benchmark_config.json | 1 + .../Java/wildfly-ee7/benchmark_config.json | 3 +- .../JavaScript/express/benchmark_config.json | 9 ++++-- .../JavaScript/hapi/benchmark_config.json | 12 +++++--- .../JavaScript/koa/benchmark_config.json | 3 +- .../JavaScript/nodejs/benchmark_config.json | 15 ++++++---- .../ringojs-convenient/benchmark_config.json | 3 +- .../JavaScript/ringojs/benchmark_config.json | 5 ++-- .../JavaScript/sailsjs/benchmark_config.json | 6 ++-- .../Kotlin/hexagon/benchmark_config.json | 3 +- .../PHP/phalcon-micro/benchmark_config.json | 2 +- frameworks/PHP/phalcon/benchmark_config.json | 4 +-- .../Python/asyncio/benchmark_config.json | 30 ++++++++++++------- .../Python/bottle/benchmark_config.json | 13 +++++--- .../Python/cherrypy/benchmark_config.json | 10 ++++--- .../Python/django/benchmark_config.json | 9 ++++-- .../Python/falcon/benchmark_config.json | 9 ++++-- frameworks/Python/flask/benchmark_config.json | 16 ++++++---- .../Python/historical/benchmark_config.json | 3 +- frameworks/Python/klein/benchmark_config.json | 9 +++--- .../Python/pyramid/benchmark_config.json | 6 ++-- .../Python/tornado/benchmark_config.json | 15 ++++++---- .../Python/turbogears/benchmark_config.json | 1 + frameworks/Python/uwsgi/benchmark_config.json | 8 +++-- .../Python/web2py/benchmark_config.json | 3 +- .../Python/wheezyweb/benchmark_config.json | 6 ++-- frameworks/Python/wsgi/benchmark_config.json | 5 ++-- .../Racket/racket-ws/benchmark_config.json | 5 ++-- 64 files changed, 255 insertions(+), 143 deletions(-) diff --git a/frameworks/CSharp/aspnetcore/benchmark_config.json b/frameworks/CSharp/aspnetcore/benchmark_config.json index 30c7e23a353..8bcf8c01ca2 100644 --- a/frameworks/CSharp/aspnetcore/benchmark_config.json +++ b/frameworks/CSharp/aspnetcore/benchmark_config.json @@ -11,6 +11,7 @@ "database": "None", "framework": "aspnetcore", "language": "C#", + "flavor": "Mono", "orm": "Raw", "platform": "NET", "webserver": "Kestrel", diff --git a/frameworks/D/vibed/benchmark_config.json b/frameworks/D/vibed/benchmark_config.json index 3ce6bcb484a..a9c8410422d 100644 --- a/frameworks/D/vibed/benchmark_config.json +++ b/frameworks/D/vibed/benchmark_config.json @@ -39,8 +39,9 @@ "database": "MongoDB", "framework": "vibed", "language": "D", + "flavor": "DLang2", "orm": "Micro", - "platform": "D", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Haskell/servant/benchmark_config.json b/frameworks/Haskell/servant/benchmark_config.json index 2688be02635..0a977b96127 100644 --- a/frameworks/Haskell/servant/benchmark_config.json +++ b/frameworks/Haskell/servant/benchmark_config.json @@ -13,8 +13,9 @@ "approach": "Realistic", "classification": "Micro", "database": "Postgres", - "framework": "None", + "framework": "Servant", "language": "Haskell", + "flavor": "GHC710", "orm": "Raw", "platform": "Wai", "webserver": "Warp", diff --git a/frameworks/Haskell/snap/benchmark_config.json b/frameworks/Haskell/snap/benchmark_config.json index 734060355b1..c9a6776e89a 100644 --- a/frameworks/Haskell/snap/benchmark_config.json +++ b/frameworks/Haskell/snap/benchmark_config.json @@ -15,7 +15,7 @@ "language": "Haskell", "flavor": "GHC78", "orm": "Full", - "platform": "Snap", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Java/baratine/benchmark_config.json b/frameworks/Java/baratine/benchmark_config.json index 72f4bedfe24..9e4eb4a66f1 100644 --- a/frameworks/Java/baratine/benchmark_config.json +++ b/frameworks/Java/baratine/benchmark_config.json @@ -11,8 +11,9 @@ "database": "None", "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", - "platform": "None", + "platform": "Baratine", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Java/bayou/benchmark_config.json b/frameworks/Java/bayou/benchmark_config.json index 6ba9091cfc8..c91db7f9131 100644 --- a/frameworks/Java/bayou/benchmark_config.json +++ b/frameworks/Java/bayou/benchmark_config.json @@ -13,7 +13,7 @@ "language": "Java", "flavor": "Java8", "orm": "Raw", - "platform": "None", + "platform": "Bayou", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Java/comsat-servlet/benchmark_config.json b/frameworks/Java/comsat-servlet/benchmark_config.json index c58475f57c0..10ca2147548 100644 --- a/frameworks/Java/comsat-servlet/benchmark_config.json +++ b/frameworks/Java/comsat-servlet/benchmark_config.json @@ -10,11 +10,12 @@ "approach": "Realistic", "classification": "Platform", "database": "None", - "framework": "comsat-servlet", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", - "platform": "Comsat Servlet", - "webserver": "Jetty", + "platform": "Servlet", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "comsat-servlet-jetty", diff --git a/frameworks/Java/comsat-webactors/benchmark_config.json b/frameworks/Java/comsat-webactors/benchmark_config.json index 949d2ec1572..0974a6cd2f7 100644 --- a/frameworks/Java/comsat-webactors/benchmark_config.json +++ b/frameworks/Java/comsat-webactors/benchmark_config.json @@ -14,7 +14,7 @@ "language": "Java", "flavor": "Java8", "orm": "Raw", - "platform": "None", + "platform": "Comsat", "webserver": "None", "os": "Linux", "database_os": "Linux", @@ -34,7 +34,7 @@ "language": "Java", "flavor": "Java8", "orm": "Raw", - "platform": "None", + "platform": "Comsat", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Java/gemini/benchmark_config.json b/frameworks/Java/gemini/benchmark_config.json index 4c6f4f0f8eb..7ea7fd925ea 100644 --- a/frameworks/Java/gemini/benchmark_config.json +++ b/frameworks/Java/gemini/benchmark_config.json @@ -14,7 +14,7 @@ "flavor": "Java8", "orm": "Micro", "platform": "Servlet", - "webserver": "None", + "webserver": "Resin", "os": "Linux", "database_os": "Linux", "display_name": "Gemini", diff --git a/frameworks/Java/grizzly-jersey/benchmark_config.json b/frameworks/Java/grizzly-jersey/benchmark_config.json index b5184338654..1c41fa9dce0 100644 --- a/frameworks/Java/grizzly-jersey/benchmark_config.json +++ b/frameworks/Java/grizzly-jersey/benchmark_config.json @@ -14,6 +14,7 @@ "database": "MySQL", "framework": "Grizzly", "language": "Java", + "flavor": "Java8", "orm": "Full", "platform": "JAX-RS", "webserver": "None", diff --git a/frameworks/Java/jawn/benchmark_config.json b/frameworks/Java/jawn/benchmark_config.json index 6740800f44f..d8ccce6e080 100644 --- a/frameworks/Java/jawn/benchmark_config.json +++ b/frameworks/Java/jawn/benchmark_config.json @@ -15,6 +15,7 @@ "database": "MySQL", "framework": "jawn", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Servlet", "webserver": "Undertow", diff --git a/frameworks/Java/jetty-servlet/benchmark_config.json b/frameworks/Java/jetty-servlet/benchmark_config.json index 71ca6609c61..cc17e337463 100644 --- a/frameworks/Java/jetty-servlet/benchmark_config.json +++ b/frameworks/Java/jetty-servlet/benchmark_config.json @@ -9,16 +9,17 @@ "approach": "Realistic", "classification": "Platform", "database": "None", - "framework": "servlet", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Jetty", - "webserver": "Jetty", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "jetty-servlet", + "display_name": "jetty", "notes": "Jetty 9.2 with ServletContext", - "versus": "" + "versus": "servlet" } }] } diff --git a/frameworks/Java/jetty/benchmark_config.json b/frameworks/Java/jetty/benchmark_config.json index 90d7866342f..5ecefedeb5f 100644 --- a/frameworks/Java/jetty/benchmark_config.json +++ b/frameworks/Java/jetty/benchmark_config.json @@ -9,16 +9,17 @@ "approach": "Stripped", "classification": "Platform", "database": "None", - "framework": "servlet", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Jetty", - "webserver": "Jetty", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "jetty", "notes": "Jetty 9.3 with Handler", - "versus": "" + "versus": "servlet" } }] } diff --git a/frameworks/Java/jlhttp/benchmark_config.json b/frameworks/Java/jlhttp/benchmark_config.json index 0a93014222b..b74a32dd010 100755 --- a/frameworks/Java/jlhttp/benchmark_config.json +++ b/frameworks/Java/jlhttp/benchmark_config.json @@ -13,7 +13,7 @@ "flavor": "Java8", "language": "Java", "orm": "Raw", - "platform": "None", + "platform": "JLHTTP", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Java/jooby/benchmark_config.json b/frameworks/Java/jooby/benchmark_config.json index 616361a81d8..8fde9cc0b6e 100644 --- a/frameworks/Java/jooby/benchmark_config.json +++ b/frameworks/Java/jooby/benchmark_config.json @@ -12,14 +12,15 @@ "database": "None", "framework": "jooby", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Netty", - "webserver": "Netty", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "Jooby", "notes": "", - "versus": "" + "versus": "netty" } }] } diff --git a/frameworks/Java/netty/benchmark_config.json b/frameworks/Java/netty/benchmark_config.json index 35492e575a4..ea8a13f27f7 100644 --- a/frameworks/Java/netty/benchmark_config.json +++ b/frameworks/Java/netty/benchmark_config.json @@ -11,6 +11,7 @@ "database": "None", "framework": "netty", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Netty", "webserver": "None", diff --git a/frameworks/Java/ninja-standalone/benchmark_config.json b/frameworks/Java/ninja-standalone/benchmark_config.json index 8a721702502..cc12753bfbf 100644 --- a/frameworks/Java/ninja-standalone/benchmark_config.json +++ b/frameworks/Java/ninja-standalone/benchmark_config.json @@ -15,14 +15,15 @@ "database": "MySQL", "framework": "ninja", "language": "Java", + "flavor": "Java8", "orm": "Full", "platform": "Jetty", - "webserver": "Jetty", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "ninja-standalone", + "display_name": "Ninja", "notes": "", - "versus": "" + "versus": "jetty" } }] } diff --git a/frameworks/Java/officefloor/benchmark_config.json b/frameworks/Java/officefloor/benchmark_config.json index fc5d6a4e44f..43d5298c436 100644 --- a/frameworks/Java/officefloor/benchmark_config.json +++ b/frameworks/Java/officefloor/benchmark_config.json @@ -15,9 +15,10 @@ "database": "MySQL", "framework": "officefloor", "language": "Java", + "flavor": "Java8", "orm": "Full", - "platform": "OfficeFloor", - "webserver": "WoOF (Web on OfficeFloor)", + "platform": "None", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "officefloor", diff --git a/frameworks/Java/permeagility/benchmark_config.json b/frameworks/Java/permeagility/benchmark_config.json index 3f2a1eacf24..d2a33719407 100644 --- a/frameworks/Java/permeagility/benchmark_config.json +++ b/frameworks/Java/permeagility/benchmark_config.json @@ -13,14 +13,15 @@ "approach": "Realistic", "classification": "Platform", "database": "None", - "framework": "permeagility", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "PermeAgility", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "permeagility", + "display_name": "PermeAgility", "notes": "PermeAgility 0.7.5", "versus": "" } diff --git a/frameworks/Java/play1/benchmark_config.json b/frameworks/Java/play1/benchmark_config.json index f48e6a8f0bd..5c8b31c516b 100644 --- a/frameworks/Java/play1/benchmark_config.json +++ b/frameworks/Java/play1/benchmark_config.json @@ -12,6 +12,7 @@ "database": "MySQL", "framework": "play1", "language": "Java", + "flavor": "Java8", "orm": "Full", "platform": "Netty", "webserver": "None", diff --git a/frameworks/Java/play2-java/benchmark_config.json b/frameworks/Java/play2-java/benchmark_config.json index f796d677d45..e0dbd935402 100644 --- a/frameworks/Java/play2-java/benchmark_config.json +++ b/frameworks/Java/play2-java/benchmark_config.json @@ -7,6 +7,7 @@ "setup_file": "setup_java", "framework": "play2", "language": "Java", + "flavor": "Java8", "orm": "Raw", "os": "Linux", "database": "None", @@ -26,6 +27,7 @@ "setup_file": "setup_java_ebean_hikaricp", "framework": "play2", "language": "Java", + "flavor": "Java8", "orm": "Full", "os": "Linux", "database": "MySQL", @@ -47,6 +49,7 @@ "setup_file": "setup_java_jpa_hikaricp", "framework": "play2", "language": "Java", + "flavor": "Java8", "orm": "Full", "os": "Linux", "database": "MySQL", diff --git a/frameworks/Java/rapidoid/benchmark_config.json b/frameworks/Java/rapidoid/benchmark_config.json index 8435e7ab5d1..f86f64d2301 100644 --- a/frameworks/Java/rapidoid/benchmark_config.json +++ b/frameworks/Java/rapidoid/benchmark_config.json @@ -9,14 +9,15 @@ "approach": "Stripped", "classification": "Platform", "database": "None", - "framework": "rapidoid", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Rapidoid", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "rapidoid", + "display_name": "Rapidoid", "notes": "", "versus": "rapidoid" } diff --git a/frameworks/Java/restexpress/benchmark_config.json b/frameworks/Java/restexpress/benchmark_config.json index 5d180bc8bf0..1a248638c31 100644 --- a/frameworks/Java/restexpress/benchmark_config.json +++ b/frameworks/Java/restexpress/benchmark_config.json @@ -11,6 +11,7 @@ "database": "None", "framework": "rest-express", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Netty", "webserver": "None", @@ -30,6 +31,7 @@ "database": "MySQL", "framework": "rest-express", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Netty", "webserver": "None", @@ -49,6 +51,7 @@ "database": "MongoDB", "framework": "rest-express", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Netty", "webserver": "None", diff --git a/frameworks/Java/revenj/benchmark_config.json b/frameworks/Java/revenj/benchmark_config.json index d7337e0824e..8f5e06594a1 100644 --- a/frameworks/Java/revenj/benchmark_config.json +++ b/frameworks/Java/revenj/benchmark_config.json @@ -11,10 +11,11 @@ "fortune_url": "/revenj/fortunes", "port": 8080, "approach": "Realistic", - "classification": "Platform", + "classification": "Fullstack", "database": "Postgres", "framework": "Revenj.JVM", "language": "Java", + "flavor": "Java8", "orm": "Full", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Java/sabina/benchmark_config.json b/frameworks/Java/sabina/benchmark_config.json index 5417ed7546e..7378bffa62e 100755 --- a/frameworks/Java/sabina/benchmark_config.json +++ b/frameworks/Java/sabina/benchmark_config.json @@ -16,6 +16,7 @@ "database": "MongoDB", "framework": "Sabina", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Servlet", "webserver": "None", @@ -40,6 +41,7 @@ "database": "MySQL", "framework": "Sabina", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Servlet", "webserver": "None", @@ -64,6 +66,7 @@ "database": "MySQL", "framework": "Sabina", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Servlet", "webserver": "None", @@ -88,6 +91,7 @@ "database": "MongoDB", "framework": "Sabina", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Servlet", "webserver": "None", diff --git a/frameworks/Java/servlet/benchmark_config.json b/frameworks/Java/servlet/benchmark_config.json index 67f3888670b..d9f75513f65 100644 --- a/frameworks/Java/servlet/benchmark_config.json +++ b/frameworks/Java/servlet/benchmark_config.json @@ -9,8 +9,9 @@ "approach": "Realistic", "classification": "Platform", "database": "None", - "framework": "servlet", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Servlet", "webserver": "Resin", @@ -30,8 +31,9 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "servlet", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Servlet", "webserver": "Resin", @@ -50,8 +52,9 @@ "approach": "Realistic", "classification": "Platform", "database": "Postgres", - "framework": "servlet", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Java/servlet3-cass/benchmark_config.json b/frameworks/Java/servlet3-cass/benchmark_config.json index 385a6ba4891..c0adff8b367 100644 --- a/frameworks/Java/servlet3-cass/benchmark_config.json +++ b/frameworks/Java/servlet3-cass/benchmark_config.json @@ -6,10 +6,10 @@ "json_url": "/servlet3-cass/json", "plaintext_url": "/servlet3-cass/plaintext", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "None", - "framework": "servlet3-cass", + "framework": "None", "language": "Java", "orm": "Raw", "platform": "Servlet", @@ -26,11 +26,12 @@ "query_url": "/servlet3-cass/queries?queries=", "update_url": "/servlet3-cass/updates?queries=", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "Cassandra", - "framework": "servlet3-cass", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Java/spark/benchmark_config.json b/frameworks/Java/spark/benchmark_config.json index b63b3aaffdd..39e01ab458b 100644 --- a/frameworks/Java/spark/benchmark_config.json +++ b/frameworks/Java/spark/benchmark_config.json @@ -13,6 +13,7 @@ "database": "MySQL", "framework": "spark", "language": "Java", + "flavor": "Java8", "orm": "Full", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Java/spring/benchmark_config.json b/frameworks/Java/spring/benchmark_config.json index 73d523e0062..cc38aed57ce 100644 --- a/frameworks/Java/spring/benchmark_config.json +++ b/frameworks/Java/spring/benchmark_config.json @@ -15,6 +15,7 @@ "database": "MySQL", "framework": "spring", "language": "Java", + "flavor": "Java8", "orm": "Full", "platform": "Servlet", "webserver": "Tomcat", diff --git a/frameworks/Java/tapestry/benchmark_config.json b/frameworks/Java/tapestry/benchmark_config.json index d53d6ef432c..a98bdd036f6 100644 --- a/frameworks/Java/tapestry/benchmark_config.json +++ b/frameworks/Java/tapestry/benchmark_config.json @@ -14,6 +14,7 @@ "database": "MySQL", "framework": "tapestry", "language": "Java", + "flavor": "Java8", "orm": "Full", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Java/undertow-edge/benchmark_config.json b/frameworks/Java/undertow-edge/benchmark_config.json index 31c8ed4b4fe..f5565129486 100644 --- a/frameworks/Java/undertow-edge/benchmark_config.json +++ b/frameworks/Java/undertow-edge/benchmark_config.json @@ -7,13 +7,14 @@ "plaintext_url": "/plaintext", "cache_url": "/cache", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "None", - "framework": "undertow-edge", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", - "platform": "Undertow Edge", + "platform": "Undertow", "webserver": "None", "os": "Linux", "database_os": "Linux", @@ -28,13 +29,14 @@ "fortune_url": "/fortunes/mysql", "update_url": "/updates/mysql?queries=", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "MySQL", - "framework": "undertow-edge", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", - "platform": "Undertow Edge", + "platform": "Undertow", "webserver": "None", "os": "Linux", "database_os": "Linux", @@ -49,13 +51,14 @@ "fortune_url": "/fortunes/postgresql", "update_url": "/updates/postgresql?queries=", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "Postgres", - "framework": "undertow-edge", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", - "platform": "Undertow Edge", + "platform": "Undertow", "webserver": "None", "os": "Linux", "database_os": "Linux", @@ -70,13 +73,14 @@ "fortune_url": "/fortunes/mongodb", "update_url": "/updates/mongodb?queries=", "port": 8080, - "approach": "Realistic", + "approach": "Stripped", "classification": "Platform", "database": "MongoDB", - "framework": "undertow-edge", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", - "platform": "Undertow Edge", + "platform": "Undertow", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Java/undertow-jersey-c3p0/benchmark_config.json b/frameworks/Java/undertow-jersey-c3p0/benchmark_config.json index 72fa357752c..3a45bf56410 100644 --- a/frameworks/Java/undertow-jersey-c3p0/benchmark_config.json +++ b/frameworks/Java/undertow-jersey-c3p0/benchmark_config.json @@ -10,16 +10,17 @@ "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", - "classification": "Micro", + "classification": "Platform", "database": "MySQL", - "framework": "undertow-jersey", + "framework": "Jersey", "language": "Java", + "flavor": "Java8", "orm": "Full", - "platform": "Servlet", - "webserver": "Undertow", + "platform": "JAX-RS", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "undertow-jersey-c3p0", + "display_name": "Undertow", "notes": "", "versus": "undertow-jersey-hikaricp" } diff --git a/frameworks/Java/undertow-jersey-hikaricp/benchmark_config.json b/frameworks/Java/undertow-jersey-hikaricp/benchmark_config.json index bb72fd5898d..beceb85681c 100644 --- a/frameworks/Java/undertow-jersey-hikaricp/benchmark_config.json +++ b/frameworks/Java/undertow-jersey-hikaricp/benchmark_config.json @@ -10,16 +10,16 @@ "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", - "classification": "Micro", + "classification": "Platform", "database": "MySQL", - "framework": "undertow-jersey", + "framework": "Jersey", "language": "Java", "orm": "Full", - "platform": "Servlet", - "webserver": "Undertow", + "platform": "JAX-RS", + "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "undertow-jersey-hikaricp", + "display_name": "Undertow-hikaricp", "notes": "", "versus": "undertow-jersey-c3p0" } diff --git a/frameworks/Java/undertow/benchmark_config.json b/frameworks/Java/undertow/benchmark_config.json index c19d9e05826..846cb34be6f 100644 --- a/frameworks/Java/undertow/benchmark_config.json +++ b/frameworks/Java/undertow/benchmark_config.json @@ -10,8 +10,9 @@ "approach": "Realistic", "classification": "Platform", "database": "None", - "framework": "undertow", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Undertow", "webserver": "None", @@ -31,8 +32,9 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "undertow", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Undertow", "webserver": "None", @@ -52,8 +54,9 @@ "approach": "Realistic", "classification": "Platform", "database": "Postgres", - "framework": "undertow", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Undertow", "webserver": "None", @@ -73,8 +76,9 @@ "approach": "Realistic", "classification": "Platform", "database": "MongoDB", - "framework": "undertow", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Undertow", "webserver": "None", diff --git a/frameworks/Java/vertx-web/benchmark_config.json b/frameworks/Java/vertx-web/benchmark_config.json index ddb5864bf30..69780d0f4dc 100644 --- a/frameworks/Java/vertx-web/benchmark_config.json +++ b/frameworks/Java/vertx-web/benchmark_config.json @@ -11,6 +11,7 @@ "database": "None", "framework": "vertx-web", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "vertx", "webserver": "None", @@ -32,12 +33,13 @@ "database": "MongoDB", "framework": "vertx-web", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "vertx", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "vertx-web-mongodb", + "display_name": "vertx-web", "notes": "", "versus": "" }, @@ -53,12 +55,13 @@ "database": "Postgres", "framework": "vertx-web", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "vertx", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "vertx-web-mysql", + "display_name": "vertx-web", "notes": "", "versus": "" }, @@ -74,12 +77,13 @@ "database": "Postgres", "framework": "vertx-web", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "vertx", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "vertx-web-postgres", + "display_name": "vertx-webs", "notes": "", "versus": "" } diff --git a/frameworks/Java/vertx/benchmark_config.json b/frameworks/Java/vertx/benchmark_config.json index 29dd38e4218..972dd72b9e2 100755 --- a/frameworks/Java/vertx/benchmark_config.json +++ b/frameworks/Java/vertx/benchmark_config.json @@ -9,8 +9,9 @@ "approach": "Realistic", "classification": "Platform", "database": "None", - "framework": "vertx", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Raw", "platform": "Netty", "webserver": "None", diff --git a/frameworks/Java/wicket/benchmark_config.json b/frameworks/Java/wicket/benchmark_config.json index dcabfe94814..fa0d36075df 100644 --- a/frameworks/Java/wicket/benchmark_config.json +++ b/frameworks/Java/wicket/benchmark_config.json @@ -15,6 +15,7 @@ "database": "MySQL", "framework": "wicket", "language": "Java", + "flavor": "Java8", "orm": "Full", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Java/wildfly-ee7/benchmark_config.json b/frameworks/Java/wildfly-ee7/benchmark_config.json index 56e3d34b32b..312ae9056fa 100644 --- a/frameworks/Java/wildfly-ee7/benchmark_config.json +++ b/frameworks/Java/wildfly-ee7/benchmark_config.json @@ -13,8 +13,9 @@ "approach": "Realistic", "classification": "Fullstack", "database": "MySQL", - "framework": "EE7", + "framework": "None", "language": "Java", + "flavor": "Java8", "orm": "Full", "platform": "Servlet", "webserver": "Wildfly", diff --git a/frameworks/JavaScript/express/benchmark_config.json b/frameworks/JavaScript/express/benchmark_config.json index 70384ffde08..e4eb3872f49 100644 --- a/frameworks/JavaScript/express/benchmark_config.json +++ b/frameworks/JavaScript/express/benchmark_config.json @@ -11,8 +11,9 @@ "database": "None", "framework": "express", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Full", - "platform": "nodejs", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", @@ -31,8 +32,9 @@ "database": "MongoDB", "framework": "express", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Full", - "platform": "nodejs", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", @@ -52,8 +54,9 @@ "database": "MySQL", "framework": "express", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Full", - "platform": "nodejs", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/JavaScript/hapi/benchmark_config.json b/frameworks/JavaScript/hapi/benchmark_config.json index f5c9a81ce72..86be400cc77 100644 --- a/frameworks/JavaScript/hapi/benchmark_config.json +++ b/frameworks/JavaScript/hapi/benchmark_config.json @@ -11,8 +11,9 @@ "database": "None", "framework": "hapi", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Raw", - "platform": "nodejs", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", @@ -32,8 +33,9 @@ "database": "MongoDB", "framework": "hapi", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Full", - "platform": "nodejs", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", @@ -53,8 +55,9 @@ "database": "MySQL", "framework": "hapi", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Full", - "platform": "nodejs", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", @@ -74,8 +77,9 @@ "database": "Postgres", "framework": "hapi", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Full", - "platform": "nodejs", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/JavaScript/koa/benchmark_config.json b/frameworks/JavaScript/koa/benchmark_config.json index ff10c2a34d2..e4e8409ab38 100644 --- a/frameworks/JavaScript/koa/benchmark_config.json +++ b/frameworks/JavaScript/koa/benchmark_config.json @@ -15,8 +15,9 @@ "database": "MongoDB", "framework": "koa", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Raw", - "platform": "nodejs", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/JavaScript/nodejs/benchmark_config.json b/frameworks/JavaScript/nodejs/benchmark_config.json index b0f2dfdbdb4..b8b1ff5943b 100644 --- a/frameworks/JavaScript/nodejs/benchmark_config.json +++ b/frameworks/JavaScript/nodejs/benchmark_config.json @@ -13,8 +13,9 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "nodejs", + "framework": "None", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Raw", "platform": "nodejs", "webserver": "None", @@ -34,8 +35,9 @@ "approach": "Realistic", "classification": "Platform", "database": "MongoDB", - "framework": "nodejs", + "framework": "None", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Full", "platform": "nodejs", "webserver": "None", @@ -55,8 +57,9 @@ "approach": "Realistic", "classification": "Platform", "database": "MongoDB", - "framework": "nodejs", + "framework": "None", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Raw", "platform": "nodejs", "webserver": "None", @@ -76,8 +79,9 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "nodejs", + "framework": "None", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Full", "platform": "nodejs", "webserver": "None", @@ -97,8 +101,9 @@ "approach": "Realistic", "classification": "Platform", "database": "Postgres", - "framework": "nodejs", + "framework": "None", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Full", "platform": "nodejs", "webserver": "None", diff --git a/frameworks/JavaScript/ringojs-convenient/benchmark_config.json b/frameworks/JavaScript/ringojs-convenient/benchmark_config.json index 00a9e1526a9..e0313aa0855 100644 --- a/frameworks/JavaScript/ringojs-convenient/benchmark_config.json +++ b/frameworks/JavaScript/ringojs-convenient/benchmark_config.json @@ -15,9 +15,10 @@ "database": "MySQL", "framework": "ringo", "language": "JavaScript", + "flavor": "RingoJS", "orm": "Micro", "platform": "ringojs", - "webserver": "Jetty", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "ringojs-conv", diff --git a/frameworks/JavaScript/ringojs/benchmark_config.json b/frameworks/JavaScript/ringojs/benchmark_config.json index c7bdd1535e4..c176db6f641 100644 --- a/frameworks/JavaScript/ringojs/benchmark_config.json +++ b/frameworks/JavaScript/ringojs/benchmark_config.json @@ -13,11 +13,12 @@ "approach": "Realistic", "classification": "Platform", "database": "MySQL", - "framework": "ringo", + "framework": "None", "language": "JavaScript", + "flavor": "RingoJS", "orm": "Raw", "platform": "ringojs", - "webserver": "Jetty", + "webserver": "None", "os": "Linux", "database_os": "Linux", "display_name": "ringojs", diff --git a/frameworks/JavaScript/sailsjs/benchmark_config.json b/frameworks/JavaScript/sailsjs/benchmark_config.json index d7021d733aa..22456bf69ee 100644 --- a/frameworks/JavaScript/sailsjs/benchmark_config.json +++ b/frameworks/JavaScript/sailsjs/benchmark_config.json @@ -13,8 +13,9 @@ "approach": "Realistic", "classification": "Fullstack", "database": "None", - "framework": "sailsjs", + "framework": "None", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Micro", "platform": "nodejs", "webserver": "None", @@ -33,8 +34,9 @@ "approach": "Realistic", "classification": "Fullstack", "database": "Postgres", - "framework": "sailsjs", + "framework": "None", "language": "JavaScript", + "flavor": "NodeJS", "orm": "Full", "platform": "nodejs", "webserver": "None", diff --git a/frameworks/Kotlin/hexagon/benchmark_config.json b/frameworks/Kotlin/hexagon/benchmark_config.json index 52fe02bceb9..ad6a7b2ea24 100644 --- a/frameworks/Kotlin/hexagon/benchmark_config.json +++ b/frameworks/Kotlin/hexagon/benchmark_config.json @@ -17,12 +17,13 @@ "database" : "MongoDB", "framework" : "Hexagon", "language" : "Kotlin", + "flavor" : "Java8", "orm" : "Raw", "platform" : "Netty", "webserver" : "None", "os" : "Linux", "database_os" : "Linux", - "display_name" : "Hexagon MongoDB", + "display_name" : "Hexagon", "notes" : "http://there4.co/hexagon", "versus" : "servlet" } diff --git a/frameworks/PHP/phalcon-micro/benchmark_config.json b/frameworks/PHP/phalcon-micro/benchmark_config.json index 56cc4ea53f6..b9f8d13fa56 100644 --- a/frameworks/PHP/phalcon-micro/benchmark_config.json +++ b/frameworks/PHP/phalcon-micro/benchmark_config.json @@ -14,7 +14,7 @@ "framework": "phalcon", "language": "PHP", "flavor": "PHP7", - "orm": "Full", + "orm": "raw", "platform": "None", "webserver": "nginx", "os": "Linux", diff --git a/frameworks/PHP/phalcon/benchmark_config.json b/frameworks/PHP/phalcon/benchmark_config.json index b08c313f43b..9f2224b28aa 100644 --- a/frameworks/PHP/phalcon/benchmark_config.json +++ b/frameworks/PHP/phalcon/benchmark_config.json @@ -16,7 +16,7 @@ "framework": "phalcon", "language": "PHP", "flavor": "PHP7", - "orm": "Full", + "orm": "raw", "platform": "None", "webserver": "nginx", "os": "Linux", @@ -37,7 +37,7 @@ "framework": "phalcon", "language": "PHP", "flavor": "PHP7", - "orm": "Full", + "orm": "raw", "platform": "None", "webserver": "nginx", "os": "Linux", diff --git a/frameworks/Python/asyncio/benchmark_config.json b/frameworks/Python/asyncio/benchmark_config.json index f53083d0d8d..2bac67d472b 100644 --- a/frameworks/Python/asyncio/benchmark_config.json +++ b/frameworks/Python/asyncio/benchmark_config.json @@ -15,13 +15,15 @@ "database": "Postgres", "framework": "aiohttp.web", "language": "Python", + "flavor": "Python3", "orm": "Raw", "platform": "API-Hour", "webserver": "Gunicorn", "os": "Linux", "database_os": "Linux", - "display_name": "API-Hour+aiohttp.web+pgsql", - "notes": "Python 3 + API-Hour + AsyncIO + aiohttp.web + PostgreSQL" + "display_name": "Asyncio", + "notes": "Python 3 + API-Hour + AsyncIO + aiohttp.web + PostgreSQL", + "versus": "asyncio" }, "mysql": { "setup_file": "aiohttp.web/setup", @@ -35,13 +37,15 @@ "database": "MySQL", "framework": "aiohttp.web", "language": "Python", + "flavor": "Python3", "orm": "Raw", "platform": "API-Hour", "webserver": "Gunicorn", "os": "Linux", "database_os": "Linux", - "display_name": "API-Hour+aiohttp.web+mysql", - "notes": "Python 3 + API-Hour + AsyncIO + aiohttp.web + MySQL" + "display_name": "Asyncio", + "notes": "Python 3 + API-Hour + AsyncIO + aiohttp.web + MySQL", + "versus": "asyncio" }, "json": { "setup_file": "yocto_http/setup", @@ -52,13 +56,15 @@ "database": "None", "framework": "AsyncIO", "language": "Python", + "flavor": "Python3", "orm": "Raw", "platform": "API-Hour", "webserver": "Gunicorn", "os": "Linux", "database_os": "Linux", - "display_name": "API-Hour+AsyncIO", - "notes": "Python 3 + API-Hour + AsyncIO" + "display_name": "Asyncio", + "notes": "Python 3 + API-Hour + AsyncIO", + "versus": "asyncio" }, "dbs": { "setup_file": "yocto_http/setup", @@ -71,13 +77,15 @@ "database": "None", "framework": "AsyncIO", "language": "Python", + "flavor": "Python3", "orm": "Raw", "platform": "API-Hour", "webserver": "Gunicorn", "os": "Linux", "database_os": "Linux", - "display_name": "API-Hour+AsyncIO", - "notes": "Python 3 + API-Hour + AsyncIO" + "display_name": "Asyncio", + "notes": "Python 3 + API-Hour + AsyncIO", + "versus": "asyncio" }, "plaintext": { "setup_file": "yocto_http/setup", @@ -88,13 +96,15 @@ "database": "None", "framework": "AsyncIO", "language": "Python", + "flavor": "Python3", "orm": "Raw", "platform": "API-Hour", "webserver": "Gunicorn", "os": "Linux", "database_os": "Linux", - "display_name": "API-Hour+AsyncIO", - "notes": "Python 3 + API-Hour + AsyncIO" + "display_name": "Asyncio", + "notes": "Python 3 + API-Hour + AsyncIO", + "versus": "asyncio" } }] } diff --git a/frameworks/Python/bottle/benchmark_config.json b/frameworks/Python/bottle/benchmark_config.json index 4970dd4e095..ec4ec166519 100644 --- a/frameworks/Python/bottle/benchmark_config.json +++ b/frameworks/Python/bottle/benchmark_config.json @@ -15,12 +15,13 @@ "database": "MySQL", "framework": "bottle", "language": "Python", + "flavor": "Python2", "orm": "Full", "platform": "Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Bottle-Py2", + "display_name": "Bottle", "notes": "CPython 2", "versus": "wsgi" }, @@ -38,12 +39,13 @@ "database": "MySQL", "framework": "bottle", "language": "Python", + "flavor": "Python3", "orm": "Full", "platform": "Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Bottle-Py3", + "display_name": "Bottle", "notes": "CPython 3", "versus": "wsgi" }, @@ -61,12 +63,13 @@ "database": "MySQL", "framework": "bottle", "language": "Python", + "flavor": "PyPy", "orm": "Full", "platform": "Tornado", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Bottle-PyPy", + "display_name": "Bottle", "notes": "PyPy", "versus": "wsgi" }, @@ -82,12 +85,13 @@ "database": "MySQL", "framework": "bottle", "language": "Python", + "flavor": "Python2", "orm": "Raw", "platform": "Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Bottle-raw-Py2", + "display_name": "Bottle-raw", "notes": "CPython 2", "versus": "wsgi" }, @@ -105,6 +109,7 @@ "database": "MySQL", "framework": "bottle", "language": "Python", + "flavor": "Python2", "orm": "Full", "platform": "uWSGI", "webserver": "nginx", diff --git a/frameworks/Python/cherrypy/benchmark_config.json b/frameworks/Python/cherrypy/benchmark_config.json index 9715a0558a6..cb0accaef67 100644 --- a/frameworks/Python/cherrypy/benchmark_config.json +++ b/frameworks/Python/cherrypy/benchmark_config.json @@ -15,12 +15,13 @@ "database": "MySQL", "framework": "CherryPy", "language": "Python", + "flavor": "Python2", "orm": "Full", - "platform": "CherryPy", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "cherrypy", + "display_name": "CherryPy", "notes": "CPython 2.7" }, "py3": { @@ -37,12 +38,13 @@ "database": "MySQL", "framework": "CherryPy", "language": "Python", + "flavor": "Python3", "orm": "Full", - "platform": "CherryPy", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "cherrypy-py3", + "display_name": "CherryPy", "notes": "CPython 3.4" } }] diff --git a/frameworks/Python/django/benchmark_config.json b/frameworks/Python/django/benchmark_config.json index b00b279b47a..55323e5e6ba 100644 --- a/frameworks/Python/django/benchmark_config.json +++ b/frameworks/Python/django/benchmark_config.json @@ -15,12 +15,13 @@ "database": "MySQL", "framework": "django", "language": "Python", + "flavor": "Python2", "orm": "Full", "platform": "Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Django-Py2", + "display_name": "Django", "notes": "CPython 2.7", "versus": "wsgi" }, @@ -38,12 +39,13 @@ "database": "MySQL", "framework": "django", "language": "Python", + "flavor": "Python3", "orm": "Full", "platform": "Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Django-Py3", + "display_name": "Django", "notes": "CPython 3.4", "versus": "wsgi" }, @@ -59,12 +61,13 @@ "database": "Postgres", "framework": "django", "language": "Python", + "flavor": "Python2", "orm": "Full", "platform": "Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Django-Postgres-Py2", + "display_name": "Django", "notes": "CPython 2.7", "versus": "wsgi" } diff --git a/frameworks/Python/falcon/benchmark_config.json b/frameworks/Python/falcon/benchmark_config.json index 803e217fb49..6b27c95f952 100644 --- a/frameworks/Python/falcon/benchmark_config.json +++ b/frameworks/Python/falcon/benchmark_config.json @@ -11,12 +11,13 @@ "database": "None", "framework": "Falcon", "language": "Python", + "flavor": "Python2", "orm": "Raw", "platform": "Gunicorn/Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Falcon-Py2", + "display_name": "Falcon", "notes": "CPython 2", "versus": "wsgi" }, @@ -30,12 +31,13 @@ "database": "None", "framework": "Falcon", "language": "Python", + "flavor": "Python3", "orm": "Raw", "platform": "Gunicorn/Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Falcon-Py3", + "display_name": "Falcon", "notes": "CPython 3", "versus": "wsgi" }, @@ -49,12 +51,13 @@ "database": "None", "framework": "Falcon", "language": "Python", + "flavor": "PyPy", "orm": "Raw", "platform": "Gunicorn/Tornado", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Falcon-PyPy", + "display_name": "Falcon", "notes": "PyPy", "versus": "wsgi" } diff --git a/frameworks/Python/flask/benchmark_config.json b/frameworks/Python/flask/benchmark_config.json index 5267329865a..6fe0b59a399 100644 --- a/frameworks/Python/flask/benchmark_config.json +++ b/frameworks/Python/flask/benchmark_config.json @@ -15,12 +15,13 @@ "database": "MySQL", "framework": "flask", "language": "Python", + "flavor": "Python2", "orm": "Full", "platform": "Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Flask-Py2", + "display_name": "Flask", "notes": "CPython 2.7", "versus": "wsgi" }, @@ -36,6 +37,7 @@ "database": "MySQL", "framework": "flask", "language": "Python", + "flavor": "Python2", "orm": "Raw", "platform": "Meinheld", "webserver": "None", @@ -59,12 +61,13 @@ "database": "MySQL", "framework": "flask", "language": "Python", + "flavor": "Python3", "orm": "Full", "platform": "Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Flask-Py3", + "display_name": "Flask", "notes": "CPython 3.4", "versus": "wsgi" }, @@ -82,12 +85,13 @@ "database": "MySQL", "framework": "flask", "language": "Python", + "flavor": "PyPy", "orm": "Full", "platform": "Tornado", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Flask-PyPy", + "display_name": "Flask", "notes": "PyPy 2.5", "versus": "wsgi" }, @@ -103,12 +107,13 @@ "database": "MySQL", "framework": "flask", "language": "Python", + "flavor": "PyPy", "orm": "Raw", "platform": "Tornado", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Flask-PyPy-raw", + "display_name": "Flask-raw", "notes": "PyPy 2.5", "versus": "wsgi" }, @@ -126,12 +131,13 @@ "database": "MySQL", "framework": "flask", "language": "Python", + "flavor": "Python2", "orm": "Full", "platform": "uWSGI", "webserver": "nginx", "os": "Linux", "database_os": "Linux", - "display_name": "Flask-nginx-uWSGI", + "display_name": "Flask", "notes": "CPython 2.7", "versus": "wsgi" } diff --git a/frameworks/Python/historical/benchmark_config.json b/frameworks/Python/historical/benchmark_config.json index 7859717ad4a..5587e3ab317 100644 --- a/frameworks/Python/historical/benchmark_config.json +++ b/frameworks/Python/historical/benchmark_config.json @@ -15,8 +15,9 @@ "database": "MySQL", "framework": "Webware", "language": "Python", + "flavor": "Python2", "orm": "Full", - "platform": "Apache", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Python/klein/benchmark_config.json b/frameworks/Python/klein/benchmark_config.json index 28547a680e8..a2cd71cae31 100644 --- a/frameworks/Python/klein/benchmark_config.json +++ b/frameworks/Python/klein/benchmark_config.json @@ -13,14 +13,15 @@ "approach": "Realistic", "classification": "Micro", "database": "MySQL", - "framework": "Twisted Klein", + "framework": "Klein", "language": "Python", + "flavor": "Python2", "orm": "Full", - "platform": "Twisted Web", - "webserver": "None", + "platform": "None", + "webserver": "Twisted Web", "os": "Linux", "database_os": "Linux", - "display_name": "Twisted Klein", + "display_name": "Klein", "notes": "CPython 2.7" } }] diff --git a/frameworks/Python/pyramid/benchmark_config.json b/frameworks/Python/pyramid/benchmark_config.json index 76fe04a65a9..02bab899a3d 100644 --- a/frameworks/Python/pyramid/benchmark_config.json +++ b/frameworks/Python/pyramid/benchmark_config.json @@ -15,12 +15,13 @@ "database": "Postgres", "framework": "pyramid", "language": "Python", + "flavor": "Python3", "orm": "Full", "platform": "Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Pyramid-Py3", + "display_name": "Pyramid", "notes": "", "versus": "wsgi" }, @@ -38,12 +39,13 @@ "database": "Postgres", "framework": "pyramid", "language": "Python", + "flavor": "Python2", "orm": "Full", "platform": "Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Pyramid-Py2", + "display_name": "Pyramid", "notes": "", "versus": "wsgi" } diff --git a/frameworks/Python/tornado/benchmark_config.json b/frameworks/Python/tornado/benchmark_config.json index 0c008ce9783..f9b8d8afc6b 100644 --- a/frameworks/Python/tornado/benchmark_config.json +++ b/frameworks/Python/tornado/benchmark_config.json @@ -11,14 +11,15 @@ "approach": "Realistic", "classification": "Platform", "database": "MongoDB", - "framework": "tornado", + "framework": "None", "language": "Python", + "flavor": "Python2", "orm": "Raw", "platform": "Tornado", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Tornado-MongoDB-Py2", + "display_name": "Tornado-raw", "notes": "CPython 2.7", "versus": "" }, @@ -30,14 +31,15 @@ "approach": "Realistic", "classification": "Platform", "database": "Postgres", - "framework": "tornado", + "framework": "None", "language": "Python", + "flavor": "Python2", "orm": "Raw", "platform": "Tornado", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Tornado-Postgres-Py2", + "display_name": "Tornado-raw", "notes": "CPython 2.7", "versus": "" }, @@ -51,14 +53,15 @@ "approach": "Realistic", "classification": "Platform", "database": "MongoDB", - "framework": "tornado", + "framework": "None", "language": "Python", + "flavor": "Python3", "orm": "Raw", "platform": "Tornado", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "Tornado-MongoDB-Py3", + "display_name": "Tornado-raw", "notes": "CPython 3.4", "versus": "" } diff --git a/frameworks/Python/turbogears/benchmark_config.json b/frameworks/Python/turbogears/benchmark_config.json index 3537b36ed97..102949caf2c 100644 --- a/frameworks/Python/turbogears/benchmark_config.json +++ b/frameworks/Python/turbogears/benchmark_config.json @@ -15,6 +15,7 @@ "database": "MySQL", "framework": "TurboGears", "language": "Python", + "flavor": "Python2", "orm": "Full", "platform": "Meinheld", "webserver": "None", diff --git a/frameworks/Python/uwsgi/benchmark_config.json b/frameworks/Python/uwsgi/benchmark_config.json index 652d98e1729..4da6531aee7 100644 --- a/frameworks/Python/uwsgi/benchmark_config.json +++ b/frameworks/Python/uwsgi/benchmark_config.json @@ -8,8 +8,9 @@ "approach": "Stripped", "classification": "Platform", "database": "None", - "framework": "wsgi", + "framework": "None", "language": "Python", + "flavor": "Python2", "orm": "Raw", "platform": "wsgi", "webserver": "uWSGI", @@ -26,14 +27,15 @@ "approach": "Stripped", "classification": "Platform", "database": "None", - "framework": "wsgi", + "framework": "None", "language": "Python", + "flavor": "Python2", "orm": "Raw", "platform": "wsgi", "webserver": "nginx-uWSGI", "os": "Linux", "database_os": "Linux", - "display_name": "uwsgi-nginx-uWSGI", + "display_name": "uwsgi", "notes": "", "versus": "" } diff --git a/frameworks/Python/web2py/benchmark_config.json b/frameworks/Python/web2py/benchmark_config.json index 8174e5aa4cb..f6b72460168 100644 --- a/frameworks/Python/web2py/benchmark_config.json +++ b/frameworks/Python/web2py/benchmark_config.json @@ -15,8 +15,9 @@ "database": "MySQL", "framework": "web2py", "language": "Python", + "flavor": "Python2", "orm": "Full", - "platform": "web2Py", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Python/wheezyweb/benchmark_config.json b/frameworks/Python/wheezyweb/benchmark_config.json index 97bba2fa0ba..5bb16a157e2 100644 --- a/frameworks/Python/wheezyweb/benchmark_config.json +++ b/frameworks/Python/wheezyweb/benchmark_config.json @@ -15,12 +15,13 @@ "database": "MySQL", "framework": "wheezy.web", "language": "Python", + "flavor": "Python2", "orm": "Full", "platform": "Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "wheezy.web-py2", + "display_name": "wheezy.web", "notes": "" }, "py3": { @@ -37,12 +38,13 @@ "database": "MySQL", "framework": "wheezy.web", "language": "Python", + "flavor": "Python3", "orm": "Full", "platform": "Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "wheezy.web-py3", + "display_name": "wheezy.web", "notes": "" } }] diff --git a/frameworks/Python/wsgi/benchmark_config.json b/frameworks/Python/wsgi/benchmark_config.json index 4b4f744b9a9..885c80313a2 100644 --- a/frameworks/Python/wsgi/benchmark_config.json +++ b/frameworks/Python/wsgi/benchmark_config.json @@ -9,14 +9,15 @@ "approach": "Stripped", "classification": "Platform", "database": "None", - "framework": "wsgi", + "framework": "None", "language": "Python", + "flavor": "Python3", "orm": "Raw", "platform": "Meinheld", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "meinheld", + "display_name": "wsgi", "notes": "", "versus": "wsgi" } diff --git a/frameworks/Racket/racket-ws/benchmark_config.json b/frameworks/Racket/racket-ws/benchmark_config.json index 7c117f6dad5..619c4ff4ec2 100644 --- a/frameworks/Racket/racket-ws/benchmark_config.json +++ b/frameworks/Racket/racket-ws/benchmark_config.json @@ -12,12 +12,13 @@ "database": "MySQL", "framework": "racket-ws", "language": "Racket", + "flavor": "Racket6.6", "orm": "Micro", - "platform": "Racket", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", - "display_name": "racket-ws", + "display_name": "Racket-ws", "notes": "", "versus": "" } From dbb68036736682407ada0e26a1cd2ada9b1bca59 Mon Sep 17 00:00:00 2001 From: "A. Shawn Bandy" Date: Mon, 26 Sep 2016 22:07:38 +0000 Subject: [PATCH 05/11] In cases where there is no distinction in 'flavor' within a language use 'None' as the value for flavor. --- frameworks/C++/cpoll_cppsp/benchmark_config.json | 8 ++++---- frameworks/C++/ffead-cpp/benchmark_config.json | 2 +- frameworks/C++/poco/benchmark_config.json | 2 +- frameworks/C++/silicon/benchmark_config.json | 6 +++--- frameworks/C++/treefrog/benchmark_config.json | 4 ++-- frameworks/C++/wt/benchmark_config.json | 4 ++-- frameworks/C/duda/benchmark_config.json | 2 +- frameworks/C/h2o/benchmark_config.json | 2 +- frameworks/C/haywire/benchmark_config.json | 2 +- frameworks/C/libreactor/benchmark_config.json | 2 +- frameworks/C/lwan/benchmark_config.json | 6 +++--- frameworks/C/onion/benchmark_config.json | 4 ++-- frameworks/Clojure/aleph/benchmark_config.json | 2 +- frameworks/Clojure/compojure/benchmark_config.json | 4 ++-- frameworks/Clojure/http-kit/benchmark_config.json | 4 ++-- frameworks/Clojure/luminus/benchmark_config.json | 2 +- frameworks/Clojure/pedestal/benchmark_config.json | 2 +- frameworks/Crystal/crystal/benchmark_config.json | 2 +- frameworks/Crystal/kemal/benchmark_config.json | 4 ++-- frameworks/Dart/dart-raw/benchmark_config.json | 2 +- frameworks/Dart/redstone/benchmark_config.json | 4 ++-- frameworks/Dart/start/benchmark_config.json | 4 ++-- frameworks/Dart/stream/benchmark_config.json | 4 ++-- frameworks/Elixir/cowboy/benchmark_config.json | 2 +- frameworks/Elixir/phoenix/benchmark_config.json | 2 +- frameworks/Erlang/chicagoboss/benchmark_config.json | 2 +- frameworks/Erlang/cowboy/benchmark_config.json | 2 +- frameworks/Erlang/elli/benchmark_config.json | 2 +- frameworks/Erlang/mochiweb/benchmark_config.json | 2 +- frameworks/Go/beego/benchmark_config.json | 2 +- frameworks/Go/echo/benchmark_config.json | 6 +++--- frameworks/Go/falcore/benchmark_config.json | 2 +- frameworks/Go/fasthttp/benchmark_config.json | 8 ++++---- frameworks/Go/gin/benchmark_config.json | 2 +- frameworks/Go/go-std/benchmark_config.json | 10 +++++----- frameworks/Go/goji/benchmark_config.json | 2 +- frameworks/Go/kami/benchmark_config.json | 2 +- frameworks/Go/revel/benchmark_config.json | 8 ++++---- frameworks/Go/webgo/benchmark_config.json | 2 +- frameworks/Java/activeweb/benchmark_config.json | 4 ++-- frameworks/Java/baratine/benchmark_config.json | 2 +- frameworks/Java/bayou/benchmark_config.json | 2 +- frameworks/Java/beyondj/benchmark_config.json | 2 +- frameworks/Java/comsat-servlet/benchmark_config.json | 4 ++-- frameworks/Java/comsat-webactors/benchmark_config.json | 4 ++-- frameworks/Java/curacao/benchmark_config.json | 2 +- frameworks/Java/dropwizard/benchmark_config.json | 6 +++--- frameworks/Java/gemini/benchmark_config.json | 6 +++--- frameworks/Java/grizzly-bm/benchmark_config.json | 2 +- frameworks/Java/grizzly-jersey/benchmark_config.json | 2 +- frameworks/Java/jawn/benchmark_config.json | 2 +- frameworks/Java/jetty-servlet/benchmark_config.json | 2 +- frameworks/Java/jetty/benchmark_config.json | 2 +- frameworks/Java/jlhttp/benchmark_config.json | 2 +- frameworks/Java/jooby/benchmark_config.json | 2 +- frameworks/Java/netty/benchmark_config.json | 2 +- frameworks/Java/ninja-standalone/benchmark_config.json | 2 +- frameworks/Java/officefloor/benchmark_config.json | 2 +- frameworks/Java/permeagility/benchmark_config.json | 2 +- frameworks/Java/play1/benchmark_config.json | 2 +- frameworks/Java/play2-java/benchmark_config.json | 6 +++--- frameworks/Java/rapidoid/benchmark_config.json | 2 +- frameworks/Java/restexpress/benchmark_config.json | 6 +++--- frameworks/Java/revenj/benchmark_config.json | 2 +- frameworks/Java/sabina/benchmark_config.json | 8 ++++---- frameworks/Java/servlet/benchmark_config.json | 6 +++--- frameworks/Java/servlet3-cass/benchmark_config.json | 2 +- frameworks/Java/spark/benchmark_config.json | 2 +- frameworks/Java/spring/benchmark_config.json | 2 +- frameworks/Java/tapestry/benchmark_config.json | 2 +- frameworks/Java/undertow-edge/benchmark_config.json | 8 ++++---- .../Java/undertow-jersey-c3p0/benchmark_config.json | 2 +- frameworks/Java/undertow/benchmark_config.json | 8 ++++---- frameworks/Java/vertx-web/benchmark_config.json | 8 ++++---- frameworks/Java/vertx/benchmark_config.json | 2 +- frameworks/Java/wicket/benchmark_config.json | 2 +- frameworks/Java/wildfly-ee7/benchmark_config.json | 2 +- 77 files changed, 130 insertions(+), 130 deletions(-) diff --git a/frameworks/C++/cpoll_cppsp/benchmark_config.json b/frameworks/C++/cpoll_cppsp/benchmark_config.json index 2eb05bf98d4..39cd6933cbe 100644 --- a/frameworks/C++/cpoll_cppsp/benchmark_config.json +++ b/frameworks/C++/cpoll_cppsp/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "cpoll-cppsp", "language": "C++", - "flavor": "C++14", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -33,7 +33,7 @@ "database": "MySQL", "framework": "cpoll-cppsp", "language": "C++", - "flavor": "C++14", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -53,7 +53,7 @@ "database": "Postgres", "framework": "cpoll-cppsp", "language": "C++", - "flavor": "C++14", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -73,7 +73,7 @@ "database": "Postgres", "framework": "cpoll-cppsp", "language": "C++", - "flavor": "C++14", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/C++/ffead-cpp/benchmark_config.json b/frameworks/C++/ffead-cpp/benchmark_config.json index 7d75d691d7c..36d0562938d 100644 --- a/frameworks/C++/ffead-cpp/benchmark_config.json +++ b/frameworks/C++/ffead-cpp/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MongoDB", "framework": "ffead-cpp", "language": "C++", - "flavor": "C++14", + "flavor": "None", "orm": "Full", "platform": "None", "webserver": "None", diff --git a/frameworks/C++/poco/benchmark_config.json b/frameworks/C++/poco/benchmark_config.json index b31abd4927e..e7d4f1c583e 100644 --- a/frameworks/C++/poco/benchmark_config.json +++ b/frameworks/C++/poco/benchmark_config.json @@ -10,7 +10,7 @@ "database": "none", "framework": "None", "language": "C++", - "flavor": "C++14", + "flavor": "None", "orm": "Raw", "platform": "POCO", "webserver": "None", diff --git a/frameworks/C++/silicon/benchmark_config.json b/frameworks/C++/silicon/benchmark_config.json index f8b8a8b518b..5da01a3714c 100644 --- a/frameworks/C++/silicon/benchmark_config.json +++ b/frameworks/C++/silicon/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "silicon", "language": "C++", - "flavor": "C++14", + "flavor": "None", "orm": "Full", "platform": "None", "webserver": "microhttpd", @@ -39,7 +39,7 @@ "database": "MySQL", "framework": "silicon", "language": "C++", - "flavor": "C++14", + "flavor": "None", "orm": "Full", "platform": "None", "webserver": "microhttpd", @@ -63,7 +63,7 @@ "database": "MySQL", "framework": "silicon", "language": "C++", - "flavor": "C++14", + "flavor": "None", "orm": "Full", "platform": "None", "webserver": "Lwan", diff --git a/frameworks/C++/treefrog/benchmark_config.json b/frameworks/C++/treefrog/benchmark_config.json index c0d6608d5db..fcbd88fe3f3 100644 --- a/frameworks/C++/treefrog/benchmark_config.json +++ b/frameworks/C++/treefrog/benchmark_config.json @@ -38,7 +38,7 @@ "database": "MySQL", "framework": "treefrog", "language": "C++", - "flavor": "C++14", + "flavor": "None", "orm": "Micro", "platform": "None", "webserver": "None", @@ -62,7 +62,7 @@ "database": "Postgres", "framework": "treefrog", "language": "C++", - "flavor": "C++14", + "flavor": "None", "orm": "Micro", "platform": "None", "webserver": "None", diff --git a/frameworks/C++/wt/benchmark_config.json b/frameworks/C++/wt/benchmark_config.json index 3b8a9f0cf03..f9da97fb324 100644 --- a/frameworks/C++/wt/benchmark_config.json +++ b/frameworks/C++/wt/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "wt", "language": "C++", - "flavor": "C++14", + "flavor": "None", "orm": "Full", "platform": "None", "webserver": "None", @@ -37,7 +37,7 @@ "database": "Postgres", "framework": "wt", "language": "C++", - "flavor": "C++14", + "flavor": "None", "orm": "Full", "platform": "None", "webserver": "None", diff --git a/frameworks/C/duda/benchmark_config.json b/frameworks/C/duda/benchmark_config.json index 9740aca8562..c063d162711 100644 --- a/frameworks/C/duda/benchmark_config.json +++ b/frameworks/C/duda/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "None", "language": "C", - "flavor": "C11", + "flavor": "None", "orm": "Raw", "platform": "duda", "webserver": "Monkey", diff --git a/frameworks/C/h2o/benchmark_config.json b/frameworks/C/h2o/benchmark_config.json index 02dae5f846d..27f4feb3563 100644 --- a/frameworks/C/h2o/benchmark_config.json +++ b/frameworks/C/h2o/benchmark_config.json @@ -15,7 +15,7 @@ "database": "Postgres", "framework": "None", "language": "C", - "flavor": "C11", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/C/haywire/benchmark_config.json b/frameworks/C/haywire/benchmark_config.json index d31f0f7211c..58e2f6e26c2 100644 --- a/frameworks/C/haywire/benchmark_config.json +++ b/frameworks/C/haywire/benchmark_config.json @@ -10,7 +10,7 @@ "database": "None", "framework": "None", "language": "C", - "flavor": "C11", + "flavor": "None", "orm": "Raw", "platform": "haywire", "webserver": "None", diff --git a/frameworks/C/libreactor/benchmark_config.json b/frameworks/C/libreactor/benchmark_config.json index 3e836b1b0db..628138659b8 100644 --- a/frameworks/C/libreactor/benchmark_config.json +++ b/frameworks/C/libreactor/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "None", "language": "C", - "flavor": "C11", + "flavor": "None", "orm": "Raw", "platform": "libreactor", "webserver": "None", diff --git a/frameworks/C/lwan/benchmark_config.json b/frameworks/C/lwan/benchmark_config.json index 557c415bc9d..73dbc04d64e 100644 --- a/frameworks/C/lwan/benchmark_config.json +++ b/frameworks/C/lwan/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "None", "language": "C", - "flavor": "C11", + "flavor": "None", "orm": "Raw", "platform": "Lwan", "webserver": "None", @@ -32,7 +32,7 @@ "database": "SQLite", "framework": "None", "language": "C", - "flavor": "C11", + "flavor": "None", "orm": "Raw", "platform": "Lwan", "webserver": "None", @@ -53,7 +53,7 @@ "database": "MySQL", "framework": "None", "language": "C", - "flavor": "C11", + "flavor": "None", "orm": "Raw", "platform": "Lwan", "webserver": "None", diff --git a/frameworks/C/onion/benchmark_config.json b/frameworks/C/onion/benchmark_config.json index 686d6a9b586..4a2485c0c74 100644 --- a/frameworks/C/onion/benchmark_config.json +++ b/frameworks/C/onion/benchmark_config.json @@ -10,7 +10,7 @@ "database": "None", "framework": "None", "language": "C", - "flavor": "C11", + "flavor": "None", "orm": "Raw", "platform": "Onion", "webserver": "None", @@ -31,7 +31,7 @@ "database": "MySQL", "framework": "None", "language": "C", - "flavor": "C11", + "flavor": "None", "orm": "Raw", "platform": "Onion", "webserver": "None", diff --git a/frameworks/Clojure/aleph/benchmark_config.json b/frameworks/Clojure/aleph/benchmark_config.json index 23b1a217ea6..5f951a310bf 100755 --- a/frameworks/Clojure/aleph/benchmark_config.json +++ b/frameworks/Clojure/aleph/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "aleph", "language": "Clojure", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Netty", "webserver": "None", diff --git a/frameworks/Clojure/compojure/benchmark_config.json b/frameworks/Clojure/compojure/benchmark_config.json index b29c418a99e..d7c50a5a554 100644 --- a/frameworks/Clojure/compojure/benchmark_config.json +++ b/frameworks/Clojure/compojure/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "compojure", "language": "Clojure", - "flavor": "Java8", + "flavor": "None", "orm": "Micro", "platform": "Servlet", "webserver": "Resin", @@ -37,7 +37,7 @@ "database": "MySQL", "framework": "compojure", "language": "Clojure", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Clojure/http-kit/benchmark_config.json b/frameworks/Clojure/http-kit/benchmark_config.json index 1dcd562dc72..d258fc10da3 100644 --- a/frameworks/Clojure/http-kit/benchmark_config.json +++ b/frameworks/Clojure/http-kit/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "None", "language": "Clojure", - "flavor": "Java8", + "flavor": "None", "orm": "Micro", "platform": "http-kit", "webserver": "None", @@ -37,7 +37,7 @@ "database": "MySQL", "framework": "None", "language": "Clojure", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "http-kit", "webserver": "None", diff --git a/frameworks/Clojure/luminus/benchmark_config.json b/frameworks/Clojure/luminus/benchmark_config.json index ec18805cff2..39f90d58810 100644 --- a/frameworks/Clojure/luminus/benchmark_config.json +++ b/frameworks/Clojure/luminus/benchmark_config.json @@ -15,7 +15,7 @@ "database": "Postgres", "framework": "luminus", "language": "Clojure", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Undertow", "webserver": "None", diff --git a/frameworks/Clojure/pedestal/benchmark_config.json b/frameworks/Clojure/pedestal/benchmark_config.json index 7639f0d911f..986d1c17c0c 100644 --- a/frameworks/Clojure/pedestal/benchmark_config.json +++ b/frameworks/Clojure/pedestal/benchmark_config.json @@ -16,7 +16,7 @@ "orm": "micro", "framework": "pedestal", "language": "Clojure", - "flavor": "Java8", + "flavor": "None", "platform": "Undertow", "webserver": "None", "os": "Linux", diff --git a/frameworks/Crystal/crystal/benchmark_config.json b/frameworks/Crystal/crystal/benchmark_config.json index 3976ee347b2..fc310c4e226 100644 --- a/frameworks/Crystal/crystal/benchmark_config.json +++ b/frameworks/Crystal/crystal/benchmark_config.json @@ -11,7 +11,7 @@ "database": "Postgres", "framework": "None", "language": "Crystal", - "flavor": "Crystal12", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Crystal/kemal/benchmark_config.json b/frameworks/Crystal/kemal/benchmark_config.json index 8d4ce7c2ddd..66a298dfe4e 100644 --- a/frameworks/Crystal/kemal/benchmark_config.json +++ b/frameworks/Crystal/kemal/benchmark_config.json @@ -15,7 +15,7 @@ "database": "Postgres", "framework": "kemal", "language": "Crystal", - "flavor": "Crystal12", + "flavor": "None", "orm": "micro", "platform": "None", "webserver": "None", @@ -39,7 +39,7 @@ "database": "Redis", "framework": "kemal", "language": "Crystal", - "flavor": "Crystal12", + "flavor": "None", "orm": "micro", "platform": "None", "webserver": "None", diff --git a/frameworks/Dart/dart-raw/benchmark_config.json b/frameworks/Dart/dart-raw/benchmark_config.json index 2990fdfcc69..41de4c4ab64 100644 --- a/frameworks/Dart/dart-raw/benchmark_config.json +++ b/frameworks/Dart/dart-raw/benchmark_config.json @@ -15,7 +15,7 @@ "database": "Postgres", "framework": "None", "language": "Dart", - "flavor": "Dart1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Dart/redstone/benchmark_config.json b/frameworks/Dart/redstone/benchmark_config.json index bd633ca2e74..c65318fcff9 100644 --- a/frameworks/Dart/redstone/benchmark_config.json +++ b/frameworks/Dart/redstone/benchmark_config.json @@ -15,7 +15,7 @@ "database": "Postgres", "framework": "redstone", "language": "Dart", - "flavor": "Dart1", + "flavor": "None", "orm": "Micro", "platform": "None", "webserver": "None", @@ -37,7 +37,7 @@ "database": "MongoDB", "framework": "redstone", "language": "Dart", - "flavor": "Dart1", + "flavor": "None", "orm": "Micro", "platform": "None", "webserver": "None", diff --git a/frameworks/Dart/start/benchmark_config.json b/frameworks/Dart/start/benchmark_config.json index 37d6f04ed06..886e45b5fff 100644 --- a/frameworks/Dart/start/benchmark_config.json +++ b/frameworks/Dart/start/benchmark_config.json @@ -15,7 +15,7 @@ "database": "Postgres", "framework": "start", "language": "Dart", - "flavor": "Dart1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "nginx", @@ -37,7 +37,7 @@ "database": "MongoDB", "framework": "start", "language": "Dart", - "flavor": "Dart1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "nginx", diff --git a/frameworks/Dart/stream/benchmark_config.json b/frameworks/Dart/stream/benchmark_config.json index c22b0ca3f81..5c90f55e224 100644 --- a/frameworks/Dart/stream/benchmark_config.json +++ b/frameworks/Dart/stream/benchmark_config.json @@ -15,7 +15,7 @@ "database": "Postgres", "framework": "stream", "language": "Dart", - "flavor": "Dart1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "nginx", @@ -37,7 +37,7 @@ "database": "MongoDB", "framework": "stream", "language": "Dart", - "flavor": "Dart1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "nginx", diff --git a/frameworks/Elixir/cowboy/benchmark_config.json b/frameworks/Elixir/cowboy/benchmark_config.json index 2659c75cd14..37c61e0ad7b 100644 --- a/frameworks/Elixir/cowboy/benchmark_config.json +++ b/frameworks/Elixir/cowboy/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "None", "language": "Elixir", - "flavor": "Elixir1", + "flavor": "None", "orm": "raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Elixir/phoenix/benchmark_config.json b/frameworks/Elixir/phoenix/benchmark_config.json index f284f7e5ad4..5674a38cf54 100644 --- a/frameworks/Elixir/phoenix/benchmark_config.json +++ b/frameworks/Elixir/phoenix/benchmark_config.json @@ -15,7 +15,7 @@ "database": "Postgres", "framework": "Phoenix", "language": "Elixir", - "flavor": "Elixir1", + "flavor": "None", "orm": "full", "platform": "Cowboy", "webserver": "None", diff --git a/frameworks/Erlang/chicagoboss/benchmark_config.json b/frameworks/Erlang/chicagoboss/benchmark_config.json index 22a891445be..77538bdad8a 100755 --- a/frameworks/Erlang/chicagoboss/benchmark_config.json +++ b/frameworks/Erlang/chicagoboss/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "ChicagoBoss", "language": "Erlang", - "flavor": "Erlang18", + "flavor": "None", "orm": "raw", "platform": "Cowboy", "webserver": "None", diff --git a/frameworks/Erlang/cowboy/benchmark_config.json b/frameworks/Erlang/cowboy/benchmark_config.json index 9d6e3167a78..fab57bd99ea 100644 --- a/frameworks/Erlang/cowboy/benchmark_config.json +++ b/frameworks/Erlang/cowboy/benchmark_config.json @@ -13,7 +13,7 @@ "database": "MySQL", "framework": "None", "language": "Erlang", - "flavor": "Erlang18", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Erlang/elli/benchmark_config.json b/frameworks/Erlang/elli/benchmark_config.json index 7f6c8da639b..c0ee04c1854 100644 --- a/frameworks/Erlang/elli/benchmark_config.json +++ b/frameworks/Erlang/elli/benchmark_config.json @@ -12,7 +12,7 @@ "database": "MySQL", "framework": "None", "language": "Erlang", - "flavor": "Erlang18", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Erlang/mochiweb/benchmark_config.json b/frameworks/Erlang/mochiweb/benchmark_config.json index 929d51d4707..dc4b2f0c68c 100644 --- a/frameworks/Erlang/mochiweb/benchmark_config.json +++ b/frameworks/Erlang/mochiweb/benchmark_config.json @@ -11,7 +11,7 @@ "database": "MySQL", "framework": "None", "language": "Erlang", - "flavor": "Erlang18", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Go/beego/benchmark_config.json b/frameworks/Go/beego/benchmark_config.json index 450618aaf6e..56bb3636a0d 100644 --- a/frameworks/Go/beego/benchmark_config.json +++ b/frameworks/Go/beego/benchmark_config.json @@ -12,7 +12,7 @@ "database": "MySQL", "framework": "beego", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Micro", "platform": "None", "webserver": "None", diff --git a/frameworks/Go/echo/benchmark_config.json b/frameworks/Go/echo/benchmark_config.json index 005786921f5..69166a9c0ba 100644 --- a/frameworks/Go/echo/benchmark_config.json +++ b/frameworks/Go/echo/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -39,7 +39,7 @@ "database": "Postgres", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -63,7 +63,7 @@ "database": "Postgres", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Go/falcore/benchmark_config.json b/frameworks/Go/falcore/benchmark_config.json index 3adea8e2570..9063c998979 100644 --- a/frameworks/Go/falcore/benchmark_config.json +++ b/frameworks/Go/falcore/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "Falcore", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Go/fasthttp/benchmark_config.json b/frameworks/Go/fasthttp/benchmark_config.json index 4569cd65aab..2c85564d384 100644 --- a/frameworks/Go/fasthttp/benchmark_config.json +++ b/frameworks/Go/fasthttp/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -39,7 +39,7 @@ "database": "MySQL", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -63,7 +63,7 @@ "database": "Postgres", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -87,7 +87,7 @@ "database": "Postgres", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Go/gin/benchmark_config.json b/frameworks/Go/gin/benchmark_config.json index 9ac52db2e74..b7eb11b1874 100644 --- a/frameworks/Go/gin/benchmark_config.json +++ b/frameworks/Go/gin/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "gin", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Go/go-std/benchmark_config.json b/frameworks/Go/go-std/benchmark_config.json index c97efec97d9..7fd597cf3e0 100644 --- a/frameworks/Go/go-std/benchmark_config.json +++ b/frameworks/Go/go-std/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "go", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -37,7 +37,7 @@ "database": "MySQL", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -61,7 +61,7 @@ "database": "MySQL", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -83,7 +83,7 @@ "database": "MongoDB", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -105,7 +105,7 @@ "database": "Postgres", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Go/goji/benchmark_config.json b/frameworks/Go/goji/benchmark_config.json index 997836551dd..87034326752 100644 --- a/frameworks/Go/goji/benchmark_config.json +++ b/frameworks/Go/goji/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "Goji", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Go/kami/benchmark_config.json b/frameworks/Go/kami/benchmark_config.json index 1c27536c546..a1f1066ae16 100644 --- a/frameworks/Go/kami/benchmark_config.json +++ b/frameworks/Go/kami/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "kami", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Go/revel/benchmark_config.json b/frameworks/Go/revel/benchmark_config.json index c3419673740..9d7ca8128f7 100644 --- a/frameworks/Go/revel/benchmark_config.json +++ b/frameworks/Go/revel/benchmark_config.json @@ -11,7 +11,7 @@ "database": "MySQL", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -33,7 +33,7 @@ "database": "MySQL", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", @@ -55,7 +55,7 @@ "database": "MySQL", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "micro", "platform": "None", "webserver": "None", @@ -77,7 +77,7 @@ "database": "MySQL", "framework": "None", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "micro", "platform": "None", "webserver": "None", diff --git a/frameworks/Go/webgo/benchmark_config.json b/frameworks/Go/webgo/benchmark_config.json index f9439759223..d827823ad47 100644 --- a/frameworks/Go/webgo/benchmark_config.json +++ b/frameworks/Go/webgo/benchmark_config.json @@ -10,7 +10,7 @@ "database": "None", "framework": "Webgo", "language": "Go", - "flavor": "Go1", + "flavor": "None", "orm": "Raw", "platform": "None", "webserver": "None", diff --git a/frameworks/Java/activeweb/benchmark_config.json b/frameworks/Java/activeweb/benchmark_config.json index abaa933184b..19b950ced95 100644 --- a/frameworks/Java/activeweb/benchmark_config.json +++ b/frameworks/Java/activeweb/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "ActiveWeb", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Micro", "platform": "Servlet", "webserver": "None", @@ -37,7 +37,7 @@ "database": "MySQL", "framework": "ActiveWeb", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Micro", "platform": "Servlet", "webserver": "None", diff --git a/frameworks/Java/baratine/benchmark_config.json b/frameworks/Java/baratine/benchmark_config.json index 9e4eb4a66f1..10af4da71a3 100644 --- a/frameworks/Java/baratine/benchmark_config.json +++ b/frameworks/Java/baratine/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Baratine", "webserver": "None", diff --git a/frameworks/Java/bayou/benchmark_config.json b/frameworks/Java/bayou/benchmark_config.json index c91db7f9131..45a2dfbdcf0 100644 --- a/frameworks/Java/bayou/benchmark_config.json +++ b/frameworks/Java/bayou/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Bayou", "webserver": "None", diff --git a/frameworks/Java/beyondj/benchmark_config.json b/frameworks/Java/beyondj/benchmark_config.json index 3411487e626..2b124e7b407 100755 --- a/frameworks/Java/beyondj/benchmark_config.json +++ b/frameworks/Java/beyondj/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "BeyondJ", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "Servlet", "webserver": "None", diff --git a/frameworks/Java/comsat-servlet/benchmark_config.json b/frameworks/Java/comsat-servlet/benchmark_config.json index 10ca2147548..a8eea793bff 100644 --- a/frameworks/Java/comsat-servlet/benchmark_config.json +++ b/frameworks/Java/comsat-servlet/benchmark_config.json @@ -12,7 +12,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "None", @@ -32,7 +32,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "None", diff --git a/frameworks/Java/comsat-webactors/benchmark_config.json b/frameworks/Java/comsat-webactors/benchmark_config.json index 0974a6cd2f7..d7f7a4cae29 100644 --- a/frameworks/Java/comsat-webactors/benchmark_config.json +++ b/frameworks/Java/comsat-webactors/benchmark_config.json @@ -12,7 +12,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Comsat", "webserver": "None", @@ -32,7 +32,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Comsat", "webserver": "None", diff --git a/frameworks/Java/curacao/benchmark_config.json b/frameworks/Java/curacao/benchmark_config.json index 499586ef81b..21e8f5da972 100644 --- a/frameworks/Java/curacao/benchmark_config.json +++ b/frameworks/Java/curacao/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "Curacao", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "None", diff --git a/frameworks/Java/dropwizard/benchmark_config.json b/frameworks/Java/dropwizard/benchmark_config.json index 61f9142514b..bbc4d4c809b 100644 --- a/frameworks/Java/dropwizard/benchmark_config.json +++ b/frameworks/Java/dropwizard/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "Dropwizard", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "JAX-RS", "webserver": "None", @@ -37,7 +37,7 @@ "database": "MongoDB", "framework": "dropwizard", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "JAX-RS", "webserver": "None", @@ -59,7 +59,7 @@ "database": "Postgres", "framework": "dropwizard", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "JAX-RS", "webserver": "None", diff --git a/frameworks/Java/gemini/benchmark_config.json b/frameworks/Java/gemini/benchmark_config.json index 7ea7fd925ea..a3de76c7509 100644 --- a/frameworks/Java/gemini/benchmark_config.json +++ b/frameworks/Java/gemini/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "Gemini", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Micro", "platform": "Servlet", "webserver": "Resin", @@ -33,7 +33,7 @@ "database": "MySQL", "framework": "gemini", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Micro", "platform": "Servlet", "webserver": "Resin", @@ -55,7 +55,7 @@ "database": "Postgres", "framework": "gemini", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Micro", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Java/grizzly-bm/benchmark_config.json b/frameworks/Java/grizzly-bm/benchmark_config.json index 2dae46fd8aa..972d6553819 100644 --- a/frameworks/Java/grizzly-bm/benchmark_config.json +++ b/frameworks/Java/grizzly-bm/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "Grizzly", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "None", diff --git a/frameworks/Java/grizzly-jersey/benchmark_config.json b/frameworks/Java/grizzly-jersey/benchmark_config.json index 1c41fa9dce0..c2e68b5b3a3 100644 --- a/frameworks/Java/grizzly-jersey/benchmark_config.json +++ b/frameworks/Java/grizzly-jersey/benchmark_config.json @@ -14,7 +14,7 @@ "database": "MySQL", "framework": "Grizzly", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "JAX-RS", "webserver": "None", diff --git a/frameworks/Java/jawn/benchmark_config.json b/frameworks/Java/jawn/benchmark_config.json index d8ccce6e080..f51ba2ffcbe 100644 --- a/frameworks/Java/jawn/benchmark_config.json +++ b/frameworks/Java/jawn/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "jawn", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "Undertow", diff --git a/frameworks/Java/jetty-servlet/benchmark_config.json b/frameworks/Java/jetty-servlet/benchmark_config.json index cc17e337463..333169d1474 100644 --- a/frameworks/Java/jetty-servlet/benchmark_config.json +++ b/frameworks/Java/jetty-servlet/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Jetty", "webserver": "None", diff --git a/frameworks/Java/jetty/benchmark_config.json b/frameworks/Java/jetty/benchmark_config.json index 5ecefedeb5f..9799c36e124 100644 --- a/frameworks/Java/jetty/benchmark_config.json +++ b/frameworks/Java/jetty/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Jetty", "webserver": "None", diff --git a/frameworks/Java/jlhttp/benchmark_config.json b/frameworks/Java/jlhttp/benchmark_config.json index b74a32dd010..c15934446a1 100755 --- a/frameworks/Java/jlhttp/benchmark_config.json +++ b/frameworks/Java/jlhttp/benchmark_config.json @@ -10,7 +10,7 @@ "classification": "Platform", "database": "None", "framework": "None", - "flavor": "Java8", + "flavor": "None", "language": "Java", "orm": "Raw", "platform": "JLHTTP", diff --git a/frameworks/Java/jooby/benchmark_config.json b/frameworks/Java/jooby/benchmark_config.json index 8fde9cc0b6e..2d28e2b0016 100644 --- a/frameworks/Java/jooby/benchmark_config.json +++ b/frameworks/Java/jooby/benchmark_config.json @@ -12,7 +12,7 @@ "database": "None", "framework": "jooby", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Netty", "webserver": "None", diff --git a/frameworks/Java/netty/benchmark_config.json b/frameworks/Java/netty/benchmark_config.json index ea8a13f27f7..30b2c2e84a2 100644 --- a/frameworks/Java/netty/benchmark_config.json +++ b/frameworks/Java/netty/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "netty", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Netty", "webserver": "None", diff --git a/frameworks/Java/ninja-standalone/benchmark_config.json b/frameworks/Java/ninja-standalone/benchmark_config.json index cc12753bfbf..bdfda5c6414 100644 --- a/frameworks/Java/ninja-standalone/benchmark_config.json +++ b/frameworks/Java/ninja-standalone/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "ninja", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "Jetty", "webserver": "None", diff --git a/frameworks/Java/officefloor/benchmark_config.json b/frameworks/Java/officefloor/benchmark_config.json index 43d5298c436..23a64a4dea3 100644 --- a/frameworks/Java/officefloor/benchmark_config.json +++ b/frameworks/Java/officefloor/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "officefloor", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "None", "webserver": "None", diff --git a/frameworks/Java/permeagility/benchmark_config.json b/frameworks/Java/permeagility/benchmark_config.json index d2a33719407..97770cfb731 100644 --- a/frameworks/Java/permeagility/benchmark_config.json +++ b/frameworks/Java/permeagility/benchmark_config.json @@ -15,7 +15,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "PermeAgility", "webserver": "None", diff --git a/frameworks/Java/play1/benchmark_config.json b/frameworks/Java/play1/benchmark_config.json index 5c8b31c516b..35a87811c35 100644 --- a/frameworks/Java/play1/benchmark_config.json +++ b/frameworks/Java/play1/benchmark_config.json @@ -12,7 +12,7 @@ "database": "MySQL", "framework": "play1", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "Netty", "webserver": "None", diff --git a/frameworks/Java/play2-java/benchmark_config.json b/frameworks/Java/play2-java/benchmark_config.json index e0dbd935402..e583c700335 100644 --- a/frameworks/Java/play2-java/benchmark_config.json +++ b/frameworks/Java/play2-java/benchmark_config.json @@ -7,7 +7,7 @@ "setup_file": "setup_java", "framework": "play2", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "os": "Linux", "database": "None", @@ -27,7 +27,7 @@ "setup_file": "setup_java_ebean_hikaricp", "framework": "play2", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "os": "Linux", "database": "MySQL", @@ -49,7 +49,7 @@ "setup_file": "setup_java_jpa_hikaricp", "framework": "play2", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "os": "Linux", "database": "MySQL", diff --git a/frameworks/Java/rapidoid/benchmark_config.json b/frameworks/Java/rapidoid/benchmark_config.json index f86f64d2301..fe5debed483 100644 --- a/frameworks/Java/rapidoid/benchmark_config.json +++ b/frameworks/Java/rapidoid/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Rapidoid", "webserver": "None", diff --git a/frameworks/Java/restexpress/benchmark_config.json b/frameworks/Java/restexpress/benchmark_config.json index 1a248638c31..959517882c5 100644 --- a/frameworks/Java/restexpress/benchmark_config.json +++ b/frameworks/Java/restexpress/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "rest-express", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Netty", "webserver": "None", @@ -31,7 +31,7 @@ "database": "MySQL", "framework": "rest-express", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Netty", "webserver": "None", @@ -51,7 +51,7 @@ "database": "MongoDB", "framework": "rest-express", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Netty", "webserver": "None", diff --git a/frameworks/Java/revenj/benchmark_config.json b/frameworks/Java/revenj/benchmark_config.json index 8f5e06594a1..012e62331fd 100644 --- a/frameworks/Java/revenj/benchmark_config.json +++ b/frameworks/Java/revenj/benchmark_config.json @@ -15,7 +15,7 @@ "database": "Postgres", "framework": "Revenj.JVM", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Java/sabina/benchmark_config.json b/frameworks/Java/sabina/benchmark_config.json index 7378bffa62e..9c4b199b207 100755 --- a/frameworks/Java/sabina/benchmark_config.json +++ b/frameworks/Java/sabina/benchmark_config.json @@ -16,7 +16,7 @@ "database": "MongoDB", "framework": "Sabina", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "None", @@ -41,7 +41,7 @@ "database": "MySQL", "framework": "Sabina", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "None", @@ -66,7 +66,7 @@ "database": "MySQL", "framework": "Sabina", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "None", @@ -91,7 +91,7 @@ "database": "MongoDB", "framework": "Sabina", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "None", diff --git a/frameworks/Java/servlet/benchmark_config.json b/frameworks/Java/servlet/benchmark_config.json index d9f75513f65..aba361c4fe4 100644 --- a/frameworks/Java/servlet/benchmark_config.json +++ b/frameworks/Java/servlet/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "Resin", @@ -33,7 +33,7 @@ "database": "MySQL", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "Resin", @@ -54,7 +54,7 @@ "database": "Postgres", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Java/servlet3-cass/benchmark_config.json b/frameworks/Java/servlet3-cass/benchmark_config.json index c0adff8b367..5e48cc88a2e 100644 --- a/frameworks/Java/servlet3-cass/benchmark_config.json +++ b/frameworks/Java/servlet3-cass/benchmark_config.json @@ -31,7 +31,7 @@ "database": "Cassandra", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Java/spark/benchmark_config.json b/frameworks/Java/spark/benchmark_config.json index 39e01ab458b..884f400b9bf 100644 --- a/frameworks/Java/spark/benchmark_config.json +++ b/frameworks/Java/spark/benchmark_config.json @@ -13,7 +13,7 @@ "database": "MySQL", "framework": "spark", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Java/spring/benchmark_config.json b/frameworks/Java/spring/benchmark_config.json index cc38aed57ce..0fde90a366f 100644 --- a/frameworks/Java/spring/benchmark_config.json +++ b/frameworks/Java/spring/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "spring", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "Servlet", "webserver": "Tomcat", diff --git a/frameworks/Java/tapestry/benchmark_config.json b/frameworks/Java/tapestry/benchmark_config.json index a98bdd036f6..66a77fc9678 100644 --- a/frameworks/Java/tapestry/benchmark_config.json +++ b/frameworks/Java/tapestry/benchmark_config.json @@ -14,7 +14,7 @@ "database": "MySQL", "framework": "tapestry", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Java/undertow-edge/benchmark_config.json b/frameworks/Java/undertow-edge/benchmark_config.json index f5565129486..c2ef5ddb598 100644 --- a/frameworks/Java/undertow-edge/benchmark_config.json +++ b/frameworks/Java/undertow-edge/benchmark_config.json @@ -12,7 +12,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Undertow", "webserver": "None", @@ -34,7 +34,7 @@ "database": "MySQL", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Undertow", "webserver": "None", @@ -56,7 +56,7 @@ "database": "Postgres", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Undertow", "webserver": "None", @@ -78,7 +78,7 @@ "database": "MongoDB", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Undertow", "webserver": "None", diff --git a/frameworks/Java/undertow-jersey-c3p0/benchmark_config.json b/frameworks/Java/undertow-jersey-c3p0/benchmark_config.json index 3a45bf56410..99fa450f297 100644 --- a/frameworks/Java/undertow-jersey-c3p0/benchmark_config.json +++ b/frameworks/Java/undertow-jersey-c3p0/benchmark_config.json @@ -14,7 +14,7 @@ "database": "MySQL", "framework": "Jersey", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "JAX-RS", "webserver": "None", diff --git a/frameworks/Java/undertow/benchmark_config.json b/frameworks/Java/undertow/benchmark_config.json index 846cb34be6f..ecbcbb0adbb 100644 --- a/frameworks/Java/undertow/benchmark_config.json +++ b/frameworks/Java/undertow/benchmark_config.json @@ -12,7 +12,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Undertow", "webserver": "None", @@ -34,7 +34,7 @@ "database": "MySQL", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Undertow", "webserver": "None", @@ -56,7 +56,7 @@ "database": "Postgres", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Undertow", "webserver": "None", @@ -78,7 +78,7 @@ "database": "MongoDB", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Undertow", "webserver": "None", diff --git a/frameworks/Java/vertx-web/benchmark_config.json b/frameworks/Java/vertx-web/benchmark_config.json index 69780d0f4dc..e35fbd79a9d 100644 --- a/frameworks/Java/vertx-web/benchmark_config.json +++ b/frameworks/Java/vertx-web/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "vertx-web", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "vertx", "webserver": "None", @@ -33,7 +33,7 @@ "database": "MongoDB", "framework": "vertx-web", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "vertx", "webserver": "None", @@ -55,7 +55,7 @@ "database": "Postgres", "framework": "vertx-web", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "vertx", "webserver": "None", @@ -77,7 +77,7 @@ "database": "Postgres", "framework": "vertx-web", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "vertx", "webserver": "None", diff --git a/frameworks/Java/vertx/benchmark_config.json b/frameworks/Java/vertx/benchmark_config.json index 972dd72b9e2..34a9e3f0b1c 100755 --- a/frameworks/Java/vertx/benchmark_config.json +++ b/frameworks/Java/vertx/benchmark_config.json @@ -11,7 +11,7 @@ "database": "None", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Raw", "platform": "Netty", "webserver": "None", diff --git a/frameworks/Java/wicket/benchmark_config.json b/frameworks/Java/wicket/benchmark_config.json index fa0d36075df..be4b9ccb83f 100644 --- a/frameworks/Java/wicket/benchmark_config.json +++ b/frameworks/Java/wicket/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "wicket", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "Servlet", "webserver": "Resin", diff --git a/frameworks/Java/wildfly-ee7/benchmark_config.json b/frameworks/Java/wildfly-ee7/benchmark_config.json index 312ae9056fa..2e3fea8f2b8 100644 --- a/frameworks/Java/wildfly-ee7/benchmark_config.json +++ b/frameworks/Java/wildfly-ee7/benchmark_config.json @@ -15,7 +15,7 @@ "database": "MySQL", "framework": "None", "language": "Java", - "flavor": "Java8", + "flavor": "None", "orm": "Full", "platform": "Servlet", "webserver": "Wildfly", From d581f1d7a99556f5135360ed4929ccb0e6e7fba8 Mon Sep 17 00:00:00 2001 From: "A. Shawn Bandy" Date: Thu, 13 Oct 2016 18:29:24 +0000 Subject: [PATCH 06/11] metadata cleanup: remove plaintext, json and fortune from db permutations in fasthttp. --- frameworks/Go/fasthttp/benchmark_config.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/frameworks/Go/fasthttp/benchmark_config.json b/frameworks/Go/fasthttp/benchmark_config.json index 2c85564d384..418e533ed8e 100644 --- a/frameworks/Go/fasthttp/benchmark_config.json +++ b/frameworks/Go/fasthttp/benchmark_config.json @@ -27,12 +27,9 @@ }, "mysql-prefork": { "setup_file": "setup-mysql-prefork", - "json_url": "/json", "db_url": "/db", "query_url": "/queries?queries=", - "fortune_url": "/fortune", "update_url": "/update?queries=", - "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", "classification": "Platform", @@ -51,12 +48,9 @@ }, "postgresql": { "setup_file": "setup-postgresql", - "json_url": "/json", "db_url": "/db", "query_url": "/queries?queries=", - "fortune_url": "/fortune", "update_url": "/update?queries=", - "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", "classification": "Platform", @@ -75,12 +69,9 @@ }, "postgresql-prefork": { "setup_file": "setup-postgresql-prefork", - "json_url": "/json", "db_url": "/db", "query_url": "/queries?queries=", - "fortune_url": "/fortune", "update_url": "/update?queries=", - "plaintext_url": "/plaintext", "port": 8080, "approach": "Realistic", "classification": "Platform", From 1025002951cbb26c357ed196a4026a328670e79d Mon Sep 17 00:00:00 2001 From: "A. Shawn Bandy" Date: Tue, 18 Oct 2016 18:06:51 +0000 Subject: [PATCH 07/11] metadata cleanup: Reviewed and cleaned-up platforms, following from https://docs.google.com/spreadsheets/d/1S2JA2BeggUAN6_AzzCZPvF5C-sIJObzqbmLul15pYAU/edit?usp=sharing --- frameworks/C++/ffead-cpp/benchmark_config.json | 3 +-- frameworks/C++/poco/benchmark_config.json | 3 +-- frameworks/C++/treefrog/benchmark_config.json | 4 ++-- frameworks/C++/ulib/benchmark_config.json | 18 +++++++++--------- frameworks/C/onion/benchmark_config.json | 4 ++-- .../Clojure/http-kit/benchmark_config.json | 4 ++-- .../Clojure/luminus/benchmark_config.json | 2 +- frameworks/Java/rapidoid/benchmark_config.json | 2 +- .../JavaScript/ringojs/benchmark_config.json | 2 +- frameworks/Nim/jester/benchmark_config.json | 2 +- .../Perl/mojolicious/benchmark_config.json | 3 +-- .../Python/cherrypy/benchmark_config.json | 4 ++-- frameworks/Python/django/benchmark_config.json | 12 ++++++------ frameworks/Python/falcon/benchmark_config.json | 12 ++++++------ frameworks/Python/flask/benchmark_config.json | 6 +++--- .../Python/pyramid/benchmark_config.json | 8 ++++---- .../Python/tornado/benchmark_config.json | 12 ++++++------ frameworks/Python/uwsgi/benchmark_config.json | 4 ++-- .../Python/wheezyweb/benchmark_config.json | 8 ++++---- frameworks/Python/wsgi/benchmark_config.json | 4 ++-- .../Ruby/ngx_mruby/benchmark_config.json | 2 +- .../Scala/spray-es/benchmark_config.json | 4 ++-- frameworks/Scala/spray/benchmark_config.json | 2 +- 23 files changed, 61 insertions(+), 64 deletions(-) diff --git a/frameworks/C++/ffead-cpp/benchmark_config.json b/frameworks/C++/ffead-cpp/benchmark_config.json index 36d0562938d..8bd6d66076d 100644 --- a/frameworks/C++/ffead-cpp/benchmark_config.json +++ b/frameworks/C++/ffead-cpp/benchmark_config.json @@ -11,7 +11,7 @@ "update_url": "/te-benchmark/updates?queries=", "port": 8080, "approach": "Realistic", - "classification": "Framework", + "classification": "micro", "database": "MongoDB", "framework": "ffead-cpp", "language": "C++", @@ -27,4 +27,3 @@ } }] } - diff --git a/frameworks/C++/poco/benchmark_config.json b/frameworks/C++/poco/benchmark_config.json index e7d4f1c583e..1de4a1b0062 100644 --- a/frameworks/C++/poco/benchmark_config.json +++ b/frameworks/C++/poco/benchmark_config.json @@ -12,7 +12,7 @@ "language": "C++", "flavor": "None", "orm": "Raw", - "platform": "POCO", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", @@ -22,4 +22,3 @@ } }] } - diff --git a/frameworks/C++/treefrog/benchmark_config.json b/frameworks/C++/treefrog/benchmark_config.json index fcbd88fe3f3..fd5402314f1 100644 --- a/frameworks/C++/treefrog/benchmark_config.json +++ b/frameworks/C++/treefrog/benchmark_config.json @@ -16,7 +16,7 @@ "framework": "treefrog", "language": "C++", "orm": "Micro", - "platform": "Treefrog", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", @@ -87,7 +87,7 @@ "framework": "treefrog", "language": "C++", "orm": "Micro", - "platform": "Treefrog", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/C++/ulib/benchmark_config.json b/frameworks/C++/ulib/benchmark_config.json index c4b768a07bd..70c4285c17f 100644 --- a/frameworks/C++/ulib/benchmark_config.json +++ b/frameworks/C++/ulib/benchmark_config.json @@ -11,7 +11,7 @@ "framework": "ULib", "language": "C++", "orm": "Micro", - "platform": "ULib", + "platform": "None", "webserver": "ULib", "os": "Linux", "database_os": "Linux", @@ -29,7 +29,7 @@ "framework": "ULib", "language": "C++", "orm": "Micro", - "platform": "ULib", + "platform": "None", "webserver": "ULib", "os": "Linux", "database_os": "Linux", @@ -47,7 +47,7 @@ "framework": "ULib", "language": "C++", "orm": "Micro", - "platform": "ULib", + "platform": "None", "webserver": "ULib", "os": "Linux", "database_os": "Linux", @@ -65,7 +65,7 @@ "framework": "ULib", "language": "C++", "orm": "Micro", - "platform": "ULib", + "platform": "None", "webserver": "ULib", "os": "Linux", "database_os": "Linux", @@ -83,7 +83,7 @@ "framework": "ULib", "language": "C++", "orm": "Micro", - "platform": "ULib", + "platform": "None", "webserver": "ULib", "os": "Linux", "database_os": "Linux", @@ -104,7 +104,7 @@ "framework": "ULib", "language": "C++", "orm": "Micro", - "platform": "ULib", + "platform": "None", "webserver": "ULib", "os": "Linux", "database_os": "Linux", @@ -125,7 +125,7 @@ "framework": "ULib", "language": "C++", "orm": "Micro", - "platform": "ULib", + "platform": "None", "webserver": "ULib", "os": "Linux", "database_os": "Linux", @@ -145,7 +145,7 @@ "framework": "ULib", "language": "C++", "orm": "Micro", - "platform": "ULib", + "platform": "None", "webserver": "ULib", "os": "Linux", "database_os": "Linux", @@ -166,7 +166,7 @@ "framework": "ULib", "language": "C++", "orm": "Micro", - "platform": "ULib", + "platform": "None", "webserver": "ULib", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/C/onion/benchmark_config.json b/frameworks/C/onion/benchmark_config.json index 4a2485c0c74..682dbeea910 100644 --- a/frameworks/C/onion/benchmark_config.json +++ b/frameworks/C/onion/benchmark_config.json @@ -12,7 +12,7 @@ "language": "C", "flavor": "None", "orm": "Raw", - "platform": "Onion", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", @@ -33,7 +33,7 @@ "language": "C", "flavor": "None", "orm": "Raw", - "platform": "Onion", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Clojure/http-kit/benchmark_config.json b/frameworks/Clojure/http-kit/benchmark_config.json index d258fc10da3..10322d9466e 100644 --- a/frameworks/Clojure/http-kit/benchmark_config.json +++ b/frameworks/Clojure/http-kit/benchmark_config.json @@ -17,7 +17,7 @@ "language": "Clojure", "flavor": "None", "orm": "Micro", - "platform": "http-kit", + "platform": "Ring", "webserver": "None", "os": "Linux", "database_os": "Linux", @@ -39,7 +39,7 @@ "language": "Clojure", "flavor": "None", "orm": "Raw", - "platform": "http-kit", + "platform": "Ring", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Clojure/luminus/benchmark_config.json b/frameworks/Clojure/luminus/benchmark_config.json index 39f90d58810..ec6ce39f0a7 100644 --- a/frameworks/Clojure/luminus/benchmark_config.json +++ b/frameworks/Clojure/luminus/benchmark_config.json @@ -17,7 +17,7 @@ "language": "Clojure", "flavor": "None", "orm": "Raw", - "platform": "Undertow", + "platform": "Ring", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Java/rapidoid/benchmark_config.json b/frameworks/Java/rapidoid/benchmark_config.json index fe5debed483..abd7b68d5d5 100644 --- a/frameworks/Java/rapidoid/benchmark_config.json +++ b/frameworks/Java/rapidoid/benchmark_config.json @@ -13,7 +13,7 @@ "language": "Java", "flavor": "None", "orm": "Raw", - "platform": "Rapidoid", + "platform": "None", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/JavaScript/ringojs/benchmark_config.json b/frameworks/JavaScript/ringojs/benchmark_config.json index c176db6f641..3a45fcaf6e2 100644 --- a/frameworks/JavaScript/ringojs/benchmark_config.json +++ b/frameworks/JavaScript/ringojs/benchmark_config.json @@ -17,7 +17,7 @@ "language": "JavaScript", "flavor": "RingoJS", "orm": "Raw", - "platform": "ringojs", + "platform": "Jetty", "webserver": "None", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Nim/jester/benchmark_config.json b/frameworks/Nim/jester/benchmark_config.json index bdaf3013427..671670467f8 100644 --- a/frameworks/Nim/jester/benchmark_config.json +++ b/frameworks/Nim/jester/benchmark_config.json @@ -11,7 +11,7 @@ "framework": "jester", "language": "Nim", "orm": "Raw", - "platform": "Nim", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Perl/mojolicious/benchmark_config.json b/frameworks/Perl/mojolicious/benchmark_config.json index 9d88995ec80..8da7182f7a6 100644 --- a/frameworks/Perl/mojolicious/benchmark_config.json +++ b/frameworks/Perl/mojolicious/benchmark_config.json @@ -16,7 +16,7 @@ "framework": "mojolicious", "language": "Perl", "orm": "Raw", - "platform": "Mojolicious", + "platform": "None", "webserver": "Hypnotoad", "os": "Linux", "database_os": "Linux", @@ -26,4 +26,3 @@ } }] } - diff --git a/frameworks/Python/cherrypy/benchmark_config.json b/frameworks/Python/cherrypy/benchmark_config.json index cb0accaef67..10b8367f2dc 100644 --- a/frameworks/Python/cherrypy/benchmark_config.json +++ b/frameworks/Python/cherrypy/benchmark_config.json @@ -13,7 +13,7 @@ "approach": "Realistic", "classification": "Micro", "database": "MySQL", - "framework": "CherryPy", + "framework": "None", "language": "Python", "flavor": "Python2", "orm": "Full", @@ -36,7 +36,7 @@ "approach": "Realistic", "classification": "Micro", "database": "MySQL", - "framework": "CherryPy", + "framework": "None", "language": "Python", "flavor": "Python3", "orm": "Full", diff --git a/frameworks/Python/django/benchmark_config.json b/frameworks/Python/django/benchmark_config.json index 55323e5e6ba..25d2e9db4b5 100644 --- a/frameworks/Python/django/benchmark_config.json +++ b/frameworks/Python/django/benchmark_config.json @@ -17,8 +17,8 @@ "language": "Python", "flavor": "Python2", "orm": "Full", - "platform": "Meinheld", - "webserver": "None", + "platform": "None", + "webserver": "Meinheld", "os": "Linux", "database_os": "Linux", "display_name": "Django", @@ -41,8 +41,8 @@ "language": "Python", "flavor": "Python3", "orm": "Full", - "platform": "Meinheld", - "webserver": "None", + "platform": "None", + "webserver": "Meinheld", "os": "Linux", "database_os": "Linux", "display_name": "Django", @@ -63,8 +63,8 @@ "language": "Python", "flavor": "Python2", "orm": "Full", - "platform": "Meinheld", - "webserver": "None", + "platform": "None", + "webserver": "Meinheld", "os": "Linux", "database_os": "Linux", "display_name": "Django", diff --git a/frameworks/Python/falcon/benchmark_config.json b/frameworks/Python/falcon/benchmark_config.json index 6b27c95f952..7702251f258 100644 --- a/frameworks/Python/falcon/benchmark_config.json +++ b/frameworks/Python/falcon/benchmark_config.json @@ -13,8 +13,8 @@ "language": "Python", "flavor": "Python2", "orm": "Raw", - "platform": "Gunicorn/Meinheld", - "webserver": "None", + "platform": "None", + "webserver": "Meinheld", "os": "Linux", "database_os": "Linux", "display_name": "Falcon", @@ -33,8 +33,8 @@ "language": "Python", "flavor": "Python3", "orm": "Raw", - "platform": "Gunicorn/Meinheld", - "webserver": "None", + "platform": "None", + "webserver": "Meinheld", "os": "Linux", "database_os": "Linux", "display_name": "Falcon", @@ -53,8 +53,8 @@ "language": "Python", "flavor": "PyPy", "orm": "Raw", - "platform": "Gunicorn/Tornado", - "webserver": "None", + "platform": "None", + "webserver": "Meinheld", "os": "Linux", "database_os": "Linux", "display_name": "Falcon", diff --git a/frameworks/Python/flask/benchmark_config.json b/frameworks/Python/flask/benchmark_config.json index 6fe0b59a399..2bc75ac89f5 100644 --- a/frameworks/Python/flask/benchmark_config.json +++ b/frameworks/Python/flask/benchmark_config.json @@ -87,8 +87,8 @@ "language": "Python", "flavor": "PyPy", "orm": "Full", - "platform": "Tornado", - "webserver": "None", + "platform": "None", + "webserver": "Tornado", "os": "Linux", "database_os": "Linux", "display_name": "Flask", @@ -133,7 +133,7 @@ "language": "Python", "flavor": "Python2", "orm": "Full", - "platform": "uWSGI", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Python/pyramid/benchmark_config.json b/frameworks/Python/pyramid/benchmark_config.json index 02bab899a3d..f7bc97751ce 100644 --- a/frameworks/Python/pyramid/benchmark_config.json +++ b/frameworks/Python/pyramid/benchmark_config.json @@ -17,8 +17,8 @@ "language": "Python", "flavor": "Python3", "orm": "Full", - "platform": "Meinheld", - "webserver": "None", + "platform": "None", + "webserver": "Meinheld", "os": "Linux", "database_os": "Linux", "display_name": "Pyramid", @@ -41,8 +41,8 @@ "language": "Python", "flavor": "Python2", "orm": "Full", - "platform": "Meinheld", - "webserver": "None", + "platform": "None", + "webserver": "Meinheld", "os": "Linux", "database_os": "Linux", "display_name": "Pyramid", diff --git a/frameworks/Python/tornado/benchmark_config.json b/frameworks/Python/tornado/benchmark_config.json index f9b8d8afc6b..1db094b7ba8 100644 --- a/frameworks/Python/tornado/benchmark_config.json +++ b/frameworks/Python/tornado/benchmark_config.json @@ -15,8 +15,8 @@ "language": "Python", "flavor": "Python2", "orm": "Raw", - "platform": "Tornado", - "webserver": "None", + "platform": "None", + "webserver": "Tornado", "os": "Linux", "database_os": "Linux", "display_name": "Tornado-raw", @@ -35,8 +35,8 @@ "language": "Python", "flavor": "Python2", "orm": "Raw", - "platform": "Tornado", - "webserver": "None", + "platform": "None", + "webserver": "Tornado", "os": "Linux", "database_os": "Linux", "display_name": "Tornado-raw", @@ -57,8 +57,8 @@ "language": "Python", "flavor": "Python3", "orm": "Raw", - "platform": "Tornado", - "webserver": "None", + "platform": "None", + "webserver": "Tornado", "os": "Linux", "database_os": "Linux", "display_name": "Tornado-raw", diff --git a/frameworks/Python/uwsgi/benchmark_config.json b/frameworks/Python/uwsgi/benchmark_config.json index 4da6531aee7..52a467107fe 100644 --- a/frameworks/Python/uwsgi/benchmark_config.json +++ b/frameworks/Python/uwsgi/benchmark_config.json @@ -12,7 +12,7 @@ "language": "Python", "flavor": "Python2", "orm": "Raw", - "platform": "wsgi", + "platform": "None", "webserver": "uWSGI", "os": "Linux", "database_os": "Linux", @@ -31,7 +31,7 @@ "language": "Python", "flavor": "Python2", "orm": "Raw", - "platform": "wsgi", + "platform": "None", "webserver": "nginx-uWSGI", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Python/wheezyweb/benchmark_config.json b/frameworks/Python/wheezyweb/benchmark_config.json index 5bb16a157e2..5273cf65b70 100644 --- a/frameworks/Python/wheezyweb/benchmark_config.json +++ b/frameworks/Python/wheezyweb/benchmark_config.json @@ -17,8 +17,8 @@ "language": "Python", "flavor": "Python2", "orm": "Full", - "platform": "Meinheld", - "webserver": "None", + "platform": "None", + "webserver": "Meinheld", "os": "Linux", "database_os": "Linux", "display_name": "wheezy.web", @@ -40,8 +40,8 @@ "language": "Python", "flavor": "Python3", "orm": "Full", - "platform": "Meinheld", - "webserver": "None", + "platform": "None", + "webserver": "Meinheld", "os": "Linux", "database_os": "Linux", "display_name": "wheezy.web", diff --git a/frameworks/Python/wsgi/benchmark_config.json b/frameworks/Python/wsgi/benchmark_config.json index 885c80313a2..577b242b591 100644 --- a/frameworks/Python/wsgi/benchmark_config.json +++ b/frameworks/Python/wsgi/benchmark_config.json @@ -13,8 +13,8 @@ "language": "Python", "flavor": "Python3", "orm": "Raw", - "platform": "Meinheld", - "webserver": "None", + "platform": "None", + "webserver": "Meinheld", "os": "Linux", "database_os": "Linux", "display_name": "wsgi", diff --git a/frameworks/Ruby/ngx_mruby/benchmark_config.json b/frameworks/Ruby/ngx_mruby/benchmark_config.json index b0db32dafc1..db6f3e4ebc6 100644 --- a/frameworks/Ruby/ngx_mruby/benchmark_config.json +++ b/frameworks/Ruby/ngx_mruby/benchmark_config.json @@ -14,7 +14,7 @@ "framework": "ngx_mruby", "language": "Ruby", "orm": "Raw", - "platform": "ngx_mruby", + "platform": "None", "webserver": "nginx", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Scala/spray-es/benchmark_config.json b/frameworks/Scala/spray-es/benchmark_config.json index 95976df0b4e..fd5a51a430c 100644 --- a/frameworks/Scala/spray-es/benchmark_config.json +++ b/frameworks/Scala/spray-es/benchmark_config.json @@ -12,7 +12,7 @@ "framework": "spray-es", "language": "Scala", "orm": "Raw", - "platform": "Spray", + "platform": "None", "webserver": "Spray", "os": "Linux", "database_os": "Linux", @@ -32,7 +32,7 @@ "framework": "spray-es", "language": "Scala", "orm": "Raw", - "platform": "Spray", + "platform": "None", "webserver": "Spray", "os": "Linux", "database_os": "Linux", diff --git a/frameworks/Scala/spray/benchmark_config.json b/frameworks/Scala/spray/benchmark_config.json index 1ccf8d2a6e7..e9978d41df8 100644 --- a/frameworks/Scala/spray/benchmark_config.json +++ b/frameworks/Scala/spray/benchmark_config.json @@ -12,7 +12,7 @@ "framework": "spray", "language": "Scala", "orm": "Raw", - "platform": "Spray", + "platform": "Akka", "webserver": "None", "os": "Linux", "database_os": "Linux", From cc498a33fdbee9c8f895ade96338b8abda0568a7 Mon Sep 17 00:00:00 2001 From: "A. Shawn Bandy" Date: Mon, 24 Oct 2016 20:47:28 +0000 Subject: [PATCH 08/11] cleanup metadata: falcon and turbogears --- frameworks/Python/falcon/benchmark_config.json | 2 +- frameworks/Python/turbogears/benchmark_config.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/Python/falcon/benchmark_config.json b/frameworks/Python/falcon/benchmark_config.json index 7702251f258..fa243c60674 100644 --- a/frameworks/Python/falcon/benchmark_config.json +++ b/frameworks/Python/falcon/benchmark_config.json @@ -54,7 +54,7 @@ "flavor": "PyPy", "orm": "Raw", "platform": "None", - "webserver": "Meinheld", + "webserver": "Tornado", "os": "Linux", "database_os": "Linux", "display_name": "Falcon", diff --git a/frameworks/Python/turbogears/benchmark_config.json b/frameworks/Python/turbogears/benchmark_config.json index 102949caf2c..6ee4afd10fa 100644 --- a/frameworks/Python/turbogears/benchmark_config.json +++ b/frameworks/Python/turbogears/benchmark_config.json @@ -17,8 +17,8 @@ "language": "Python", "flavor": "Python2", "orm": "Full", - "platform": "Meinheld", - "webserver": "None", + "platform": "None", + "webserver": "Meinheld", "os": "Linux", "database_os": "Linux", "display_name": "TurboGears", From 5a44173e735b674a1df4483e808e52a75377b29d Mon Sep 17 00:00:00 2001 From: "A. Shawn Bandy" Date: Mon, 24 Oct 2016 23:59:36 +0000 Subject: [PATCH 09/11] metadata cleanup: reduce ulib json permutations --- frameworks/C++/ulib/benchmark_config.json | 76 +---------------------- 1 file changed, 1 insertion(+), 75 deletions(-) diff --git a/frameworks/C++/ulib/benchmark_config.json b/frameworks/C++/ulib/benchmark_config.json index 70c4285c17f..4ca90115078 100644 --- a/frameworks/C++/ulib/benchmark_config.json +++ b/frameworks/C++/ulib/benchmark_config.json @@ -19,7 +19,7 @@ "notes": "", "versus": "" }, - "json_normal": { + "json": { "setup_file": "setup_json", "json_url": "/json", "port": 8080, @@ -37,60 +37,6 @@ "notes": "", "versus": "" }, - "json_medium": { - "setup_file": "setup_json_medium", - "json_url": "/json", - "port": 8080, - "approach": "Realistic", - "classification": "Platform", - "database": "None", - "framework": "ULib", - "language": "C++", - "orm": "Micro", - "platform": "None", - "webserver": "ULib", - "os": "Linux", - "database_os": "Linux", - "display_name": "ULib", - "notes": "", - "versus": "" - }, - "json_large": { - "setup_file": "setup_json_large", - "json_url": "/json", - "port": 8080, - "approach": "Realistic", - "classification": "Platform", - "database": "None", - "framework": "ULib", - "language": "C++", - "orm": "Micro", - "platform": "None", - "webserver": "ULib", - "os": "Linux", - "database_os": "Linux", - "display_name": "ULib", - "notes": "", - "versus": "" - }, - "json_extra": { - "setup_file": "setup_json_extra", - "json_url": "/json", - "port": 8080, - "approach": "Realistic", - "classification": "Platform", - "database": "None", - "framework": "ULib", - "language": "C++", - "orm": "Micro", - "platform": "None", - "webserver": "ULib", - "os": "Linux", - "database_os": "Linux", - "display_name": "ULib", - "notes": "", - "versus": "" - }, "mysql": { "setup_file": "setup_mysql", "db_url": "/db", @@ -133,26 +79,6 @@ "notes": "", "versus": "" }, - "sqlite": { - "setup_file": "setup_sqlite", - "db_url": "/db", - "query_url": "/query?queries=", - "fortune_url": "/fortune", - "port": 8080, - "approach": "Realistic", - "classification": "Platform", - "database": "SQLite", - "framework": "ULib", - "language": "C++", - "orm": "Micro", - "platform": "None", - "webserver": "ULib", - "os": "Linux", - "database_os": "Linux", - "display_name": "ULib-sqlite", - "notes": "", - "versus": "" - }, "mongodb": { "setup_file": "setup_mongodb", "db_url": "/mdb", From 9e2c5b96c47b4fd363d211f5a70c1d0af2c235de Mon Sep 17 00:00:00 2001 From: "A. Shawn Bandy" Date: Tue, 25 Oct 2016 22:29:15 +0000 Subject: [PATCH 10/11] metadata cleanup: remove fasthttp non-prefork for mysql. --- frameworks/Go/fasthttp/benchmark_config.json | 21 -------------------- 1 file changed, 21 deletions(-) diff --git a/frameworks/Go/fasthttp/benchmark_config.json b/frameworks/Go/fasthttp/benchmark_config.json index 418e533ed8e..a82eeacf919 100644 --- a/frameworks/Go/fasthttp/benchmark_config.json +++ b/frameworks/Go/fasthttp/benchmark_config.json @@ -46,27 +46,6 @@ "notes": "", "versus": "go" }, - "postgresql": { - "setup_file": "setup-postgresql", - "db_url": "/db", - "query_url": "/queries?queries=", - "update_url": "/update?queries=", - "port": 8080, - "approach": "Realistic", - "classification": "Platform", - "database": "Postgres", - "framework": "None", - "language": "Go", - "flavor": "None", - "orm": "Raw", - "platform": "None", - "webserver": "None", - "os": "Linux", - "database_os": "Linux", - "display_name": "FastHTTP", - "notes": "", - "versus": "go" - }, "postgresql-prefork": { "setup_file": "setup-postgresql-prefork", "db_url": "/db", From 9d3454a98b83429b2ae3bad4053740e3fe569e1b Mon Sep 17 00:00:00 2001 From: "A. Shawn Bandy" Date: Wed, 26 Oct 2016 17:11:27 +0000 Subject: [PATCH 11/11] metadata cleanup: remove undertow edge --- .travis.yml | 1 - frameworks/Java/undertow-edge/README.md | 17 -- .../Java/undertow-edge/benchmark_config.json | 93 -------- frameworks/Java/undertow-edge/pom.xml | 219 ------------------ frameworks/Java/undertow-edge/setup.sh | 8 - frameworks/Java/undertow-edge/source_code | 4 - .../src/main/java/hello/CacheHandler.java | 37 --- .../src/main/java/hello/DbMongoHandler.java | 68 ------ .../src/main/java/hello/DbSqlHandler.java | 75 ------ .../src/main/java/hello/Fortune.java | 25 -- .../main/java/hello/FortunesMongoHandler.java | 55 ----- .../main/java/hello/FortunesSqlHandler.java | 61 ----- .../src/main/java/hello/HelloWebServer.java | 161 ------------- .../src/main/java/hello/Helper.java | 82 ------- .../src/main/java/hello/JsonHandler.java | 32 --- .../src/main/java/hello/PlaintextHandler.java | 33 --- .../main/java/hello/UpdatesMongoHandler.java | 60 ----- .../main/java/hello/UpdatesSqlHandler.java | 63 ----- .../src/main/java/hello/World.java | 20 -- .../main/resources/hello/fortunes.mustache | 20 -- .../main/resources/hello/server.properties | 14 -- 21 files changed, 1148 deletions(-) delete mode 100644 frameworks/Java/undertow-edge/README.md delete mode 100644 frameworks/Java/undertow-edge/benchmark_config.json delete mode 100644 frameworks/Java/undertow-edge/pom.xml delete mode 100755 frameworks/Java/undertow-edge/setup.sh delete mode 100644 frameworks/Java/undertow-edge/source_code delete mode 100644 frameworks/Java/undertow-edge/src/main/java/hello/CacheHandler.java delete mode 100644 frameworks/Java/undertow-edge/src/main/java/hello/DbMongoHandler.java delete mode 100644 frameworks/Java/undertow-edge/src/main/java/hello/DbSqlHandler.java delete mode 100644 frameworks/Java/undertow-edge/src/main/java/hello/Fortune.java delete mode 100644 frameworks/Java/undertow-edge/src/main/java/hello/FortunesMongoHandler.java delete mode 100644 frameworks/Java/undertow-edge/src/main/java/hello/FortunesSqlHandler.java delete mode 100644 frameworks/Java/undertow-edge/src/main/java/hello/HelloWebServer.java delete mode 100644 frameworks/Java/undertow-edge/src/main/java/hello/Helper.java delete mode 100644 frameworks/Java/undertow-edge/src/main/java/hello/JsonHandler.java delete mode 100644 frameworks/Java/undertow-edge/src/main/java/hello/PlaintextHandler.java delete mode 100644 frameworks/Java/undertow-edge/src/main/java/hello/UpdatesMongoHandler.java delete mode 100644 frameworks/Java/undertow-edge/src/main/java/hello/UpdatesSqlHandler.java delete mode 100644 frameworks/Java/undertow-edge/src/main/java/hello/World.java delete mode 100644 frameworks/Java/undertow-edge/src/main/resources/hello/fortunes.mustache delete mode 100644 frameworks/Java/undertow-edge/src/main/resources/hello/server.properties diff --git a/.travis.yml b/.travis.yml index 986e7198474..d7ac5004dba 100755 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,6 @@ env: - "TESTDIR=Java/spring" - "TESTDIR=Java/tapestry" - "TESTDIR=Java/undertow" - - "TESTDIR=Java/undertow-edge" - "TESTDIR=Java/undertow-jersey-c3p0" - "TESTDIR=Java/undertow-jersey-hikaricp" - "TESTDIR=Java/vertx" diff --git a/frameworks/Java/undertow-edge/README.md b/frameworks/Java/undertow-edge/README.md deleted file mode 100644 index 1e1a99df5e8..00000000000 --- a/frameworks/Java/undertow-edge/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# Undertow Edge Benchmarking Test - -This is the undertow portion of a [benchmarking test suite](../) comparing a variety of web development platforms. - -Edge version of undertow framework uses native implementation of xnio instead of NIO - -### JSON Encoding Test -* [JSON test source](src/main/java/hello/HelloWebServer.java) - -## Versions -Undertow 1.0.0.Beta31 (http://undertow.io) - -## Test URLs - -### JSON Encoding Test - - http://localhost:8080 diff --git a/frameworks/Java/undertow-edge/benchmark_config.json b/frameworks/Java/undertow-edge/benchmark_config.json deleted file mode 100644 index c2ef5ddb598..00000000000 --- a/frameworks/Java/undertow-edge/benchmark_config.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "framework": "undertow-edge", - "tests": [{ - "default": { - "setup_file": "setup", - "json_url": "/json", - "plaintext_url": "/plaintext", - "cache_url": "/cache", - "port": 8080, - "approach": "Stripped", - "classification": "Platform", - "database": "None", - "framework": "None", - "language": "Java", - "flavor": "None", - "orm": "Raw", - "platform": "Undertow", - "webserver": "None", - "os": "Linux", - "database_os": "Linux", - "display_name": "undertow edge", - "notes": "", - "versus": "" - }, - "mysql" : { - "setup_file": "setup", - "db_url": "/db/mysql", - "query_url": "/queries/mysql?queries=", - "fortune_url": "/fortunes/mysql", - "update_url": "/updates/mysql?queries=", - "port": 8080, - "approach": "Stripped", - "classification": "Platform", - "database": "MySQL", - "framework": "None", - "language": "Java", - "flavor": "None", - "orm": "Raw", - "platform": "Undertow", - "webserver": "None", - "os": "Linux", - "database_os": "Linux", - "display_name": "undertow edge", - "notes": "", - "versus": "" - }, - "postgresql" : { - "setup_file": "setup", - "db_url": "/db/postgresql", - "query_url": "/queries/postgresql?queries=", - "fortune_url": "/fortunes/postgresql", - "update_url": "/updates/postgresql?queries=", - "port": 8080, - "approach": "Stripped", - "classification": "Platform", - "database": "Postgres", - "framework": "None", - "language": "Java", - "flavor": "None", - "orm": "Raw", - "platform": "Undertow", - "webserver": "None", - "os": "Linux", - "database_os": "Linux", - "display_name": "undertow edge", - "notes": "", - "versus": "" - }, - "mongodb" : { - "setup_file": "setup", - "db_url": "/db/mongodb", - "query_url": "/queries/mongodb?queries=", - "fortune_url": "/fortunes/mongodb", - "update_url": "/updates/mongodb?queries=", - "port": 8080, - "approach": "Stripped", - "classification": "Platform", - "database": "MongoDB", - "framework": "None", - "language": "Java", - "flavor": "None", - "orm": "Raw", - "platform": "Undertow", - "webserver": "None", - "os": "Linux", - "database_os": "Linux", - "display_name": "undertow edge", - "notes": "", - "versus": "" - } - }] -} - diff --git a/frameworks/Java/undertow-edge/pom.xml b/frameworks/Java/undertow-edge/pom.xml deleted file mode 100644 index 020217250b5..00000000000 --- a/frameworks/Java/undertow-edge/pom.xml +++ /dev/null @@ -1,219 +0,0 @@ - - - 4.0.0 - - org.jboss - jboss-parent - 12 - - - com.techempower - undertow-edge - 0.1 - - - 9.4.1208 - - - - - - io.undertow - undertow-core - 1.0.13.Final - - - org.jboss.xnio - xnio-nio - - - - - org.jboss.xnio - xnio-api - 3.2.1.Final - - - org.jboss.xnio - xnio-native - 1.0.0.Beta1 - - - - mysql - mysql-connector-java - 5.1.38 - - - org.postgresql - postgresql - ${postgres-jdbc.version} - - - org.mongodb - mongo-java-driver - 2.11.2 - - - - commons-dbcp - commons-dbcp - 1.4 - - - - com.google.guava - guava - 14.0.1 - - - - com.fasterxml.jackson.core - jackson-databind - 2.3.0 - - - com.fasterxml.jackson.core - jackson-annotations - 2.3.0 - - - com.fasterxml.jackson.core - jackson-core - 2.3.0 - - - - com.github.spullara.mustache.java - compiler - 0.8.13 - - - - - - - true - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - true - false - - - - com.googlecode.maven-download-plugin - maven-download-plugin - 1.1.0 - - - install-xnio-native - prepare-package - - wget - - - http://downloads.jboss.org/xnio/native/1.0/1.0.0.Beta1/xnio-native-1.0.0.Beta1.zip - true - ${project.build.directory} - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - package - - - - - - - - - run - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.4 - - - - hello.HelloWebServer - - - - - - jar-with-dependencies - - - - - make-assembly - - package - - - single - - - - - - - - - 32bit-native - - - x86 - - - - linux-i686/libxnio.so - - - - - 64bit-native - - - amd64 - - - - linux-x86_64/libxnio.so - - - - - - jboss-public-repository-group - JBoss Public Maven Repository Group - https://repository.jboss.org/nexus/content/groups/public/ - default - - true - never - - - true - never - - - - - diff --git a/frameworks/Java/undertow-edge/setup.sh b/frameworks/Java/undertow-edge/setup.sh deleted file mode 100755 index 77d13868793..00000000000 --- a/frameworks/Java/undertow-edge/setup.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -sed -i 's|127.0.0.1|'${DBHOST}'|g' src/main/resources/hello/server.properties - -fw_depends java maven - -mvn clean package -java -Djava.library.path=target/ -jar target/undertow-edge-0.1-jar-with-dependencies.jar & diff --git a/frameworks/Java/undertow-edge/source_code b/frameworks/Java/undertow-edge/source_code deleted file mode 100644 index cb345d9cb2d..00000000000 --- a/frameworks/Java/undertow-edge/source_code +++ /dev/null @@ -1,4 +0,0 @@ -./undertow/src/main/java/hello/ -./undertow/src/main/java/hello/HelloWebServer.java -./undertow/src/main/java/hello/World.java -./undertow/src/main/java/hello/Fortune.java diff --git a/frameworks/Java/undertow-edge/src/main/java/hello/CacheHandler.java b/frameworks/Java/undertow-edge/src/main/java/hello/CacheHandler.java deleted file mode 100644 index 0f84c8f704d..00000000000 --- a/frameworks/Java/undertow-edge/src/main/java/hello/CacheHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package hello; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.cache.LoadingCache; -import io.undertow.server.HttpHandler; -import io.undertow.server.HttpServerExchange; -import io.undertow.util.Headers; - -import java.util.Objects; - -import static hello.HelloWebServer.JSON_UTF8; - -/** - * Handles the cache access test. - */ -final class CacheHandler implements HttpHandler { - private final ObjectMapper objectMapper; - private final LoadingCache worldCache; - - CacheHandler(ObjectMapper objectMapper, - LoadingCache worldCache) { - this.objectMapper = Objects.requireNonNull(objectMapper); - this.worldCache = Objects.requireNonNull(worldCache); - } - - @Override - public void handleRequest(HttpServerExchange exchange) throws Exception { - int queries = Helper.getQueries(exchange); - World[] worlds = new World[queries]; - for (int i = 0; i < queries; i++) { - worlds[i] = worldCache.get(Helper.randomWorld()); - } - exchange.getResponseHeaders().put( - Headers.CONTENT_TYPE, JSON_UTF8); - exchange.getResponseSender().send(objectMapper.writeValueAsString(worlds)); - } -} diff --git a/frameworks/Java/undertow-edge/src/main/java/hello/DbMongoHandler.java b/frameworks/Java/undertow-edge/src/main/java/hello/DbMongoHandler.java deleted file mode 100644 index cc50400acfb..00000000000 --- a/frameworks/Java/undertow-edge/src/main/java/hello/DbMongoHandler.java +++ /dev/null @@ -1,68 +0,0 @@ -package hello; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.mongodb.BasicDBObject; -import com.mongodb.DB; -import com.mongodb.DBObject; -import io.undertow.server.HttpHandler; -import io.undertow.server.HttpServerExchange; -import io.undertow.util.Headers; - -import java.util.Objects; - -import static hello.HelloWebServer.JSON_UTF8; - -/** - * Handles the single- and multiple-query database tests using MongoDB. - */ -final class DbMongoHandler implements HttpHandler { - private final ObjectMapper objectMapper; - private final DB database; - private final boolean multiple; - - DbMongoHandler(ObjectMapper objectMapper, DB database, boolean multiple) { - this.objectMapper = Objects.requireNonNull(objectMapper); - this.database = Objects.requireNonNull(database); - this.multiple = multiple; - } - - @Override - public void handleRequest(HttpServerExchange exchange) throws Exception { - if (exchange.isInIoThread()) { - exchange.dispatch(this); - return; - } - - int queries = 1; - if(multiple) - { - queries = Helper.getQueries(exchange); - } - - World[] worlds = new World[queries]; - for (int i = 0; i < queries; i++) { - DBObject object = database.getCollection("World").findOne( - new BasicDBObject("_id", Helper.randomWorld())); - worlds[i] = new World( - // - // The creation script for the Mongo database inserts these numbers as - // JavaScript numbers, which resolve to Doubles in Java. - // - ((Number) object.get("_id")).intValue(), - ((Number) object.get("randomNumber")).intValue()); - } - exchange.getResponseHeaders().put( - Headers.CONTENT_TYPE, JSON_UTF8); - - if (multiple) - { - // If a multiple query then response must be an array - exchange.getResponseSender().send(objectMapper.writeValueAsString(worlds)); - } - else - { - // If a single query then response must be an object - exchange.getResponseSender().send(objectMapper.writeValueAsString(worlds[0])); - } - } -} diff --git a/frameworks/Java/undertow-edge/src/main/java/hello/DbSqlHandler.java b/frameworks/Java/undertow-edge/src/main/java/hello/DbSqlHandler.java deleted file mode 100644 index 050801f6e55..00000000000 --- a/frameworks/Java/undertow-edge/src/main/java/hello/DbSqlHandler.java +++ /dev/null @@ -1,75 +0,0 @@ -package hello; - -import com.fasterxml.jackson.databind.ObjectMapper; - -import io.undertow.server.HttpHandler; -import io.undertow.server.HttpServerExchange; -import io.undertow.util.Headers; - -import javax.sql.DataSource; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.Objects; - -import static hello.HelloWebServer.JSON_UTF8; - -/** - * Handles the single- and multiple-query database tests using a SQL database. - */ -final class DbSqlHandler implements HttpHandler { - private final ObjectMapper objectMapper; - private final DataSource database; - private final boolean multiple; - - DbSqlHandler(ObjectMapper objectMapper, DataSource database, boolean multiple) { - this.objectMapper = Objects.requireNonNull(objectMapper); - this.database = Objects.requireNonNull(database); - this.multiple = multiple; - } - - @Override - public void handleRequest(HttpServerExchange exchange) throws Exception { - if (exchange.isInIoThread()) { - exchange.dispatch(this); - return; - } - - int queries = 1; - if(multiple) - { - queries = Helper.getQueries(exchange); - } - - World[] worlds = new World[queries]; - try (Connection connection = database.getConnection(); - PreparedStatement statement = connection.prepareStatement( - "SELECT * FROM World WHERE id = ?", - ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY)) { - for (int i = 0; i < queries; i++) { - statement.setInt(1, Helper.randomWorld()); - try (ResultSet resultSet = statement.executeQuery()) { - resultSet.next(); - worlds[i] = new World( - resultSet.getInt("id"), - resultSet.getInt("randomNumber")); - } - } - } - exchange.getResponseHeaders().put( - Headers.CONTENT_TYPE, JSON_UTF8); - - if (multiple) - { - // If a multiple query then response must be an array - exchange.getResponseSender().send(objectMapper.writeValueAsString(worlds)); - } - else - { - // If a single query then response must be an object - exchange.getResponseSender().send(objectMapper.writeValueAsString(worlds[0])); - } - } -} diff --git a/frameworks/Java/undertow-edge/src/main/java/hello/Fortune.java b/frameworks/Java/undertow-edge/src/main/java/hello/Fortune.java deleted file mode 100644 index 198b76a1d62..00000000000 --- a/frameworks/Java/undertow-edge/src/main/java/hello/Fortune.java +++ /dev/null @@ -1,25 +0,0 @@ -package hello; - -/** - * The model for the "fortune" database table. - */ -public final class Fortune implements Comparable { - public int id; - public String message; - - /** - * Constructs a new fortune object with the given parameters. - * - * @param id the ID of the fortune - * @param message the message of the fortune - */ - public Fortune(int id, String message) { - this.id = id; - this.message = message; - } - - @Override - public int compareTo(Fortune other) { - return message.compareTo(other.message); - } -} diff --git a/frameworks/Java/undertow-edge/src/main/java/hello/FortunesMongoHandler.java b/frameworks/Java/undertow-edge/src/main/java/hello/FortunesMongoHandler.java deleted file mode 100644 index fef72b35f58..00000000000 --- a/frameworks/Java/undertow-edge/src/main/java/hello/FortunesMongoHandler.java +++ /dev/null @@ -1,55 +0,0 @@ -package hello; - -import com.github.mustachejava.Mustache; -import com.github.mustachejava.MustacheFactory; -import com.mongodb.DB; -import com.mongodb.DBCursor; -import com.mongodb.DBObject; -import io.undertow.server.HttpHandler; -import io.undertow.server.HttpServerExchange; -import io.undertow.util.Headers; - -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Objects; - -import static hello.HelloWebServer.HTML_UTF8; - -/** - * Handles the fortunes test using MongoDB. - */ -final class FortunesMongoHandler implements HttpHandler { - private final MustacheFactory mustacheFactory; - private final DB database; - - FortunesMongoHandler(MustacheFactory mustacheFactory, DB database) { - this.mustacheFactory = Objects.requireNonNull(mustacheFactory); - this.database = Objects.requireNonNull(database); - } - - @Override - public void handleRequest(HttpServerExchange exchange) throws Exception { - if (exchange.isInIoThread()) { - exchange.dispatch(this); - return; - } - List fortunes = new ArrayList<>(); - DBCursor cursor = database.getCollection("Fortune").find(); - while (cursor.hasNext()) { - DBObject object = cursor.next(); - fortunes.add(new Fortune( - ((Number) object.get("_id")).intValue(), - (String) object.get("message"))); - } - fortunes.add(new Fortune(0, "Additional fortune added at request time.")); - Collections.sort(fortunes); - Mustache mustache = mustacheFactory.compile("hello/fortunes.mustache"); - StringWriter writer = new StringWriter(); - mustache.execute(writer, fortunes); - exchange.getResponseHeaders().put( - Headers.CONTENT_TYPE, HTML_UTF8); - exchange.getResponseSender().send(writer.toString()); - } -} diff --git a/frameworks/Java/undertow-edge/src/main/java/hello/FortunesSqlHandler.java b/frameworks/Java/undertow-edge/src/main/java/hello/FortunesSqlHandler.java deleted file mode 100644 index f36a9f32dd5..00000000000 --- a/frameworks/Java/undertow-edge/src/main/java/hello/FortunesSqlHandler.java +++ /dev/null @@ -1,61 +0,0 @@ -package hello; - -import com.github.mustachejava.Mustache; -import com.github.mustachejava.MustacheFactory; -import io.undertow.server.HttpHandler; -import io.undertow.server.HttpServerExchange; -import io.undertow.util.Headers; - -import javax.sql.DataSource; -import java.io.StringWriter; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Objects; - -import static hello.HelloWebServer.HTML_UTF8; - -/** - * Handles the fortunes test using a SQL database. - */ -final class FortunesSqlHandler implements HttpHandler { - private final MustacheFactory mustacheFactory; - private final DataSource database; - - FortunesSqlHandler(MustacheFactory mustacheFactory, DataSource database) { - this.mustacheFactory = Objects.requireNonNull(mustacheFactory); - this.database = Objects.requireNonNull(database); - } - - @Override - public void handleRequest(HttpServerExchange exchange) throws Exception { - if (exchange.isInIoThread()) { - exchange.dispatch(this); - return; - } - List fortunes = new ArrayList<>(); - try (Connection connection = database.getConnection(); - PreparedStatement statement = connection.prepareStatement( - "SELECT * FROM Fortune", - ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY); - ResultSet resultSet = statement.executeQuery()) { - while (resultSet.next()) { - fortunes.add(new Fortune( - resultSet.getInt("id"), - resultSet.getString("message"))); - } - } - fortunes.add(new Fortune(0, "Additional fortune added at request time.")); - Collections.sort(fortunes); - Mustache mustache = mustacheFactory.compile("hello/fortunes.mustache"); - StringWriter writer = new StringWriter(); - mustache.execute(writer, fortunes); - exchange.getResponseHeaders().put( - Headers.CONTENT_TYPE, HTML_UTF8); - exchange.getResponseSender().send(writer.toString()); - } -} diff --git a/frameworks/Java/undertow-edge/src/main/java/hello/HelloWebServer.java b/frameworks/Java/undertow-edge/src/main/java/hello/HelloWebServer.java deleted file mode 100644 index d9c72413459..00000000000 --- a/frameworks/Java/undertow-edge/src/main/java/hello/HelloWebServer.java +++ /dev/null @@ -1,161 +0,0 @@ -package hello; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.github.mustachejava.DefaultMustacheFactory; -import com.github.mustachejava.MustacheFactory; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.google.common.net.MediaType; -import com.mongodb.DB; -import com.mongodb.MongoClient; -import io.undertow.Handlers; -import io.undertow.Undertow; -import io.undertow.UndertowOptions; -import io.undertow.util.Headers; -import org.xnio.Options; - -import javax.sql.DataSource; -import java.io.IOException; -import java.io.InputStream; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Properties; - -/** - * An implementation of the TechEmpower benchmark tests using the Undertow web - * server. The only test that truly exercises Undertow in isolation is the - * plaintext test. For the rest, it uses best-of-breed components that are - * expected to perform well. The idea is that using these components enables - * these tests to serve as performance baselines for hypothetical, Undertow-based - * frameworks. For instance, it is unlikely that such frameworks would complete - * the JSON test faster than this will, because this implementation uses - * Undertow and Jackson in the most direct way possible to fulfill the test - * requirements. - */ -public final class HelloWebServer { - - //MediaType.toString() does non-trivial work and does not cache the result - //so we cache it here - public static final String JSON_UTF8 = MediaType.JSON_UTF_8.toString(); - - public static final String TEXT_PLAIN = MediaType.PLAIN_TEXT_UTF_8.toString(); - - public static final String HTML_UTF8 = MediaType.HTML_UTF_8.toString(); - - public static void main(String[] args) throws Exception { - new HelloWebServer(); - } - - /** - * Creates and starts a new web server whose configuration is specified in the - * {@code server.properties} file. - * - * @throws IOException if the application properties file cannot be read or - * the Mongo database hostname cannot be resolved - * @throws SQLException if reading from the SQL database (while priming the - * cache) fails - */ - public HelloWebServer() throws ClassNotFoundException, IOException, SQLException { - Class.forName("org.postgresql.Driver"); - Properties properties = new Properties(); - try (InputStream in = HelloWebServer.class.getResourceAsStream( - "server.properties")) { - properties.load(in); - } - final ObjectMapper objectMapper = new ObjectMapper(); - final MustacheFactory mustacheFactory = new DefaultMustacheFactory(); - final DataSource mysql = Helper.newDataSource( - properties.getProperty("mysql.uri"), - properties.getProperty("mysql.user"), - properties.getProperty("mysql.password")); - final DataSource postgresql = Helper.newDataSource( - properties.getProperty("postgresql.uri"), - properties.getProperty("postgresql.user"), - properties.getProperty("postgresql.password")); - final DB mongodb = new MongoClient(properties.getProperty("mongodb.host")) - .getDB(properties.getProperty("mongodb.name")); - // - // The world cache is primed at startup with all values. It doesn't - // matter which database backs it; they all contain the same information - // and the CacheLoader.load implementation below is never invoked. - // - final LoadingCache worldCache = CacheBuilder.newBuilder() - .build(new CacheLoader() { - @Override - public World load(Integer id) throws Exception { - try (Connection connection = mysql.getConnection(); - PreparedStatement statement = connection.prepareStatement( - "SELECT * FROM World WHERE id = ?", - ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY)) { - statement.setInt(1, id); - try (ResultSet resultSet = statement.executeQuery()) { - resultSet.next(); - return new World( - resultSet.getInt("id"), - resultSet.getInt("randomNumber")); - } - } - } - }); - try (Connection connection = mysql.getConnection(); - PreparedStatement statement = connection.prepareStatement( - "SELECT * FROM World", - ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY); - ResultSet resultSet = statement.executeQuery()) { - while (resultSet.next()) { - World world = new World( - resultSet.getInt("id"), - resultSet.getInt("randomNumber")); - worldCache.put(world.id, world); - } - } - Undertow.builder() - .addListener( - Integer.parseInt(properties.getProperty("web.port")), - properties.getProperty("web.host")) - .setBufferSize(1024 * 16) - .setIoThreads(Runtime.getRuntime().availableProcessors() * 2) //this seems slightly faster in some configurations - .setSocketOption(Options.BACKLOG, 10000) - .setServerOption(UndertowOptions.ALWAYS_SET_KEEP_ALIVE, false) //don't send a keep-alive header for HTTP/1.1 requests, as it is not required - .setHandler(Handlers.date(Handlers.header(Handlers.path() - .addPrefixPath("/json", - new JsonHandler(objectMapper)) - .addPrefixPath("/db/mysql", - new DbSqlHandler(objectMapper, mysql, false)) - .addPrefixPath("/queries/mysql", - new DbSqlHandler(objectMapper, mysql, true)) - .addPrefixPath("/db/postgresql", - new DbSqlHandler(objectMapper, postgresql, false)) - .addPrefixPath("/queries/postgresql", - new DbSqlHandler(objectMapper, postgresql, true)) - .addPrefixPath("/db/mongodb", - new DbMongoHandler(objectMapper, mongodb, false)) - .addPrefixPath("/queries/mongodb", - new DbMongoHandler(objectMapper, mongodb, true)) - .addPrefixPath("/fortunes/mysql", - new FortunesSqlHandler(mustacheFactory, mysql)) - .addPrefixPath("/fortunes/postgresql", - new FortunesSqlHandler(mustacheFactory, postgresql)) - .addPrefixPath("/fortunes/mongodb", - new FortunesMongoHandler(mustacheFactory, mongodb)) - .addPrefixPath("/updates/mysql", - new UpdatesSqlHandler(objectMapper, mysql)) - .addPrefixPath("/updates/postgresql", - new UpdatesSqlHandler(objectMapper, postgresql)) - .addPrefixPath("/updates/mongodb", - new UpdatesMongoHandler(objectMapper, mongodb)) - .addPrefixPath("/plaintext", - new PlaintextHandler()) - .addPrefixPath("/cache", - new CacheHandler(objectMapper, worldCache)), - Headers.SERVER_STRING, "U-tow"))) - .setWorkerThreads(200) - .build() - .start(); - } -} diff --git a/frameworks/Java/undertow-edge/src/main/java/hello/Helper.java b/frameworks/Java/undertow-edge/src/main/java/hello/Helper.java deleted file mode 100644 index 824f07f1503..00000000000 --- a/frameworks/Java/undertow-edge/src/main/java/hello/Helper.java +++ /dev/null @@ -1,82 +0,0 @@ -package hello; - -import io.undertow.server.HttpServerExchange; -import org.apache.commons.dbcp.ConnectionFactory; -import org.apache.commons.dbcp.DriverManagerConnectionFactory; -import org.apache.commons.dbcp.PoolableConnectionFactory; -import org.apache.commons.dbcp.PoolingDataSource; -import org.apache.commons.pool.impl.GenericObjectPool; - -import javax.sql.DataSource; -import java.util.Deque; -import java.util.concurrent.ThreadLocalRandom; - -/** - * Provides utility methods for the benchmark tests. - */ -final class Helper { - private Helper() { - throw new AssertionError(); - } - - /** - * Constructs a new SQL data source with the given parameters. Connections - * to this data source are pooled. - * - * @param uri the URI for database connections - * @param user the username for the database - * @param password the password for the database - * @return a new SQL data source - */ - static DataSource newDataSource(String uri, - String user, - String password) { - GenericObjectPool connectionPool = new GenericObjectPool(); - connectionPool.setMaxActive(256); - connectionPool.setMaxIdle(256); - ConnectionFactory connectionFactory = new DriverManagerConnectionFactory( - uri, user, password); - // - // This constructor modifies the connection pool, setting its connection - // factory to this. (So despite how it may appear, all of the objects - // declared in this method are incorporated into the returned result.) - // - new PoolableConnectionFactory( - connectionFactory, connectionPool, null, null, false, true); - return new PoolingDataSource(connectionPool); - } - - /** - * Returns the value of the "queries" request parameter, which is an integer - * bound between 1 and 500 with a default value of 1. - * - * @param exchange the current HTTP exchange - * @return the value of the "queries" request parameter - */ - static int getQueries(HttpServerExchange exchange) { - Deque values = exchange.getQueryParameters().get("queries"); - if (values == null) { - return 1; - } - String textValue = values.peekFirst(); - if (textValue == null) { - return 1; - } - try { - int parsedValue = Integer.parseInt(textValue); - return Math.min(500, Math.max(1, parsedValue)); - } catch (NumberFormatException e) { - return 1; - } - } - - /** - * Returns a random integer that is a suitable value for both the {@code id} - * and {@code randomNumber} properties of a world object. - * - * @return a random world number - */ - static int randomWorld() { - return 1 + ThreadLocalRandom.current().nextInt(10000); - } -} diff --git a/frameworks/Java/undertow-edge/src/main/java/hello/JsonHandler.java b/frameworks/Java/undertow-edge/src/main/java/hello/JsonHandler.java deleted file mode 100644 index 5e800dbf209..00000000000 --- a/frameworks/Java/undertow-edge/src/main/java/hello/JsonHandler.java +++ /dev/null @@ -1,32 +0,0 @@ -package hello; - -import com.fasterxml.jackson.databind.ObjectMapper; -import io.undertow.server.HttpHandler; -import io.undertow.server.HttpServerExchange; -import io.undertow.util.Headers; - -import java.nio.ByteBuffer; -import java.util.Collections; -import java.util.Objects; - -import static hello.HelloWebServer.JSON_UTF8; - -/** - * Handles the JSON test. - */ -final class JsonHandler implements HttpHandler { - private final ObjectMapper objectMapper; - - public JsonHandler(ObjectMapper objectMapper) { - this.objectMapper = Objects.requireNonNull(objectMapper); - } - - @Override - public void handleRequest(HttpServerExchange exchange) throws Exception { - exchange.getResponseHeaders().put( - Headers.CONTENT_TYPE, JSON_UTF8); - exchange.getResponseSender().send(ByteBuffer.wrap( - objectMapper.writeValueAsBytes( - Collections.singletonMap("message", "Hello, World!")))); - } -} diff --git a/frameworks/Java/undertow-edge/src/main/java/hello/PlaintextHandler.java b/frameworks/Java/undertow-edge/src/main/java/hello/PlaintextHandler.java deleted file mode 100644 index 9d59a677539..00000000000 --- a/frameworks/Java/undertow-edge/src/main/java/hello/PlaintextHandler.java +++ /dev/null @@ -1,33 +0,0 @@ -package hello; - -import io.undertow.server.HttpHandler; -import io.undertow.server.HttpServerExchange; -import io.undertow.util.Headers; -import java.nio.ByteBuffer; - -import static hello.HelloWebServer.TEXT_PLAIN; - -/** - * Handles the plaintext test. - */ -final class PlaintextHandler implements HttpHandler { - private static final ByteBuffer buffer; - private static final String MESSAGE = "Hello, World!"; - - static { - buffer = ByteBuffer.allocateDirect(MESSAGE.length()); - try { - buffer.put(MESSAGE.getBytes("US-ASCII")); - } catch (Exception e) { - throw new RuntimeException(e); - } - buffer.flip(); - } - - @Override - public void handleRequest(HttpServerExchange exchange) throws Exception { - exchange.getResponseHeaders().put( - Headers.CONTENT_TYPE, TEXT_PLAIN); - exchange.getResponseSender().send(buffer.duplicate()); - } -} diff --git a/frameworks/Java/undertow-edge/src/main/java/hello/UpdatesMongoHandler.java b/frameworks/Java/undertow-edge/src/main/java/hello/UpdatesMongoHandler.java deleted file mode 100644 index c2642f9bf78..00000000000 --- a/frameworks/Java/undertow-edge/src/main/java/hello/UpdatesMongoHandler.java +++ /dev/null @@ -1,60 +0,0 @@ -package hello; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.mongodb.BasicDBObject; -import com.mongodb.DB; -import com.mongodb.DBObject; - -import io.undertow.server.HttpHandler; -import io.undertow.server.HttpServerExchange; -import io.undertow.util.Headers; - -import java.util.Objects; - -import static hello.HelloWebServer.JSON_UTF8; - -/** - * Handles the updates test using MongoDB. - */ -final class UpdatesMongoHandler implements HttpHandler { - private final ObjectMapper objectMapper; - private final DB database; - - UpdatesMongoHandler(ObjectMapper objectMapper, DB database) { - this.objectMapper = Objects.requireNonNull(objectMapper); - this.database = Objects.requireNonNull(database); - } - - @Override - public void handleRequest(HttpServerExchange exchange) throws Exception { - if (exchange.isInIoThread()) { - exchange.dispatch(this); - return; - } - int queries = Helper.getQueries(exchange); - World[] worlds = new World[queries]; - for (int i = 0; i < queries; i++) { - int id = Helper.randomWorld(); - DBObject key = new BasicDBObject("_id", id); - // - // The requirements for the test dictate that we must fetch the World - // object from the data store and read its randomNumber field, even though - // we could technically avoid doing either of those things and still - // produce the correct output and side effects. - // - DBObject object = database.getCollection("World").findOne(key); - - @SuppressWarnings("unused") - // Per test requirement the old value must be read - int oldRandomNumber = ((Number) object.get("randomNumber")).intValue(); - - int newRandomNumber = Helper.randomWorld(); - object.put("randomNumber", newRandomNumber); - database.getCollection("World").update(key, object); - worlds[i] = new World(id, newRandomNumber); - } - exchange.getResponseHeaders().put( - Headers.CONTENT_TYPE, JSON_UTF8); - exchange.getResponseSender().send(objectMapper.writeValueAsString(worlds)); - } -} diff --git a/frameworks/Java/undertow-edge/src/main/java/hello/UpdatesSqlHandler.java b/frameworks/Java/undertow-edge/src/main/java/hello/UpdatesSqlHandler.java deleted file mode 100644 index 64161499d17..00000000000 --- a/frameworks/Java/undertow-edge/src/main/java/hello/UpdatesSqlHandler.java +++ /dev/null @@ -1,63 +0,0 @@ -package hello; - -import com.fasterxml.jackson.databind.ObjectMapper; -import io.undertow.server.HttpHandler; -import io.undertow.server.HttpServerExchange; -import io.undertow.util.Headers; - -import javax.sql.DataSource; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.Objects; - -import static hello.HelloWebServer.JSON_UTF8; - -/** - * Handles the updates test using a SQL database. - */ -final class UpdatesSqlHandler implements HttpHandler { - private final ObjectMapper objectMapper; - private final DataSource database; - - UpdatesSqlHandler(ObjectMapper objectMapper, DataSource database) { - this.objectMapper = Objects.requireNonNull(objectMapper); - this.database = Objects.requireNonNull(database); - } - - @Override - public void handleRequest(HttpServerExchange exchange) throws Exception { - if (exchange.isInIoThread()) { - exchange.dispatch(this); - return; - } - int queries = Helper.getQueries(exchange); - World[] worlds = new World[queries]; - try (Connection connection = database.getConnection(); - PreparedStatement query = connection.prepareStatement( - "SELECT * FROM World WHERE id = ?", - ResultSet.TYPE_FORWARD_ONLY, - ResultSet.CONCUR_READ_ONLY); - PreparedStatement update = connection.prepareStatement( - "UPDATE World SET randomNumber = ? WHERE id= ?")) { - for (int i = 0; i < queries; i++) { - query.setInt(1, Helper.randomWorld()); - World world; - try (ResultSet resultSet = query.executeQuery()) { - resultSet.next(); - world = new World( - resultSet.getInt("id"), - resultSet.getInt("randomNumber")); - } - world.randomNumber = Helper.randomWorld(); - update.setInt(1, world.randomNumber); - update.setInt(2, world.id); - update.executeUpdate(); - worlds[i] = world; - } - } - exchange.getResponseHeaders().put( - Headers.CONTENT_TYPE, JSON_UTF8); - exchange.getResponseSender().send(objectMapper.writeValueAsString(worlds)); - } -} diff --git a/frameworks/Java/undertow-edge/src/main/java/hello/World.java b/frameworks/Java/undertow-edge/src/main/java/hello/World.java deleted file mode 100644 index 3bbbff13677..00000000000 --- a/frameworks/Java/undertow-edge/src/main/java/hello/World.java +++ /dev/null @@ -1,20 +0,0 @@ -package hello; - -/** - * The model for the "world" database table. - */ -public final class World { - public int id; - public int randomNumber; - - /** - * Constructs a new world object with the given parameters. - * - * @param id the ID of the world - * @param randomNumber the random number of the world - */ - public World(int id, int randomNumber) { - this.id = id; - this.randomNumber = randomNumber; - } -} diff --git a/frameworks/Java/undertow-edge/src/main/resources/hello/fortunes.mustache b/frameworks/Java/undertow-edge/src/main/resources/hello/fortunes.mustache deleted file mode 100644 index 23514bf6963..00000000000 --- a/frameworks/Java/undertow-edge/src/main/resources/hello/fortunes.mustache +++ /dev/null @@ -1,20 +0,0 @@ - - - - Fortunes - - - - - - - - {{#.}} - - - - - {{/.}} -
idmessage
{{id}}{{message}}
- - diff --git a/frameworks/Java/undertow-edge/src/main/resources/hello/server.properties b/frameworks/Java/undertow-edge/src/main/resources/hello/server.properties deleted file mode 100644 index d4bd878f74e..00000000000 --- a/frameworks/Java/undertow-edge/src/main/resources/hello/server.properties +++ /dev/null @@ -1,14 +0,0 @@ -web.port = 8080 -web.host = 0.0.0.0 -mysql.uri = jdbc:mysql://127.0.0.1:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true -mysql.user = benchmarkdbuser -mysql.password = benchmarkdbpass -# -# TODO: Audit this postgresql connection string. -# It looks copy & pasted from MySQL. Do these parameters even do anything? -# -postgresql.uri = jdbc:postgresql://127.0.0.1:5432/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true -postgresql.user = benchmarkdbuser -postgresql.password = benchmarkdbpass -mongodb.host = 127.0.0.1:27017 -mongodb.name = hello_world