Commit 5e0149aa authored by Daniel Seybold's avatar Daniel Seybold

added additional fields for tsbs integrations

parent b110517c
Pipeline #58340 failed with stage
in 12 minutes and 9 seconds
......@@ -23,7 +23,7 @@ import javax.validation.constraints.*;
/**
* DBEndpoint
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-07-12T14:18:17.633+02:00")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-09-18T17:26:06.293+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 = "2019-07-12T14:18:17.633+02:00")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-09-18T17:26:06.293+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 = "2019-07-12T14:18:17.633+02:00")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-09-18T17:26:06.293+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 = "2019-07-12T14:18:17.633+02:00")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-09-18T17:26:06.293+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 = "2019-07-12T14:18:17.633+02:00")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-09-18T17:26:06.293+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 = "2019-07-12T14:18:17.633+02:00")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-09-18T17:26:06.293+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 = "2019-07-12T14:18:17.633+02:00")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-09-18T17:26:06.293+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 = "2019-07-12T14:18:17.633+02:00")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-09-18T17:26:06.293+02:00")
public class TPCCWorkloadConfig {
@JsonProperty("activeWarehouses")
private Integer activeWarehouses = null;
......
......@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
/**
* TSBSDataConfig
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-07-12T14:18:17.633+02:00")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-09-18T17:26:06.293+02:00")
public class TSBSDataConfig {
@JsonProperty("usecase")
private String usecase = null;
......
......@@ -25,7 +25,7 @@ import javax.validation.constraints.*;
/**
* TSBSLoadConfig
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-07-12T14:18:17.633+02:00")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-09-18T17:26:06.293+02:00")
public class TSBSLoadConfig {
@JsonProperty("numberOfWorkers")
private BigDecimal numberOfWorkers = null;
......
......@@ -19,6 +19,8 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import de.uulm.omi.cloudiator.dbms.evaluator.model.DBEndpoints;
import de.uulm.omi.cloudiator.dbms.evaluator.model.TSBSDataConfig;
import de.uulm.omi.cloudiator.dbms.evaluator.model.TSBSLoadConfig;
import de.uulm.omi.cloudiator.dbms.evaluator.model.TSBSQueryConfig;
import de.uulm.omi.cloudiator.dbms.evaluator.model.TSBSQueryExecution;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.*;
......@@ -26,7 +28,7 @@ import javax.validation.constraints.*;
/**
* TSBSLoadWorkload
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-07-12T14:18:17.633+02:00")
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-09-18T17:26:06.293+02:00")
public class TSBSLoadWorkload {
@JsonProperty("dbEndpoints")
private DBEndpoints dbEndpoints = null;
......@@ -37,6 +39,12 @@ public class TSBSLoadWorkload {
@JsonProperty("tsbsLoadConfig")
private TSBSLoadConfig tsbsLoadConfig = null;
@JsonProperty("tsbsQueryConfig")
private TSBSQueryConfig tsbsQueryConfig = null;
@JsonProperty("tsbsQueryExecution")
private TSBSQueryExecution tsbsQueryExecution = null;
public TSBSLoadWorkload dbEndpoints(DBEndpoints dbEndpoints) {
this.dbEndpoints = dbEndpoints;
return this;
......@@ -94,6 +102,44 @@ public class TSBSLoadWorkload {
this.tsbsLoadConfig = tsbsLoadConfig;
}
public TSBSLoadWorkload tsbsQueryConfig(TSBSQueryConfig tsbsQueryConfig) {
this.tsbsQueryConfig = tsbsQueryConfig;
return this;
}
/**
* Get tsbsQueryConfig
* @return tsbsQueryConfig
**/
@JsonProperty("tsbsQueryConfig")
@ApiModelProperty(value = "")
public TSBSQueryConfig getTsbsQueryConfig() {
return tsbsQueryConfig;
}
public void setTsbsQueryConfig(TSBSQueryConfig tsbsQueryConfig) {
this.tsbsQueryConfig = tsbsQueryConfig;
}
public TSBSLoadWorkload tsbsQueryExecution(TSBSQueryExecution tsbsQueryExecution) {
this.tsbsQueryExecution = tsbsQueryExecution;
return this;
}
/**
* Get tsbsQueryExecution
* @return tsbsQueryExecution
**/
@JsonProperty("tsbsQueryExecution")
@ApiModelProperty(value = "")
public TSBSQueryExecution getTsbsQueryExecution() {
return tsbsQueryExecution;
}
public void setTsbsQueryExecution(TSBSQueryExecution tsbsQueryExecution) {
this.tsbsQueryExecution = tsbsQueryExecution;
}
@Override
public boolean equals(java.lang.Object o) {
......@@ -106,12 +152,14 @@ public class TSBSLoadWorkload {
TSBSLoadWorkload tsBSLoadWorkload = (TSBSLoadWorkload) o;
return Objects.equals(this.dbEndpoints, tsBSLoadWorkload.dbEndpoints) &&
Objects.equals(this.tsbsDataConfig, tsBSLoadWorkload.tsbsDataConfig) &&
Objects.equals(this.tsbsLoadConfig, tsBSLoadWorkload.tsbsLoadConfig);
Objects.equals(this.tsbsLoadConfig, tsBSLoadWorkload.tsbsLoadConfig) &&
Objects.equals(this.tsbsQueryConfig, tsBSLoadWorkload.tsbsQueryConfig) &&
Objects.equals(this.tsbsQueryExecution, tsBSLoadWorkload.tsbsQueryExecution);
}
@Override
public int hashCode() {
return Objects.hash(dbEndpoints, tsbsDataConfig, tsbsLoadConfig);
return Objects.hash(dbEndpoints, tsbsDataConfig, tsbsLoadConfig, tsbsQueryConfig, tsbsQueryExecution);
}
......@@ -123,6 +171,8 @@ public class TSBSLoadWorkload {
sb.append(" dbEndpoints: ").append(toIndentedString(dbEndpoints)).append("\n");
sb.append(" tsbsDataConfig: ").append(toIndentedString(tsbsDataConfig)).append("\n");
sb.append(" tsbsLoadConfig: ").append(toIndentedString(tsbsLoadConfig)).append("\n");
sb.append(" tsbsQueryConfig: ").append(toIndentedString(tsbsQueryConfig)).append("\n");
sb.append(" tsbsQueryExecution: ").append(toIndentedString(tsbsQueryExecution)).append("\n");
sb.append("}");
return sb.toString();
}
......
/*
* Workload API
* Benchmark your distributed DBMS with a specific workload
*
* OpenAPI spec version: 0.0.1
*
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
package de.uulm.omi.cloudiator.dbms.evaluator.model;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import javax.validation.constraints.*;
/**
* TSBSQueryConfig
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-09-18T17:26:06.293+02:00")
public class TSBSQueryConfig {
@JsonProperty("usecase")
private String usecase = null;
@JsonProperty("seed")
private BigDecimal seed = null;
@JsonProperty("scale")
private BigDecimal scale = null;
@JsonProperty("startTime")
private String startTime = null;
@JsonProperty("endTime")
private String endTime = null;
@JsonProperty("queries")
private BigDecimal queries = null;
@JsonProperty("queryType")
private String queryType = null;
/**
* specifies the data format for the selected DBMS
*/
public enum FormatEnum {
INFLUX("influx");
private String value;
FormatEnum(String value) {
this.value = value;
}
@Override
@JsonValue
public String toString() {
return String.valueOf(value);
}
@JsonCreator
public static FormatEnum fromValue(String text) {
for (FormatEnum b : FormatEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
}
@JsonProperty("format")
private FormatEnum format = null;
public TSBSQueryConfig usecase(String usecase) {
this.usecase = usecase;
return this;
}
/**
* TODO
* @return usecase
**/
@JsonProperty("usecase")
@ApiModelProperty(example = "cpu-only", value = "TODO")
public String getUsecase() {
return usecase;
}
public void setUsecase(String usecase) {
this.usecase = usecase;
}
public TSBSQueryConfig seed(BigDecimal seed) {
this.seed = seed;
return this;
}
/**
* By supplying the same seed to the generation programs, each database is loaded with identical data and queried using identical queries.
* @return seed
**/
@JsonProperty("seed")
@ApiModelProperty(example = "123.0", value = "By supplying the same seed to the generation programs, each database is loaded with identical data and queried using identical queries.")
public BigDecimal getSeed() {
return seed;
}
public void setSeed(BigDecimal seed) {
this.seed = seed;
}
public TSBSQueryConfig scale(BigDecimal scale) {
this.scale = scale;
return this;
}
/**
* TODO
* @return scale
**/
@JsonProperty("scale")
@ApiModelProperty(example = "1000.0", value = "TODO")
public BigDecimal getScale() {
return scale;
}
public void setScale(BigDecimal scale) {
this.scale = scale;
}
public TSBSQueryConfig startTime(String startTime) {
this.startTime = startTime;
return this;
}
/**
* starting timestamp for generating the data
* @return startTime
**/
@JsonProperty("startTime")
@ApiModelProperty(example = "2016-01-01T00:00:00Z", value = "starting timestamp for generating the data")
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public TSBSQueryConfig endTime(String endTime) {
this.endTime = endTime;
return this;
}
/**
* ending timestamp for generating the data
* @return endTime
**/
@JsonProperty("endTime")
@ApiModelProperty(example = "2016-01-04T00:00:00Z", value = "ending timestamp for generating the data")
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
public TSBSQueryConfig queries(BigDecimal queries) {
this.queries = queries;
return this;
}
/**
* TODO
* @return queries
**/
@JsonProperty("queries")
@ApiModelProperty(example = "20.0", value = "TODO")
public BigDecimal getQueries() {
return queries;
}
public void setQueries(BigDecimal queries) {
this.queries = queries;
}
public TSBSQueryConfig queryType(String queryType) {
this.queryType = queryType;
return this;
}
/**
* specifies one of the supported query type
* @return queryType
**/
@JsonProperty("queryType")
@ApiModelProperty(example = "single-groupby-1-1-1", value = "specifies one of the supported query type")
public String getQueryType() {
return queryType;
}
public void setQueryType(String queryType) {
this.queryType = queryType;
}
public TSBSQueryConfig format(FormatEnum format) {
this.format = format;
return this;
}
/**
* specifies the data format for the selected DBMS
* @return format
**/
@JsonProperty("format")
@ApiModelProperty(example = "influx", value = "specifies the data format for the selected DBMS")
public FormatEnum getFormat() {
return format;
}
public void setFormat(FormatEnum format) {
this.format = format;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
TSBSQueryConfig tsBSQueryConfig = (TSBSQueryConfig) o;
return Objects.equals(this.usecase, tsBSQueryConfig.usecase) &&
Objects.equals(this.seed, tsBSQueryConfig.seed) &&
Objects.equals(this.scale, tsBSQueryConfig.scale) &&
Objects.equals(this.startTime, tsBSQueryConfig.startTime) &&
Objects.equals(this.endTime, tsBSQueryConfig.endTime) &&
Objects.equals(this.queries, tsBSQueryConfig.queries) &&
Objects.equals(this.queryType, tsBSQueryConfig.queryType) &&
Objects.equals(this.format, tsBSQueryConfig.format);
}
@Override
public int hashCode() {
return Objects.hash(usecase, seed, scale, startTime, endTime, queries, queryType, format);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class TSBSQueryConfig {\n");
sb.append(" usecase: ").append(toIndentedString(usecase)).append("\n");
sb.append(" seed: ").append(toIndentedString(seed)).append("\n");
sb.append(" scale: ").append(toIndentedString(scale)).append("\n");
sb.append(" startTime: ").append(toIndentedString(startTime)).append("\n");
sb.append(" endTime: ").append(toIndentedString(endTime)).append("\n");
sb.append(" queries: ").append(toIndentedString(queries)).append("\n");
sb.append(" queryType: ").append(toIndentedString(queryType)).append("\n");
sb.append(" format: ").append(toIndentedString(format)).append("\n");
sb.append("}");
return sb.toString();
}
/**
* Convert the given object to string with each line indented by 4 spaces
* (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}
}
/*
* Workload API
* Benchmark your distributed DBMS with a specific workload
*
* OpenAPI spec version: 0.0.1
*
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
package de.uulm.omi.cloudiator.dbms.evaluator.model;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import de.uulm.omi.cloudiator.dbms.evaluator.model.TSDBMSDBMSProperties;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import javax.validation.constraints.*;
/**
* TSBSQueryExecution
*/
@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2019-09-18T17:26:06.293+02:00")
public class TSBSQueryExecution {
@JsonProperty("workers")
private BigDecimal workers = null;
@JsonProperty("dbmsPorperties")
private java.util.List<TSDBMSDBMSProperties> dbmsPorperties = null;
public TSBSQueryExecution workers(BigDecimal workers) {
this.workers = workers;
return this;
}
/**
* number of worker to execute the workload
* @return workers
**/
@JsonProperty("workers")
@ApiModelProperty(example = "4.0", value = "number of worker to execute the workload")
public BigDecimal getWorkers() {
return workers;
}
public void setWorkers(BigDecimal workers) {
this.workers = workers;
}
public TSBSQueryExecution dbmsPorperties(java.util.List<TSDBMSDBMSProperties> dbmsPorperties) {
this.dbmsPorperties = dbmsPorperties;
return this;
}
public TSBSQueryExecution addDbmsPorpertiesItem(TSDBMSDBMSProperties dbmsPorpertiesItem) {
if (this.dbmsPorperties == null) {
this.dbmsPorperties = new java.util.ArrayList<>();
}
this.dbmsPorperties.add(dbmsPorpertiesItem);
return this;
}
/**
* Get dbmsPorperties
* @return dbmsPorperties
**/
@JsonProperty("dbmsPorperties")
@ApiModelProperty(value = "")
public java.util.List<TSDBMSDBMSProperties> getDbmsPorperties() {
return dbmsPorperties;
}
public void setDbmsPorperties(java.util.List<TSDBMSDBMSProperties> dbmsPorperties) {
this.dbmsPorperties = dbmsPorperties;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
TSBSQueryExecution tsBSQueryExecution = (TSBSQueryExecution) o;
return Objects.equals(this.workers, tsBSQueryExecution.workers) &&
Objects.equals(this.dbmsPorperties, tsBSQueryExecution.dbmsPorperties);
}
@Override
public int hashCode() {
return Objects.hash(workers, dbmsPorperties);
}
@Override