Skip to content

Commit 6f56c9f

Browse files
authored
Add logging JMH & expose the dataset for external usage (#2207)
* Adding Extra Logging * Expose dataset params so it will be easier to init externaly * Expose dataset properties like tableNameFilled, tableNameEmpty. so it will be easier to init externally * Remove dataset definition in pom.xml
1 parent a6b069a commit 6f56c9f

2 files changed

Lines changed: 25 additions & 4 deletions

File tree

performance/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@
195195
<argument>-classpath</argument>
196196
<classpath />
197197
<argument>com.clickhouse.benchmark.BenchmarkRunner</argument>
198+
<argument>.*</argument>
198199
</arguments>
199200
</configuration>
200201
</execution>

performance/src/test/com/clickhouse/benchmark/clients/BenchmarkBase.java

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,39 @@ public static class DataState {
8080
@Param({"data_empty"})
8181
String tableNameEmpty;
8282
DataSet dataSet;
83+
84+
public void setDataSet(DataSet dataSet) {
85+
this.dataSet = dataSet;
86+
}
87+
88+
public void setDatasetSourceName(String datasetSourceName) {
89+
this.datasetSourceName = datasetSourceName;
90+
}
91+
92+
public void setLimit(int limit) {
93+
this.limit = limit;
94+
}
95+
96+
public void setTableNameFilled(String tableNameFilled) {
97+
this.tableNameFilled = tableNameFilled;
98+
}
99+
100+
public void setTableNameEmpty(String tableNameEmpty) {
101+
this.tableNameEmpty = tableNameEmpty;
102+
}
103+
83104
}
84105

85106
@Setup(Level.Trial)
86107
public void setup(DataState dataState) {
87108
setupEnvironment();
88-
89109
LOGGER.info("Setup benchmarks using dataset: {}", dataState.datasetSourceName);
90-
if ("simple".equals(dataState.datasetSourceName) && dataState.dataSet == null) {
110+
if (dataState.dataSet == null && "simple".equals(dataState.datasetSourceName)) {
91111
dataState.dataSet = new SimpleDataSet();
92-
} else if (dataState.datasetSourceName.startsWith("file://")) {
112+
} else if (dataState.dataSet == null && dataState.datasetSourceName.startsWith("file://")) {
113+
LOGGER.info("Loading data from file " + dataState.datasetSourceName + " with limit " + dataState.limit);
93114
dataState.dataSet = new FileDataSet(dataState.datasetSourceName.substring("file://".length()), dataState.limit);
94115
}
95-
96116
initializeTables(dataState);
97117
}
98118

0 commit comments

Comments
 (0)