Drizzle Automation

Merge lp:~kalebral-deactivatedaccount/drizzle-automation/rename-db-tables into lp:drizzle-automation

  1. rename-db-tables
  2. Merge into trunk
Proposed by Lee Bieber
Status: Merged
Merged at revision: not available
Proposed branch: lp:~kalebral-deactivatedaccount/drizzle-automation/rename-db-tables
Merge into: lp:drizzle-automation
Diff against target: 307 lines (+78/-41)
6 files modified
drizzle/automation/lib/db.py (+39/-2)
drizzle/automation/lib/util.py (+7/-7)
drizzle/automation/reports/dbt2.py (+8/-8)
drizzle/automation/reports/drizzleslap.py (+8/-8)
drizzle/automation/reports/sqlbench.py (+8/-8)
drizzle/automation/reports/sysbench.py (+8/-8)
To merge this branch: bzr merge lp:~kalebral-deactivatedaccount/drizzle-automation/rename-db-tables
Reviewer Review Type Date Requested Status
Jay Pipes Approve
Review via email: mp+17865@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

Rename sysbench_config and sysbench_runs tables to be more generic since they are used by many different benchmarks, bench_config and bench_runs

Revision history for this message
Jay Pipes (jaypipes) wrote :

Nice! I've been wanting to do this for a while now. :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzle/automation/lib/db.py'
2--- drizzle/automation/lib/db.py 2009-06-21 07:25:45 +0000
3+++ drizzle/automation/lib/db.py 2010-01-22 04:01:12 +0000
4@@ -147,12 +147,12 @@
5 , PRIMARY KEY (server, version, run_date, dir_name)
6 ) ENGINE=InnoDB;
7
8-CREATE TABLE sysbench_config (
9+CREATE TABLE bench_config (
10 config_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY
11 , name VARCHAR(255) NOT NULL
12 ) ENGINE=InnoDB;
13
14-CREATE TABLE sysbench_runs (
15+CREATE TABLE bench_runs (
16 run_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY
17 , config_id INT NOT NULL
18 , server VARCHAR(20) NOT NULL
19@@ -182,5 +182,42 @@
20 , PRIMARY KEY (run_id, concurrency)
21 ) ENGINE=InnoDB;
22
23+CREATE TABLE sqlbench_run_iterations (
24+ run_id INT NOT NULL
25+, operation_name VARCHAR(40) NOT NULL
26+, seconds DECIMAL(5,2) NOT NULL
27+, usr DECIMAL(5,2) NOT NULL
28+, sys DECIMAL(5,2) NOT NULL
29+, cpu DECIMAL(5,2) NOT NULL
30+, tests INT NOT NULL
31+, engine VARCHAR(20) NOT NULL
32+, PRIMARY KEY (run_id, operation_name)
33+) ENGINE=InnoDB;
34+
35+CREATE TABLE dbt2_run_iterations (
36+run_id INT NOT NULL
37+, tpm DECIMAL(6,2) NOT NULL
38+, connections INT NOT NULL
39+, test_time INT NOT NULL
40+, rollbacks INT NOT NULL
41+, warehouses INT NOT NULL
42+, PRIMARY KEY (run_id, connections, test_time)
43+) ENGINE=InnoDB;
44+
45+CREATE TABLE drizzleslap_run_iterations (
46+run_id INT NOT NULL
47+, engine_name VARCHAR(40) NOT NULL
48+, test_name VARCHAR(40) NOT NULL
49+, queries_avg DECIMAL(8,3) NOT NULL
50+, queries_min DECIMAL(8,3) NOT NULL
51+, queries_max DECIMAL(8,3) NOT NULL
52+, total_time DECIMAL(8,3) NOT NULL
53+, stddev DECIMAL(8,3) NOT NULL
54+, iterations INT NOT NULL
55+, concurrency INT NOT NULL
56+, concurrency2 INT NOT NULL
57+, queries_per_client INT NOT NULL
58+, PRIMARY KEY (run_id, test_name, concurrency)
59+) ENGINE=InnoDB;
60 """
61 execute_sql(create_sql)
62
63=== modified file 'drizzle/automation/lib/util.py'
64--- drizzle/automation/lib/util.py 2010-01-07 20:48:08 +0000
65+++ drizzle/automation/lib/util.py 2010-01-22 04:01:12 +0000
66@@ -70,7 +70,7 @@
67
68 def log_sysbench_run(run_id, config_id, server_name, server_version, run_date):
69 """Creates a new run record in the database for this run"""
70- sql= """INSERT INTO sysbench_runs (
71+ sql= """INSERT INTO bench_runs (
72 run_id
73 , config_id
74 , server
75@@ -92,17 +92,17 @@
76
77 # If we have not already done so, we query the local DB for the ID
78 # matching this sqlbench config name. If none is there, we insert
79- # a new record in the sysbench_config table and return the newly generated
80+ # a new record in the bench_config table and return the newly generated
81 # identifier.
82
83- sql= "SELECT config_id FROM sysbench_config WHERE name = '%s'" % bench_config_name
84+ sql= "SELECT config_id FROM bench_config WHERE name = '%s'" % bench_config_name
85
86 from drizzle.automation.lib import db
87 result= db.get_select(sql)
88
89 if len(result) == 0:
90 # Insert a new record for this config and return the new ID...
91- sql= "INSERT INTO sysbench_config (config_id, name) VALUES (NULL, '%s')" % bench_config_name
92+ sql= "INSERT INTO bench_config (config_id, name) VALUES (NULL, '%s')" % bench_config_name
93 db.execute_sql(sql)
94 return getConfigId(bench_config_name)
95 else:
96@@ -113,7 +113,7 @@
97 def getNextRunId():
98 """Returns a new run identifier from the database.
99 The run ID is used in logging the results of the run iterations."""
100- sql= "SELECT MAX(run_id) as new_run_id FROM sysbench_runs"
101+ sql= "SELECT MAX(run_id) as new_run_id FROM bench_runs"
102
103 from drizzle.automation.lib import db
104 result= db.get_select(sql)
105@@ -132,8 +132,8 @@
106 sql= """
107 SELECT
108 run_id
109-FROM sysbench_config c
110-NATURAL JOIN sysbench_runs r
111+FROM bench_config c
112+NATURAL JOIN bench_runs r
113 WHERE c.name = '%s'
114 AND r.server = '%s'
115 AND r.version LIKE '%s%%'
116
117=== modified file 'drizzle/automation/reports/dbt2.py'
118--- drizzle/automation/reports/dbt2.py 2010-01-07 20:48:08 +0000
119+++ drizzle/automation/reports/dbt2.py 2010-01-22 04:01:12 +0000
120@@ -50,8 +50,8 @@
121 , ROUND(agg.max_tpm,2) AS max_tpm
122 , ROUND(agg.avg_tpm,2) AS avg_tpm
123 , ROUND(agg.stddev_tpm,2) AS stddev_tpm
124-FROM sysbench_config c
125-NATURAL JOIN sysbench_runs r
126+FROM bench_config c
127+NATURAL JOIN bench_runs r
128 NATURAL JOIN dbt2_run_iterations i
129 INNER JOIN (
130 SELECT
131@@ -126,8 +126,8 @@
132 sql= """
133 SELECT
134 run_id
135-FROM sysbench_config c
136-NATURAL JOIN sysbench_runs r
137+FROM bench_config c
138+NATURAL JOIN bench_runs r
139 WHERE c.name = '%s'
140 AND r.server = '%s'
141 AND r.version LIKE '%s%%'
142@@ -201,8 +201,8 @@
143 , ROUND(agg.max_tpm,2) AS max_tpm
144 , ROUND(agg.avg_tpm,2) AS avg_tpm
145 , ROUND(agg.stddev_tpm,2) AS stddev_tpm
146-FROM sysbench_config c
147-NATURAL JOIN sysbench_runs r
148+FROM bench_config c
149+NATURAL JOIN bench_runs r
150 NATURAL JOIN dbt2_run_iterations i
151 INNER JOIN (
152 SELECT
153@@ -211,8 +211,8 @@
154 , MAX(tpm) as max_tpm
155 , AVG(tpm) as avg_tpm
156 , STDDEV(tpm) as stddev_tpm
157- FROM sysbench_config conf
158- NATURAL JOIN sysbench_runs runs
159+ FROM bench_config conf
160+ NATURAL JOIN bench_runs runs
161 NATURAL JOIN dbt2_run_iterations iter
162 WHERE conf.name = '%s'
163 AND runs.server = '%s'
164
165=== modified file 'drizzle/automation/reports/drizzleslap.py'
166--- drizzle/automation/reports/drizzleslap.py 2010-01-07 20:48:08 +0000
167+++ drizzle/automation/reports/drizzleslap.py 2010-01-22 04:01:12 +0000
168@@ -51,8 +51,8 @@
169 , FORMAT(agg.max_total_time,3) AS max_total_time
170 , FORMAT(agg.avg_total_time,3) AS avg_total_time
171 , FORMAT(agg.stddev_total_time,3) AS stddev_total_time
172-FROM sysbench_config c
173-NATURAL JOIN sysbench_runs r
174+FROM bench_config c
175+NATURAL JOIN bench_runs r
176 NATURAL JOIN drizzleslap_run_iterations i
177 INNER JOIN (
178 SELECT
179@@ -130,8 +130,8 @@
180 sql= """
181 SELECT
182 run_id
183-FROM sysbench_config c
184-NATURAL JOIN sysbench_runs r
185+FROM bench_config c
186+NATURAL JOIN bench_runs r
187 WHERE c.name = '%s'
188 AND r.server = '%s'
189 AND r.version LIKE '%s%%'
190@@ -205,8 +205,8 @@
191 , FORMAT(agg.max_total_time,3) AS max_total_time
192 , FORMAT(agg.avg_total_time,3) AS avg_total_time
193 , FORMAT(agg.stddev_total_time,3) AS stddev_total_time
194-FROM sysbench_config c
195-NATURAL JOIN sysbench_runs r
196+FROM bench_config c
197+NATURAL JOIN bench_runs r
198 NATURAL JOIN drizzleslap_run_iterations i
199 INNER JOIN (
200 SELECT
201@@ -215,8 +215,8 @@
202 , MAX(total_time) as max_total_time
203 , AVG(total_time) as avg_total_time
204 , STDDEV(total_time) as stddev_total_time
205- FROM sysbench_config conf
206- NATURAL JOIN sysbench_runs runs
207+ FROM bench_config conf
208+ NATURAL JOIN bench_runs runs
209 NATURAL JOIN drizzleslap_run_iterations iter
210 WHERE conf.name = '%s'
211 AND runs.server = '%s'
212
213=== modified file 'drizzle/automation/reports/sqlbench.py'
214--- drizzle/automation/reports/sqlbench.py 2010-01-07 20:48:08 +0000
215+++ drizzle/automation/reports/sqlbench.py 2010-01-22 04:01:12 +0000
216@@ -51,8 +51,8 @@
217 , ROUND(agg.max_seconds,2) AS max_seconds
218 , ROUND(agg.avg_seconds,2) AS avg_seconds
219 , ROUND(agg.stddev_seconds,2) AS stddev_seconds
220-FROM sysbench_config c
221-NATURAL JOIN sysbench_runs r
222+FROM bench_config c
223+NATURAL JOIN bench_runs r
224 NATURAL JOIN sqlbench_run_iterations i
225 INNER JOIN (
226 SELECT
227@@ -127,8 +127,8 @@
228 sql= """
229 SELECT
230 run_id
231-FROM sysbench_config c
232-NATURAL JOIN sysbench_runs r
233+FROM bench_config c
234+NATURAL JOIN bench_runs r
235 WHERE c.name = '%s'
236 AND r.server = '%s'
237 AND r.version LIKE '%s%%'
238@@ -205,8 +205,8 @@
239 , ROUND(agg.max_seconds,2) AS max_seconds
240 , ROUND(agg.avg_seconds,2) AS avg_seconds
241 , ROUND(agg.stddev_seconds,2) AS stddev_seconds
242-FROM sysbench_config c
243-NATURAL JOIN sysbench_runs r
244+FROM bench_config c
245+NATURAL JOIN bench_runs r
246 NATURAL JOIN sqlbench_run_iterations i
247 INNER JOIN (
248 SELECT
249@@ -215,8 +215,8 @@
250 , MAX(seconds) as max_seconds
251 , AVG(seconds) as avg_seconds
252 , STDDEV(seconds) as stddev_seconds
253- FROM sysbench_config conf
254- NATURAL JOIN sysbench_runs runs
255+ FROM bench_config conf
256+ NATURAL JOIN bench_runs runs
257 NATURAL JOIN sqlbench_run_iterations iter
258 WHERE conf.name = '%s'
259 AND runs.server = '%s'
260
261=== modified file 'drizzle/automation/reports/sysbench.py'
262--- drizzle/automation/reports/sysbench.py 2010-01-07 20:48:08 +0000
263+++ drizzle/automation/reports/sysbench.py 2010-01-22 04:01:12 +0000
264@@ -35,8 +35,8 @@
265 sql= """
266 SELECT
267 run_id
268-FROM sysbench_config c
269-NATURAL JOIN sysbench_runs r
270+FROM bench_config c
271+NATURAL JOIN bench_runs r
272 WHERE c.name = '%s'
273 AND r.server = '%s'
274 AND r.version LIKE '%s%%'
275@@ -81,8 +81,8 @@
276 , ROUND(agg.max_tps, 2) AS max_tps
277 , ROUND(agg.avg_tps, 2) AS avg_tps
278 , ROUND(agg.stddev_tps, 2) AS stddev_tps
279-FROM sysbench_config c
280-NATURAL JOIN sysbench_runs r
281+FROM bench_config c
282+NATURAL JOIN bench_runs r
283 NATURAL JOIN sysbench_run_iterations i
284 INNER JOIN (
285 SELECT
286@@ -123,8 +123,8 @@
287 , ROUND(agg.max_tps, 2) AS max_tps
288 , ROUND(agg.avg_tps, 2) AS avg_tps
289 , ROUND(agg.stddev_tps, 2) AS stddev_tps
290-FROM sysbench_config c
291-NATURAL JOIN sysbench_runs r
292+FROM bench_config c
293+NATURAL JOIN bench_runs r
294 NATURAL JOIN sysbench_run_iterations i
295 INNER JOIN (
296 SELECT
297@@ -133,8 +133,8 @@
298 , MAX(tps) as max_tps
299 , AVG(tps) as avg_tps
300 , STDDEV(tps) as stddev_tps
301- FROM sysbench_config conf
302- NATURAL JOIN sysbench_runs runs
303+ FROM bench_config conf
304+ NATURAL JOIN bench_runs runs
305 NATURAL JOIN sysbench_run_iterations iter
306 WHERE conf.name = '%s'
307 AND runs.server = '%s'

Subscribers

People subscribed via source and target branches

to all changes: