Skip to content

Commit 849ec48

Browse files
Bump com.spotify.fmt:fmt-maven-plugin from 2.22.1 to 2.23 (#479)
Bumps [com.spotify.fmt:fmt-maven-plugin](https://github.com/spotify/fmt-maven-plugin) from 2.22.1 to 2.23. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/a89d6dfc3575395a06020061c85666ff7e86c326"><code>a89d6df</code></a> [maven-release-plugin] prepare release 2.23</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/645ace37a2e5887fc71f0d120d51975665714c25"><code>645ace3</code></a> Bump google format &amp; other dependencies (<a href="https://redirect.github.com/spotify/fmt-maven-plugin/issues/188">#188</a>)</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/01fb56f8224885c900239af05020ebe8201de1b7"><code>01fb56f</code></a> Update foss-root to 17 (<a href="https://redirect.github.com/spotify/fmt-maven-plugin/issues/187">#187</a>)</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/6add68eabed21bce93415e9084b2558ada124bcf"><code>6add68e</code></a> [maven-release-plugin] prepare for next development iteration</li> <li>See full diff in <a href="https://github.com/spotify/fmt-maven-plugin/compare/2.22.1...2.23">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.spotify.fmt:fmt-maven-plugin&package-manager=maven&previous-version=2.22.1&new-version=2.23)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brian Kroth <[email protected]> Co-authored-by: Brian Kroth <[email protected]>
1 parent aebe964 commit 849ec48

File tree

8 files changed

+37
-36
lines changed

8 files changed

+37
-36
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@
358358
<!-- format/check code via google style format -->
359359
<groupId>com.spotify.fmt</groupId>
360360
<artifactId>fmt-maven-plugin</artifactId>
361-
<version>2.22.1</version>
361+
<version>2.23</version>
362362
<executions>
363363
<execution>
364364
<goals>

src/main/java/com/oltpbenchmark/benchmarks/templated/TemplatedBenchmark.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private CustomClassLoader loadQueryTemplates(String file) {
179179
ParsedQueryTemplate qt = b.build();
180180
// Create and compile class.
181181
final String s =
182-
"""
182+
"""
183183
package %s ;
184184
public final class %s extends %s {
185185
@Override

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class Delivery extends TPCCProcedure {
3434

3535
public SQLStmt delivGetOrderIdSQL =
3636
new SQLStmt(
37-
"""
37+
"""
3838
SELECT NO_O_ID FROM %s
3939
WHERE NO_D_ID = ?
4040
AND NO_W_ID = ?
@@ -45,7 +45,7 @@ public class Delivery extends TPCCProcedure {
4545

4646
public SQLStmt delivDeleteNewOrderSQL =
4747
new SQLStmt(
48-
"""
48+
"""
4949
DELETE FROM %s
5050
WHERE NO_O_ID = ?
5151
AND NO_D_ID = ?
@@ -55,7 +55,7 @@ public class Delivery extends TPCCProcedure {
5555

5656
public SQLStmt delivGetCustIdSQL =
5757
new SQLStmt(
58-
"""
58+
"""
5959
SELECT O_C_ID FROM %s
6060
WHERE O_ID = ?
6161
AND O_D_ID = ?
@@ -65,7 +65,7 @@ public class Delivery extends TPCCProcedure {
6565

6666
public SQLStmt delivUpdateCarrierIdSQL =
6767
new SQLStmt(
68-
"""
68+
"""
6969
UPDATE %s
7070
SET O_CARRIER_ID = ?
7171
WHERE O_ID = ?
@@ -76,7 +76,7 @@ public class Delivery extends TPCCProcedure {
7676

7777
public SQLStmt delivUpdateDeliveryDateSQL =
7878
new SQLStmt(
79-
"""
79+
"""
8080
UPDATE %s
8181
SET OL_DELIVERY_D = ?
8282
WHERE OL_O_ID = ?
@@ -87,7 +87,7 @@ public class Delivery extends TPCCProcedure {
8787

8888
public SQLStmt delivSumOrderAmountSQL =
8989
new SQLStmt(
90-
"""
90+
"""
9191
SELECT SUM(OL_AMOUNT) AS OL_TOTAL
9292
FROM %s
9393
WHERE OL_O_ID = ?
@@ -98,7 +98,7 @@ SELECT SUM(OL_AMOUNT) AS OL_TOTAL
9898

9999
public SQLStmt delivUpdateCustBalDelivCntSQL =
100100
new SQLStmt(
101-
"""
101+
"""
102102
UPDATE %s
103103
SET C_BALANCE = C_BALANCE + ?,
104104
C_DELIVERY_CNT = C_DELIVERY_CNT + 1

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class NewOrder extends TPCCProcedure {
3434

3535
public final SQLStmt stmtGetCustSQL =
3636
new SQLStmt(
37-
"""
37+
"""
3838
SELECT C_DISCOUNT, C_LAST, C_CREDIT
3939
FROM %s
4040
WHERE C_W_ID = ?
@@ -45,7 +45,7 @@ public class NewOrder extends TPCCProcedure {
4545

4646
public final SQLStmt stmtGetWhseSQL =
4747
new SQLStmt(
48-
"""
48+
"""
4949
SELECT W_TAX
5050
FROM %s
5151
WHERE W_ID = ?
@@ -54,7 +54,7 @@ public class NewOrder extends TPCCProcedure {
5454

5555
public final SQLStmt stmtGetDistSQL =
5656
new SQLStmt(
57-
"""
57+
"""
5858
SELECT D_NEXT_O_ID, D_TAX
5959
FROM %s
6060
WHERE D_W_ID = ? AND D_ID = ? FOR UPDATE
@@ -63,7 +63,7 @@ public class NewOrder extends TPCCProcedure {
6363

6464
public final SQLStmt stmtInsertNewOrderSQL =
6565
new SQLStmt(
66-
"""
66+
"""
6767
INSERT INTO %s
6868
(NO_O_ID, NO_D_ID, NO_W_ID)
6969
VALUES ( ?, ?, ?)
@@ -72,7 +72,7 @@ public class NewOrder extends TPCCProcedure {
7272

7373
public final SQLStmt stmtUpdateDistSQL =
7474
new SQLStmt(
75-
"""
75+
"""
7676
UPDATE %s
7777
SET D_NEXT_O_ID = D_NEXT_O_ID + 1
7878
WHERE D_W_ID = ?
@@ -82,7 +82,7 @@ public class NewOrder extends TPCCProcedure {
8282

8383
public final SQLStmt stmtInsertOOrderSQL =
8484
new SQLStmt(
85-
"""
85+
"""
8686
INSERT INTO %s
8787
(O_ID, O_D_ID, O_W_ID, O_C_ID, O_ENTRY_D, O_OL_CNT, O_ALL_LOCAL)
8888
VALUES (?, ?, ?, ?, ?, ?, ?)
@@ -91,7 +91,7 @@ public class NewOrder extends TPCCProcedure {
9191

9292
public final SQLStmt stmtGetItemSQL =
9393
new SQLStmt(
94-
"""
94+
"""
9595
SELECT I_PRICE, I_NAME , I_DATA
9696
FROM %s
9797
WHERE I_ID = ?
@@ -100,7 +100,7 @@ public class NewOrder extends TPCCProcedure {
100100

101101
public final SQLStmt stmtGetStockSQL =
102102
new SQLStmt(
103-
"""
103+
"""
104104
SELECT S_QUANTITY, S_DATA, S_DIST_01, S_DIST_02, S_DIST_03, S_DIST_04, S_DIST_05,
105105
S_DIST_06, S_DIST_07, S_DIST_08, S_DIST_09, S_DIST_10
106106
FROM %s
@@ -111,7 +111,7 @@ public class NewOrder extends TPCCProcedure {
111111

112112
public final SQLStmt stmtUpdateStockSQL =
113113
new SQLStmt(
114-
"""
114+
"""
115115
UPDATE %s
116116
SET S_QUANTITY = ? ,
117117
S_YTD = S_YTD + ?,
@@ -124,7 +124,7 @@ public class NewOrder extends TPCCProcedure {
124124

125125
public final SQLStmt stmtInsertOrderLineSQL =
126126
new SQLStmt(
127-
"""
127+
"""
128128
INSERT INTO %s
129129
(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)
130130
VALUES (?,?,?,?,?,?,?,?,?)

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class OrderStatus extends TPCCProcedure {
3939

4040
public SQLStmt ordStatGetNewestOrdSQL =
4141
new SQLStmt(
42-
"""
42+
"""
4343
SELECT O_ID, O_CARRIER_ID, O_ENTRY_D
4444
FROM %s
4545
WHERE O_W_ID = ?
@@ -51,7 +51,7 @@ public class OrderStatus extends TPCCProcedure {
5151

5252
public SQLStmt ordStatGetOrderLinesSQL =
5353
new SQLStmt(
54-
"""
54+
"""
5555
SELECT OL_I_ID, OL_SUPPLY_W_ID, OL_QUANTITY, OL_AMOUNT, OL_DELIVERY_D
5656
FROM %s
5757
WHERE OL_O_ID = ?
@@ -62,7 +62,7 @@ public class OrderStatus extends TPCCProcedure {
6262

6363
public SQLStmt payGetCustSQL =
6464
new SQLStmt(
65-
"""
65+
"""
6666
SELECT C_FIRST, C_MIDDLE, C_LAST, C_STREET_1, C_STREET_2,
6767
C_CITY, C_STATE, C_ZIP, C_PHONE, C_CREDIT, C_CREDIT_LIM,
6868
C_DISCOUNT, C_BALANCE, C_YTD_PAYMENT, C_PAYMENT_CNT, C_SINCE
@@ -75,7 +75,7 @@ public class OrderStatus extends TPCCProcedure {
7575

7676
public SQLStmt customerByNameSQL =
7777
new SQLStmt(
78-
"""
78+
"""
7979
SELECT C_FIRST, C_MIDDLE, C_ID, C_STREET_1, C_STREET_2, C_CITY,
8080
C_STATE, C_ZIP, C_PHONE, C_CREDIT, C_CREDIT_LIM, C_DISCOUNT,
8181
C_BALANCE, C_YTD_PAYMENT, C_PAYMENT_CNT, C_SINCE

src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/Payment.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class Payment extends TPCCProcedure {
3838

3939
public SQLStmt payUpdateWhseSQL =
4040
new SQLStmt(
41-
"""
41+
"""
4242
UPDATE %s
4343
SET W_YTD = W_YTD + ?
4444
WHERE W_ID = ?
@@ -47,7 +47,7 @@ public class Payment extends TPCCProcedure {
4747

4848
public SQLStmt payGetWhseSQL =
4949
new SQLStmt(
50-
"""
50+
"""
5151
SELECT W_STREET_1, W_STREET_2, W_CITY, W_STATE, W_ZIP, W_NAME
5252
FROM %s
5353
WHERE W_ID = ?
@@ -56,7 +56,7 @@ public class Payment extends TPCCProcedure {
5656

5757
public SQLStmt payUpdateDistSQL =
5858
new SQLStmt(
59-
"""
59+
"""
6060
UPDATE %s
6161
SET D_YTD = D_YTD + ?
6262
WHERE D_W_ID = ?
@@ -66,7 +66,7 @@ public class Payment extends TPCCProcedure {
6666

6767
public SQLStmt payGetDistSQL =
6868
new SQLStmt(
69-
"""
69+
"""
7070
SELECT D_STREET_1, D_STREET_2, D_CITY, D_STATE, D_ZIP, D_NAME
7171
FROM %s
7272
WHERE D_W_ID = ?
@@ -76,7 +76,7 @@ public class Payment extends TPCCProcedure {
7676

7777
public SQLStmt payGetCustSQL =
7878
new SQLStmt(
79-
"""
79+
"""
8080
SELECT C_FIRST, C_MIDDLE, C_LAST, C_STREET_1, C_STREET_2,
8181
C_CITY, C_STATE, C_ZIP, C_PHONE, C_CREDIT, C_CREDIT_LIM,
8282
C_DISCOUNT, C_BALANCE, C_YTD_PAYMENT, C_PAYMENT_CNT, C_SINCE
@@ -89,7 +89,7 @@ public class Payment extends TPCCProcedure {
8989

9090
public SQLStmt payGetCustCdataSQL =
9191
new SQLStmt(
92-
"""
92+
"""
9393
SELECT C_DATA
9494
FROM %s
9595
WHERE C_W_ID = ?
@@ -100,7 +100,7 @@ public class Payment extends TPCCProcedure {
100100

101101
public SQLStmt payUpdateCustBalCdataSQL =
102102
new SQLStmt(
103-
"""
103+
"""
104104
UPDATE %s
105105
SET C_BALANCE = ?,
106106
C_YTD_PAYMENT = ?,
@@ -114,7 +114,7 @@ public class Payment extends TPCCProcedure {
114114

115115
public SQLStmt payUpdateCustBalSQL =
116116
new SQLStmt(
117-
"""
117+
"""
118118
UPDATE %s
119119
SET C_BALANCE = ?,
120120
C_YTD_PAYMENT = ?,
@@ -127,7 +127,7 @@ public class Payment extends TPCCProcedure {
127127

128128
public SQLStmt payInsertHistSQL =
129129
new SQLStmt(
130-
"""
130+
"""
131131
INSERT INTO %s
132132
(H_C_D_ID, H_C_W_ID, H_C_ID, H_D_ID, H_W_ID, H_DATE, H_AMOUNT, H_DATA)
133133
VALUES (?,?,?,?,?,?,?,?)
@@ -136,7 +136,7 @@ public class Payment extends TPCCProcedure {
136136

137137
public SQLStmt customerByNameSQL =
138138
new SQLStmt(
139-
"""
139+
"""
140140
SELECT C_FIRST, C_MIDDLE, C_ID, C_STREET_1, C_STREET_2, C_CITY,
141141
C_STATE, C_ZIP, C_PHONE, C_CREDIT, C_CREDIT_LIM, C_DISCOUNT,
142142
C_BALANCE, C_YTD_PAYMENT, C_PAYMENT_CNT, C_SINCE

src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/StockLevel.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class StockLevel extends TPCCProcedure {
3535

3636
public SQLStmt stockGetDistOrderIdSQL =
3737
new SQLStmt(
38-
"""
38+
"""
3939
SELECT D_NEXT_O_ID
4040
FROM %s
4141
WHERE D_W_ID = ?
@@ -45,7 +45,7 @@ public class StockLevel extends TPCCProcedure {
4545

4646
public SQLStmt stockGetCountStockSQL =
4747
new SQLStmt(
48-
"""
48+
"""
4949
SELECT COUNT(DISTINCT (S_I_ID)) AS STOCK_COUNT
5050
FROM %s, %s
5151
WHERE OL_W_ID = ?

src/main/java/com/oltpbenchmark/benchmarks/tpch/procedures/Q15.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ CREATE view revenue0 (supplier_no, total_revenue) AS
6767
""");
6868

6969
public final SQLStmt dropview_stmt =
70-
new SQLStmt("""
70+
new SQLStmt(
71+
"""
7172
DROP VIEW revenue0
7273
""");
7374

0 commit comments

Comments
 (0)