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 9ce64eb7c0d1b722e1bd5e36ac46cc54bc2667c7..4debe6e6f327d725d8b1581e0f919bc36f742c6f 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 9fcfc697390d2dda338db4ac5e2e195a58e8cd3b..d0d86454eb1e78bc696607425221266e0144b099 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 4a905734d4e378d03547ceb5d18f4b3a023d6b1d..4bc95949d1cc8fea8f9590d16903c682d41dceec 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 251a8f2e3aca85014a92a8fdef477d5bee075d31..08c28ab4c77be65387591087cab2441c0c6b47b9 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 9b31741c67ef74fc06f95d25dc2a9550e846398e..c6e72c49fbad85a039d05714acd5d35d7c83120a 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 be726e84e6e4e273d278cacf44dc54617f7a3a26..3b12bc8cbecdf25b4f455d4f3d427b7a7a7aff2e 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 d9f9f6ae977eef40d544e0b0859bac0bbf58520d..2938db10c0eeb3ee768dd812ceb5c52ac07565fd 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 ae1aa4e62f3ec0946f51c84ed04a2de91878aa12..c6c8e143ed0c508060ae4d590201773787858c24 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 c4075b8efe4fa35ad296d7a72e73e06a1c842b6d..cf8b90b2423046634a8a7ef98fe1f1bf401dd347 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 c87bbedbed180b72e8a89990f5b6046dfd1c5222..dca23a933cc0760dbe79ac38371b0c27fd994fe5 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 555809213860d6aa0eb5a9bab847a180890d6bee..21b99f77d76837aa5fb912087fbbdffdfacc64a1 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,11 +25,23 @@ import javax.validation.constraints.*; /** * TSBSQueryExecution */ -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+02:00") public class TSBSQueryExecution { @JsonProperty("workers") private BigDecimal workers = null; + @JsonProperty("burn-in") + private BigDecimal burnIn = null; + + @JsonProperty("debug") + private Boolean debug = null; + + @JsonProperty("print-interval") + private BigDecimal printInterval = null; + + @JsonProperty("print-responses") + private Boolean printResponses = null; + @JsonProperty("dbmsPorperties") private java.util.List dbmsPorperties = null; @@ -52,6 +64,82 @@ public class TSBSQueryExecution { this.workers = workers; } + public TSBSQueryExecution burnIn(BigDecimal burnIn) { + this.burnIn = burnIn; + return this; + } + + /** + * number of queries to ignore before collecting statistics + * @return burnIn + **/ + @JsonProperty("burn-in") + @ApiModelProperty(example = "0.0", value = "number of queries to ignore before collecting statistics") + public BigDecimal getBurnIn() { + return burnIn; + } + + public void setBurnIn(BigDecimal burnIn) { + this.burnIn = burnIn; + } + + public TSBSQueryExecution debug(Boolean debug) { + this.debug = debug; + return this; + } + + /** + * print debug messages + * @return debug + **/ + @JsonProperty("debug") + @ApiModelProperty(example = "false", value = "print debug messages") + public Boolean isDebug() { + return debug; + } + + public void setDebug(Boolean debug) { + this.debug = debug; + } + + public TSBSQueryExecution printInterval(BigDecimal printInterval) { + this.printInterval = printInterval; + return this; + } + + /** + * print timing stats to stderr after this many queries (0 to disable) (default 100) + * @return printInterval + **/ + @JsonProperty("print-interval") + @ApiModelProperty(example = "100.0", value = "print timing stats to stderr after this many queries (0 to disable) (default 100)") + public BigDecimal getPrintInterval() { + return printInterval; + } + + public void setPrintInterval(BigDecimal printInterval) { + this.printInterval = printInterval; + } + + public TSBSQueryExecution printResponses(Boolean printResponses) { + this.printResponses = printResponses; + return this; + } + + /** + * pretty print response bodies for correctness checking (default false) + * @return printResponses + **/ + @JsonProperty("print-responses") + @ApiModelProperty(example = "false", value = "pretty print response bodies for correctness checking (default false)") + public Boolean isPrintResponses() { + return printResponses; + } + + public void setPrintResponses(Boolean printResponses) { + this.printResponses = printResponses; + } + public TSBSQueryExecution dbmsPorperties(java.util.List dbmsPorperties) { this.dbmsPorperties = dbmsPorperties; return this; @@ -90,12 +178,16 @@ public class TSBSQueryExecution { } TSBSQueryExecution tsBSQueryExecution = (TSBSQueryExecution) o; return Objects.equals(this.workers, tsBSQueryExecution.workers) && + Objects.equals(this.burnIn, tsBSQueryExecution.burnIn) && + Objects.equals(this.debug, tsBSQueryExecution.debug) && + Objects.equals(this.printInterval, tsBSQueryExecution.printInterval) && + Objects.equals(this.printResponses, tsBSQueryExecution.printResponses) && Objects.equals(this.dbmsPorperties, tsBSQueryExecution.dbmsPorperties); } @Override public int hashCode() { - return Objects.hash(workers, dbmsPorperties); + return Objects.hash(workers, burnIn, debug, printInterval, printResponses, dbmsPorperties); } @@ -105,6 +197,10 @@ public class TSBSQueryExecution { sb.append("class TSBSQueryExecution {\n"); sb.append(" workers: ").append(toIndentedString(workers)).append("\n"); + sb.append(" burnIn: ").append(toIndentedString(burnIn)).append("\n"); + sb.append(" debug: ").append(toIndentedString(debug)).append("\n"); + sb.append(" printInterval: ").append(toIndentedString(printInterval)).append("\n"); + sb.append(" printResponses: ").append(toIndentedString(printResponses)).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 f455253e84c720d8c13dd46b39671d96e4a2b67a..1bbf36527011939c33878a472aa469b076252973 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 fc93c0ebf48d9cc919708b2a9ed7986ba1011a3e..d9be42adee4174d38227f5b132d6fa16d1f562d2 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 63cd9ddc92849250b4a84ea5f504348554a1ab9c..1af465ebdd2bde22bdf4cc47f5350a736addddcc 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 8bb83d6d211673e8572464f5b89a6c9f6300cf20..f66282651cc9d725e52cc0ece8c00fcd6afbdfbd 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 11a3ff91187e3d3217a65be98ea0da07760cd476..df20fd53eba7b3e1e8c7ae0d2a1ce60c35909868 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 70eb8fadf982a32447c367b1bd9001185df9858b..ac38e9f29c0b0b7a8176707e2672727fb9e8dd29 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 39569d4b573518ad97dbc3bf1c8d8cdd50e30195..69e46878e7443fe41bae8be6f7ed3ea2343854d6 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 384d048d5cc09bdedc65d7d9a321beb47135f320..6fa4bc17184e9fd299c289390427b31b835b858b 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 e05e94bebed918135301abb83cf5baeaa70803ce..78fe42efb5aa14e2b77fa50ebcd89221c92fe33e 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 63692dbc2aed8119273234f3e2becf3585961463..c1f980ba054402ae9ea92430b0fd9df772beca06 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 a1eb2a6c8ded390ce9b0445e77e4afacd6c227d2..327c29a7dddbdf96a4c351f9f707fb5c2515565d 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 fdf973952e9aad97231673f1edfb2ca041bf684d..7e8e5047b025d5cd2389ee68a6ca6e08ca4cf3da 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 d8a6bf2a8e63685df01e88d6d869c4ccefd71f2d..2bd17e0f55219f613d42b4924da9ff6807f0754f 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 5e4a11cee1c8da82d9bcad4b2989f225acaef9cc..c23f684b88a9a5c48dc67179779bf1f0563a12a5 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 d1759f6337dda7bf164b41609cae449e7f97ef89..19daf44dfa40fc57397133c18dc262c4a9353b9e 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-08T15:27:14.409+02:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2020-05-14T10:01:48.492+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 9a6f0c64ea95aa944dc3c155060151ad8635ebcc..9b256198a0ec49a33d41f846081d98af6519b63c 100644 --- a/src/main/java/de/uulm/omi/workload/tsbs/TSBSCommandBuilder.java +++ b/src/main/java/de/uulm/omi/workload/tsbs/TSBSCommandBuilder.java @@ -186,11 +186,30 @@ public class TSBSCommandBuilder { String queriesCommand = "cat " + queryFolder + dbms.toString().toLowerCase() + "-queries.gz " + " | gunzip | " + binaryPath + "tsbs_run_queries_" + dbms.toString().toLowerCase() + " "; //common parameters - if (tsbsQueryExecution.getWorkers() != null){ - queriesCommand += "--workers=\"" + tsbsQueryExecution.getWorkers()+ "\" "; + if (tsbsQueryExecution.getWorkers() != null && tsbsQueryExecution.getWorkers().intValue() > 0){ + queriesCommand += "--workers " + tsbsQueryExecution.getWorkers()+ " "; } else throw new IllegalArgumentException("Missing or incorrect --workers parameter!"); + if (tsbsQueryExecution.getBurnIn() != null){ + queriesCommand += "--burn-in " + tsbsQueryExecution.getBurnIn()+ " "; + } + else throw new IllegalArgumentException("Missing or incorrect --burn-in parameter!"); + + if (tsbsQueryExecution.getPrintInterval() != null){ + queriesCommand += "--print-interval " + tsbsQueryExecution.getPrintInterval()+ " "; + } + else throw new IllegalArgumentException("Missing or incorrect --print-interval parameter!"); + + if (tsbsQueryExecution.isDebug()){ + queriesCommand += "--debug 1 "; + } + + if (tsbsQueryExecution.isPrintResponses()){ + queriesCommand += "--print-responses "; + } + + //DBMS specific parameters return getDBMSConnection(dbms, dbEndpoints, queriesCommand, diff --git a/swagger/swagger.yaml b/swagger/swagger.yaml index 90330396192075fd60e9a0a574dc4b0e36cbebcb..d5360d46e3a80a33a9ee35c0b5d42bcd6b43ca93 100644 --- a/swagger/swagger.yaml +++ b/swagger/swagger.yaml @@ -625,6 +625,24 @@ definitions: format: int32 description: 'number of worker to execute the workload' example: 4 + burn-in: + type: number + format: int32 + description: 'number of queries to ignore before collecting statistics' + example: 0 + debug: + type: boolean + description: 'print debug messages' + example: false + print-interval: + type: number + format: int32 + description: 'print timing stats to stderr after this many queries (0 to disable) (default 100)' + example: 100 + print-responses: + type: boolean + description: 'pretty print response bodies for correctness checking (default false)' + example: false dbmsPorperties: type: array items: