File tree Expand file tree Collapse file tree 8 files changed +29
-21
lines changed Expand file tree Collapse file tree 8 files changed +29
-21
lines changed Original file line number Diff line number Diff line change @@ -4,6 +4,8 @@ require 'yaml'
4
4
require_relative 'config/auto_tune'
5
5
6
6
MAX_PK = 10_000
7
+ ID_RANGE = ( 1 ..MAX_PK ) . freeze
8
+ ALL_IDS = ID_RANGE . to_a
7
9
QUERIES_MIN = 1
8
10
QUERIES_MAX = 500
9
11
@@ -53,17 +55,17 @@ module Acme
53
55
54
56
get '/query' do
55
57
ActiveRecord ::Base . connection_pool . with_connection do
56
- Array . new ( bounded_queries ) do
57
- World . find ( rand1 )
58
+ ALL_IDS . sample ( bounded_queries ) . map do | id |
59
+ World . find ( id )
58
60
end
59
61
end
60
62
end
61
63
62
64
get '/updates' do
63
65
worlds =
64
66
ActiveRecord ::Base . connection_pool . with_connection do
65
- Array . new ( bounded_queries ) do
66
- world = World . find ( rand1 )
67
+ ALL_IDS . sample ( bounded_queries ) . map do | id |
68
+ world = World . find ( id )
67
69
new_value = rand1
68
70
new_value = rand1 while new_value == world . randomNumber
69
71
world . update_columns ( randomNumber : new_value )
Original file line number Diff line number Diff line change 3
3
require 'time'
4
4
5
5
MAX_PK = 10_000
6
+ ID_RANGE = ( 1 ..10_000 ) . freeze
7
+ ALL_IDS = ID_RANGE . to_a
6
8
QUERIES_MIN = 1
7
9
QUERIES_MAX = 500
8
10
SEQUEL_NO_ASSOCIATIONS = true
Original file line number Diff line number Diff line change 29
29
30
30
def queries ( env )
31
31
DB . synchronize do
32
- Array . new ( bounded_queries ( env ) ) do
33
- WORLD_BY_ID . ( :id => rand1 )
32
+ ALL_IDS . sample ( bounded_queries ( env ) ) . map do | id |
33
+ WORLD_BY_ID . ( id : id )
34
34
end
35
35
end
36
36
end
@@ -78,9 +78,9 @@ def fortunes
78
78
79
79
def updates ( env )
80
80
DB . synchronize do
81
- Array . new ( bounded_queries ( env ) ) do
82
- world = WORLD_BY_ID . ( :id => rand1 )
83
- WORLD_UPDATE . ( :id => world [ :id ] , : randomnumber=> ( world [ :randomnumber ] = rand1 ) )
81
+ ALL_IDS . sample ( bounded_queries ( env ) ) . map do | id |
82
+ world = WORLD_BY_ID . ( id : id )
83
+ WORLD_UPDATE . ( id : world [ :id ] , randomnumber : ( world [ :randomnumber ] = rand1 ) )
84
84
world
85
85
end
86
86
end
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ class HelloWorldController < ApplicationController
7
7
MAX_QUERIES = 500 # max number of records that can be retrieved
8
8
9
9
def db
10
- render json : World . find ( random_id )
10
+ render json : World . find ( random_id ) . attributes
11
11
end
12
12
13
13
def query
Original file line number Diff line number Diff line change 3
3
require 'time'
4
4
5
5
MAX_PK = 10_000
6
+ ID_RANGE = ( 1 ..MAX_PK ) . freeze
7
+ ALL_IDS = ID_RANGE . to_a
6
8
QUERIES_MIN = 1
7
9
QUERIES_MAX = 500
8
10
SEQUEL_NO_ASSOCIATIONS = true
Original file line number Diff line number Diff line change @@ -56,8 +56,8 @@ def rand1
56
56
get '/queries' do
57
57
worlds =
58
58
DB . synchronize do
59
- Array . new ( bounded_queries ) do
60
- World . with_pk ( rand1 )
59
+ ALL_IDS . sample ( bounded_queries ) . map do | id |
60
+ World . with_pk ( id )
61
61
end
62
62
end
63
63
@@ -80,8 +80,8 @@ def rand1
80
80
get '/updates' do
81
81
worlds =
82
82
DB . synchronize do
83
- Array . new ( bounded_queries ) do
84
- world = World . with_pk ( rand1 )
83
+ ALL_IDS . sample ( bounded_queries ) . map do | id |
84
+ world = World . with_pk ( id )
85
85
new_value = rand1
86
86
new_value = rand1 while new_value == world . randomnumber
87
87
world . update ( randomnumber : new_value )
Original file line number Diff line number Diff line change 3
3
require 'time'
4
4
5
5
MAX_PK = 10_000
6
+ ID_RANGE = ( 1 ..MAX_PK ) . freeze
7
+ ALL_IDS = ID_RANGE . to_a
6
8
QUERIES_MIN = 1
7
9
QUERIES_MAX = 500
8
10
Original file line number Diff line number Diff line change @@ -62,12 +62,12 @@ def rand1
62
62
get '/queries' do
63
63
worlds =
64
64
ActiveRecord ::Base . connection_pool . with_connection do
65
- Array . new ( bounded_queries ) do
66
- World . find ( rand1 )
65
+ ALL_IDS . sample ( bounded_queries ) . map do | id |
66
+ World . find ( id ) . attributes
67
67
end
68
68
end
69
69
70
- json worlds . map! ( & :attributes )
70
+ json worlds
71
71
end
72
72
73
73
# Test type 4: Fortunes
@@ -88,16 +88,16 @@ def rand1
88
88
get '/updates' do
89
89
worlds =
90
90
ActiveRecord ::Base . connection_pool . with_connection do
91
- Array . new ( bounded_queries ) do
92
- world = World . find ( rand1 )
91
+ ALL_IDS . sample ( bounded_queries ) . map do | id |
92
+ world = World . find ( id )
93
93
new_value = rand1
94
94
new_value = rand1 while new_value == world . randomnumber
95
95
world . update_columns ( randomnumber : new_value )
96
- world
96
+ world . attributes
97
97
end
98
98
end
99
99
100
- json worlds . map! ( & :attributes )
100
+ json worlds
101
101
end
102
102
103
103
# Test type 6: Plaintext
You can’t perform that action at this time.
0 commit comments