Merge pull request #28 from project-tsurugi/wip/tpcc_distribution

implement tpcc response time distribution statistics
project-tsurugi · Oct 9, 2024 · 6e9f3cb · 6e9f3cb
2 parents 379bd39 + e29d77a
commit 6e9f3cb
Show file tree

Hide file tree

Showing 8 changed files with 170 additions and 98 deletions.
diff --git a/modules/tpcc/src/main/java/com/tsurugidb/tsubakuro/examples/tpcc/Client.java b/modules/tpcc/src/main/java/com/tsurugidb/tsubakuro/examples/tpcc/Client.java
@@ -67,7 +67,7 @@ public void run() {
                         wId = (int) delivery.warehouseId();
                         if (!doingDelivery.getAndSet(wId - 1, true)) {
                             delivery.transaction(stop);
-                            profile.time.delivery += (System.nanoTime() - transactionStart);
+                            profile.addTimeDelivery(System.nanoTime() - transactionStart);
                             doingDelivery.set(wId - 1, false);
                             pendingDelivery--;
                             if (pendingDelivery > 0) {
@@ -81,15 +81,15 @@ public void run() {
                     if (transactionType <= Percent.KXCT_NEWORDER_PERCENT) {
                         newOrder.setParams();
                         newOrder.transaction(stop);
-                        profile.time.newOrder += (System.nanoTime() - transactionStart);
+                        profile.addTimeNewOrder(System.nanoTime() - transactionStart);
                     } else if (transactionType <= Percent.KXCT_PAYMENT_PERCENT) {
                         payment.setParams();
                         payment.transaction(stop);
-                        profile.time.payment += (System.nanoTime() - transactionStart);
+                        profile.addTimePayment(System.nanoTime() - transactionStart);
                     } else if (transactionType <= Percent.KXCT_ORDERSTATUS_PERCENT) {
                         orderStatus.setParams();
                         orderStatus.transaction(stop);
-                        profile.time.orderStatus += (System.nanoTime() - transactionStart);
+                        profile.addTimeOrderStatus(System.nanoTime() - transactionStart);
                     } else if (transactionType <= Percent.KXCT_DELIEVERY_PERCENT) {
                         if (pendingDelivery > 0) {
                             pendingDelivery++;
@@ -99,15 +99,15 @@ public void run() {
                         wId = (int) delivery.warehouseId();
                         if (!doingDelivery.getAndSet(wId - 1, true)) {
                             delivery.transaction(stop);
-                            profile.time.delivery += (System.nanoTime() - transactionStart);
+                            profile.addTimeDelivery(System.nanoTime() - transactionStart);
                             doingDelivery.set(wId - 1, false);
                         } else {
                             pendingDelivery++;
                         }
                     } else {
                         stockLevel.setParams();
                         stockLevel.transaction(stop);
-                        profile.time.stockLevel += (System.nanoTime() - transactionStart);
+                        profile.addTimeStockLevel(System.nanoTime() - transactionStart);
                     }
                 }
                 profile.elapsed = System.currentTimeMillis() - start;

diff --git a/modules/tpcc/src/main/java/com/tsurugidb/tsubakuro/examples/tpcc/Delivery.java b/modules/tpcc/src/main/java/com/tsurugidb/tsubakuro/examples/tpcc/Delivery.java
@@ -107,7 +107,7 @@ void rollback(Transaction transaction) throws IOException, ServerException, Inte
 
     @SuppressWarnings("checkstyle:methodlength")
     public void transaction(AtomicBoolean stop) throws IOException, ServerException, InterruptedException {
-        while (!stop.get()) {
+        while (!stop.get()) {  // placed for transaction reexecution due to failure. If the transaction ends normally, it returns.
             try (var transaction = sqlClient.createTransaction().get();) {
                 profile.invocation.delivery++;
                 long dId;

diff --git a/modules/tpcc/src/main/java/com/tsurugidb/tsubakuro/examples/tpcc/Main.java b/modules/tpcc/src/main/java/com/tsurugidb/tsubakuro/examples/tpcc/Main.java
@@ -16,6 +16,7 @@
 
 public final class Main {
     private static String url = System.getProperty("tsurugi.dbname");
+    private static String printDistribution = System.getProperty("printResponseTimeDistribution");
 
     static long warehouses()  throws IOException, ServerException, InterruptedException, TimeoutException {
         try (
@@ -82,7 +83,7 @@ public static void main(String[] args) {
             AtomicBoolean stop = new AtomicBoolean();
 
             for (int i = 0; i < threads; i++) {
-                var profile = new Profile();
+                var profile = new Profile(printDistribution != null ? (printDistribution == "true") : true);  // default true (temporary)
                 profile.warehouses = warehouses;
                 profile.threads = threads;
                 profile.index = i;

diff --git a/modules/tpcc/src/main/java/com/tsurugidb/tsubakuro/examples/tpcc/NewOrder.java b/modules/tpcc/src/main/java/com/tsurugidb/tsubakuro/examples/tpcc/NewOrder.java
@@ -184,7 +184,7 @@ void rollback(Transaction transaction) throws IOException, ServerException, Inte
 
     @SuppressWarnings("checkstyle:methodlength")
     public void transaction(AtomicBoolean stop) throws IOException, ServerException, InterruptedException {
-        while (!stop.get()) {
+        while (!stop.get()) {  // placed for transaction reexecution due to failure. If the transaction ends normally, it returns.
             try (var transaction = sqlClient.createTransaction().get();) {
                 profile.invocation.newOrder++;
                 total = 0;

diff --git a/modules/tpcc/src/main/java/com/tsurugidb/tsubakuro/examples/tpcc/OrderStatus.java b/modules/tpcc/src/main/java/com/tsurugidb/tsubakuro/examples/tpcc/OrderStatus.java
@@ -119,7 +119,7 @@ void rollback(Transaction transaction) throws IOException, ServerException, Inte
 
     @SuppressWarnings("checkstyle:methodlength")
     public void transaction(AtomicBoolean stop) throws IOException, ServerException, InterruptedException {
-        while (!stop.get()) {
+        while (!stop.get()) {  // placed for transaction reexecution due to failure. If the transaction ends normally, it returns.
             try (var transaction = sqlClient.createTransaction().get();) {
                 profile.invocation.orderStatus++;
                 if (!paramsByName) {

diff --git a/modules/tpcc/src/main/java/com/tsurugidb/tsubakuro/examples/tpcc/Payment.java b/modules/tpcc/src/main/java/com/tsurugidb/tsubakuro/examples/tpcc/Payment.java
@@ -191,7 +191,7 @@ void rollback(Transaction transaction) throws IOException, ServerException, Inte
 
     @SuppressWarnings("checkstyle:methodlength")
     public void transaction(AtomicBoolean stop) throws IOException, ServerException, InterruptedException {
-        while (!stop.get()) {
+        while (!stop.get()) {  // placed for transaction reexecution due to failure. If the transaction ends normally, it returns.
             try (var transaction = sqlClient.createTransaction().get();) {
                 profile.invocation.payment++;