You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/07/07 06:52:12 UTC
[hbase] branch branch-2.3 updated: HBASE-26068 The last assertion
in TestHStore.testRefreshStoreFilesNotChanged is wrong (#3461)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.3 by this push:
new 3f6b6e1 HBASE-26068 The last assertion in TestHStore.testRefreshStoreFilesNotChanged is wrong (#3461)
3f6b6e1 is described below
commit 3f6b6e141179d86f7bd64e6ce2352af17ec98a2d
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Wed Jul 7 14:34:42 2021 +0800
HBASE-26068 The last assertion in TestHStore.testRefreshStoreFilesNotChanged is wrong (#3461)
Signed-off-by: Yulin Niu <niuyulin@apache.org
---
.../hadoop/hbase/regionserver/TestHStore.java | 36 ++++++----------------
1 file changed, 10 insertions(+), 26 deletions(-)
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
index 7af9e33..0a198b9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
@@ -161,11 +161,6 @@ public class TestHStore {
private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private static final String DIR = TEST_UTIL.getDataTestDir("TestStore").toString();
-
- /**
- * Setup
- * @throws IOException
- */
@Before
public void setUp() throws IOException {
qualifiers.clear();
@@ -245,7 +240,6 @@ public class TestHStore {
/**
* Test we do not lose data if we fail a flush and then close.
* Part of HBase-10466
- * @throws Exception
*/
@Test
public void testFlushSizeSizing() throws Exception {
@@ -347,7 +341,7 @@ public class TestHStore {
testDeleteExpiredStoreFiles(1);
}
- /*
+ /**
* @param minVersions the MIN_VERSIONS for the column family
*/
public void testDeleteExpiredStoreFiles(int minVersions) throws Exception {
@@ -472,9 +466,9 @@ public class TestHStore {
//////////////////////////////////////////////////////////////////////////////
private static final int BLOCKSIZE_SMALL = 8192;
+
/**
* Test for hbase-1686.
- * @throws IOException
*/
@Test
public void testEmptyStoreFile() throws IOException {
@@ -512,7 +506,6 @@ public class TestHStore {
/**
* Getting data from memstore only
- * @throws IOException
*/
@Test
public void testGet_FromMemStoreOnly() throws IOException {
@@ -567,7 +560,6 @@ public class TestHStore {
/**
* Getting data from files only
- * @throws IOException
*/
@Test
public void testGet_FromFilesOnly() throws IOException {
@@ -606,7 +598,6 @@ public class TestHStore {
/**
* Getting data from memstore and files
- * @throws IOException
*/
@Test
public void testGet_FromMemStoreAndFiles() throws IOException {
@@ -735,7 +726,7 @@ public class TestHStore {
public FaultyFileSystem() {
super(new LocalFileSystem());
- System.err.println("Creating faulty!");
+ LOG.info("Creating faulty!");
}
@Override
@@ -774,7 +765,7 @@ public class TestHStore {
@Override
public synchronized void write(byte[] buf, int offset, int length) throws IOException {
- System.err.println("faulty stream write at pos " + getPos());
+ LOG.info("faulty stream write at pos " + getPos());
injectFault();
super.write(buf, offset, length);
}
@@ -795,13 +786,9 @@ public class TestHStore {
/**
* Generate a list of KeyValues for testing based on given parameters
- * @param timestamps
- * @param numRows
- * @param qualifier
- * @param family
* @return the rows key-value list
*/
- List<Cell> getKeyValueSet(long[] timestamps, int numRows,
+ private List<Cell> getKeyValueSet(long[] timestamps, int numRows,
byte[] qualifier, byte[] family) {
List<Cell> kvList = new ArrayList<>();
for (int i=1;i<=numRows;i++) {
@@ -1031,7 +1018,7 @@ public class TestHStore {
assertEquals(0, this.store.getStorefilesCount());
// add some data, flush
- this.store.add(new KeyValue(row, family, qf1, 1, (byte[])null), null);
+ this.store.add(new KeyValue(row, family, qf1, 1, (byte[]) null), null);
flush(1);
// add one more file
addStoreFile();
@@ -1046,17 +1033,16 @@ public class TestHStore {
// call second time
spiedStore.refreshStoreFiles();
- //ensure that replaceStoreFiles is not called if files are not refreshed
- verify(spiedStore, times(0)).replaceStoreFiles(null, null);
+ // ensure that replaceStoreFiles is not called, i.e, the times does not change, if files are not
+ // refreshed,
+ verify(spiedStore, times(1)).replaceStoreFiles(any(), any());
}
private long countMemStoreScanner(StoreScanner scanner) {
if (scanner.currentScanners == null) {
return 0;
}
- return scanner.currentScanners.stream()
- .filter(s -> !s.isFileScanner())
- .count();
+ return scanner.currentScanners.stream().filter(s -> !s.isFileScanner()).count();
}
@Test
@@ -1472,8 +1458,6 @@ public class TestHStore {
* may change the versionedList. And the first InMemoryFlushRunnable will use the chagned
* versionedList to remove the corresponding segments.
* In short, there will be some segements which isn't in merge are removed.
- * @throws IOException
- * @throws InterruptedException
*/
@Test
public void testRunDoubleMemStoreCompactors() throws IOException, InterruptedException {