Bump com.spotify.fmt:fmt-maven-plugin from 2.23 to 2.25 (#571)

Bumps [com.spotify.fmt:fmt-maven-plugin](https://github.com/spotify/fmt-maven-plugin) from 2.23 to 2.25. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/spotify/fmt-maven-plugin/releases">com.spotify.fmt:fmt-maven-plugin's releases</a>.</em></p> <blockquote> <h2>2.25</h2> <h2>What's Changed</h2> <ul> <li>Upgrade Google Java Format 1.23.0 -> 1.24.0 by <a href="https://github.com/Stephan202"><code>@Stephan202</code></a> in <a href="https://redirect.github.com/spotify/fmt-maven-plugin/pull/194">spotify/fmt-maven-plugin#194</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/spotify/fmt-maven-plugin/compare/2.24...2.25">https://github.com/spotify/fmt-maven-plugin/compare/2.24...2.25</a></p> <h2>2.24</h2> <h2>What's Changed</h2> <ul> <li>Upgrade Google Java Format 1.21.0 -> 1.22.0 by <a href="https://github.com/Stephan202"><code>@Stephan202</code></a> in <a href="https://redirect.github.com/spotify/fmt-maven-plugin/pull/190">spotify/fmt-maven-plugin#190</a></li> <li>Upgrade Google Java Format 1.22.0 -> 1.23.0 by <a href="https://github.com/Stephan202"><code>@Stephan202</code></a> in <a href="https://redirect.github.com/spotify/fmt-maven-plugin/pull/192">spotify/fmt-maven-plugin#192</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/spotify/fmt-maven-plugin/compare/2.23...2.24">https://github.com/spotify/fmt-maven-plugin/compare/2.23...2.24</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/9e0190fc20f6c147b247c9a065cf6d260f186363"><code>9e0190f</code></a> [maven-release-plugin] prepare release 2.25</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/a3aff4ac1d0f5bdab37d24efb13d3fb15260e0c1"><code>a3aff4a</code></a> Upgrade Google Java Format 1.23.0 -> 1.24.0 (<a href="https://redirect.github.com/spotify/fmt-maven-plugin/issues/194">#194</a>)</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/7fa55be1587ce1285f09ad640292cd80050a2df4"><code>7fa55be</code></a> [maven-release-plugin] prepare for next development iteration</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/f5a267537e0c6bb65454ca0f3c1ae6409e58530a"><code>f5a2675</code></a> [maven-release-plugin] prepare release 2.24</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/775d418757082bcd5e333223a1b39f52ae85f882"><code>775d418</code></a> Upgrade Google Java Format 1.22.0 -> 1.23.0 (<a href="https://redirect.github.com/spotify/fmt-maven-plugin/issues/192">#192</a>)</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/76aa75f3d92097684745c101579dcce594e51a28"><code>76aa75f</code></a> Upgrade Google Java Format 1.21.0 -> 1.22.0 (<a href="https://redirect.github.com/spotify/fmt-maven-plugin/issues/190">#190</a>)</li> <li><a href="https://github.com/spotify/fmt-maven-plugin/commit/ced5b96052e739ab43e99532f1405dfed4cdf0f5"><code>ced5b96</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.23...2.25">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.23&new-version=2.25)](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]>
cmu-db · Oct 10, 2024 · 51ae02f · 51ae02f
1 parent 2671ccd
commit 51ae02f
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 64 deletions.
diff --git a/pom.xml b/pom.xml
@@ -365,7 +365,7 @@
                 <!-- format/check code via google style format -->
                 <groupId>com.spotify.fmt</groupId>
                 <artifactId>fmt-maven-plugin</artifactId>
-                <version>2.23</version>
+                <version>2.25</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/src/main/java/com/oltpbenchmark/benchmarks/seats/SEATSLoader.java b/src/main/java/com/oltpbenchmark/benchmarks/seats/SEATSLoader.java
@@ -923,7 +923,7 @@ public CustomerIterable(Table catalog_tbl, long total) {
     protected Object specialValue(long id, int columnIdx) {
       Object value = null;
       switch (columnIdx) {
-          // CUSTOMER ID
+        // CUSTOMER ID
         case (0):
           {
             // HACK: The flights_per_airport histogram may not match up
@@ -950,26 +950,26 @@ protected Object specialValue(long id, int columnIdx) {
             }
             break;
           }
-          // CUSTOMER ID STR
+        // CUSTOMER ID STR
         case (1):
           {
             value = this.last_id.encode();
             this.last_id = null;
             break;
           }
-          // LOCAL AIRPORT
+        // LOCAL AIRPORT
         case (2):
           {
             value = this.airport_code;
             break;
           }
-          // BALANCE
+        // BALANCE
         case (3):
           {
             value = (double) this.randBalance.nextInt();
             break;
           }
-          // BAD MOJO!
+        // BAD MOJO!
         default:
       }
       return (value);
@@ -1060,7 +1060,7 @@ public FrequentFlyerIterable(Table catalog_tbl, long num_customers) {
     protected Object specialValue(long id, int columnIdx) {
       String value = null;
       switch (columnIdx) {
-          // CUSTOMER ID
+        // CUSTOMER ID
         case (0):
           {
             while (this.customer_idx < this.ff_per_customer.length
@@ -1080,7 +1080,7 @@ protected Object specialValue(long id, int columnIdx) {
             value = this.last_customer_id.encode();
             break;
           }
-          // AIRLINE ID
+        // AIRLINE ID
         case (1):
           {
             do {
@@ -1092,13 +1092,13 @@ protected Object specialValue(long id, int columnIdx) {
             }
             break;
           }
-          // CUSTOMER_ID_STR
+        // CUSTOMER_ID_STR
         case (2):
           {
             value = this.last_customer_id.encode();
             break;
           }
-          // BAD MOJO!
+        // BAD MOJO!
         default:
       }
       return (value);
@@ -1195,19 +1195,19 @@ protected boolean hasNext() {
     protected Object specialValue(long id, int columnIdx) {
       Object value = null;
       switch (columnIdx) {
-          // OUTER AIRPORT
+        // OUTER AIRPORT
         case (0):
           value = this.outer_airport;
           break;
-          // INNER AIRPORT
+        // INNER AIRPORT
         case (1):
           value = this.inner_airport;
           break;
-          // DISTANCE
+        // DISTANCE
         case (2):
           value = this.distance;
           break;
-          // BAD MOJO!
+        // BAD MOJO!
         default:
       }
       return (value);
@@ -1389,7 +1389,7 @@ boolean seatIsOccupied() {
     protected Object specialValue(long id, int columnIdx) {
       Object value = null;
       switch (columnIdx) {
-          // FLIGHT ID
+        // FLIGHT ID
         case (0):
           {
             // Figure out what date we are currently on
@@ -1435,56 +1435,56 @@ protected Object specialValue(long id, int columnIdx) {
             value = this.flight_id.encode();
             break;
           }
-          // AIRLINE ID
+        // AIRLINE ID
         case (1):
           {
             value = this.airline_code;
             SEATSLoader.this.flights_per_airline.put(this.airline_code);
             break;
           }
-          // DEPART AIRPORT
+        // DEPART AIRPORT
         case (2):
           {
             value = this.depart_airport;
             break;
           }
-          // DEPART TIME
+        // DEPART TIME
         case (3):
           {
             value = this.depart_time;
             break;
           }
-          // ARRIVE AIRPORT
+        // ARRIVE AIRPORT
         case (4):
           {
             value = this.arrive_airport;
             break;
           }
-          // ARRIVE TIME
+        // ARRIVE TIME
         case (5):
           {
             value = this.arrive_time;
             break;
           }
-          // FLIGHT STATUS
+        // FLIGHT STATUS
         case (6):
           {
             value = this.status;
             break;
           }
-          // BASE PRICE
+        // BASE PRICE
         case (7):
           {
             value = (double) this.prices.nextInt();
             break;
           }
-          // SEATS TOTAL
+        // SEATS TOTAL
         case (8):
           {
             value = SEATSConstants.FLIGHTS_NUM_SEATS;
             break;
           }
-          // SEATS REMAINING
+        // SEATS REMAINING
         case (9):
           {
             // We have to figure this out ahead of time since we need to
@@ -1501,7 +1501,7 @@ protected Object specialValue(long id, int columnIdx) {
             }
             break;
           }
-          // BAD MOJO!
+        // BAD MOJO!
         default:
       }
       return (value);
@@ -1763,13 +1763,13 @@ protected Object specialValue(long id, int columnIdx) {
 
       Object value = null;
       switch (columnIdx) {
-          // CUSTOMER ID
+        // CUSTOMER ID
         case (1):
           {
             value = ((CustomerId) this.current[0]).encode();
             break;
           }
-          // FLIGHT ID
+        // FLIGHT ID
         case (2):
           {
             FlightId flight_id = (FlightId) this.current[1];
@@ -1782,19 +1782,19 @@ protected Object specialValue(long id, int columnIdx) {
             }
             break;
           }
-          // SEAT
+        // SEAT
         case (3):
           {
             value = this.current[2];
             break;
           }
-          // PRICE
+        // PRICE
         case (4):
           {
             value = (double) this.prices.nextInt();
             break;
           }
-          // BAD MOJO!
+        // BAD MOJO!
         default:
       }
       return (value);

diff --git a/src/main/java/com/oltpbenchmark/benchmarks/templated/TemplatedBenchmark.java b/src/main/java/com/oltpbenchmark/benchmarks/templated/TemplatedBenchmark.java
@@ -214,7 +214,7 @@ private CustomClassLoader loadQueryTemplates(String file) {
         ParsedQueryTemplate qt = b.build();
         // Create and compile class.
         final String s =
-                """
+            """
                         package %s ;
                         import %s ;
                         public final class %s extends %s {

diff --git a/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/Delivery.java b/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/Delivery.java
@@ -34,7 +34,7 @@ public class Delivery extends TPCCProcedure {
 
   public SQLStmt delivGetOrderIdSQL =
       new SQLStmt(
-              """
+          """
             SELECT NO_O_ID FROM %s
              WHERE NO_D_ID = ?
                AND NO_W_ID = ?
@@ -45,7 +45,7 @@ public class Delivery extends TPCCProcedure {
 
   public SQLStmt delivDeleteNewOrderSQL =
       new SQLStmt(
-              """
+          """
             DELETE FROM %s
             WHERE NO_O_ID = ?
             AND NO_D_ID = ?
@@ -55,7 +55,7 @@ public class Delivery extends TPCCProcedure {
 
   public SQLStmt delivGetCustIdSQL =
       new SQLStmt(
-              """
+          """
             SELECT O_C_ID FROM %s
             WHERE O_ID = ?
             AND O_D_ID = ?
@@ -65,7 +65,7 @@ public class Delivery extends TPCCProcedure {
 
   public SQLStmt delivUpdateCarrierIdSQL =
       new SQLStmt(
-              """
+          """
         UPDATE %s
            SET O_CARRIER_ID = ?
          WHERE O_ID = ?
@@ -76,7 +76,7 @@ public class Delivery extends TPCCProcedure {
 
   public SQLStmt delivUpdateDeliveryDateSQL =
       new SQLStmt(
-              """
+          """
         UPDATE %s
            SET OL_DELIVERY_D = ?
          WHERE OL_O_ID = ?
@@ -87,7 +87,7 @@ public class Delivery extends TPCCProcedure {
 
   public SQLStmt delivSumOrderAmountSQL =
       new SQLStmt(
-              """
+          """
         SELECT SUM(OL_AMOUNT) AS OL_TOTAL
           FROM %s
          WHERE OL_O_ID = ?
@@ -98,7 +98,7 @@ SELECT SUM(OL_AMOUNT) AS OL_TOTAL
 
   public SQLStmt delivUpdateCustBalDelivCntSQL =
       new SQLStmt(
-              """
+          """
         UPDATE %s
            SET C_BALANCE = C_BALANCE + ?,
                C_DELIVERY_CNT = C_DELIVERY_CNT + 1

diff --git a/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/NewOrder.java b/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/NewOrder.java
@@ -34,7 +34,7 @@ public class NewOrder extends TPCCProcedure {
 
   public final SQLStmt stmtGetCustSQL =
       new SQLStmt(
-              """
+          """
         SELECT C_DISCOUNT, C_LAST, C_CREDIT
           FROM %s
          WHERE C_W_ID = ?
@@ -45,7 +45,7 @@ public class NewOrder extends TPCCProcedure {
 
   public final SQLStmt stmtGetWhseSQL =
       new SQLStmt(
-              """
+          """
         SELECT W_TAX
           FROM %s
          WHERE W_ID = ?
@@ -54,7 +54,7 @@ public class NewOrder extends TPCCProcedure {
 
   public final SQLStmt stmtGetDistSQL =
       new SQLStmt(
-              """
+          """
         SELECT D_NEXT_O_ID, D_TAX
           FROM %s
          WHERE D_W_ID = ? AND D_ID = ? FOR UPDATE
@@ -63,7 +63,7 @@ public class NewOrder extends TPCCProcedure {
 
   public final SQLStmt stmtInsertNewOrderSQL =
       new SQLStmt(
-              """
+          """
         INSERT INTO %s
          (NO_O_ID, NO_D_ID, NO_W_ID)
          VALUES ( ?, ?, ?)
@@ -72,7 +72,7 @@ public class NewOrder extends TPCCProcedure {
 
   public final SQLStmt stmtUpdateDistSQL =
       new SQLStmt(
-              """
+          """
         UPDATE %s
            SET D_NEXT_O_ID = D_NEXT_O_ID + 1
          WHERE D_W_ID = ?
@@ -82,7 +82,7 @@ public class NewOrder extends TPCCProcedure {
 
   public final SQLStmt stmtInsertOOrderSQL =
       new SQLStmt(
-              """
+          """
         INSERT INTO %s
          (O_ID, O_D_ID, O_W_ID, O_C_ID, O_ENTRY_D, O_OL_CNT, O_ALL_LOCAL)
          VALUES (?, ?, ?, ?, ?, ?, ?)
@@ -91,7 +91,7 @@ public class NewOrder extends TPCCProcedure {
 
   public final SQLStmt stmtGetItemSQL =
       new SQLStmt(
-              """
+          """
         SELECT I_PRICE, I_NAME , I_DATA
           FROM %s
          WHERE I_ID = ?
@@ -100,7 +100,7 @@ public class NewOrder extends TPCCProcedure {
 
   public final SQLStmt stmtGetStockSQL =
       new SQLStmt(
-              """
+          """
         SELECT S_QUANTITY, S_DATA, S_DIST_01, S_DIST_02, S_DIST_03, S_DIST_04, S_DIST_05,
                S_DIST_06, S_DIST_07, S_DIST_08, S_DIST_09, S_DIST_10
           FROM %s
@@ -111,7 +111,7 @@ public class NewOrder extends TPCCProcedure {
 
   public final SQLStmt stmtUpdateStockSQL =
       new SQLStmt(
-              """
+          """
         UPDATE %s
            SET S_QUANTITY = ? ,
                S_YTD = S_YTD + ?,
@@ -124,7 +124,7 @@ public class NewOrder extends TPCCProcedure {
 
   public final SQLStmt stmtInsertOrderLineSQL =
       new SQLStmt(
-              """
+          """
         INSERT INTO %s
          (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)
          VALUES (?,?,?,?,?,?,?,?,?)