Disable Hikari Connection Pool for using only YSQL Connection Manager

config/workload_all.xml

@@ -11,6 +11,8 @@
     <sslCert></sslCert>
     <sslKey></sslKey>
     <jdbcURL></jdbcURL>
+    <useConnMngr>false</useConnMngr>
+    <useShortLivedConn>false</useShortLivedConn>
 
     <batchSize>128</batchSize>
     <useKeyingTime>true</useKeyingTime>

config/workload_all_conn_mngr.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<parameters>
+    <dbtype>yugabyte</dbtype>
+    <driver>com.yugabyte.Driver</driver>
+    <port>5433</port>
+    <username>yugabyte</username>
+    <DBName>yugabyte</DBName>
+    <password></password>
+    <isolation>TRANSACTION_REPEATABLE_READ</isolation>
+
+    <sslCert></sslCert>
+    <sslKey></sslKey>
+    <jdbcURL></jdbcURL>
+    <useConnMngr>true</useConnMngr>
+    <useShortLivedConn>false</useShortLivedConn>
+
+    <batchSize>128</batchSize>
+    <useKeyingTime>true</useKeyingTime>
+    <useThinkTime>true</useThinkTime>
+    <enableForeignKeysAfterLoad>true</enableForeignKeysAfterLoad>
+    <hikariConnectionTimeoutMs>180000</hikariConnectionTimeoutMs>
+    <useStoredProcedures>true</useStoredProcedures>
+    <displayEnhancedLatencyMetrics>false</displayEnhancedLatencyMetrics>
+    <trackPerSQLStmtLatencies>false</trackPerSQLStmtLatencies>
+
+   	<transactiontypes>
+        <transaction>
+            <name>NewOrder</name>
+            <weight>45</weight>
+        </transaction>
+        <transaction>
+            <name>Payment</name>
+            <weight>43</weight>
+        </transaction>
+        <transaction>
+            <name>OrderStatus</name>
+            <weight>4</weight>
+        </transaction>
+        <transaction>
+            <name>Delivery</name>
+            <weight>4</weight>
+        </transaction>
+        <transaction>
+            <name>StockLevel</name>
+            <weight>4</weight>
+        </transaction>
+   	</transactiontypes>
+
+    <runtime>1800</runtime>
+    <rate>10000</rate>
+    <!--
+      Set the number of retries to 0 as retrying when the number of warehouses is
+      high is pointless as it just leads to more failures.
+    -->
+    <maxRetriesPerTransaction>2</maxRetriesPerTransaction>
+    <maxLoaderRetries>2</maxLoaderRetries>
+
+</parameters>

config/workload_all_conn_mngr_short_lived_conn.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<parameters>
+    <dbtype>yugabyte</dbtype>
+    <driver>com.yugabyte.Driver</driver>
+    <port>5433</port>
+    <username>yugabyte</username>
+    <DBName>yugabyte</DBName>
+    <password></password>
+    <isolation>TRANSACTION_REPEATABLE_READ</isolation>
+
+    <sslCert></sslCert>
+    <sslKey></sslKey>
+    <jdbcURL></jdbcURL>
+    <useConnMngr>true</useConnMngr>
+    <useShortLivedConn>true</useShortLivedConn>
+
+    <batchSize>128</batchSize>
+    <useKeyingTime>true</useKeyingTime>
+    <useThinkTime>true</useThinkTime>
+    <enableForeignKeysAfterLoad>true</enableForeignKeysAfterLoad>
+    <hikariConnectionTimeoutMs>180000</hikariConnectionTimeoutMs>
+    <useStoredProcedures>true</useStoredProcedures>
+    <displayEnhancedLatencyMetrics>false</displayEnhancedLatencyMetrics>
+    <trackPerSQLStmtLatencies>false</trackPerSQLStmtLatencies>
+
+   	<transactiontypes>
+        <transaction>
+            <name>NewOrder</name>
+            <weight>45</weight>
+        </transaction>
+        <transaction>
+            <name>Payment</name>
+            <weight>43</weight>
+        </transaction>
+        <transaction>
+            <name>OrderStatus</name>
+            <weight>4</weight>
+        </transaction>
+        <transaction>
+            <name>Delivery</name>
+            <weight>4</weight>
+        </transaction>
+        <transaction>
+            <name>StockLevel</name>
+            <weight>4</weight>
+        </transaction>
+   	</transactiontypes>
+
+    <runtime>1800</runtime>
+    <rate>10000</rate>
+    <!--
+      Set the number of retries to 0 as retrying when the number of warehouses is
+      high is pointless as it just leads to more failures.
+    -->
+    <maxRetriesPerTransaction>2</maxRetriesPerTransaction>
+    <maxLoaderRetries>2</maxLoaderRetries>
+
+</parameters>

src/com/oltpbenchmark/ConfigFileOptions.java

@@ -53,6 +53,14 @@ public Optional<Boolean> getUseThinkTime() {
         return getBoolOpt("useThinkTime");
     }
 
+    public Optional<Boolean> getUseConnMngr() {
+        return getBoolOpt("useConnMngr");
+    }
+
+    public Optional<Boolean> getUseShortLivedConn() {
+        return getBoolOpt("useShortLivedConn");
+    }
+
     public Optional<Boolean> getEnableForeignKeysAfterLoad() {
         return getBoolOpt("enableForeignKeysAfterLoad");
     }

src/com/oltpbenchmark/DBWorkload.java

