Modified: lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHRegion.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHRegion.java?view=diff&rev=544188&r1=544187&r2=544188 ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHRegion.java (original) +++ lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHRegion.java Mon Jun 4 10:14:10 2007 @@ -214,7 +214,7 @@ for (int i = 0; i < lockCount; i++) { try { Text rowid = new Text(Integer.toString(i)); - lockids[i] = region.obtainLock(rowid); + lockids[i] = region.obtainRowLock(rowid); rowid.equals(region.getRowFromLock(lockids[i])); LOG.debug(getName() + " locked " + rowid.toString()); } catch (IOException e) { @@ -590,8 +590,7 @@ } // NOTE: This test depends on testBatchWrite succeeding - - private void splitAndMerge() throws IOException { + void splitAndMerge() throws IOException { Text midKey = new Text(); if(region.needsSplit(midKey)) { @@ -634,7 +633,11 @@ /* (non-Javadoc) * @see org.apache.hadoop.hbase.RegionUnavailableListener#regionIsUnavailable(org.apache.hadoop.io.Text) */ - public void regionIsUnavailable(Text regionName) { + public void closing(@SuppressWarnings("unused") final Text regionName) { + // We don't use this here. It is only for the HRegionServer + } + + public void closed(@SuppressWarnings("unused") final Text regionName) { // We don't use this here. It is only for the HRegionServer }
Modified: lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestScanner.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestScanner.java?view=diff&rev=544188&r1=544187&r2=544188 ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestScanner.java (original) +++ lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestScanner.java Mon Jun 4 10:14:10 2007 @@ -28,6 +28,9 @@ import org.apache.hadoop.io.DataInputBuffer; import org.apache.hadoop.io.Text; +/** + * Test of a long-lived scanner validating as we go. + */ public class TestScanner extends HBaseTestCase { private static final Text FIRST_ROW = new Text(); private static final Text[] COLS = { Added: lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestScanner2.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestScanner2.java?view=auto&rev=544188 ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestScanner2.java (added) +++ lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestScanner2.java Mon Jun 4 10:14:10 2007 @@ -0,0 +1,106 @@ +package org.apache.hadoop.hbase; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.TreeMap; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.io.Text; + +/** + * Additional scanner tests. + * [EMAIL PROTECTED] TestScanner} does a custom setup/takedown not conducive + * to addition of extra scanning tests. + * @see TestScanner + */ +public class TestScanner2 extends HBaseClusterTestCase { + final Log LOG = LogFactory.getLog(this.getClass().getName()); + + /** + * Test scanning of META table around split. + * There was a problem where only one of the splits showed in a scan. + * Split deletes a row and then adds two new ones. + * @throws IOException + */ + public void testSplitDeleteOneAddTwoRegions() throws IOException { + // First add a new table. Its intial region will be added to META region. + HClient client = new HClient(this.conf); + client.createTable(new HTableDescriptor(getName())); + List<HRegionInfo> regions = scan(client, HConstants.META_TABLE_NAME); + assertEquals("Expected one region", regions.size(), 1); + HRegionInfo region = regions.get(0); + assertTrue("Expected region named for test", + region.regionName.toString().startsWith(getName())); + // Now do what happens at split time; remove old region and then add two + // new ones in its place. + HRegion.removeRegionFromMETA(client, HConstants.META_TABLE_NAME, + region.regionName); + HTableDescriptor desc = region.tableDesc; + Path homedir = new Path(getName()); + List<HRegion> newRegions = new ArrayList<HRegion>(2); + newRegions.add(HRegion.createHRegion( + new HRegionInfo(2L, desc, null, new Text("midway")), + homedir, this.conf, null, null)); + newRegions.add(HRegion.createHRegion( + new HRegionInfo(3L, desc, new Text("midway"), null), + homedir, this.conf, null, null)); + for (HRegion r: newRegions) { + HRegion.addRegionToMETA(client, HConstants.META_TABLE_NAME, r, + this.cluster.getHMasterAddress(), -1L); + } + regions = scan(client, HConstants.META_TABLE_NAME); + assertEquals("Should be two regions only", regions.size(), 2); + } + + private List<HRegionInfo> scan(final HClient client, final Text table) + throws IOException { + List<HRegionInfo> regions = new ArrayList<HRegionInfo>(); + HRegionInterface regionServer = null; + long scannerId = -1L; + try { + client.openTable(table); + HClient.RegionLocation rl = client.getRegionLocation(table); + regionServer = client.getHRegionConnection(rl.serverAddress); + scannerId = regionServer.openScanner(rl.regionInfo.regionName, + HMaster.METACOLUMNS, new Text()); + while (true) { + TreeMap<Text, byte[]> results = new TreeMap<Text, byte[]>(); + HStoreKey key = new HStoreKey(); + LabelledData[] values = regionServer.next(scannerId, key); + if (values.length == 0) { + break; + } + + for (int i = 0; i < values.length; i++) { + byte[] bytes = new byte[values[i].getData().getSize()]; + System.arraycopy(values[i].getData().get(), 0, bytes, 0, + bytes.length); + results.put(values[i].getLabel(), bytes); + } + + HRegionInfo info = HRegion.getRegionInfo(results); + String serverName = HRegion.getServerName(results); + long startCode = HRegion.getStartCode(results); + LOG.info(Thread.currentThread().getName() + " scanner: " + + Long.valueOf(scannerId) + " row: " + key + + ": regioninfo: {" + info.toString() + "}, server: " + serverName + + ", startCode: " + startCode); + regions.add(info); + } + } finally { + try { + if (scannerId != -1L) { + if (regionServer != null) { + regionServer.close(scannerId); + } + } + } catch (IOException e) { + LOG.error(e); + } + } + return regions; + } +} \ No newline at end of file
