From 44492a791265d2b630e9b437eca8b1d95e59b9f1 Mon Sep 17 00:00:00 2001 From: Daniel Seybold Date: Thu, 7 May 2020 16:28:13 +0200 Subject: [PATCH] removed unnecessary fields form tsbs query execution --- .../dbms/evaluator/model/DBEndpoint.java | 2 +- .../dbms/evaluator/model/DBEndpoints.java | 2 +- .../dbms/evaluator/model/DatabaseConfig.java | 2 +- .../model/DatabaseConfigProperty.java | 2 +- .../dbms/evaluator/model/Error.java | 2 +- .../evaluator/model/MeasurementConfig.java | 2 +- .../dbms/evaluator/model/TPCCWorkload.java | 2 +- .../evaluator/model/TPCCWorkloadConfig.java | 2 +- .../evaluator/model/TSBSDataGeneration.java | 2 +- .../evaluator/model/TSBSLoadExecution.java | 2 +- .../evaluator/model/TSBSQueryExecution.java | 76 +------------------ .../evaluator/model/TSBSQueryGeneration.java | 2 +- .../dbms/evaluator/model/TSBSWorkload.java | 2 +- .../evaluator/model/TSDBMSDBMSProperties.java | 2 +- .../dbms/evaluator/model/WorkloadConfig.java | 2 +- .../model/WorkloadProcessInstance.java | 2 +- .../model/WorkloadProcessSubmissionError.java | 2 +- .../dbms/evaluator/model/YCSBWorkload.java | 2 +- .../omi/dbms/workload/api/ApiException.java | 2 +- .../dbms/workload/api/ApiOriginFilter.java | 2 +- .../dbms/workload/api/ApiResponseMessage.java | 2 +- .../dbms/workload/api/NotFoundException.java | 2 +- .../omi/dbms/workload/api/StringUtil.java | 2 +- .../omi/dbms/workload/api/WorkloadApi.java | 2 +- .../dbms/workload/api/WorkloadApiService.java | 2 +- .../factories/WorkloadApiServiceFactory.java | 2 +- .../omi/workload/tsbs/TSBSCommandBuilder.java | 14 ---- swagger/swagger.yaml | 15 +--- 28 files changed, 29 insertions(+), 126 deletions(-) diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoint.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoint.java index 82ecac5..2528b8f 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoint.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoint.java @@ -23,7 +23,7 @@ import javax.validation.constraints.*; /** * DBEndpoint */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class DBEndpoint { @JsonProperty("ipAddress") private String ipAddress = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoints.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoints.java index 951fe1e..ea4de2b 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoints.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DBEndpoints.java @@ -22,7 +22,7 @@ import javax.validation.constraints.*; * a list of the database endpoints to issue the workload */ @ApiModel(description = "a list of the database endpoints to issue the workload") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class DBEndpoints extends java.util.ArrayList { @Override diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfig.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfig.java index da2a8de..f4c7969 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfig.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfig.java @@ -25,7 +25,7 @@ import javax.validation.constraints.*; /** * DatabaseConfig */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class DatabaseConfig { /** * Gets or Sets databaseBinding diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfigProperty.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfigProperty.java index 13a34ce..01667ec 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfigProperty.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/DatabaseConfigProperty.java @@ -23,7 +23,7 @@ import javax.validation.constraints.*; /** * DatabaseConfigProperty */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class DatabaseConfigProperty { @JsonProperty("name") private String name = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Error.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Error.java index 77a1f18..eea6f50 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Error.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/Error.java @@ -23,7 +23,7 @@ import javax.validation.constraints.*; /** * Error */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class Error { @JsonProperty("code") private Integer code = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MeasurementConfig.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MeasurementConfig.java index a6adf31..3d8315d 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MeasurementConfig.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/MeasurementConfig.java @@ -24,7 +24,7 @@ import javax.validation.constraints.*; /** * MeasurementConfig */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class MeasurementConfig { @JsonProperty("interval") private Integer interval = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkload.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkload.java index 0f8cad7..940924e 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkload.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkload.java @@ -25,7 +25,7 @@ import javax.validation.constraints.*; /** * TPCCWorkload */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class TPCCWorkload { @JsonProperty("dbEndpoints") private DBEndpoints dbEndpoints = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkloadConfig.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkloadConfig.java index b0ecb59..cb0cb1a 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkloadConfig.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TPCCWorkloadConfig.java @@ -23,7 +23,7 @@ import javax.validation.constraints.*; /** * TPCCWorkloadConfig */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class TPCCWorkloadConfig { @JsonProperty("activeWarehouses") private Integer activeWarehouses = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSDataGeneration.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSDataGeneration.java index e63ad6f..ccd2a3c 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSDataGeneration.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSDataGeneration.java @@ -25,7 +25,7 @@ import javax.validation.constraints.*; * parameters for the data generation phase */ @ApiModel(description = "parameters for the data generation phase") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class TSBSDataGeneration { @JsonProperty("usecase") private String usecase = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSLoadExecution.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSLoadExecution.java index ca39bed..7894729 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSLoadExecution.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSLoadExecution.java @@ -25,7 +25,7 @@ import javax.validation.constraints.*; /** * TSBSLoadExecution */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class TSBSLoadExecution { @JsonProperty("workers") private BigDecimal workers = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryExecution.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryExecution.java index 4edf83a..801fb0a 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryExecution.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryExecution.java @@ -25,20 +25,11 @@ import javax.validation.constraints.*; /** * TSBSQueryExecution */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class TSBSQueryExecution { @JsonProperty("workers") private BigDecimal workers = null; - @JsonProperty("batchSize") - private BigDecimal batchSize = null; - - @JsonProperty("dbName") - private String dbName = null; - - @JsonProperty("reportingPeriod") - private String reportingPeriod = null; - @JsonProperty("dbmsPorperties") private java.util.List dbmsPorperties = null; @@ -61,63 +52,6 @@ public class TSBSQueryExecution { this.workers = workers; } - public TSBSQueryExecution batchSize(BigDecimal batchSize) { - this.batchSize = batchSize; - return this; - } - - /** - * The batch size to use for inserting the data - * @return batchSize - **/ - @JsonProperty("batchSize") - @ApiModelProperty(example = "1000.0", value = "The batch size to use for inserting the data") - public BigDecimal getBatchSize() { - return batchSize; - } - - public void setBatchSize(BigDecimal batchSize) { - this.batchSize = batchSize; - } - - public TSBSQueryExecution dbName(String dbName) { - this.dbName = dbName; - return this; - } - - /** - * The DB to use for the benchmark will be created automatically - * @return dbName - **/ - @JsonProperty("dbName") - @ApiModelProperty(example = "benchmark", value = "The DB to use for the benchmark will be created automatically") - public String getDbName() { - return dbName; - } - - public void setDbName(String dbName) { - this.dbName = dbName; - } - - public TSBSQueryExecution reportingPeriod(String reportingPeriod) { - this.reportingPeriod = reportingPeriod; - return this; - } - - /** - * metric reporting interval - * @return reportingPeriod - **/ - @JsonProperty("reportingPeriod") - @ApiModelProperty(example = "10s", value = "metric reporting interval") - public String getReportingPeriod() { - return reportingPeriod; - } - - public void setReportingPeriod(String reportingPeriod) { - this.reportingPeriod = reportingPeriod; - } - public TSBSQueryExecution dbmsPorperties(java.util.List dbmsPorperties) { this.dbmsPorperties = dbmsPorperties; return this; @@ -156,15 +90,12 @@ public class TSBSQueryExecution { } TSBSQueryExecution tsBSQueryExecution = (TSBSQueryExecution) o; return Objects.equals(this.workers, tsBSQueryExecution.workers) && - Objects.equals(this.batchSize, tsBSQueryExecution.batchSize) && - Objects.equals(this.dbName, tsBSQueryExecution.dbName) && - Objects.equals(this.reportingPeriod, tsBSQueryExecution.reportingPeriod) && Objects.equals(this.dbmsPorperties, tsBSQueryExecution.dbmsPorperties); } @Override public int hashCode() { - return Objects.hash(workers, batchSize, dbName, reportingPeriod, dbmsPorperties); + return Objects.hash(workers, dbmsPorperties); } @@ -174,9 +105,6 @@ public class TSBSQueryExecution { sb.append("class TSBSQueryExecution {\n"); sb.append(" workers: ").append(toIndentedString(workers)).append("\n"); - sb.append(" batchSize: ").append(toIndentedString(batchSize)).append("\n"); - sb.append(" dbName: ").append(toIndentedString(dbName)).append("\n"); - sb.append(" reportingPeriod: ").append(toIndentedString(reportingPeriod)).append("\n"); sb.append(" dbmsPorperties: ").append(toIndentedString(dbmsPorperties)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryGeneration.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryGeneration.java index d26c9bc..9738487 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryGeneration.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSQueryGeneration.java @@ -25,7 +25,7 @@ import javax.validation.constraints.*; * parameters for the query generation phase */ @ApiModel(description = "parameters for the query generation phase") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class TSBSQueryGeneration { @JsonProperty("usecase") private String usecase = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSWorkload.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSWorkload.java index d325d33..db4e3e2 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSWorkload.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSBSWorkload.java @@ -29,7 +29,7 @@ import javax.validation.constraints.*; /** * TSBSWorkload */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class TSBSWorkload { @JsonProperty("dbEndpoints") private DBEndpoints dbEndpoints = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSDBMSDBMSProperties.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSDBMSDBMSProperties.java index d993e9e..d4e9f76 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSDBMSDBMSProperties.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/TSDBMSDBMSProperties.java @@ -23,7 +23,7 @@ import javax.validation.constraints.*; /** * TSDBMSDBMSProperties */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class TSDBMSDBMSProperties { @JsonProperty("name") private String name = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadConfig.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadConfig.java index a95a383..2939345 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadConfig.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadConfig.java @@ -24,7 +24,7 @@ import javax.validation.constraints.*; /** * WorkloadConfig */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class WorkloadConfig { /** * Gets or Sets workloadType diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessInstance.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessInstance.java index d64cbd1..1964aab 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessInstance.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessInstance.java @@ -25,7 +25,7 @@ import javax.validation.constraints.*; /** * WorkloadProcessInstance */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class WorkloadProcessInstance { @JsonProperty("processId") private String processId = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessSubmissionError.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessSubmissionError.java index 3506c12..793ee21 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessSubmissionError.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/WorkloadProcessSubmissionError.java @@ -23,7 +23,7 @@ import javax.validation.constraints.*; /** * WorkloadProcessSubmissionError */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class WorkloadProcessSubmissionError { @JsonProperty("message") private String message = null; diff --git a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/YCSBWorkload.java b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/YCSBWorkload.java index a4ab335..57919ff 100644 --- a/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/YCSBWorkload.java +++ b/src/gen/java/de/uulm/omi/cloudiator/dbms/evaluator/model/YCSBWorkload.java @@ -27,7 +27,7 @@ import javax.validation.constraints.*; /** * YCSBWorkload */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class YCSBWorkload { @JsonProperty("dbEndpoints") private DBEndpoints dbEndpoints = null; diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/ApiException.java b/src/gen/java/de/uulm/omi/dbms/workload/api/ApiException.java index 1f00e5a..68fb805 100644 --- a/src/gen/java/de/uulm/omi/dbms/workload/api/ApiException.java +++ b/src/gen/java/de/uulm/omi/dbms/workload/api/ApiException.java @@ -1,6 +1,6 @@ package de.uulm.omi.dbms.workload.api; -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class ApiException extends Exception{ private int code; public ApiException (int code, String msg) { diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/ApiOriginFilter.java b/src/gen/java/de/uulm/omi/dbms/workload/api/ApiOriginFilter.java index fac38d3..a0c8765 100644 --- a/src/gen/java/de/uulm/omi/dbms/workload/api/ApiOriginFilter.java +++ b/src/gen/java/de/uulm/omi/dbms/workload/api/ApiOriginFilter.java @@ -5,7 +5,7 @@ import java.io.IOException; import javax.servlet.*; import javax.servlet.http.HttpServletResponse; -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class ApiOriginFilter implements javax.servlet.Filter { public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/ApiResponseMessage.java b/src/gen/java/de/uulm/omi/dbms/workload/api/ApiResponseMessage.java index e99d7be..698f0a2 100644 --- a/src/gen/java/de/uulm/omi/dbms/workload/api/ApiResponseMessage.java +++ b/src/gen/java/de/uulm/omi/dbms/workload/api/ApiResponseMessage.java @@ -3,7 +3,7 @@ package de.uulm.omi.dbms.workload.api; import javax.xml.bind.annotation.XmlTransient; @javax.xml.bind.annotation.XmlRootElement -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class ApiResponseMessage { public static final int ERROR = 1; public static final int WARNING = 2; diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/NotFoundException.java b/src/gen/java/de/uulm/omi/dbms/workload/api/NotFoundException.java index eef9594..f61ad97 100644 --- a/src/gen/java/de/uulm/omi/dbms/workload/api/NotFoundException.java +++ b/src/gen/java/de/uulm/omi/dbms/workload/api/NotFoundException.java @@ -1,6 +1,6 @@ package de.uulm.omi.dbms.workload.api; -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class NotFoundException extends ApiException { private int code; public NotFoundException (int code, String msg) { diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/StringUtil.java b/src/gen/java/de/uulm/omi/dbms/workload/api/StringUtil.java index 5d97b52..3797742 100644 --- a/src/gen/java/de/uulm/omi/dbms/workload/api/StringUtil.java +++ b/src/gen/java/de/uulm/omi/dbms/workload/api/StringUtil.java @@ -1,6 +1,6 @@ package de.uulm.omi.dbms.workload.api; -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class StringUtil { /** * Check if the given array contains the given value (with case-insensitive comparison). diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApi.java b/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApi.java index 695a887..1c06060 100644 --- a/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApi.java +++ b/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApi.java @@ -35,7 +35,7 @@ import javax.validation.constraints.*; @Produces({ "application/json" }) @io.swagger.annotations.Api(description = "the workload API") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class WorkloadApi { private final WorkloadApiService delegate; diff --git a/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApiService.java b/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApiService.java index 8f984da..185ee38 100644 --- a/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApiService.java +++ b/src/gen/java/de/uulm/omi/dbms/workload/api/WorkloadApiService.java @@ -21,7 +21,7 @@ import java.io.InputStream; import javax.ws.rs.core.Response; import javax.ws.rs.core.SecurityContext; import javax.validation.constraints.*; -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public abstract class WorkloadApiService { public abstract Response workloadResultGet( @NotNull String taskId, @NotNull String workloadType,SecurityContext securityContext) throws NotFoundException; public abstract Response workloadStatusGet( String applicationInstanceId,SecurityContext securityContext) throws NotFoundException; diff --git a/src/main/java/de/uulm/omi/dbms/workload/api/factories/WorkloadApiServiceFactory.java b/src/main/java/de/uulm/omi/dbms/workload/api/factories/WorkloadApiServiceFactory.java index b80b633..95b9fc0 100644 --- a/src/main/java/de/uulm/omi/dbms/workload/api/factories/WorkloadApiServiceFactory.java +++ b/src/main/java/de/uulm/omi/dbms/workload/api/factories/WorkloadApiServiceFactory.java @@ -3,7 +3,7 @@ package de.uulm.omi.dbms.workload.api.factories; import de.uulm.omi.dbms.workload.api.WorkloadApiService; import de.uulm.omi.dbms.workload.api.impl.WorkloadApiServiceImpl; -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T15:48:43.188+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-07T16:24:47.548+02:00") public class WorkloadApiServiceFactory { private final static WorkloadApiService service = new WorkloadApiServiceImpl(); diff --git a/src/main/java/de/uulm/omi/workload/tsbs/TSBSCommandBuilder.java b/src/main/java/de/uulm/omi/workload/tsbs/TSBSCommandBuilder.java index 948ca25..23298a5 100644 --- a/src/main/java/de/uulm/omi/workload/tsbs/TSBSCommandBuilder.java +++ b/src/main/java/de/uulm/omi/workload/tsbs/TSBSCommandBuilder.java @@ -190,25 +190,11 @@ public class TSBSCommandBuilder { String queriesCommand = "cat " + queryFolder + dbms.toString() + "-queries.gz " + " | gunzip | " + binaryPath + "tsbs_run_queries_" + dbms.toString() + " "; //common parameters - if (tsbsQueryExecution.getDbName() != null){ - queriesCommand += "--db-name=\"" + tsbsQueryExecution.getDbName().toLowerCase()+ "\" "; - } - else throw new IllegalArgumentException("Missing or incorrect --db-name parameter!"); - if (tsbsQueryExecution.getWorkers() != null){ queriesCommand += "--workers=\"" + tsbsQueryExecution.getWorkers()+ "\" "; } else throw new IllegalArgumentException("Missing or incorrect --workers parameter!"); - if (tsbsQueryExecution.getReportingPeriod() != null){ - queriesCommand += "--reporting-period=\"" + tsbsQueryExecution.getReportingPeriod()+ "\" "; - } - else throw new IllegalArgumentException("Missing or incorrect --reporting-period parameter!"); - - if (tsbsQueryExecution.getBatchSize() != null){ - queriesCommand += "--batch-size=\"" + tsbsQueryExecution.getBatchSize()+ "\" "; - } - else throw new IllegalArgumentException("Missing or incorrect --batch-size parameter!"); //DBMS specific parameters if(dbms.equals(DbmsEnum.INFLUX)){ diff --git a/swagger/swagger.yaml b/swagger/swagger.yaml index 441f7ca..9a3aa6c 100644 --- a/swagger/swagger.yaml +++ b/swagger/swagger.yaml @@ -149,6 +149,8 @@ paths: type: string enum: - YCSB + - TPCC + - TSBS required: true responses: '200': @@ -624,19 +626,6 @@ definitions: format: int32 description: 'number of worker to execute the workload' example: 4 - batchSize: - type: number - format: int32 - description: 'The batch size to use for inserting the data' - example: 1000 - dbName: - type: string - description: 'The DB to use for the benchmark will be created automatically' - example: 'benchmark' - reportingPeriod: - type: string - description: 'metric reporting interval' - example: '10s' dbmsPorperties: type: array items: -- GitLab