[ruby/sinatra] Remove Unicorn variant

frameworks/Ruby/sinatra-sequel/Gemfile

@@ -20,7 +20,3 @@ end
 group :puma, optional: true do
   gem 'puma', '~> 6.4', require: false
 end
-
-group :unicorn, optional: true do
-  gem 'unicorn', '~> 6.1', platforms: [:ruby, :mswin], require: false
-end

frameworks/Ruby/sinatra-sequel/Gemfile.lock

@@ -5,7 +5,6 @@ GEM
     bigdecimal (3.1.9)
     iodine (0.7.58)
     json (2.11.3)
-    kgio (2.11.4)
     logger (1.6.6)
     mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
@@ -22,7 +21,6 @@ GEM
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
-    raindrops (0.20.1)
     ruby2_keywords (0.0.5)
     sequel (5.90.0)
       bigdecimal
@@ -37,9 +35,6 @@ GEM
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
     tilt (2.6.0)
-    unicorn (6.1.0)
-      kgio (~> 2.6)
-      raindrops (~> 0.7)
 
 PLATFORMS
   ruby
@@ -55,7 +50,6 @@ DEPENDENCIES
   sequel (~> 5.0)
   sequel_pg (~> 1.6)
   sinatra (~> 4.0)
-  unicorn (~> 6.1)
 
 BUNDLED WITH
    2.6.2

frameworks/Ruby/sinatra-sequel/README.md

