From 3a0b1d0df0224912e336314ea6573c5c74fbf425 Mon Sep 17 00:00:00 2001 From: Daniel Seybold Date: Tue, 12 May 2020 11:55:14 +0200 Subject: [PATCH] fixed more merge commits --- .../workload/api/impl/WorkloadApiServiceImpl.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) 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 8dbb487..54ed0fd 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 @@ -45,17 +45,7 @@ public class WorkloadApiServiceImpl extends WorkloadApiService { //TPC-C constants private final String TPCC_RESULT_FOLDER = "TPCC/"; private static final String TPCC_BINARY = "./cockroach"; - - -<<<<<<< HEAD - //TSBS constants - private final String TSBS_RESULT_FOLDER = "TSBS/"; - private static final String TSBS_BINARY = "/opt/workloads/tsbs/bin/"; - private static final String TSBS_SCRIPTS = "/opt/workloads/tsbs/src/omi-gitlab.e-technik.uni-ulm.de/mowgli/benchmarks/mowgli-tsbs/scripts/"; - - -======= ->>>>>>> 1f37d36184567e516e0854bf1dd0cf0073592d05 + @Override public Response workloadResultGet(@NotNull String taskId, @NotNull String workloadType, -- GitLab