Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-1488 After 1304 goes in, fix and reenable test of thrift, mr indexer, and merge tool 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@786620 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2009-06-19 18:46:38 +00:00
parent cfc84a624f
commit 3b01f1a469
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -200,6 +200,8 @@ Release 0.20.0 - Unreleased
in spinning state, regions not reassigned in spinning state, regions not reassigned
HBASE-1543 Unnecessary toString during scanning costs us some CPU HBASE-1543 Unnecessary toString during scanning costs us some CPU
HBASE-1544 Cleanup HTable (Jonathan Gray via Stack) HBASE-1544 Cleanup HTable (Jonathan Gray via Stack)
HBASE-1488 After 1304 goes in, fix and reenable test of thrift, mr indexer,
and merge tool
IMPROVEMENTS IMPROVEMENTS
HBASE-1089 Add count of regions on filesystem to master UI; add percentage HBASE-1089 Add count of regions on filesystem to master UI; add percentage

12
src/test/org/apache/hadoop/hbase/util/DisabledTestMergeTool.java → src/test/org/apache/hadoop/hbase/util/TestMergeTool.java
View File

@ -45,8 +45,8 @@ import org.apache.hadoop.hbase.regionserver.InternalScanner;
import org.apache.hadoop.util.ToolRunner; import org.apache.hadoop.util.ToolRunner;
/** Test stand alone merge tool that can merge arbitrary regions */ /** Test stand alone merge tool that can merge arbitrary regions */
public class DisabledTestMergeTool extends HBaseTestCase { public class TestMergeTool extends HBaseTestCase {
static final Log LOG = LogFactory.getLog(DisabledTestMergeTool.class); static final Log LOG = LogFactory.getLog(TestMergeTool.class);
// static final byte [] COLUMN_NAME = Bytes.toBytes("contents:"); // static final byte [] COLUMN_NAME = Bytes.toBytes("contents:");
static final byte [] FAMILY = Bytes.toBytes("contents"); static final byte [] FAMILY = Bytes.toBytes("contents");
static final byte [] QUALIFIER = Bytes.toBytes("dc"); static final byte [] QUALIFIER = Bytes.toBytes("dc");
@ -194,14 +194,18 @@ public class DisabledTestMergeTool extends HBaseTestCase {
Scan scan = new Scan(); Scan scan = new Scan();
scan.addFamily(FAMILY); scan.addFamily(FAMILY);
InternalScanner scanner = merged.getScanner(scan); InternalScanner scanner = merged.getScanner(scan);
try {
List<KeyValue> testRes = null; List<KeyValue> testRes = null;
while(true) { while (true) {
testRes = new ArrayList<KeyValue>(); testRes = new ArrayList<KeyValue>();
boolean hasNext = scanner.next(testRes); boolean hasNext = scanner.next(testRes);
if(!hasNext) { if (!hasNext) {
break; break;
} }
} }
} finally {
scanner.close();
}
//!Test //!Test