Skip to content

Commit c23894b

Browse files
anjagruenheidbpkroth
anjagruenheid
and
bpkroth
authored
Change formatting of TPC-C queries. (#305)
Co-authored-by: Brian Kroth <[email protected]>
1 parent ff75de7 commit c23894b

File tree

5 files changed

+231
-164
lines changed

5 files changed

+231
-164
lines changed

‎src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/Delivery.java

Lines changed: 48 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -34,52 +34,66 @@ public class Delivery extends TPCCProcedure {
3434
private static final Logger LOG = LoggerFactory.getLogger(Delivery.class);
3535

3636
public SQLStmt delivGetOrderIdSQL = new SQLStmt(
37-
"SELECT NO_O_ID FROM " + TPCCConstants.TABLENAME_NEWORDER +
38-
" WHERE NO_D_ID = ? " +
39-
" AND NO_W_ID = ? " +
40-
" ORDER BY NO_O_ID ASC " +
41-
" LIMIT 1");
37+
"""
38+
SELECT NO_O_ID FROM %s
39+
WHERE NO_D_ID = ?
40+
AND NO_W_ID = ?
41+
ORDER BY NO_O_ID ASC
42+
LIMIT 1
43+
""".formatted(TPCCConstants.TABLENAME_NEWORDER));
4244

4345
public SQLStmt delivDeleteNewOrderSQL = new SQLStmt(
44-
"DELETE FROM " + TPCCConstants.TABLENAME_NEWORDER +
45-
" WHERE NO_O_ID = ? " +
46-
" AND NO_D_ID = ?" +
47-
" AND NO_W_ID = ?");
46+
"""
47+
DELETE FROM %s
48+
WHERE NO_O_ID = ?
49+
AND NO_D_ID = ?
50+
AND NO_W_ID = ?
51+
""".formatted(TPCCConstants.TABLENAME_NEWORDER));
4852

4953
public SQLStmt delivGetCustIdSQL = new SQLStmt(
50-
"SELECT O_C_ID FROM " + TPCCConstants.TABLENAME_OPENORDER +
51-
" WHERE O_ID = ? " +
52-
" AND O_D_ID = ? " +
53-
" AND O_W_ID = ?");
54+
"""
55+
SELECT O_C_ID FROM %s
56+
WHERE O_ID = ?
57+
AND O_D_ID = ?
58+
AND O_W_ID = ?
59+
""".formatted(TPCCConstants.TABLENAME_OPENORDER));
5460

5561
public SQLStmt delivUpdateCarrierIdSQL = new SQLStmt(
56-
"UPDATE " + TPCCConstants.TABLENAME_OPENORDER +
57-
" SET O_CARRIER_ID = ? " +
58-
" WHERE O_ID = ? " +
59-
" AND O_D_ID = ?" +
60-
" AND O_W_ID = ?");
62+
"""
63+
UPDATE %s
64+
SET O_CARRIER_ID = ?
65+
WHERE O_ID = ?
66+
AND O_D_ID = ?
67+
AND O_W_ID = ?
68+
""".formatted(TPCCConstants.TABLENAME_OPENORDER));
6169

6270
public SQLStmt delivUpdateDeliveryDateSQL = new SQLStmt(
63-
"UPDATE " + TPCCConstants.TABLENAME_ORDERLINE +
64-
" SET OL_DELIVERY_D = ? " +
65-
" WHERE OL_O_ID = ? " +
66-
" AND OL_D_ID = ? " +
67-
" AND OL_W_ID = ? ");
71+
"""
72+
UPDATE %s
73+
SET OL_DELIVERY_D = ?
74+
WHERE OL_O_ID = ?
75+
AND OL_D_ID = ?
76+
AND OL_W_ID = ?
77+
""".formatted(TPCCConstants.TABLENAME_ORDERLINE));
6878

6979
public SQLStmt delivSumOrderAmountSQL = new SQLStmt(
70-
"SELECT SUM(OL_AMOUNT) AS OL_TOTAL " +
71-
" FROM " + TPCCConstants.TABLENAME_ORDERLINE +
72-
" WHERE OL_O_ID = ? " +
73-
" AND OL_D_ID = ? " +
74-
" AND OL_W_ID = ?");
80+
"""
81+
SELECT SUM(OL_AMOUNT) AS OL_TOTAL
82+
FROM %s
83+
WHERE OL_O_ID = ?
84+
AND OL_D_ID = ?
85+
AND OL_W_ID = ?
86+
""".formatted(TPCCConstants.TABLENAME_ORDERLINE));
7587

