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
=== modified file 'drizzle/automation/lib/db.py'
--- drizzle/automation/lib/db.py 2009-06-21 07:25:45 +0000
+++ drizzle/automation/lib/db.py 2010-01-22 04:01:12 +0000
@@ -147,12 +147,12 @@
147, PRIMARY KEY (server, version, run_date, dir_name)147, PRIMARY KEY (server, version, run_date, dir_name)
148) ENGINE=InnoDB;148) ENGINE=InnoDB;
149149
150CREATE TABLE sysbench_config (150CREATE TABLE bench_config (
151 config_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY151 config_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY
152, name VARCHAR(255) NOT NULL152, name VARCHAR(255) NOT NULL
153) ENGINE=InnoDB;153) ENGINE=InnoDB;
154154
155CREATE TABLE sysbench_runs (155CREATE TABLE bench_runs (
156 run_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY156 run_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY
157, config_id INT NOT NULL157, config_id INT NOT NULL
158, server VARCHAR(20) NOT NULL158, server VARCHAR(20) NOT NULL
@@ -182,5 +182,42 @@
182, PRIMARY KEY (run_id, concurrency)182, PRIMARY KEY (run_id, concurrency)
183) ENGINE=InnoDB;183) ENGINE=InnoDB;
184 184
185CREATE TABLE sqlbench_run_iterations (
186 run_id INT NOT NULL
187, operation_name VARCHAR(40) NOT NULL
188, seconds DECIMAL(5,2) NOT NULL
189, usr DECIMAL(5,2) NOT NULL
190, sys DECIMAL(5,2) NOT NULL
191, cpu DECIMAL(5,2) NOT NULL
192, tests INT NOT NULL
193, engine VARCHAR(20) NOT NULL
194, PRIMARY KEY (run_id, operation_name)
195) ENGINE=InnoDB;
196
197CREATE TABLE dbt2_run_iterations (
198run_id INT NOT NULL
199, tpm DECIMAL(6,2) NOT NULL
200, connections INT NOT NULL
201, test_time INT NOT NULL
202, rollbacks INT NOT NULL
203, warehouses INT NOT NULL
204, PRIMARY KEY (run_id, connections, test_time)
205) ENGINE=InnoDB;
206
207CREATE TABLE drizzleslap_run_iterations (
208run_id INT NOT NULL
209, engine_name VARCHAR(40) NOT NULL
210, test_name VARCHAR(40) NOT NULL
211, queries_avg DECIMAL(8,3) NOT NULL
212, queries_min DECIMAL(8,3) NOT NULL
213, queries_max DECIMAL(8,3) NOT NULL
214, total_time DECIMAL(8,3) NOT NULL
215, stddev DECIMAL(8,3) NOT NULL
216, iterations INT NOT NULL
217, concurrency INT NOT NULL
218, concurrency2 INT NOT NULL
219, queries_per_client INT NOT NULL
220, PRIMARY KEY (run_id, test_name, concurrency)
221) ENGINE=InnoDB;
185"""222"""
186 execute_sql(create_sql)223 execute_sql(create_sql)
187224
=== modified file 'drizzle/automation/lib/util.py'
--- drizzle/automation/lib/util.py 2010-01-07 20:48:08 +0000
+++ drizzle/automation/lib/util.py 2010-01-22 04:01:12 +0000
@@ -70,7 +70,7 @@
7070
71def log_sysbench_run(run_id, config_id, server_name, server_version, run_date):71def log_sysbench_run(run_id, config_id, server_name, server_version, run_date):
72 """Creates a new run record in the database for this run"""72 """Creates a new run record in the database for this run"""
73 sql= """INSERT INTO sysbench_runs (73 sql= """INSERT INTO bench_runs (
74 run_id74 run_id
75 , config_id75 , config_id
76 , server76 , server
@@ -92,17 +92,17 @@
9292
93 # If we have not already done so, we query the local DB for the ID93 # If we have not already done so, we query the local DB for the ID
94 # matching this sqlbench config name. If none is there, we insert94 # matching this sqlbench config name. If none is there, we insert
95 # a new record in the sysbench_config table and return the newly generated95 # a new record in the bench_config table and return the newly generated
96 # identifier.96 # identifier.
9797
98 sql= "SELECT config_id FROM sysbench_config WHERE name = '%s'" % bench_config_name98 sql= "SELECT config_id FROM bench_config WHERE name = '%s'" % bench_config_name
9999
100 from drizzle.automation.lib import db100 from drizzle.automation.lib import db
101 result= db.get_select(sql)101 result= db.get_select(sql)
102 102
103 if len(result) == 0:103 if len(result) == 0:
104 # Insert a new record for this config and return the new ID...104 # Insert a new record for this config and return the new ID...
105 sql= "INSERT INTO sysbench_config (config_id, name) VALUES (NULL, '%s')" % bench_config_name105 sql= "INSERT INTO bench_config (config_id, name) VALUES (NULL, '%s')" % bench_config_name
106 db.execute_sql(sql)106 db.execute_sql(sql)
107 return getConfigId(bench_config_name)107 return getConfigId(bench_config_name)
108 else:108 else:
@@ -113,7 +113,7 @@
113def getNextRunId():113def getNextRunId():
114 """Returns a new run identifier from the database. 114 """Returns a new run identifier from the database.
115 The run ID is used in logging the results of the run iterations."""115 The run ID is used in logging the results of the run iterations."""
116 sql= "SELECT MAX(run_id) as new_run_id FROM sysbench_runs"116 sql= "SELECT MAX(run_id) as new_run_id FROM bench_runs"
117117
118 from drizzle.automation.lib import db118 from drizzle.automation.lib import db
119 result= db.get_select(sql)119 result= db.get_select(sql)
@@ -132,8 +132,8 @@
132 sql= """132 sql= """
133SELECT 133SELECT
134 run_id134 run_id
135FROM sysbench_config c135FROM bench_config c
136NATURAL JOIN sysbench_runs r136NATURAL JOIN bench_runs r
137WHERE c.name = '%s'137WHERE c.name = '%s'
138AND r.server = '%s'138AND r.server = '%s'
139AND r.version LIKE '%s%%'139AND r.version LIKE '%s%%'
140140
=== modified file 'drizzle/automation/reports/dbt2.py'
--- drizzle/automation/reports/dbt2.py 2010-01-07 20:48:08 +0000
+++ drizzle/automation/reports/dbt2.py 2010-01-22 04:01:12 +0000
@@ -50,8 +50,8 @@
50, ROUND(agg.max_tpm,2) AS max_tpm50, ROUND(agg.max_tpm,2) AS max_tpm
51, ROUND(agg.avg_tpm,2) AS avg_tpm51, ROUND(agg.avg_tpm,2) AS avg_tpm
52, ROUND(agg.stddev_tpm,2) AS stddev_tpm52, ROUND(agg.stddev_tpm,2) AS stddev_tpm
53FROM sysbench_config c53FROM bench_config c
54NATURAL JOIN sysbench_runs r54NATURAL JOIN bench_runs r
55NATURAL JOIN dbt2_run_iterations i55NATURAL JOIN dbt2_run_iterations i
56INNER JOIN (56INNER JOIN (
57 SELECT57 SELECT
@@ -126,8 +126,8 @@
126 sql= """126 sql= """
127SELECT 127SELECT
128 run_id128 run_id
129FROM sysbench_config c129FROM bench_config c
130NATURAL JOIN sysbench_runs r130NATURAL JOIN bench_runs r
131WHERE c.name = '%s'131WHERE c.name = '%s'
132AND r.server = '%s'132AND r.server = '%s'
133AND r.version LIKE '%s%%'133AND r.version LIKE '%s%%'
@@ -201,8 +201,8 @@
201, ROUND(agg.max_tpm,2) AS max_tpm201, ROUND(agg.max_tpm,2) AS max_tpm
202, ROUND(agg.avg_tpm,2) AS avg_tpm202, ROUND(agg.avg_tpm,2) AS avg_tpm
203, ROUND(agg.stddev_tpm,2) AS stddev_tpm203, ROUND(agg.stddev_tpm,2) AS stddev_tpm
204FROM sysbench_config c204FROM bench_config c
205NATURAL JOIN sysbench_runs r205NATURAL JOIN bench_runs r
206NATURAL JOIN dbt2_run_iterations i206NATURAL JOIN dbt2_run_iterations i
207INNER JOIN (207INNER JOIN (
208 SELECT208 SELECT
@@ -211,8 +211,8 @@
211 , MAX(tpm) as max_tpm211 , MAX(tpm) as max_tpm
212 , AVG(tpm) as avg_tpm212 , AVG(tpm) as avg_tpm
213 , STDDEV(tpm) as stddev_tpm213 , STDDEV(tpm) as stddev_tpm
214 FROM sysbench_config conf214 FROM bench_config conf
215 NATURAL JOIN sysbench_runs runs215 NATURAL JOIN bench_runs runs
216 NATURAL JOIN dbt2_run_iterations iter216 NATURAL JOIN dbt2_run_iterations iter
217 WHERE conf.name = '%s'217 WHERE conf.name = '%s'
218 AND runs.server = '%s'218 AND runs.server = '%s'
219219
=== modified file 'drizzle/automation/reports/drizzleslap.py'
--- drizzle/automation/reports/drizzleslap.py 2010-01-07 20:48:08 +0000
+++ drizzle/automation/reports/drizzleslap.py 2010-01-22 04:01:12 +0000
@@ -51,8 +51,8 @@
51, FORMAT(agg.max_total_time,3) AS max_total_time51, FORMAT(agg.max_total_time,3) AS max_total_time
52, FORMAT(agg.avg_total_time,3) AS avg_total_time52, FORMAT(agg.avg_total_time,3) AS avg_total_time
53, FORMAT(agg.stddev_total_time,3) AS stddev_total_time53, FORMAT(agg.stddev_total_time,3) AS stddev_total_time
54FROM sysbench_config c54FROM bench_config c
55NATURAL JOIN sysbench_runs r55NATURAL JOIN bench_runs r
56NATURAL JOIN drizzleslap_run_iterations i56NATURAL JOIN drizzleslap_run_iterations i
57INNER JOIN (57INNER JOIN (
58 SELECT58 SELECT
@@ -130,8 +130,8 @@
130 sql= """130 sql= """
131SELECT 131SELECT
132 run_id132 run_id
133FROM sysbench_config c133FROM bench_config c
134NATURAL JOIN sysbench_runs r134NATURAL JOIN bench_runs r
135WHERE c.name = '%s'135WHERE c.name = '%s'
136AND r.server = '%s'136AND r.server = '%s'
137AND r.version LIKE '%s%%'137AND r.version LIKE '%s%%'
@@ -205,8 +205,8 @@
205, FORMAT(agg.max_total_time,3) AS max_total_time205, FORMAT(agg.max_total_time,3) AS max_total_time
206, FORMAT(agg.avg_total_time,3) AS avg_total_time206, FORMAT(agg.avg_total_time,3) AS avg_total_time
207, FORMAT(agg.stddev_total_time,3) AS stddev_total_time207, FORMAT(agg.stddev_total_time,3) AS stddev_total_time
208FROM sysbench_config c208FROM bench_config c
209NATURAL JOIN sysbench_runs r209NATURAL JOIN bench_runs r
210NATURAL JOIN drizzleslap_run_iterations i210NATURAL JOIN drizzleslap_run_iterations i
211INNER JOIN (211INNER JOIN (
212 SELECT212 SELECT
@@ -215,8 +215,8 @@
215 , MAX(total_time) as max_total_time215 , MAX(total_time) as max_total_time
216 , AVG(total_time) as avg_total_time216 , AVG(total_time) as avg_total_time
217 , STDDEV(total_time) as stddev_total_time217 , STDDEV(total_time) as stddev_total_time
218 FROM sysbench_config conf218 FROM bench_config conf
219 NATURAL JOIN sysbench_runs runs219 NATURAL JOIN bench_runs runs
220 NATURAL JOIN drizzleslap_run_iterations iter220 NATURAL JOIN drizzleslap_run_iterations iter
221 WHERE conf.name = '%s'221 WHERE conf.name = '%s'
222 AND runs.server = '%s'222 AND runs.server = '%s'
223223
=== modified file 'drizzle/automation/reports/sqlbench.py'
--- drizzle/automation/reports/sqlbench.py 2010-01-07 20:48:08 +0000
+++ drizzle/automation/reports/sqlbench.py 2010-01-22 04:01:12 +0000
@@ -51,8 +51,8 @@
51, ROUND(agg.max_seconds,2) AS max_seconds51, ROUND(agg.max_seconds,2) AS max_seconds
52, ROUND(agg.avg_seconds,2) AS avg_seconds52, ROUND(agg.avg_seconds,2) AS avg_seconds
53, ROUND(agg.stddev_seconds,2) AS stddev_seconds53, ROUND(agg.stddev_seconds,2) AS stddev_seconds
54FROM sysbench_config c54FROM bench_config c
55NATURAL JOIN sysbench_runs r55NATURAL JOIN bench_runs r
56NATURAL JOIN sqlbench_run_iterations i56NATURAL JOIN sqlbench_run_iterations i
57INNER JOIN (57INNER JOIN (
58 SELECT58 SELECT
@@ -127,8 +127,8 @@
127 sql= """127 sql= """
128SELECT 128SELECT
129 run_id129 run_id
130FROM sysbench_config c130FROM bench_config c
131NATURAL JOIN sysbench_runs r131NATURAL JOIN bench_runs r
132WHERE c.name = '%s'132WHERE c.name = '%s'
133AND r.server = '%s'133AND r.server = '%s'
134AND r.version LIKE '%s%%'134AND r.version LIKE '%s%%'
@@ -205,8 +205,8 @@
205, ROUND(agg.max_seconds,2) AS max_seconds205, ROUND(agg.max_seconds,2) AS max_seconds
206, ROUND(agg.avg_seconds,2) AS avg_seconds206, ROUND(agg.avg_seconds,2) AS avg_seconds
207, ROUND(agg.stddev_seconds,2) AS stddev_seconds207, ROUND(agg.stddev_seconds,2) AS stddev_seconds
208FROM sysbench_config c208FROM bench_config c
209NATURAL JOIN sysbench_runs r209NATURAL JOIN bench_runs r
210NATURAL JOIN sqlbench_run_iterations i210NATURAL JOIN sqlbench_run_iterations i
211INNER JOIN (211INNER JOIN (
212 SELECT212 SELECT
@@ -215,8 +215,8 @@
215 , MAX(seconds) as max_seconds215 , MAX(seconds) as max_seconds
216 , AVG(seconds) as avg_seconds216 , AVG(seconds) as avg_seconds
217 , STDDEV(seconds) as stddev_seconds217 , STDDEV(seconds) as stddev_seconds
218 FROM sysbench_config conf218 FROM bench_config conf
219 NATURAL JOIN sysbench_runs runs219 NATURAL JOIN bench_runs runs
220 NATURAL JOIN sqlbench_run_iterations iter220 NATURAL JOIN sqlbench_run_iterations iter
221 WHERE conf.name = '%s'221 WHERE conf.name = '%s'
222 AND runs.server = '%s'222 AND runs.server = '%s'
223223
=== modified file 'drizzle/automation/reports/sysbench.py'
--- drizzle/automation/reports/sysbench.py 2010-01-07 20:48:08 +0000
+++ drizzle/automation/reports/sysbench.py 2010-01-22 04:01:12 +0000
@@ -35,8 +35,8 @@
35 sql= """35 sql= """
36SELECT 36SELECT
37 run_id37 run_id
38FROM sysbench_config c38FROM bench_config c
39NATURAL JOIN sysbench_runs r39NATURAL JOIN bench_runs r
40WHERE c.name = '%s'40WHERE c.name = '%s'
41AND r.server = '%s'41AND r.server = '%s'
42AND r.version LIKE '%s%%'42AND r.version LIKE '%s%%'
@@ -81,8 +81,8 @@
81, ROUND(agg.max_tps, 2) AS max_tps81, ROUND(agg.max_tps, 2) AS max_tps
82, ROUND(agg.avg_tps, 2) AS avg_tps82, ROUND(agg.avg_tps, 2) AS avg_tps
83, ROUND(agg.stddev_tps, 2) AS stddev_tps83, ROUND(agg.stddev_tps, 2) AS stddev_tps
84FROM sysbench_config c84FROM bench_config c
85NATURAL JOIN sysbench_runs r85NATURAL JOIN bench_runs r
86NATURAL JOIN sysbench_run_iterations i86NATURAL JOIN sysbench_run_iterations i
87INNER JOIN (87INNER JOIN (
88 SELECT88 SELECT
@@ -123,8 +123,8 @@
123, ROUND(agg.max_tps, 2) AS max_tps123, ROUND(agg.max_tps, 2) AS max_tps
124, ROUND(agg.avg_tps, 2) AS avg_tps124, ROUND(agg.avg_tps, 2) AS avg_tps
125, ROUND(agg.stddev_tps, 2) AS stddev_tps125, ROUND(agg.stddev_tps, 2) AS stddev_tps
126FROM sysbench_config c126FROM bench_config c
127NATURAL JOIN sysbench_runs r127NATURAL JOIN bench_runs r
128NATURAL JOIN sysbench_run_iterations i128NATURAL JOIN sysbench_run_iterations i
129INNER JOIN (129INNER JOIN (
130 SELECT130 SELECT
@@ -133,8 +133,8 @@
133 , MAX(tps) as max_tps133 , MAX(tps) as max_tps
134 , AVG(tps) as avg_tps134 , AVG(tps) as avg_tps
135 , STDDEV(tps) as stddev_tps135 , STDDEV(tps) as stddev_tps
136 FROM sysbench_config conf136 FROM bench_config conf
137 NATURAL JOIN sysbench_runs runs137 NATURAL JOIN bench_runs runs
138 NATURAL JOIN sysbench_run_iterations iter138 NATURAL JOIN sysbench_run_iterations iter
139 WHERE conf.name = '%s'139 WHERE conf.name = '%s'
140 AND runs.server = '%s'140 AND runs.server = '%s'

Subscribers

People subscribed via source and target branches

to all changes: