From 2ccc2b48ea6880e3c29ba27e72117f81a64123c6 Mon Sep 17 00:00:00 2001
From: Daniel Seybold <daniel.seybold@uni-ulm.de>
Date: Tue, 3 Mar 2020 16:00:38 +0100
Subject: [PATCH] fixed Dockerfile and command building for TPC-C

---
 Dockerfile                                           |  6 +-----
 .../workload/api/impl/WorkloadApiServiceImpl.java    |  1 +
 .../uulm/omi/workload/tpcc/TPCCCommandBuilder.java   | 12 +++++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bf3e278..77a800c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,11 +53,7 @@ ADD lib/ycsb_0.15/jdbc-binding/jdbc-binding-0.15.0.jar /opt/workloads/ycsb/jdbc-
 ###### CockroachDB loadgen for TPC-C  ######
 # downlaod cockroachdb loadgen 
 RUN mkdir /opt/workloads/cockroach/
-RUN cd /opt/workloads/cockroach
-RUN wget  https://binaries.cockroachdb.com/cockroach-v19.2.4.linux-amd64.tgz
-RUN tar  fxvz cockroach-v19.2.4.linux-amd64.tgz
-RUN mv  cockroach-v19.2.4.linux-amd64 binary
-RUN rm cockroach-v19.2.4.linux-amd64.tgz
+RUN cd /opt/workloads/cockroach ; wget  https://binaries.cockroachdb.com/cockroach-v19.2.4.linux-amd64.tgz ; tar  fxvz cockroach-v19.2.4.linux-amd64.tgz ; mv  cockroach-v19.2.4.linux-amd64 binary ; rm cockroach-v19.2.4.linux-amd64.tgz
 
 
 ###### TSBS by Timescale ######
diff --git a/src/main/java/de/uulm/omi/dbms/workload/api/impl/WorkloadApiServiceImpl.java b/src/main/java/de/uulm/omi/dbms/workload/api/impl/WorkloadApiServiceImpl.java
index 09f302b..c96ad09 100644
--- a/src/main/java/de/uulm/omi/dbms/workload/api/impl/WorkloadApiServiceImpl.java
+++ b/src/main/java/de/uulm/omi/dbms/workload/api/impl/WorkloadApiServiceImpl.java
@@ -43,6 +43,7 @@ public class WorkloadApiServiceImpl extends WorkloadApiService {
   private final String TPCC_RESULT_FOLDER = "TPCC/";
   private static final String TPCC_BINARY = "./cockroach";
 
+
   //TSBS constants
   private final String TSBS_RESULT_FOLDER = "/tmp/"; // TODO CHANGE
   private static final String TSBS_BINARY = "/opt/workloads/tsbs/bin/";
diff --git a/src/main/java/de/uulm/omi/workload/tpcc/TPCCCommandBuilder.java b/src/main/java/de/uulm/omi/workload/tpcc/TPCCCommandBuilder.java
index f2d657b..a350def 100644
--- a/src/main/java/de/uulm/omi/workload/tpcc/TPCCCommandBuilder.java
+++ b/src/main/java/de/uulm/omi/workload/tpcc/TPCCCommandBuilder.java
@@ -66,9 +66,13 @@ public class TPCCCommandBuilder {
       workloadCommand += " --histograms \"" + workload.getHistogram() + ".txt\" ";
     }
 
+    //TODO: remove as this is deprecated
+    /*
     if (workload.isInit()){
       workloadCommand += " --init ";
     }
+    */
+
 
     if (workload.isInterleaved()){
       workloadCommand += " --interleaved ";
@@ -141,7 +145,7 @@ public class TPCCCommandBuilder {
 
     String connectionUrl;
 
-    StringJoiner dbmsEndpoints = new StringJoiner(" ");
+    StringJoiner dbmsEndpoints = new StringJoiner(",");
     for(DBEndpoint endpoint : dbEndpoints){
 
       String postgresEndpoint;
@@ -152,12 +156,10 @@ public class TPCCCommandBuilder {
         postgresEndpoint = endpoint.getIpAddress() + ":26257";
       }
 
-      String postgresUrl =  "\"postgresql://" + postgresEndpoint+"?sslmode=disable\"";
-
-      dbmsEndpoints.add(postgresUrl);
+      dbmsEndpoints.add(postgresEndpoint);
 
     }
-    connectionUrl = " " + dbmsEndpoints.toString();
+    connectionUrl = " \"postgresql://" + dbmsEndpoints.toString() + "?sslmode=disable\"";
 
     LOGGER.debug("DBMS connection URL for TPC-C is: " + connectionUrl);
 
-- 
GitLab