Skip to content

Commit de6fb71

Browse files
committed
address comments
1 parent daf16a3 commit de6fb71

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

hbase-compression/hbase-compression-zstd/src/test/java/org/apache/hadoop/hbase/io/compress/zstd/TestHFileCompressionZstd.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void testReconfLevels() throws Exception {
8181
long len_2 = FS.getFileStatus(path_2).getLen();
8282
LOG.info("Level 1 len {}", len_1);
8383
LOG.info("Level 22 len {}", len_2);
84-
assertTrue(len_1 > len_2, "Reconfiguraton with ZSTD_LEVEL_KEY did not seem to work");
84+
assertTrue(len_1 > len_2, "Reconfiguration with ZSTD_LEVEL_KEY did not seem to work");
8585
}
8686

8787
}

hbase-server/src/test/java/org/apache/hadoop/hbase/io/compress/HFileTestBase.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,38 +82,29 @@ public void doTest(Configuration conf, Path path, Compression.Algorithm compress
8282
// read it back in
8383
LOG.info("Reading with " + fileContext);
8484
int i = 0;
85-
HFileScanner scanner = null;
86-
HFile.Reader reader = HFile.createReader(FS, path, cacheConf, true, conf);
87-
try {
88-
scanner = reader.getScanner(conf, false, false);
85+
try (HFile.Reader reader = HFile.createReader(FS, path, cacheConf, true, conf);
86+
HFileScanner scanner = reader.getScanner(conf, false, false)) {
8987
assertTrue(scanner.seekTo(), "Initial seekTo failed");
9088
do {
9189
ExtendedCell kv = scanner.getCell();
9290
assertTrue(testKvs.contains(KeyValueUtil.ensureKeyValue(kv)),
9391
"Read back an unexpected or invalid KV");
9492
i++;
9593
} while (scanner.next());
96-
} finally {
97-
reader.close();
98-
scanner.close();
9994
}
10095

10196
assertEquals(i, testKvs.size(), "Did not read back as many KVs as written");
10297

10398
// Test random seeks with pread
10499
Random rand = ThreadLocalRandom.current();
105100
LOG.info("Random seeking with " + fileContext);
106-
reader = HFile.createReader(FS, path, cacheConf, true, conf);
107-
try {
108-
scanner = reader.getScanner(conf, false, true);
101+
try (HFile.Reader reader = HFile.createReader(FS, path, cacheConf, true, conf);
102+
HFileScanner scanner = reader.getScanner(conf, false, true)) {
109103
assertTrue(scanner.seekTo(), "Initial seekTo failed");
110104
for (i = 0; i < 100; i++) {
111105
KeyValue kv = testKvs.get(rand.nextInt(testKvs.size()));
112106
assertEquals(0, scanner.seekTo(kv), "Unable to find KV as expected: " + kv);
113107
}
114-
} finally {
115-
scanner.close();
116-
reader.close();
117108
}
118109
}
119110

0 commit comments

Comments
 (0)