Skip to content

Commit 1ba6033

Browse files
p8litongjava
authored andcommitted
[ruby/rack-sequel] Remove failing Unicorn variant (TechEmpower#9893)
Unicorn hasn't been updated for 4 years and seems unmaintained. It is currently failing as well.
1 parent f839308 commit 1ba6033

File tree

9 files changed

+5
-181
lines changed

9 files changed

+5
-181
lines changed

frameworks/Ruby/rack-sequel/Gemfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,3 @@ end
1616
group :puma, optional: true do
1717
gem 'puma', '~> 6.5', require: false
1818
end
19-
20-
group :unicorn, optional: true do
21-
gem 'unicorn', '~> 6.1', platforms: [:ruby, :mswin], require: false
22-
gem 'logger' # required by unicorn on Ruby 3.5
23-
end

frameworks/Ruby/rack-sequel/Gemfile.lock

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,17 @@ GEM
33
specs:
44
bigdecimal (3.1.9)
55
json (2.11.3)
6-
kgio (2.11.4)
7-
logger (1.7.0)
86
mysql2 (0.5.6)
97
nio4r (2.7.4)
108
pg (1.5.9)
119
puma (6.6.0)
1210
nio4r (~> 2.0)
1311
rack (3.1.11)
14-
raindrops (0.20.1)
1512
sequel (5.90.0)
1613
bigdecimal
1714
sequel_pg (1.17.1)
1815
pg (>= 0.18.0, != 1.2.0)
1916
sequel (>= 4.38.0)
20-
unicorn (6.1.0)
21-
kgio (~> 2.6)
22-
raindrops (~> 0.7)
2317

2418
PLATFORMS
2519
ruby
@@ -28,14 +22,12 @@ PLATFORMS
2822

2923
DEPENDENCIES
3024
json (~> 2.8)
31-
logger
3225
mysql2 (~> 0.4)
3326
pg (~> 1.5)
3427
puma (~> 6.5)
3528
rack (~> 3.0)
3629
sequel (~> 5.0)
3730
sequel_pg (~> 1.6)
38-
unicorn (~> 6.1)
3931

4032
BUNDLED WITH
4133
2.6.2

frameworks/Ruby/rack-sequel/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ The tests will be run with:
1414

1515
* [Ruby 3.4](http://www.ruby-lang.org)
1616
* [Puma 6](http://puma.io)
17-
* [Passenger 6](https://www.phusionpassenger.com)
18-
* [Unicorn 5](https://bogomips.org/unicorn/)
19-
* [Rack 2](http://rack.rubyforge.org)
17+
* [Rack 3](http://rack.rubyforge.org)
2018
* [Sequel 5](http://sequel.jeremyevans.net)
2119
* [MySQL 5.5](https://www.mysql.com)
2220
* [Postgres 9.3](https://www.postgresql.org)

frameworks/Ruby/rack-sequel/benchmark_config.json

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -41,46 +41,6 @@
4141
"display_name": "rack-sequel-postgres-puma-mri",
4242
"versus": null,
4343
"notes": ""
44-
},
45-
"unicorn-mri": {
46-
"db_url": "/db",
47-
"query_url": "/queries?queries=",
48-
"fortune_url": "/fortunes",
49-
"update_url": "/updates?queries=",
50-
"port": 8080,
51-
"approach": "Realistic",
52-
"classification": "Micro",
53-
"database": "MySQL",
54-
"framework": "rack",
55-
"language": "Ruby",
56-
"orm": "Micro",
57-
"platform": "Rack",
58-
"webserver": "Unicorn",
59-
"os": "Linux",
60-
"database_os": "Linux",
61-
"display_name": "rack-sequel-unicorn-mri",
62-
"versus": "rack-unicorn",
63-
"notes": ""
64-
},
65-
"postgres-unicorn-mri": {
66-
"db_url": "/db",
67-
"query_url": "/queries?queries=",
68-
"fortune_url": "/fortunes",
69-
"update_url": "/updates?queries=",
70-
"port": 8080,
71-
"approach": "Realistic",
72-
"classification": "Micro",
73-
"database": "Postgres",
74-
"framework": "rack",
75-
"language": "Ruby",
76-
"orm": "Micro",
77-
"platform": "Rack",
78-
"webserver": "Unicorn",
79-
"os": "Linux",
80-
"database_os": "Linux",
81-
"display_name": "rack-sequel-postgres-unicorn-mri",
82-
"versus": null,
83-
"notes": ""
8444
}
8545
}
8646
]

frameworks/Ruby/rack-sequel/boot.rb

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,21 @@ def connect(dbtype)
99
Bundler.require(dbtype) # Load database-specific modules
1010

1111
adapters = {
12-
mysql: { jruby: 'jdbc:mysql', mri: 'mysql2' },
13-
postgresql: { jruby: 'jdbc:postgresql', mri: 'postgres' }
12+
mysql: 'mysql2',
13+
postgresql: 'postgres'
1414
}
1515

1616
opts = {}
1717

1818
# Determine threading/thread pool size and timeout
19-
if defined?(JRUBY_VERSION)
20-
opts[:max_connections] = (2 * Math.log(Integer(ENV.fetch('MAX_CONCURRENCY')))).floor
21-
opts[:pool_timeout] = 10
22-
elsif defined?(Puma) && (threads = Puma.cli_config.options.fetch(:max_threads)) > 1
19+
if defined?(Puma) && (threads = Puma.cli_config.options.fetch(:max_threads)) > 1
2320
opts[:max_connections] = (2 * Math.log(threads)).floor
2421
opts[:pool_timeout] = 10
25-
else
26-
Sequel.single_threaded = true
2722
end
2823

2924
Sequel.connect \
3025
'%{adapter}://%{host}/%{database}?user=%{user}&password=%{password}' % {
31-
adapter: adapters.fetch(dbtype).fetch(defined?(JRUBY_VERSION) ? :jruby : :mri),
26+
adapter: (dbtype == :mysql ? 'mysql2' : 'postgresql'),
3227
host: 'tfb-database',
3328
database: 'hello_world',
3429
user: 'benchmarkdbuser',

frameworks/Ruby/rack-sequel/config.toml

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -34,71 +34,3 @@ orm = "Micro"
3434
platform = "Rack"
3535
webserver = "Puma"
3636
versus = "rack-puma-mri"
37-
38-
[postgres-passenger-mri]
39-
urls.plaintext = "/plaintext"
40-
urls.json = "/json"
41-
urls.db = "/db"
42-
urls.query = "/queries?queries="
43-
urls.update = "/updates?queries="
44-
urls.fortune = "/fortunes"
45-
approach = "Stripped"
46-
classification = "Micro"
47-
database = "Postgres"
48-
database_os = "Linux"
49-
os = "Linux"
50-
orm = "Micro"
51-
platform = "Rack"
52-
webserver = "Passenger"
53-
versus = "None"
54-
55-
[postgres-unicorn-mri]
56-
urls.plaintext = "/plaintext"
57-
urls.json = "/json"
58-
urls.db = "/db"
59-
urls.query = "/queries?queries="
60-
urls.update = "/updates?queries="
61-
urls.fortune = "/fortunes"
62-
approach = "Stripped"
63-
classification = "Micro"
64-
database = "Postgres"
65-
database_os = "Linux"
66-
os = "Linux"
67-
orm = "Micro"
68-
platform = "Rack"
69-
webserver = "Unicorn"
70-
versus = "None"
71-
72-
[passenger-mri]
73-
urls.plaintext = "/plaintext"
74-
urls.json = "/json"
75-
urls.db = "/db"
76-
urls.query = "/queries?queries="
77-
urls.update = "/updates?queries="
78-
urls.fortune = "/fortunes"
79-
approach = "Stripped"
80-
classification = "Micro"
81-
database = "MySQL"
82-
database_os = "Linux"
83-
os = "Linux"
84-
orm = "Micro"
85-
platform = "Rack"
86-
webserver = "Passenger"
87-
versus = "None"
88-
89-
[unicorn-mri]
90-
urls.plaintext = "/plaintext"
91-
urls.json = "/json"
92-
urls.db = "/db"
93-
urls.query = "/queries?queries="
94-
urls.update = "/updates?queries="
95-
urls.fortune = "/fortunes"
96-
approach = "Stripped"
97-
classification = "Micro"
98-
database = "MySQL"
99-
database_os = "Linux"
100-
os = "Linux"
101-
orm = "Micro"
102-
platform = "Rack"
103-
webserver = "Unicorn"
104-
versus = "rack-unicorn"

frameworks/Ruby/rack-sequel/config/mri_unicorn.rb

Lines changed: 0 additions & 6 deletions
This file was deleted.

frameworks/Ruby/rack-sequel/rack-sequel-postgres-unicorn-mri.dockerfile

Lines changed: 0 additions & 21 deletions
This file was deleted.

frameworks/Ruby/rack-sequel/rack-sequel-unicorn-mri.dockerfile

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)