Skip to content

Commit 9b7ca25

Browse files
author
Paultagoras
committed
Update MixedWorkload.java
1 parent 049fe61 commit 9b7ca25

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.openjdk.jmh.annotations.State;
2020
import org.openjdk.jmh.annotations.TearDown;
2121
import org.openjdk.jmh.annotations.Threads;
22+
import org.openjdk.jmh.infra.Blackhole;
2223
import org.slf4j.Logger;
2324
import org.slf4j.LoggerFactory;
2425

@@ -54,6 +55,10 @@ public void teardownIteration(DataState dataState) {
5455
truncateTable(dataState.tableNameEmpty);
5556
}
5657

58+
// @State(Scope.Thread)
59+
// public static class MixedWorkloadState {
60+
//
61+
// }
5762

5863
@Benchmark
5964
@Group("mixed_v1")
@@ -79,7 +84,7 @@ public void insertV1(DataState dataState) {
7984

8085
@Benchmark
8186
@Group("mixed_v1")
82-
public void queryV1(DataState dataState) {
87+
public void queryV1(DataState dataState, Blackhole blackhole) {
8388
try {
8489
try (ClickHouseResponse response = clientV1Shared.read(getServer())
8590
.query(BenchmarkRunner.getSelectQuery(dataState.tableNameFilled))
@@ -88,7 +93,7 @@ public void queryV1(DataState dataState) {
8893
.executeAndWait()) {
8994
for (ClickHouseRecord record: response.records()) {//Compiler optimization avoidance
9095
for (int i = 0; i < dataState.dataSet.getSchema().getColumns().size(); i++) {
91-
isNotNull(record.getValue(i), false);
96+
blackhole.consume(record.getValue(i).asObject());
9297
}
9398
}
9499
}
@@ -119,13 +124,13 @@ public void insertV2(DataState dataState) {
119124

120125
@Benchmark
121126
@Group("mixed_v2")
122-
public void queryV2(DataState dataState) {
127+
public void queryV2(DataState dataState, Blackhole blackhole) {
123128
try {
124-
try(QueryResponse response = clientV2Shared.query(BenchmarkRunner.getSelectQuery(dataState.tableNameEmpty)).get()) {
129+
try(QueryResponse response = clientV2Shared.query(BenchmarkRunner.getSelectQuery(dataState.tableNameFilled)).get()) {
125130
ClickHouseBinaryFormatReader reader = clientV2Shared.newBinaryFormatReader(response);
126131
while (reader.next() != null) {//Compiler optimization avoidance
127132
for (int i = 1; i <= dataState.dataSet.getSchema().getColumns().size(); i++) {
128-
isNotNull(reader.readValue(1), false);
133+
blackhole.consume(reader.readValue(1));
129134
}
130135
}
131136
}

0 commit comments

Comments
 (0)