7688
public SQLStmt delivUpdateCustBalDelivCntSQL = new SQLStmt(
77-
"UPDATE " + TPCCConstants.TABLENAME_CUSTOMER +
78-
" SET C_BALANCE = C_BALANCE + ?," +
79-
" C_DELIVERY_CNT = C_DELIVERY_CNT + 1 " +
80-
" WHERE C_W_ID = ? " +
81-
" AND C_D_ID = ? " +
82-
" AND C_ID = ? ");
89+
"""
90+
UPDATE %s
91+
SET C_BALANCE = C_BALANCE + ?,
92+
C_DELIVERY_CNT = C_DELIVERY_CNT + 1
93+
WHERE C_W_ID = ?
94+
AND C_D_ID = ?
95+
AND C_ID = ?
96+
""".formatted(TPCCConstants.TABLENAME_CUSTOMER));
8397

8498

8599
public void run(Connection conn, Random gen, int w_id, int numWarehouses, int terminalDistrictLowerID, int terminalDistrictUpperID, TPCCWorker w) throws SQLException {

‎src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/NewOrder.java

Lines changed: 60 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -34,63 +34,84 @@ public class NewOrder extends TPCCProcedure {
3434
private static final Logger LOG = LoggerFactory.getLogger(NewOrder.class);
3535

3636
public final SQLStmt stmtGetCustSQL = new SQLStmt(
37-
"SELECT C_DISCOUNT, C_LAST, C_CREDIT" +
38-
" FROM " + TPCCConstants.TABLENAME_CUSTOMER +
39-
" WHERE C_W_ID = ? " +
40-
" AND C_D_ID = ? " +
41-
" AND C_ID = ?");
37+
"""
38+
SELECT C_DISCOUNT, C_LAST, C_CREDIT
39+
FROM %s
40+
WHERE C_W_ID = ?
41+
AND C_D_ID = ?
42+
AND C_ID = ?
43+
""".formatted(TPCCConstants.TABLENAME_CUSTOMER));
4244

4345
public final SQLStmt stmtGetWhseSQL = new SQLStmt(
44-
"SELECT W_TAX " +
45-
" FROM " + TPCCConstants.TABLENAME_WAREHOUSE +
46-
" WHERE W_ID = ?");
46+
"""
47+
SELECT W_TAX
48+
FROM %s
49+
WHERE W_ID = ?
50+
""".formatted(TPCCConstants.TABLENAME_WAREHOUSE));
4751

4852
public final SQLStmt stmtGetDistSQL = new SQLStmt(
49-
"SELECT D_NEXT_O_ID, D_TAX " +
50-
" FROM " + TPCCConstants.TABLENAME_DISTRICT +
51-
" WHERE D_W_ID = ? AND D_ID = ? FOR UPDATE");
53+
"""
54+
SELECT D_NEXT_O_ID, D_TAX
55+
FROM %s
56+
WHERE D_W_ID = ? AND D_ID = ? FOR UPDATE
57+
""".formatted(TPCCConstants.TABLENAME_DISTRICT));
5258

5359
public final SQLStmt stmtInsertNewOrderSQL = new SQLStmt(
54-
"INSERT INTO " + TPCCConstants.TABLENAME_NEWORDER +
55-
" (NO_O_ID, NO_D_ID, NO_W_ID) " +
56-
" VALUES ( ?, ?, ?)");
60+
"""
61+
INSERT INTO %s
62+
(NO_O_ID, NO_D_ID, NO_W_ID)
63+
VALUES ( ?, ?, ?)
64+
""".formatted(TPCCConstants.TABLENAME_NEWORDER));
5765

5866
public final SQLStmt stmtUpdateDistSQL = new SQLStmt(
59-
"UPDATE " + TPCCConstants.TABLENAME_DISTRICT +
60-
" SET D_NEXT_O_ID = D_NEXT_O_ID + 1 " +
61-
" WHERE D_W_ID = ? " +
62-
" AND D_ID = ?");
67+
"""
68+
UPDATE %s
69+
SET D_NEXT_O_ID = D_NEXT_O_ID + 1
70+
WHERE D_W_ID = ?
71+
AND D_ID = ?
72+
""".formatted(TPCCConstants.TABLENAME_DISTRICT));
6373

