Skip to content

Commit 90784b1

Browse files
ScottLinnncopybara-github
ScottLinnn
authored and
copybara-github
committed
Supporting new benchmark
PiperOrigin-RevId: 835092096
1 parent 24672e0 commit 90784b1

File tree

2 files changed

+382
-0
lines changed

2 files changed

+382
-0
lines changed

‎perfkitbenchmarker/data/benchbase/spanner_pg_tpcc_no_fk.diff‎

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
diff --git a/pom.xml b/pom.xml
2+
index 9e164417..33524c40 100644
3+
--- a/pom.xml
4+
+++ b/pom.xml
5+
@@ -438,6 +438,7 @@
6+
<appendAssemblyId>false</appendAssemblyId>
7+
<finalName>${project.artifactId}-${classifier}</finalName>
8+
<recompressZippedFiles>false</recompressZippedFiles>
9+
+ <tarLongFileMode>posix</tarLongFileMode>
10+
<descriptors>${descriptors}</descriptors>
11+
</configuration>
12+
<executions>
13+
diff --git a/src/main/resources/benchmarks/tpcc/ddl-postgres.sql b/src/main/resources/benchmarks/tpcc/ddl-postgres.sql
14+
index 2402e94d..a747b022 100644
15+
--- a/src/main/resources/benchmarks/tpcc/ddl-postgres.sql
16+
+++ b/src/main/resources/benchmarks/tpcc/ddl-postgres.sql
17+
@@ -10,21 +10,21 @@ DROP TABLE IF EXISTS warehouse CASCADE;
18+
19+
CREATE TABLE warehouse (
20+
w_id int NOT NULL,
21+
- w_ytd decimal(12, 2) NOT NULL,
22+
- w_tax decimal(4, 4) NOT NULL,
23+
+ w_ytd decimal NOT NULL,
24+
+ w_tax decimal NOT NULL,
25+
w_name varchar(10) NOT NULL,
26+
w_street_1 varchar(20) NOT NULL,
27+
w_street_2 varchar(20) NOT NULL,
28+
w_city varchar(20) NOT NULL,
29+
- w_state char(2) NOT NULL,
30+
- w_zip char(9) NOT NULL,
31+
+ w_state varchar(2) NOT NULL,
32+
+ w_zip varchar(9) NOT NULL,
33+
PRIMARY KEY (w_id)
34+
);
35+
36+
CREATE TABLE item (
37+
i_id int NOT NULL,
38+
i_name varchar(24) NOT NULL,
39+
- i_price decimal(5, 2) NOT NULL,
40+
+ i_price decimal NOT NULL,
41+
i_data varchar(50) NOT NULL,
42+
i_im_id int NOT NULL,
43+
PRIMARY KEY (i_id)
44+
@@ -34,38 +34,38 @@ CREATE TABLE stock (
45+
s_w_id int NOT NULL,
46+
s_i_id int NOT NULL,
47+
s_quantity int NOT NULL,
48+
- s_ytd decimal(8, 2) NOT NULL,
49+
+ s_ytd decimal NOT NULL,
50+
s_order_cnt int NOT NULL,
51+
s_remote_cnt int NOT NULL,
52+
s_data varchar(50) NOT NULL,
53+
- s_dist_01 char(24) NOT NULL,
54+
- s_dist_02 char(24) NOT NULL,
55+
- s_dist_03 char(24) NOT NULL,
56+
- s_dist_04 char(24) NOT NULL,
57+
- s_dist_05 char(24) NOT NULL,
58+
- s_dist_06 char(24) NOT NULL,
59+
- s_dist_07 char(24) NOT NULL,
60+
- s_dist_08 char(24) NOT NULL,
61+
- s_dist_09 char(24) NOT NULL,
62+
- s_dist_10 char(24) NOT NULL,
63+
- FOREIGN KEY (s_w_id) REFERENCES warehouse (w_id) ON DELETE CASCADE,
64+
- FOREIGN KEY (s_i_id) REFERENCES item (i_id) ON DELETE CASCADE,
65+
+ s_dist_01 varchar(24) NOT NULL,
66+
+ s_dist_02 varchar(24) NOT NULL,
67+
+ s_dist_03 varchar(24) NOT NULL,
68+
+ s_dist_04 varchar(24) NOT NULL,
69+
+ s_dist_05 varchar(24) NOT NULL,
70+
+ s_dist_06 varchar(24) NOT NULL,
71+
+ s_dist_07 varchar(24) NOT NULL,
72+
+ s_dist_08 varchar(24) NOT NULL,
73+
+ s_dist_09 varchar(24) NOT NULL,
74+
+ s_dist_10 varchar(24) NOT NULL,
75+
+ -- FOREIGN KEY (s_w_id) REFERENCES warehouse (w_id) ON DELETE CASCADE,
76+
+ -- FOREIGN KEY (s_i_id) REFERENCES item (i_id) ON DELETE CASCADE,
77+
PRIMARY KEY (s_w_id, s_i_id)
78+
);
79+
80+
CREATE TABLE district (
81+
d_w_id int NOT NULL,
82+
d_id int NOT NULL,
83+
- d_ytd decimal(12, 2) NOT NULL,
84+
- d_tax decimal(4, 4) NOT NULL,
85+
+ d_ytd decimal NOT NULL,
86+
+ d_tax decimal NOT NULL,
87+
d_next_o_id int NOT NULL,
88+
d_name varchar(10) NOT NULL,
89+
d_street_1 varchar(20) NOT NULL,
90+
d_street_2 varchar(20) NOT NULL,
91+
d_city varchar(20) NOT NULL,
92+
- d_state char(2) NOT NULL,
93+
- d_zip char(9) NOT NULL,
94+
- FOREIGN KEY (d_w_id) REFERENCES warehouse (w_id) ON DELETE CASCADE,
95+
+ d_state varchar(2) NOT NULL,
96+
+ d_zip varchar(9) NOT NULL,
97+
+ -- FOREIGN KEY (d_w_id) REFERENCES warehouse (w_id) ON DELETE CASCADE,
98+
PRIMARY KEY (d_w_id, d_id)
99+
);
100+
101+
@@ -73,25 +73,25 @@ CREATE TABLE customer (
102+
c_w_id int NOT NULL,
103+
c_d_id int NOT NULL,
104+
c_id int NOT NULL,
105+
- c_discount decimal(4, 4) NOT NULL,
106+
- c_credit char(2) NOT NULL,
107+
+ c_discount decimal NOT NULL,
108+
+ c_credit varchar(2) NOT NULL,
109+
c_last varchar(16) NOT NULL,
110+
c_first varchar(16) NOT NULL,
111+
- c_credit_lim decimal(12, 2) NOT NULL,
112+
- c_balance decimal(12, 2) NOT NULL,
113+
+ c_credit_lim decimal NOT NULL,
114+
+ c_balance decimal NOT NULL,
115+
c_ytd_payment float NOT NULL,
116+
c_payment_cnt int NOT NULL,
117+
c_delivery_cnt int NOT NULL,
118+
c_street_1 varchar(20) NOT NULL,
119+
c_street_2 varchar(20) NOT NULL,
120+
c_city varchar(20) NOT NULL,
121+
- c_state char(2) NOT NULL,
122+
- c_zip char(9) NOT NULL,
123+
- c_phone char(16) NOT NULL,
124+
- c_since timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
125+
- c_middle char(2) NOT NULL,
126+
+ c_state varchar(2) NOT NULL,
127+
+ c_zip varchar(9) NOT NULL,
128+
+ c_phone varchar(16) NOT NULL,
129+
+ c_since timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
130+
+ c_middle varchar(2) NOT NULL,
131+
c_data varchar(500) NOT NULL,
132+
- FOREIGN KEY (c_w_id, c_d_id) REFERENCES district (d_w_id, d_id) ON DELETE CASCADE,
133+
+ -- FOREIGN KEY (c_w_id, c_d_id) REFERENCES district (d_w_id, d_id) ON DELETE CASCADE,
134+
PRIMARY KEY (c_w_id, c_d_id, c_id)
135+
);
136+
137+
@@ -101,11 +101,12 @@ CREATE TABLE history (
138+
h_c_w_id int NOT NULL,
139+
h_d_id int NOT NULL,
140+
h_w_id int NOT NULL,
141+
- h_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
142+
- h_amount decimal(6, 2) NOT NULL,
143+
+ h_date timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
144+
+ h_amount decimal NOT NULL,
145+
h_data varchar(24) NOT NULL,
146+
- FOREIGN KEY (h_c_w_id, h_c_d_id, h_c_id) REFERENCES customer (c_w_id, c_d_id, c_id) ON DELETE CASCADE,
147+
- FOREIGN KEY (h_w_id, h_d_id) REFERENCES district (d_w_id, d_id) ON DELETE CASCADE
148+
+ -- FOREIGN KEY (h_c_w_id, h_c_d_id, h_c_id) REFERENCES customer (c_w_id, c_d_id, c_id) ON DELETE CASCADE,
149+
+ -- FOREIGN KEY (h_w_id, h_d_id) REFERENCES district (d_w_id, d_id) ON DELETE CASCADE,
150+
+ PRIMARY KEY(h_c_id, h_date, h_data)
151+
);
152+
153+
CREATE TABLE oorder (
154+
@@ -113,20 +114,21 @@ CREATE TABLE oorder (
155+
o_d_id int NOT NULL,
156+
o_id int NOT NULL,
157+
o_c_id int NOT NULL,
158+
- o_carrier_id int DEFAULT NULL,
159+
+ o_carrier_id int ,
160+
o_ol_cnt int NOT NULL,
161+
o_all_local int NOT NULL,
162+
- o_entry_d timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
163+
- PRIMARY KEY (o_w_id, o_d_id, o_id),
164+
- FOREIGN KEY (o_w_id, o_d_id, o_c_id) REFERENCES customer (c_w_id, c_d_id, c_id) ON DELETE CASCADE,
165+
- UNIQUE (o_w_id, o_d_id, o_c_id, o_id)
166+
+ o_entry_d timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
167+
+ PRIMARY KEY (o_w_id, o_d_id, o_id)
168+
+ -- FOREIGN KEY (o_w_id, o_d_id, o_c_id) REFERENCES customer (c_w_id, c_d_id, c_id) ON DELETE CASCADE
169+
);
170+
171+
+CREATE UNIQUE INDEX unique_index_oorder ON oorder (o_w_id, o_d_id, o_c_id, o_id);
172+
+
173+
CREATE TABLE new_order (
174+
no_w_id int NOT NULL,
175+
no_d_id int NOT NULL,
176+
no_o_id int NOT NULL,
177+
- FOREIGN KEY (no_w_id, no_d_id, no_o_id) REFERENCES oorder (o_w_id, o_d_id, o_id) ON DELETE CASCADE,
178+
+ -- FOREIGN KEY (no_w_id, no_d_id, no_o_id) REFERENCES oorder (o_w_id, o_d_id, o_id) ON DELETE CASCADE,
179+
PRIMARY KEY (no_w_id, no_d_id, no_o_id)
180+
);
181+
182+
@@ -136,13 +138,13 @@ CREATE TABLE order_line (
183+
ol_o_id int NOT NULL,
184+
ol_number int NOT NULL,
185+
ol_i_id int NOT NULL,
186+
- ol_delivery_d timestamp NULL DEFAULT NULL,
187+
- ol_amount decimal(6, 2) NOT NULL,
188+
+ ol_delivery_d timestamptz ,
189+
+ ol_amount decimal NOT NULL,
190+
ol_supply_w_id int NOT NULL,
191+
- ol_quantity decimal(6,2) NOT NULL,
192+
- ol_dist_info char(24) NOT NULL,
193+
- FOREIGN KEY (ol_w_id, ol_d_id, ol_o_id) REFERENCES oorder (o_w_id, o_d_id, o_id) ON DELETE CASCADE,
194+
- FOREIGN KEY (ol_supply_w_id, ol_i_id) REFERENCES stock (s_w_id, s_i_id) ON DELETE CASCADE,
195+
+ ol_quantity decimal NOT NULL,
196+
+ ol_dist_info varchar(24) NOT NULL,
197+
+ -- FOREIGN KEY (ol_w_id, ol_d_id, ol_o_id) REFERENCES oorder (o_w_id, o_d_id, o_id) ON DELETE CASCADE,
198+
+ -- FOREIGN KEY (ol_supply_w_id, ol_i_id) REFERENCES stock (s_w_id, s_i_id) ON DELETE CASCADE,
199+
PRIMARY KEY (ol_w_id, ol_d_id, ol_o_id, ol_number)
200+
);
201+

‎perfkitbenchmarker/data/benchbase/spanner_pg_tpcc_with_fk.diff‎

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
diff --git a/pom.xml b/pom.xml
2+
index 9e164417..33524c40 100644
3+
--- a/pom.xml
4+
+++ b/pom.xml
5+
@@ -438,6 +438,7 @@
6+
<appendAssemblyId>false</appendAssemblyId>
7+
<finalName>${project.artifactId}-${classifier}</finalName>
8+
<recompressZippedFiles>false</recompressZippedFiles>
9+
+ <tarLongFileMode>posix</tarLongFileMode>
10+
<descriptors>${descriptors}</descriptors>
11+
</configuration>
12+
<executions>
13+
diff --git a/src/main/resources/benchmarks/tpcc/ddl-postgres.sql b/src/main/resources/benchmarks/tpcc/ddl-postgres.sql
14+
index 2402e94d..1c5e95c5 100644
15+
--- a/src/main/resources/benchmarks/tpcc/ddl-postgres.sql
16+
+++ b/src/main/resources/benchmarks/tpcc/ddl-postgres.sql
17+
@@ -10,21 +10,21 @@ DROP TABLE IF EXISTS warehouse CASCADE;
18+
19+
CREATE TABLE warehouse (
20+
w_id int NOT NULL,
21+
- w_ytd decimal(12, 2) NOT NULL,
22+
- w_tax decimal(4, 4) NOT NULL,
23+
+ w_ytd decimal NOT NULL,
24+
+ w_tax decimal NOT NULL,
25+
w_name varchar(10) NOT NULL,
26+
w_street_1 varchar(20) NOT NULL,
27+
w_street_2 varchar(20) NOT NULL,
28+
w_city varchar(20) NOT NULL,
29+
- w_state char(2) NOT NULL,
30+
- w_zip char(9) NOT NULL,
31+
+ w_state varchar(2) NOT NULL,
32+
+ w_zip varchar(9) NOT NULL,
33+
PRIMARY KEY (w_id)
34+
);
35+
36+
CREATE TABLE item (
37+
i_id int NOT NULL,
38+
i_name varchar(24) NOT NULL,
39+
- i_price decimal(5, 2) NOT NULL,
40+
+ i_price decimal NOT NULL,
41+
i_data varchar(50) NOT NULL,
42+
i_im_id int NOT NULL,
43+
PRIMARY KEY (i_id)
44+
@@ -34,20 +34,20 @@ CREATE TABLE stock (
45+
s_w_id int NOT NULL,
46+
s_i_id int NOT NULL,
47+
s_quantity int NOT NULL,
48+
- s_ytd decimal(8, 2) NOT NULL,
49+
+ s_ytd decimal NOT NULL,
50+
s_order_cnt int NOT NULL,
51+
s_remote_cnt int NOT NULL,
52+
s_data varchar(50) NOT NULL,
53+
- s_dist_01 char(24) NOT NULL,
54+
- s_dist_02 char(24) NOT NULL,
55+
- s_dist_03 char(24) NOT NULL,
56+
- s_dist_04 char(24) NOT NULL,
57+
- s_dist_05 char(24) NOT NULL,
58+
- s_dist_06 char(24) NOT NULL,
59+
- s_dist_07 char(24) NOT NULL,
60+
- s_dist_08 char(24) NOT NULL,
61+
- s_dist_09 char(24) NOT NULL,
62+
- s_dist_10 char(24) NOT NULL,
63+
+ s_dist_01 varchar(24) NOT NULL,
64+
+ s_dist_02 varchar(24) NOT NULL,
65+
+ s_dist_03 varchar(24) NOT NULL,
66+
+ s_dist_04 varchar(24) NOT NULL,
67+
+ s_dist_05 varchar(24) NOT NULL,
68+
+ s_dist_06 varchar(24) NOT NULL,
69+
+ s_dist_07 varchar(24) NOT NULL,
70+
+ s_dist_08 varchar(24) NOT NULL,
71+
+ s_dist_09 varchar(24) NOT NULL,
72+
+ s_dist_10 varchar(24) NOT NULL,
73+
FOREIGN KEY (s_w_id) REFERENCES warehouse (w_id) ON DELETE CASCADE,
74+
FOREIGN KEY (s_i_id) REFERENCES item (i_id) ON DELETE CASCADE,
75+
PRIMARY KEY (s_w_id, s_i_id)
76+
@@ -56,15 +56,15 @@ CREATE TABLE stock (
77+
CREATE TABLE district (
78+
d_w_id int NOT NULL,
79+
d_id int NOT NULL,
80+
- d_ytd decimal(12, 2) NOT NULL,
81+
- d_tax decimal(4, 4) NOT NULL,
82+
+ d_ytd decimal NOT NULL,
83+
+ d_tax decimal NOT NULL,
84+
d_next_o_id int NOT NULL,
85+
d_name varchar(10) NOT NULL,
86+
d_street_1 varchar(20) NOT NULL,
87+
d_street_2 varchar(20) NOT NULL,
88+
d_city varchar(20) NOT NULL,
89+
- d_state char(2) NOT NULL,
90+
- d_zip char(9) NOT NULL,
91+
+ d_state varchar(2) NOT NULL,
92+
+ d_zip varchar(9) NOT NULL,
93+
FOREIGN KEY (d_w_id) REFERENCES warehouse (w_id) ON DELETE CASCADE,
94+
PRIMARY KEY (d_w_id, d_id)
95+
);
96+
@@ -73,23 +73,23 @@ CREATE TABLE customer (
97+
c_w_id int NOT NULL,
98+
c_d_id int NOT NULL,
99+
c_id int NOT NULL,
100+
- c_discount decimal(4, 4) NOT NULL,
101+
- c_credit char(2) NOT NULL,
102+
+ c_discount decimal NOT NULL,
103+
+ c_credit varchar(2) NOT NULL,
104+
c_last varchar(16) NOT NULL,
105+
c_first varchar(16) NOT NULL,
106+
- c_credit_lim decimal(12, 2) NOT NULL,
107+
- c_balance decimal(12, 2) NOT NULL,
108+
+ c_credit_lim decimal NOT NULL,
109+
+ c_balance decimal NOT NULL,
110+
c_ytd_payment float NOT NULL,
111+
c_payment_cnt int NOT NULL,
112+
c_delivery_cnt int NOT NULL,
113+
c_street_1 varchar(20) NOT NULL,
114+
c_street_2 varchar(20) NOT NULL,
115+
c_city varchar(20) NOT NULL,
116+
- c_state char(2) NOT NULL,
117+
- c_zip char(9) NOT NULL,
118+
- c_phone char(16) NOT NULL,
119+
- c_since timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
120+
- c_middle char(2) NOT NULL,
121+
+ c_state varchar(2) NOT NULL,
122+
+ c_zip varchar(9) NOT NULL,
123+
+ c_phone varchar(16) NOT NULL,
124+
+ c_since timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
125+
+ c_middle varchar(2) NOT NULL,
126+
c_data varchar(500) NOT NULL,
127+
FOREIGN KEY (c_w_id, c_d_id) REFERENCES district (d_w_id, d_id) ON DELETE CASCADE,
128+
PRIMARY KEY (c_w_id, c_d_id, c_id)
129+
@@ -101,11 +101,12 @@ CREATE TABLE history (
130+
h_c_w_id int NOT NULL,
131+
h_d_id int NOT NULL,
132+
h_w_id int NOT NULL,
133+
- h_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
134+
- h_amount decimal(6, 2) NOT NULL,
135+
+ h_date timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
136+
+ h_amount decimal NOT NULL,
137+
h_data varchar(24) NOT NULL,
138+
FOREIGN KEY (h_c_w_id, h_c_d_id, h_c_id) REFERENCES customer (c_w_id, c_d_id, c_id) ON DELETE CASCADE,
139+
- FOREIGN KEY (h_w_id, h_d_id) REFERENCES district (d_w_id, d_id) ON DELETE CASCADE
140+
+ FOREIGN KEY (h_w_id, h_d_id) REFERENCES district (d_w_id, d_id) ON DELETE CASCADE,
141+
+ PRIMARY KEY(h_c_id, h_date, h_data)
142+
);
143+
144+
CREATE TABLE oorder (
145+
@@ -113,15 +114,16 @@ CREATE TABLE oorder (
146+
o_d_id int NOT NULL,
147+
o_id int NOT NULL,
148+
o_c_id int NOT NULL,
149+
- o_carrier_id int DEFAULT NULL,
150+
+ o_carrier_id int ,
151+
o_ol_cnt int NOT NULL,
152+
o_all_local int NOT NULL,
153+
- o_entry_d timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
154+
+ o_entry_d timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
155+
PRIMARY KEY (o_w_id, o_d_id, o_id),
156+
- FOREIGN KEY (o_w_id, o_d_id, o_c_id) REFERENCES customer (c_w_id, c_d_id, c_id) ON DELETE CASCADE,
157+
- UNIQUE (o_w_id, o_d_id, o_c_id, o_id)
158+
+ FOREIGN KEY (o_w_id, o_d_id, o_c_id) REFERENCES customer (c_w_id, c_d_id, c_id) ON DELETE CASCADE
159+
);
160+
161+
+CREATE UNIQUE INDEX unique_index_oorder ON oorder (o_w_id, o_d_id, o_c_id, o_id);
162+
+
163+
CREATE TABLE new_order (
164+
no_w_id int NOT NULL,
165+
no_d_id int NOT NULL,
166+
@@ -136,11 +138,11 @@ CREATE TABLE order_line (
167+
ol_o_id int NOT NULL,
168+
ol_number int NOT NULL,
169+
ol_i_id int NOT NULL,
170+
- ol_delivery_d timestamp NULL DEFAULT NULL,
171+
- ol_amount decimal(6, 2) NOT NULL,
172+
+ ol_delivery_d timestamptz ,
173+
+ ol_amount decimal NOT NULL,
174+
ol_supply_w_id int NOT NULL,
175+
- ol_quantity decimal(6,2) NOT NULL,
176+
- ol_dist_info char(24) NOT NULL,
177+
+ ol_quantity decimal NOT NULL,
178+
+ ol_dist_info varchar(24) NOT NULL,
179+
FOREIGN KEY (ol_w_id, ol_d_id, ol_o_id) REFERENCES oorder (o_w_id, o_d_id, o_id) ON DELETE CASCADE,
180+
FOREIGN KEY (ol_supply_w_id, ol_i_id) REFERENCES stock (s_w_id, s_i_id) ON DELETE CASCADE,
181+
PRIMARY KEY (ol_w_id, ol_d_id, ol_o_id, ol_number)

0 commit comments

Comments
 (0)