Commit 44492a79 authored by Daniel Seybold's avatar Daniel Seybold

removed unnecessary fields form tsbs query execution

parent 0b48c160
......@@ -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;
......
......@@ -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<DBEndpoint> {
@Override
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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<TSDBMSDBMSProperties> 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<TSDBMSDBMSProperties> 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();
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
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) {
......
......@@ -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 {
......
......@@ -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;
......
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) {
......
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).
......
......@@ -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;
......
......@@ -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;
......
......@@ -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();
......
......@@ -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)){
......
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment