Skip to content

Commit 83febda

Browse files
author
Gary Gregory
committed
Fix benchmark.
1 parent 4a79cda commit 83febda

1 file changed

Lines changed: 25 additions & 24 deletions

File tree

‎src/test/java/org/apache/commons/io/jmh/IOUtilsContentEqualsReadersBenchmark.java‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import java.io.BufferedReader;
2424
import java.io.IOException;
25-
import java.io.InputStream;
2625
import java.io.InputStreamReader;
2726
import java.io.Reader;
2827
import java.io.StringReader;
@@ -43,15 +42,15 @@
4342
import org.openjdk.jmh.infra.Blackhole;
4443

4544
/**
46-
* Test different implementations of {@link IOUtils#contentEquals(InputStream, InputStream)}.
45+
* Test different implementations of {@link IOUtils#contentEquals(Reader, Reader)}.
4746
*
4847
* <pre>
49-
* IOUtilsContentEqualsReadersBenchmark.testFileCurrent avgt 5 1788514.748 ▒ 725103.413 ns/op
50-
* IOUtilsContentEqualsReadersBenchmark.testFilePr118 avgt 5 1786345.992 ▒ 636923.719 ns/op
51-
* IOUtilsContentEqualsReadersBenchmark.testFileRelease_2_8_0 avgt 5 2113268.805 ▒ 670263.275 ns/op
52-
* IOUtilsContentEqualsReadersBenchmark.testStringCurrent avgt 5 4773229733.333 ▒ 198489493.236 ns/op
53-
* IOUtilsContentEqualsReadersBenchmark.testStringPr118 avgt 5 1158805764.444 ▒ 49390259.195 ns/op
54-
* IOUtilsContentEqualsReadersBenchmark.testStringRelease_2_8_0 avgt 5 4692235120.000 ▒ 315543521.826 ns/op
48+
* IOUtilsContentEqualsReadersBenchmark.testFileCurrent avgt 5 1984542.440 ▒ 741983.929 ns/op
49+
* IOUtilsContentEqualsReadersBenchmark.testFilePr118 avgt 5 1903047.996 ▒ 1126067.279 ns/op
50+
* IOUtilsContentEqualsReadersBenchmark.testFileRelease_2_8_0 avgt 5 2000614.270 ▒ 577200.820 ns/op
51+
* IOUtilsContentEqualsReadersBenchmark.testStringCurrent avgt 5 4833065053.333 ▒ 313253734.966 ns/op
52+
* IOUtilsContentEqualsReadersBenchmark.testStringPr118 avgt 5 1032292548.000 ▒ 32968762.278 ns/op
53+
* IOUtilsContentEqualsReadersBenchmark.testStringRelease_2_8_0 avgt 5 4810962660.000 ▒ 221405909.807 ns/op
5554
* </pre>
5655
*/
5756
@BenchmarkMode(Mode.AverageTime)
@@ -149,16 +148,17 @@ public static boolean contentEqualsPr118(final Reader input1, final Reader input
149148
@Benchmark
150149
public boolean[] testFileCurrent() throws IOException {
151150
final boolean[] res = new boolean[3];
152-
try (InputStream input1 = getClass().getResourceAsStream(TEST_PATH_A);
153-
InputStream input2 = getClass().getResourceAsStream(TEST_PATH_B)) {
151+
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A), DEFAULT_CHARSET);
152+
Reader input2 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_B), DEFAULT_CHARSET)) {
154153
res[0] = IOUtils.contentEquals(input1, input1);
155154
}
156-
try (InputStream input1 = getClass().getResourceAsStream(TEST_PATH_A);
157-
InputStream input2 = getClass().getResourceAsStream(TEST_PATH_A)) {
155+
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A), DEFAULT_CHARSET);
156+
Reader input2 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A), DEFAULT_CHARSET)) {
158157
res[1] = IOUtils.contentEquals(input1, input2);
159158
}
160-
try (InputStream input1 = getClass().getResourceAsStream(TEST_PATH_16K_A);
161-
InputStream input2 = getClass().getResourceAsStream(TEST_PATH_16K_A_COPY)) {
159+
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_16K_A), DEFAULT_CHARSET);
160+
Reader input2 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_16K_A_COPY),
161+
DEFAULT_CHARSET)) {
162162
res[2] = IOUtils.contentEquals(input1, input2);
163163
}
164164
return res;
@@ -167,12 +167,12 @@ public boolean[] testFileCurrent() throws IOException {
167167
@Benchmark
168168
public boolean[] testFilePr118() throws IOException {
169169
final boolean[] res = new boolean[3];
170-
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A));
171-
Reader input2 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_B))) {
170+
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A), DEFAULT_CHARSET);
171+
Reader input2 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_B), DEFAULT_CHARSET)) {
172172
res[0] = contentEqualsPr118(input1, input1);
173173
}
174-
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A));
175-
Reader input2 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A))) {
174+
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A), DEFAULT_CHARSET);
175+
Reader input2 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A), DEFAULT_CHARSET)) {
176176
res[1] = contentEqualsPr118(input1, input2);
177177
}
178178
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_16K_A));
@@ -185,16 +185,17 @@ public boolean[] testFilePr118() throws IOException {
185185
@Benchmark
186186
public boolean[] testFileRelease_2_8_0() throws IOException {
187187
final boolean[] res = new boolean[3];
188-
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A));
189-
Reader input2 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_B))) {
188+
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A), DEFAULT_CHARSET);
189+
Reader input2 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_B), DEFAULT_CHARSET)) {
190190
res[0] = contentEquals_release_2_8_0(input1, input1);
191191
}
192-
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A));
193-
Reader input2 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A))) {
192+
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A), DEFAULT_CHARSET);
193+
Reader input2 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_A), DEFAULT_CHARSET)) {
194194
res[1] = contentEquals_release_2_8_0(input1, input2);
195195
}
196-
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_16K_A));
197-
Reader input2 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_16K_A_COPY))) {
196+
try (Reader input1 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_16K_A), DEFAULT_CHARSET);
197+
Reader input2 = new InputStreamReader(getClass().getResourceAsStream(TEST_PATH_16K_A_COPY),
198+
DEFAULT_CHARSET)) {
198199
res[2] = contentEquals_release_2_8_0(input1, input2);
199200
}
200201
return res;

0 commit comments

Comments
 (0)