Skip to content

Commit 2b8ca85

Browse files
authored
[ruby/roda] Remove unused JRuby code (#8674)
JRuby is no longer tested. We can remove the specific code for it.
1 parent 101e4fb commit 2b8ca85

File tree

3 files changed

+3
-32
lines changed

3 files changed

+3
-32
lines changed

frameworks/Ruby/roda-sequel/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ comparing a variety of web platforms.
1313
The tests will be run with:
1414

1515
* [Ruby 3.3](http://www.ruby-lang.org)
16-
* [JRuby 9.1](http://jruby.org)
17-
* [Rubinius 3](https://rubinius.com)\*
18-
* [Puma 3](http://puma.io)
16+
* [Puma 6](http://puma.io)
1917
* [Passenger 5](https://www.phusionpassenger.com)
2018
* [Unicorn 5](https://bogomips.org/unicorn/)
2119
* [Roda 3](http://roda.jeremyevans.net)

frameworks/Ruby/roda-sequel/boot.rb

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,17 @@ def connect(dbtype)
2929

3030
adapters = {
3131
mysql: {
32-
jruby: "jdbc:mysql",
3332
mri: "mysql2"
3433
},
3534
postgresql: {
36-
jruby: "jdbc:postgresql",
3735
mri: "postgres"
3836
}
3937
}
4038

4139
opts = {}
4240

4341
# Determine threading/thread pool size and timeout
44-
if defined?(JRUBY_VERSION)
45-
opts[:max_connections] = (
46-
2 * Math.log(Integer(ENV.fetch("MAX_CONCURRENCY")))
47-
).floor
48-
opts[:pool_timeout] = 10
49-
elsif defined?(Puma) &&
42+
if defined?(Puma) &&
5043
(threads = Puma.cli_config.options.fetch(:max_threads)) > 1
5144
opts[:max_connections] = (2 * Math.log(threads)).floor
5245
opts[:pool_timeout] = 10
@@ -57,9 +50,7 @@ def connect(dbtype)
5750
Sequel.connect "%{adapter}://%{host}/%{database}?user=%{user}&password=%{password}" %
5851
{
5952
adapter:
60-
adapters.fetch(dbtype).fetch(
61-
defined?(JRUBY_VERSION) ? :jruby : :mri
62-
),
53+
adapters.fetch(dbtype).fetch(:mri),
6354
host: "tfb-database",
6455
database: "hello_world",
6556
user: "benchmarkdbuser",

frameworks/Ruby/roda-sequel/config/java_tune.sh

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

0 commit comments

Comments
 (0)