From 7dfa1687208f966f220d79f83acf2e9727127a13 Mon Sep 17 00:00:00 2001 From: Brian Kroth Date: Thu, 10 Oct 2024 15:56:05 +0000 Subject: [PATCH] apply reformat --- .../benchmarks/seats/SEATSLoader.java | 58 +++++++++---------- .../templated/TemplatedBenchmark.java | 2 +- .../benchmarks/tpcc/procedures/Delivery.java | 14 ++--- .../benchmarks/tpcc/procedures/NewOrder.java | 20 +++---- .../tpcc/procedures/OrderStatus.java | 8 +-- .../benchmarks/tpcc/procedures/Payment.java | 20 +++---- .../tpcc/procedures/StockLevel.java | 4 +- 7 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/oltpbenchmark/benchmarks/seats/SEATSLoader.java b/src/main/java/com/oltpbenchmark/benchmarks/seats/SEATSLoader.java index bf31f2cec..11b0d56b2 100644 --- 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 index 38ae2c533..2afbbf3f7 100644 --- 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 index 3a9fe3a7c..2cf7acee7 100644 --- 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 index aa6699778..e98f9ebe1 100644 --- 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 (?,?,?,?,?,?,?,?,?) diff --git a/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/OrderStatus.java b/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/OrderStatus.java index 3b4bbe713..eeedcfd2f 100644 --- a/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/OrderStatus.java +++ b/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/OrderStatus.java @@ -39,7 +39,7 @@ public class OrderStatus extends TPCCProcedure { public SQLStmt ordStatGetNewestOrdSQL = new SQLStmt( - """ + """ SELECT O_ID, O_CARRIER_ID, O_ENTRY_D FROM %s WHERE O_W_ID = ? @@ -51,7 +51,7 @@ public class OrderStatus extends TPCCProcedure { public SQLStmt ordStatGetOrderLinesSQL = new SQLStmt( - """ + """ SELECT OL_I_ID, OL_SUPPLY_W_ID, OL_QUANTITY, OL_AMOUNT, OL_DELIVERY_D FROM %s WHERE OL_O_ID = ? @@ -62,7 +62,7 @@ public class OrderStatus extends TPCCProcedure { public SQLStmt payGetCustSQL = new SQLStmt( - """ + """ SELECT C_FIRST, C_MIDDLE, C_LAST, C_STREET_1, C_STREET_2, C_CITY, C_STATE, C_ZIP, C_PHONE, C_CREDIT, C_CREDIT_LIM, C_DISCOUNT, C_BALANCE, C_YTD_PAYMENT, C_PAYMENT_CNT, C_SINCE @@ -75,7 +75,7 @@ public class OrderStatus extends TPCCProcedure { public SQLStmt customerByNameSQL = new SQLStmt( - """ + """ SELECT C_FIRST, C_MIDDLE, C_ID, C_STREET_1, C_STREET_2, C_CITY, C_STATE, C_ZIP, C_PHONE, C_CREDIT, C_CREDIT_LIM, C_DISCOUNT, C_BALANCE, C_YTD_PAYMENT, C_PAYMENT_CNT, C_SINCE diff --git a/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/Payment.java b/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/Payment.java index d17255d1e..7f3ea5c88 100644 --- a/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/Payment.java +++ b/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/Payment.java @@ -38,7 +38,7 @@ public class Payment extends TPCCProcedure { public SQLStmt payUpdateWhseSQL = new SQLStmt( - """ + """ UPDATE %s SET W_YTD = W_YTD + ? WHERE W_ID = ? @@ -47,7 +47,7 @@ public class Payment extends TPCCProcedure { public SQLStmt payGetWhseSQL = new SQLStmt( - """ + """ SELECT W_STREET_1, W_STREET_2, W_CITY, W_STATE, W_ZIP, W_NAME FROM %s WHERE W_ID = ? @@ -56,7 +56,7 @@ public class Payment extends TPCCProcedure { public SQLStmt payUpdateDistSQL = new SQLStmt( - """ + """ UPDATE %s SET D_YTD = D_YTD + ? WHERE D_W_ID = ? @@ -66,7 +66,7 @@ public class Payment extends TPCCProcedure { public SQLStmt payGetDistSQL = new SQLStmt( - """ + """ SELECT D_STREET_1, D_STREET_2, D_CITY, D_STATE, D_ZIP, D_NAME FROM %s WHERE D_W_ID = ? @@ -76,7 +76,7 @@ public class Payment extends TPCCProcedure { public SQLStmt payGetCustSQL = new SQLStmt( - """ + """ SELECT C_FIRST, C_MIDDLE, C_LAST, C_STREET_1, C_STREET_2, C_CITY, C_STATE, C_ZIP, C_PHONE, C_CREDIT, C_CREDIT_LIM, C_DISCOUNT, C_BALANCE, C_YTD_PAYMENT, C_PAYMENT_CNT, C_SINCE @@ -89,7 +89,7 @@ public class Payment extends TPCCProcedure { public SQLStmt payGetCustCdataSQL = new SQLStmt( - """ + """ SELECT C_DATA FROM %s WHERE C_W_ID = ? @@ -100,7 +100,7 @@ public class Payment extends TPCCProcedure { public SQLStmt payUpdateCustBalCdataSQL = new SQLStmt( - """ + """ UPDATE %s SET C_BALANCE = ?, C_YTD_PAYMENT = ?, @@ -114,7 +114,7 @@ public class Payment extends TPCCProcedure { public SQLStmt payUpdateCustBalSQL = new SQLStmt( - """ + """ UPDATE %s SET C_BALANCE = ?, C_YTD_PAYMENT = ?, @@ -127,7 +127,7 @@ public class Payment extends TPCCProcedure { public SQLStmt payInsertHistSQL = new SQLStmt( - """ + """ INSERT INTO %s (H_C_D_ID, H_C_W_ID, H_C_ID, H_D_ID, H_W_ID, H_DATE, H_AMOUNT, H_DATA) VALUES (?,?,?,?,?,?,?,?) @@ -136,7 +136,7 @@ public class Payment extends TPCCProcedure { public SQLStmt customerByNameSQL = new SQLStmt( - """ + """ SELECT C_FIRST, C_MIDDLE, C_ID, C_STREET_1, C_STREET_2, C_CITY, C_STATE, C_ZIP, C_PHONE, C_CREDIT, C_CREDIT_LIM, C_DISCOUNT, C_BALANCE, C_YTD_PAYMENT, C_PAYMENT_CNT, C_SINCE diff --git a/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/StockLevel.java b/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/StockLevel.java index 4ee553285..184ee7379 100644 --- a/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/StockLevel.java +++ b/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/StockLevel.java @@ -35,7 +35,7 @@ public class StockLevel extends TPCCProcedure { public SQLStmt stockGetDistOrderIdSQL = new SQLStmt( - """ + """ SELECT D_NEXT_O_ID FROM %s WHERE D_W_ID = ? @@ -45,7 +45,7 @@ public class StockLevel extends TPCCProcedure { public SQLStmt stockGetCountStockSQL = new SQLStmt( - """ + """ SELECT COUNT(DISTINCT (S_I_ID)) AS STOCK_COUNT FROM %s, %s WHERE OL_W_ID = ?