6474
public final SQLStmt stmtInsertOOrderSQL = new SQLStmt(
65-
"INSERT INTO " + TPCCConstants.TABLENAME_OPENORDER +
66-
" (O_ID, O_D_ID, O_W_ID, O_C_ID, O_ENTRY_D, O_OL_CNT, O_ALL_LOCAL)" +
67-
" VALUES (?, ?, ?, ?, ?, ?, ?)");
75+
"""
76+
INSERT INTO %s
77+
(O_ID, O_D_ID, O_W_ID, O_C_ID, O_ENTRY_D, O_OL_CNT, O_ALL_LOCAL)
78+
VALUES (?, ?, ?, ?, ?, ?, ?)
79+
""".formatted(TPCCConstants.TABLENAME_OPENORDER));
6880

6981
public final SQLStmt stmtGetItemSQL = new SQLStmt(
70-
"SELECT I_PRICE, I_NAME , I_DATA " +
71-
" FROM " + TPCCConstants.TABLENAME_ITEM +
72-
" WHERE I_ID = ?");
82+
"""
83+
SELECT I_PRICE, I_NAME , I_DATA
84+
FROM %s
85+
WHERE I_ID = ?
86+
""".formatted(TPCCConstants.TABLENAME_ITEM));
7387

7488
public final SQLStmt stmtGetStockSQL = new SQLStmt(
75-
"SELECT S_QUANTITY, S_DATA, S_DIST_01, S_DIST_02, S_DIST_03, S_DIST_04, S_DIST_05, " +
76-
" S_DIST_06, S_DIST_07, S_DIST_08, S_DIST_09, S_DIST_10" +
77-
" FROM " + TPCCConstants.TABLENAME_STOCK +
78-
" WHERE S_I_ID = ? " +
79-
" AND S_W_ID = ? FOR UPDATE");
89+
"""
90+
SELECT S_QUANTITY, S_DATA, S_DIST_01, S_DIST_02, S_DIST_03, S_DIST_04, S_DIST_05,
91+
S_DIST_06, S_DIST_07, S_DIST_08, S_DIST_09, S_DIST_10
92+
FROM %s
93+
WHERE S_I_ID = ?
94+
AND S_W_ID = ? FOR UPDATE
95+
""".formatted(TPCCConstants.TABLENAME_STOCK));
8096

8197
public final SQLStmt stmtUpdateStockSQL = new SQLStmt(
82-
"UPDATE " + TPCCConstants.TABLENAME_STOCK +
83-
" SET S_QUANTITY = ? , " +
84-
" S_YTD = S_YTD + ?, " +
85-
" S_ORDER_CNT = S_ORDER_CNT + 1, " +
86-
" S_REMOTE_CNT = S_REMOTE_CNT + ? " +
87-
" WHERE S_I_ID = ? " +
88-
" AND S_W_ID = ?");
98+
"""
99+
UPDATE %s
100+
SET S_QUANTITY = ? ,
101+
S_YTD = S_YTD + ?,
102+
S_ORDER_CNT = S_ORDER_CNT + 1,
103+
S_REMOTE_CNT = S_REMOTE_CNT + ?
104+
WHERE S_I_ID = ?
105+
AND S_W_ID = ?
106+
""".formatted(TPCCConstants.TABLENAME_STOCK));
89107

90108
public final SQLStmt stmtInsertOrderLineSQL = new SQLStmt(
91-
"INSERT INTO " + TPCCConstants.TABLENAME_ORDERLINE +
92-
" (OL_O_ID, OL_D_ID, OL_W_ID, OL_NUMBER, OL_I_ID, OL_SUPPLY_W_ID, OL_QUANTITY, OL_AMOUNT, OL_DIST_INFO) " +
93-
" VALUES (?,?,?,?,?,?,?,?,?)");
109+
"""
110+
INSERT INTO %s
111+
(OL_O_ID, OL_D_ID, OL_W_ID, OL_NUMBER, OL_I_ID, OL_SUPPLY_W_ID, OL_QUANTITY, OL_AMOUNT, OL_DIST_INFO)
112+
VALUES (?,?,?,?,?,?,?,?,?)
113+
""".formatted(TPCCConstants.TABLENAME_ORDERLINE));
114+
94115

95116