@@ -188,6 +188,8 @@ public static void main(String[] args) throws Exception {
           wrkld.setShouldEnableForeignKeys(false);
       }
 
+      configOptions.getUseConnMngr().ifPresent(wrkld::setUseConnMngr);
+      configOptions.getUseShortLivedConn().ifPresent(wrkld::setUseShortLivedConn);
       configOptions.getBatchSize().ifPresent(wrkld::setBatchSize);
       configOptions.getMaxRetriesPerTransaction().ifPresent(wrkld::setMaxRetriesPerTransaction);
       configOptions.getMaxLoaderRetries().ifPresent(wrkld::setMaxLoaderRetries);

src/com/oltpbenchmark/WorkloadConfiguration.java

@@ -68,6 +68,8 @@ public void setBenchmarkName(String benchmarkName) {
   private boolean useStoredProcedures = true;
   private int maxRetriesPerTransaction = 0;
   private int maxLoaderRetries = 0;
+  private boolean useConnMngr;
+  private boolean useShortLivedConn;
 
   public TraceReader getTraceReader() {
     return traceReader;
@@ -361,6 +363,16 @@ public void setMaxRetriesPerTransaction(int maxRetriesPerTransaction) {
     this.maxRetriesPerTransaction = maxRetriesPerTransaction;
   }
 
+  public void setUseConnMngr(boolean useConnMngr) {
+    this.useConnMngr = useConnMngr;
+  }
+  public boolean getUseConnMngr() { return this.useConnMngr; }
+
+  public void setUseShortLivedConn(boolean useShortLivedConn) {
+    this.useShortLivedConn = useShortLivedConn;
+  }
+  public boolean getUseShortLivedConn() { return this.useShortLivedConn; }
+
   public int getMaxRetriesPerTransaction() {
     return maxRetriesPerTransaction;
   }

src/com/oltpbenchmark/api/BenchmarkModule.java

@@ -71,7 +71,11 @@ public BenchmarkModule(WorkloadConfiguration workConf) {
         this.workConf = workConf;
         if (workConf.getNeedsExecution()) {
             try {
-                createDataSource();
+                if(!workConf.getUseConnMngr())
+                    createDataSource();
+                else {
+                    System.out.println("Using connection manager without HikariPool");
+                }
             } catch (Exception e) {
                 LOG.error("Failed to create Data source", e);
                 throw e;

src/com/oltpbenchmark/api/Worker.java

@@ -17,6 +17,7 @@
 package com.oltpbenchmark.api;
 
 import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.Statement;
 import java.sql.SQLException;
 import java.util.*;
@@ -51,12 +52,11 @@ public class Worker implements Runnable {
     private TransactionLatencyRecord latencies;
     private TransactionLatencyRecord failureLatencies;
     private WorkerTaskLatencyRecord workerTaskLatencyRecord;
-
     private final Statement currStatement;
 
     // Interval requests used by the monitor
     private final AtomicInteger intervalRequests = new AtomicInteger(0);
-
+    private Connection ll_conn;
     private final int id;
     private final BenchmarkModule benchmarkModule;
     protected final HikariDataSource dataSource;
@@ -81,7 +81,15 @@ public Worker(
 
         assert (this.transactionTypes != null) : "The TransactionTypes from the WorkloadConfiguration is null!";
         try {
-            this.dataSource = this.benchmarkModule.getDataSource();
+            if(wrkld.getUseConnMngr()) {
+                this.dataSource = null;
+                if(!wrkld.getUseShortLivedConn()) {
+                    ll_conn = benchmarkModule.makeConnection();
+                    System.out.println("Using connection manager for long lived connection without HikariPool");
+                }
+            } else {
+                this.dataSource = this.benchmarkModule.getDataSource();
+            }
         } catch (Exception ex) {
             throw new RuntimeException("Failed to connect to database", ex);
         }
@@ -473,14 +481,18 @@ protected final ArrayList<Pair<TransactionExecutionState, TransactionStatus>> do
 
         TransactionStatus status = TransactionStatus.RETRY;
 
-        Connection conn;
+        Connection conn = ll_conn;
         try {
             if (next == null) {
                 next = transactionTypes.getType(pieceOfWork.getType());
             }
             startConnection = System.nanoTime();
-
-            conn = dataSource.getConnection();
+            if(wrkld.getUseConnMngr()){
+                if(wrkld.getUseShortLivedConn())
+                    conn = benchmarkModule.makeConnection();
+            } else {
+                conn = dataSource.getConnection();
+            }
             try {
                 if(wrkld.getDBType().equals("yugabyte"))
                     conn.createStatement().execute("SET yb_enable_expression_pushdown to on");
@@ -490,7 +502,7 @@ protected final ArrayList<Pair<TransactionExecutionState, TransactionStatus>> do
                     conn.setAutoCommit(false);
                 }
             } catch (Throwable e) {
-
+                System.out.println("Error in enabling expression_pushdown or setting auto_commit to false ");
             }
 
             endConnection = System.nanoTime();
@@ -592,7 +604,11 @@ protected final ArrayList<Pair<TransactionExecutionState, TransactionStatus>> do
                     break;
                 }
             } // WHILE
-            conn.close();
+            if(wrkld.getUseConnMngr()) {
+                if (wrkld.getUseShortLivedConn())
+                    conn.close();
+            } else
+                conn.close();
         } catch (SQLException ex) {
             String msg = String.format("Unexpected fatal, error in '%s' when executing '%s'",
                                        this, next);