Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HBASE-22037 Re-enable TestAvoidCellReferencesIntoShippedBlocks #246

Merged
merged 1 commit into from
May 22, 2019
Merged

HBASE-22037 Re-enable TestAvoidCellReferencesIntoShippedBlocks #246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions ...rc/test/java/org/apache/hadoop/hbase/client/TestAvoidCellReferencesIntoShippedBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
Expand Down Expand Up @@ -292,18 +291,11 @@ public boolean next(List<Cell> result, ScannerContext scannerContext) throws IOE
}
}

/**
* TODO: not sure what do we test here but seems the test can not work together with async
* prefetch scanner. Ignore it for now, as after HBASE-21879 is landed we will have a more natural
* way to deal with reference counting...
*/
@Ignore
@Test
public void testHBASE16372InReadPath() throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
// Create a table with block size as 1024
final Table table = TEST_UTIL.createTable(tableName, FAMILIES_1, 1, 1024, null);
try {
try (Table table = TEST_UTIL.createTable(tableName, FAMILIES_1, 1, 1024, null)) {
// get the block cache and region
RegionLocator locator = TEST_UTIL.getConnection().getRegionLocator(tableName);
String regionName = locator.getAllRegionLocations().get(0).getRegion().getEncodedName();
Expand Down Expand Up @@ -370,7 +362,8 @@ public void testHBASE16372InReadPath() throws Exception {
// set partial as true so that the scan can send partial columns also
s.setAllowPartialResults(true);
s.setMaxResultSize(1000);
try (ResultScanner scanner = table.getScanner(s)) {
try (ScanPerNextResultScanner scanner =
new ScanPerNextResultScanner(TEST_UTIL.getAsyncConnection().getTable(tableName), s)) {
Thread evictorThread = new Thread() {
@Override
public void run() {
Expand Down Expand Up @@ -402,9 +395,8 @@ public void run() {
s1.withStartRow(ROW3);
s1.withStopRow(ROW5);
s1.setCaching(1);
ResultScanner scanner;
try {
scanner = table.getScanner(s1);

try (ResultScanner scanner = table.getScanner(s1)) {
int count = Iterables.size(scanner);
assertEquals("Count the rows", 2, count);
int newBlockRefCount = 0;
Expand Down Expand Up @@ -442,8 +434,6 @@ public void run() {
}
}
assertEquals("Count should give all rows ", 10, count);
} finally {
table.close();
}
}
}