96117
public void run(Connection conn, Random gen, int terminalWarehouseID, int numWarehouses, int terminalDistrictLowerID, int terminalDistrictUpperID, TPCCWorker w) throws SQLException {

‎src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/OrderStatus.java

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,38 +39,46 @@ public class OrderStatus extends TPCCProcedure {
3939
private static final Logger LOG = LoggerFactory.getLogger(OrderStatus.class);
4040

4141
public SQLStmt ordStatGetNewestOrdSQL = new SQLStmt(
42-
"SELECT O_ID, O_CARRIER_ID, O_ENTRY_D " +
43-
" FROM " + TPCCConstants.TABLENAME_OPENORDER +
44-
" WHERE O_W_ID = ? " +
45-
" AND O_D_ID = ? " +
46-
" AND O_C_ID = ? " +
47-
" ORDER BY O_ID DESC LIMIT 1");
42+
"""
43+
SELECT O_ID, O_CARRIER_ID, O_ENTRY_D
44+
FROM %s
45+
WHERE O_W_ID = ?
46+
AND O_D_ID = ?
47+
AND O_C_ID = ?
48+
ORDER BY O_ID DESC LIMIT 1
49+
""".formatted(TPCCConstants.TABLENAME_OPENORDER));
4850

4951
public SQLStmt ordStatGetOrderLinesSQL = new SQLStmt(
50-
"SELECT OL_I_ID, OL_SUPPLY_W_ID, OL_QUANTITY, OL_AMOUNT, OL_DELIVERY_D " +
51-
" FROM " + TPCCConstants.TABLENAME_ORDERLINE +
52-
" WHERE OL_O_ID = ?" +
53-
" AND OL_D_ID = ?" +
54-
" AND OL_W_ID = ?");
52+
"""
53+
SELECT OL_I_ID, OL_SUPPLY_W_ID, OL_QUANTITY, OL_AMOUNT, OL_DELIVERY_D
54+
FROM %s
55+
WHERE OL_O_ID = ?
56+
AND OL_D_ID = ?
57+
AND OL_W_ID = ?
58+
""".formatted(TPCCConstants.TABLENAME_ORDERLINE));
5559

5660
public SQLStmt payGetCustSQL = new SQLStmt(
57-
"SELECT C_FIRST, C_MIDDLE, C_LAST, C_STREET_1, C_STREET_2, " +
58-
" C_CITY, C_STATE, C_ZIP, C_PHONE, C_CREDIT, C_CREDIT_LIM, " +
59-
" C_DISCOUNT, C_BALANCE, C_YTD_PAYMENT, C_PAYMENT_CNT, C_SINCE " +
60-
" FROM " + TPCCConstants.TABLENAME_CUSTOMER +
61-
" WHERE C_W_ID = ? " +
62-
" AND C_D_ID = ? " +
63-
" AND C_ID = ?");
61+
"""
62+
SELECT C_FIRST, C_MIDDLE, C_LAST, C_STREET_1, C_STREET_2,
63+
C_CITY, C_STATE, C_ZIP, C_PHONE, C_CREDIT, C_CREDIT_LIM,
64+
C_DISCOUNT, C_BALANCE, C_YTD_PAYMENT, C_PAYMENT_CNT, C_SINCE
65+
FROM %s
66+
WHERE C_W_ID = ?
67+
AND C_D_ID = ?
68+
AND C_ID = ?
69+
""".formatted(TPCCConstants.TABLENAME_CUSTOMER));
6470

6571
public SQLStmt customerByNameSQL = new SQLStmt(
66-
"SELECT C_FIRST, C_MIDDLE, C_ID, C_STREET_1, C_STREET_2, C_CITY, " +
67-
" C_STATE, C_ZIP, C_PHONE, C_CREDIT, C_CREDIT_LIM, C_DISCOUNT, " +
68-
" C_BALANCE, C_YTD_PAYMENT, C_PAYMENT_CNT, C_SINCE " +
69-
" FROM " + TPCCConstants.TABLENAME_CUSTOMER +
70-
" WHERE C_W_ID = ? " +
71-
" AND C_D_ID = ? " +
72-
" AND C_LAST = ? " +
73-
" ORDER BY C_FIRST");
72+
"""
73+
SELECT C_FIRST, C_MIDDLE, C_ID, C_STREET_1, C_STREET_2, C_CITY,
74+
C_STATE, C_ZIP, C_PHONE, C_CREDIT, C_CREDIT_LIM, C_DISCOUNT,
75+
C_BALANCE, C_YTD_PAYMENT, C_PAYMENT_CNT, C_SINCE
76+
FROM %s
77+
WHERE C_W_ID = ?
78+
AND C_D_ID = ?
79+
AND C_LAST = ?
80+
ORDER BY C_FIRST
81+
""".formatted(TPCCConstants.TABLENAME_CUSTOMER));
7482

7583
public void run(Connection conn, Random gen, int w_id, int numWarehouses, int terminalDistrictLowerID, int terminalDistrictUpperID, TPCCWorker w) throws SQLException {
7684

0 commit comments

Comments
 (0)