@@ -13,13 +13,9 @@ comparing a variety of web platforms.
 The tests will be run with:
 
 * [Ruby 3.4](http://www.ruby-lang.org)
-* [JRuby 9.4](http://jruby.org)
 * [Puma 6](http://puma.io)
-* [Passenger 6](https://www.phusionpassenger.com)
-* [Unicorn 5](https://bogomips.org/unicorn/)
 * [Sinatra 4](http://www.sinatrarb.com)
 * [Sequel 5](http://sequel.jeremyevans.net)
-* [Slim 3](http://slim-lang.com)
 * [MySQL 5.5](https://www.mysql.com)
 * [Postgres 9.3](https://www.postgresql.org)
 

frameworks/Ruby/sinatra-sequel/benchmark_config.json

@@ -61,26 +61,6 @@
         "display_name": "sinatra-sequel-postgres-iodine-mri",
         "versus": "rack-sequel-postgres-iodine-mri",
         "notes": ""
-      },
-      "postgres-unicorn-mri": {
-        "db_url": "/db",
-        "query_url": "/queries?queries=",
-        "fortune_url": "/fortunes",
-        "update_url": "/updates?queries=",
-        "port": 8080,
-        "approach": "Realistic",
-        "classification": "Micro",
-        "database": "Postgres",
-        "framework": "sinatra",
-        "language": "Ruby",
-        "orm": "Full",
-        "platform": "Rack",
-        "webserver": "Unicorn",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "sinatra-sequel-postgres-unicorn-mri",
-        "versus": "rack-sequel-postgres-unicorn-mri",
-        "notes": ""
       }
     }
   ]

frameworks/Ruby/sinatra-sequel/boot.rb

@@ -16,8 +16,8 @@ def connect(dbtype)
   Bundler.require(dbtype) # Load database-specific modules
 
   adapters = {
-    :mysql=>{ :jruby=>'jdbc:mysql', :mri=>'mysql2' },
-    :postgresql=>{ :jruby=>'jdbc:postgresql', :mri=>'postgres' }
+    mysql: 'mysql2',
+    postgresql: 'postgres'
   }
 
   opts = {}
@@ -26,17 +26,15 @@ def connect(dbtype)
   if defined?(Puma) && (threads = Puma.cli_config.options.fetch(:max_threads)) > 1
     opts[:max_connections] = (2 * Math.log(threads)).floor
     opts[:pool_timeout] = 10
-  elsif defined?(Unicorn)
-    Sequel.single_threaded = true
   end
 
   Sequel.connect \
     '%{adapter}://%{host}/%{database}?user=%{user}&password=%{password}' % {
-      :adapter=>adapters.fetch(dbtype).fetch(defined?(JRUBY_VERSION) ? :jruby : :mri),
-      :host=>'tfb-database',
-      :database=>'hello_world',
-      :user=>'benchmarkdbuser',
-      :password=>'benchmarkdbpass'
+      adapter: (dbtype == :mysql ? 'mysql2' : 'postgresql'),
+      host: 'tfb-database',
+      database: 'hello_world',
+      user: 'benchmarkdbuser',
+      password: 'benchmarkdbpass'
     }, opts
 end
 

frameworks/Ruby/sinatra-sequel/config.toml

@@ -34,71 +34,3 @@ orm = "Full"
 platform = "Rack"
 webserver = "Puma"
 versus = "rack-sequel-puma-mri"
-
-[postgres-passenger-mri]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
-urls.fortune = "/fortunes"
-approach = "Realistic"
-classification = "Micro"
-database = "Postgres"
-database_os = "Linux"
-os = "Linux"
-orm = "Full"
-platform = "Rack"
-webserver = "Passenger"
-versus = "rack-sequel-postgres-passenger-mri"
-
-[postgres-unicorn-mri]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
-urls.fortune = "/fortunes"
-approach = "Realistic"
-classification = "Micro"
-database = "Postgres"
-database_os = "Linux"
-os = "Linux"
-orm = "Full"
-platform = "Rack"
-webserver = "Unicorn"
-versus = "rack-sequel-postgres-unicorn-mri"
-
-[passenger-mri]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
-urls.fortune = "/fortunes"
-approach = "Realistic"
-classification = "Micro"
-database = "MySQL"
-database_os = "Linux"
-os = "Linux"
-orm = "Full"
-platform = "Rack"
-webserver = "Passenger"
-versus = "rack-sequel-passenger-mri"
-
-[unicorn-mri]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
-urls.fortune = "/fortunes"
-approach = "Realistic"
-classification = "Micro"
-database = "MySQL"
-database_os = "Linux"
-os = "Linux"
-orm = "Full"
-platform = "Rack"
-webserver = "Unicorn"
-versus = "rack-sequel-unicorn-mri"

frameworks/Ruby/sinatra/Gemfile

@@ -19,7 +19,3 @@ end
 group :puma, optional: true do
   gem 'puma', '~> 6.4', require: false
 end
-
-group :unicorn, optional: true do
-  gem 'unicorn', '~> 6.1', platforms: [:ruby, :mswin], require: false
-end

frameworks/Ruby/sinatra/benchmark_config.json

@@ -65,26 +65,6 @@
         "display_name": "sinatra-postgres-iodine-mri",
         "versus": "rack-postgres-iodine-mri",
         "notes": ""
-      },
-      "postgres-unicorn-mri": {
-        "db_url": "/db",
-        "query_url": "/queries?queries=",
-        "fortune_url": "/fortunes",
-        "update_url": "/updates?queries=",
-        "port": 8080,
-        "approach": "Realistic",
-        "classification": "Micro",
-        "database": "Postgres",
-        "framework": "sinatra",
-        "language": "Ruby",
-        "orm": "Full",
-        "platform": "Rack",
-        "webserver": "Unicorn",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "sinatra-postgres-unicorn-mri",
-        "versus": "rack-postgres-unicorn-mri",
-        "notes": ""
       }
     }
   ]

frameworks/Ruby/sinatra/boot.rb

@@ -15,18 +15,15 @@ def connect(dbtype)
   Bundler.require(dbtype) # Load database-specific modules
 
   opts = {
-    :adapter=>(dbtype == :mysql ? 'mysql2' : 'postgresql'),
-    :username=>'benchmarkdbuser',
-    :password=>'benchmarkdbpass',
-    :host=>'tfb-database',
-    :database=>'hello_world'
+    adapter: (dbtype == :mysql ? 'mysql2' : 'postgresql'),
+    username: 'benchmarkdbuser',
+    password: 'benchmarkdbpass',
+    host: 'tfb-database',
+    database: 'hello_world'
   }
 
   # Determine threading/thread pool size and timeout
-  if defined?(JRUBY_VERSION)
-    opts[:pool] = (2 * Math.log(Integer(ENV.fetch('MAX_CONCURRENCY')))).floor
-    opts[:checkout_timeout] = 10
-  elsif defined?(Puma) && (threads = Puma.cli_config.options.fetch(:max_threads)) > 1
+  if defined?(Puma) && (threads = Puma.cli_config.options.fetch(:max_threads)) > 1
     opts[:pool] = (2 * Math.log(threads)).floor
     opts[:checkout_timeout] = 10
   else