Browse Source

[ruby] Combine *-sequel frameworks with their main frameworks (#8997)

`rack-sequel` and `sinatra-sequel` only use a different ORM (sequel)
than `rack` and `sinatra`. There is no need to test `/json` and
`/plaintext` for `rack-sequel` and `sinatra-sequel`, as they don't use
the ORM.

For `sinatra-sequel` the `/json` and `/plaintext` calls were already
removed from the benchmark config in 1f94f389dcc30f1795b23953ad152560d5433f9f.
This change does the same for `rack-sequel`.

To still see these results in the combined table the framework
should be set to `rack` and `sinatra`.
Petrik de Heus 1 year ago
parent
commit
c84fa047b7

+ 6 - 12
frameworks/Ruby/rack-sequel/benchmark_config.json

@@ -3,17 +3,15 @@
   "tests": [
     {
       "default": {
-        "json_url": "/json",
         "db_url": "/db",
         "query_url": "/queries?queries=",
         "fortune_url": "/fortunes",
         "update_url": "/updates?queries=",
-        "plaintext_url": "/plaintext",
         "port": 8080,
         "approach": "Stripped",
         "classification": "Micro",
         "database": "MySQL",
-        "framework": "rack-sequel",
+        "framework": "rack",
         "language": "Ruby",
         "orm": "Micro",
         "platform": "Rack",
@@ -33,7 +31,7 @@
         "approach": "Stripped",
         "classification": "Micro",
         "database": "Postgres",
-        "framework": "rack-sequel",
+        "framework": "rack",
         "language": "Ruby",
         "orm": "Micro",
         "platform": "Rack",
@@ -45,8 +43,6 @@
         "notes": ""
       },
       "passenger-mri": {
-        "json_url": "/json",
-        "db_url": "/db",
         "query_url": "/queries?queries=",
         "fortune_url": "/fortunes",
         "update_url": "/updates?queries=",
@@ -55,7 +51,7 @@
         "approach": "Stripped",
         "classification": "Micro",
         "database": "MySQL",
-        "framework": "rack-sequel",
+        "framework": "rack",
         "language": "Ruby",
         "orm": "Micro",
         "platform": "Rack",
@@ -75,7 +71,7 @@
         "approach": "Stripped",
         "classification": "Micro",
         "database": "Postgres",
-        "framework": "rack-sequel",
+        "framework": "rack",
         "language": "Ruby",
         "orm": "Micro",
         "platform": "Rack",
@@ -87,17 +83,15 @@
         "notes": ""
       },
       "unicorn-mri": {
-        "json_url": "/json",
         "db_url": "/db",
         "query_url": "/queries?queries=",
         "fortune_url": "/fortunes",
         "update_url": "/updates?queries=",
-        "plaintext_url": "/plaintext",
         "port": 8080,
         "approach": "Stripped",
         "classification": "Micro",
         "database": "MySQL",
-        "framework": "rack-sequel",
+        "framework": "rack",
         "language": "Ruby",
         "orm": "Micro",
         "platform": "Rack",
@@ -117,7 +111,7 @@
         "approach": "Stripped",
         "classification": "Micro",
         "database": "Postgres",
-        "framework": "rack-sequel",
+        "framework": "rack",
         "language": "Ruby",
         "orm": "Micro",
         "platform": "Rack",

+ 0 - 8
frameworks/Ruby/rack-sequel/benchmark_config.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-require 'yaml'
-
-yaml = YAML.load(ARGF.read)
-yaml["tests"][0].delete_if { |_, v| v["disabled"] }
-puts JSON.pretty_generate(yaml)

+ 0 - 69
frameworks/Ruby/rack-sequel/benchmark_config.yaml

@@ -1,69 +0,0 @@
----
-framework: rack-sequel
-tests:
-  - default: &default
-      setup_file: run_mri_puma
-      json_url: /json
-      db_url: /db
-      query_url: /queries?queries=
-      fortune_url: /fortunes
-      update_url: /updates?queries=
-      plaintext_url: /plaintext
-      port: 8080
-      approach: Stripped
-      classification: Micro
-      database: MySQL
-      framework: rack-sequel
-      language: Ruby
-      orm: Micro
-      platform: Rack
-      webserver: Puma
-      os: Linux
-      database_os: Linux
-      display_name: rack-sequel-puma-mri
-      versus: rack-puma-mri
-      notes: ""
-    postgres:
-      <<: *default
-      database: Postgres
-      display_name: rack-sequel-postgres-puma-mri
-      versus: ~
-    puma-jruby:
-      <<: *default
-      setup_file: run_jruby_puma
-      display_name: rack-sequel-puma-jruby
-      versus: rack-puma-jruby
-      disabled: true
-    postgres-puma-jruby:
-      <<: *default
-      setup_file: run_jruby_puma
-      database: Postgres
-      display_name: rack-sequel-postgres-puma-jruby
-      versus: ~
-      disabled: true
-    passenger-mri:
-      <<: *default
-      setup_file: run_mri_passenger
-      webserver: Passenger
-      display_name: rack-sequel-passenger-mri
-      versus: ~
-    postgres-passenger-mri:
-      <<: *default
-      setup_file: run_mri_passenger
-      database: Postgres
-      webserver: Passenger
-      display_name: rack-sequel-postgres-passenger-mri
-      versus: ~
-    unicorn-mri:
-      <<: *default
-      setup_file: run_mri_unicorn
-      webserver: Unicorn
-      display_name: rack-sequel-unicorn-mri
-      versus: rack-unicorn
-    postgres-unicorn-mri:
-      <<: *default
-      setup_file: run_mri_unicorn
-      database: Postgres
-      webserver: Unicorn
-      display_name: rack-sequel-postgres-unicorn-mri
-      versus: ~

+ 6 - 6
frameworks/Ruby/sinatra-sequel/benchmark_config.json

@@ -11,7 +11,7 @@
         "approach": "Realistic",
         "classification": "Micro",
         "database": "MySQL",
-        "framework": "sinatra-sequel",
+        "framework": "sinatra",
         "language": "Ruby",
         "orm": "Full",
         "platform": "Rack",
@@ -31,7 +31,7 @@
         "approach": "Realistic",
         "classification": "Micro",
         "database": "Postgres",
-        "framework": "sinatra-sequel",
+        "framework": "sinatra",
         "language": "Ruby",
         "orm": "Full",
         "platform": "Rack",
@@ -51,7 +51,7 @@
         "approach": "Realistic",
         "classification": "Micro",
         "database": "MySQL",
-        "framework": "sinatra-sequel",
+        "framework": "sinatra",
         "language": "Ruby",
         "orm": "Full",
         "platform": "Rack",
@@ -71,7 +71,7 @@
         "approach": "Realistic",
         "classification": "Micro",
         "database": "Postgres",
-        "framework": "sinatra-sequel",
+        "framework": "sinatra",
         "language": "Ruby",
         "orm": "Full",
         "platform": "Rack",
@@ -91,7 +91,7 @@
         "approach": "Realistic",
         "classification": "Micro",
         "database": "MySQL",
-        "framework": "sinatra-sequel",
+        "framework": "sinatra",
         "language": "Ruby",
         "orm": "Full",
         "platform": "Rack",
@@ -111,7 +111,7 @@
         "approach": "Realistic",
         "classification": "Micro",
         "database": "Postgres",
-        "framework": "sinatra-sequel",
+        "framework": "sinatra",
         "language": "Ruby",
         "orm": "Full",
         "platform": "Rack",