Author: stack
Date: Fri Jul 17 18:06:09 2009
New Revision: 795174
URL: http://svn.apache.org/viewvc?rev=795174&view=rev
Log:
HBASE-1668 hbase-1609 broke TestHRegion.testScanSplitOnRegion unit test
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=795174&r1=795173&r2=795174&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Jul 17 18:06:09 2009
@@ -273,6 +273,7 @@
this.blockingStoreFilesNumber loop
HBASE-1058 Disable 1058 on catalog tables
HBASE-1583 Start/Stop of large cluster untenable
+ HBASE-1668 hbase-1609 broke TestHRegion.testScanSplitOnRegion unit test
IMPROVEMENTS
HBASE-1089 Add count of regions on filesystem to master UI; add percentage
Modified:
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java?rev=795174&r1=795173&r2=795174&view=diff
==============================================================================
---
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java
(original)
+++
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java
Fri Jul 17 18:06:09 2009
@@ -1472,61 +1472,7 @@
}
}
}
-
-
- /**
- * Test for HBASE-810
- * @throws Exception
- */
- public void testScanSplitOnRegion() throws Exception {
- byte [] tableName = Bytes.toBytes("testtable");
-
- HBaseConfiguration hc = initSplit();
- //Setting up region
- String method = this.getName();
- initHRegion(tableName, method, hc, new byte [][] {fam3});
- try {
- addContent(region, fam3);
- region.flushcache();
- final byte [] midkey = region.compactStores();
- assertNotNull(midkey);
- Scan scan = new Scan();
- scan.addFamily(fam3);
- final InternalScanner s = region.getScanner(scan);
- final HRegion regionForThread = region;
-
- Thread splitThread = new Thread() {
- @Override
- public void run() {
- try {
- split(regionForThread, midkey);
- } catch (IOException e) {
- fail("Unexpected exception " + e);
- }
- }
- };
- splitThread.start();
- for(int i = 0; i < 6; i++) {
- try {
- Put put = new Put(region.getRegionInfo().getStartKey());
- put.add(fam3, null, Bytes.toBytes("val"));
- region.put(put);
- Thread.sleep(1000);
- }
- catch (InterruptedException e) {
- fail("Unexpected exception " + e);
- }
- }
- s.next(new ArrayList<KeyValue>());
- s.close();
- } catch(UnknownScannerException ex) {
- ex.printStackTrace();
- fail("Got the " + ex);
- }
- }
-
-
private void assertGet(final HRegion r, final byte [] family, final byte []
k)
throws IOException {
// Now I have k, get values out and assert they are as expected.
