You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2010/08/20 01:51:51 UTC
svn commit: r987351 - in /hbase/branches/0.90_master_rewrite/src:
main/java/org/apache/hadoop/hbase/client/
main/java/org/apache/hadoop/hbase/io/
main/java/org/apache/hadoop/hbase/master/handler/
main/java/org/apache/hadoop/hbase/zookeeper/ test/java/o...
Author: stack
Date: Thu Aug 19 23:51:51 2010
New Revision: 987351
URL: http://svn.apache.org/viewvc?rev=987351&view=rev
Log:
Working on enable/disable of table. Now table is disabled if znode set under
/hbase/tables... the HRI#offline flag is no longer checked.
Make TestAdmin pass tests.
M src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java
M src/main/java/org/apache/hadoop/hbase/io/HbaseObjectWritable.java
Removed unused imports.
M src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
Fixup but still doesn't pass because depends on not yet working force split
facility.
M src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
Fixes. Split test not passing yet.
M src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
M src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
Removed old method. Added notes.
M src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java
This doesn't do what it used to... Formatting changes only for now.
M src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Changed how we check enabled/disbled
Modified:
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/io/HbaseObjectWritable.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java
hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTableDisable.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=987351&r1=987350&r2=987351&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Thu Aug 19 23:51:51 2010
@@ -408,7 +408,6 @@ public class HBaseAdmin {
// Wait until all regions are enabled
boolean enabled = false;
for (int tries = 0; tries < this.numRetries; tries++) {
-
try {
getMaster().enableTable(tableName);
} catch (RemoteException e) {
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=987351&r1=987350&r2=987351&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Thu Aug 19 23:51:51 2010
@@ -63,6 +63,7 @@ import org.apache.hadoop.hbase.util.Byte
import org.apache.hadoop.hbase.util.MetaUtils;
import org.apache.hadoop.hbase.util.SoftValueSortedMap;
import org.apache.hadoop.hbase.util.Writables;
+import org.apache.hadoop.hbase.zookeeper.ZKTableDisable;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.apache.hadoop.ipc.RemoteException;
@@ -469,15 +470,11 @@ public class HConnectionManager {
}
/*
- * If online == true
- * Returns true if all regions are online
- * Returns false in any other case
- * If online == false
- * Returns true if all regions are offline
- * Returns false in any other case
+ * @param True if table is online
*/
private boolean testTableOnlineState(byte[] tableName, boolean online)
throws IOException {
+ // TODO: Replace w/ CatalogTracker-based tableExists test.
if (!tableExists(tableName)) {
throw new TableNotFoundException(Bytes.toString(tableName));
}
@@ -485,53 +482,14 @@ public class HConnectionManager {
// The root region is always enabled
return true;
}
- int rowsScanned = 0;
- int rowsOffline = 0;
- byte[] startKey =
- HRegionInfo.createRegionName(tableName, null, HConstants.ZEROES, false);
- byte[] endKey;
- HRegionInfo currentRegion;
- Scan scan = new Scan(startKey);
- scan.addColumn(HConstants.CATALOG_FAMILY,
- HConstants.REGIONINFO_QUALIFIER);
- int rows = this.conf.getInt("hbase.meta.scanner.caching", 100);
- scan.setCaching(rows);
- ScannerCallable s = new ScannerCallable(this,
- (Bytes.equals(tableName, HConstants.META_TABLE_NAME) ?
- HConstants.ROOT_TABLE_NAME : HConstants.META_TABLE_NAME), scan);
try {
- // Open scanner
- getRegionServerWithRetries(s);
- do {
- currentRegion = s.getHRegionInfo();
- Result r;
- Result [] rrs;
- while ((rrs = getRegionServerWithRetries(s)) != null && rrs.length > 0) {
- r = rrs[0];
- byte [] value = r.getValue(HConstants.CATALOG_FAMILY,
- HConstants.REGIONINFO_QUALIFIER);
- if (value != null) {
- HRegionInfo info = Writables.getHRegionInfoOrNull(value);
- if (info != null) {
- if (Bytes.equals(info.getTableDesc().getName(), tableName)) {
- rowsScanned += 1;
- rowsOffline += info.isOffline() ? 1 : 0;
- }
- }
- }
- }
- endKey = currentRegion.getEndKey();
- } while (!(endKey == null ||
- Bytes.equals(endKey, HConstants.EMPTY_BYTE_ARRAY)));
- } finally {
- s.setClose();
- // Doing below will call 'next' again and this will close the scanner
- // Without it we leave scanners open.
- getRegionServerWithRetries(s);
- }
- LOG.debug("Rowscanned=" + rowsScanned + ", rowsOffline=" + rowsOffline);
- boolean onOffLine = online? rowsOffline == 0: rowsOffline == rowsScanned;
- return rowsScanned > 0 && onOffLine;
+ List<String> tables = ZKTableDisable.getDisabledTables(this.zooKeeper);
+ String searchStr = Bytes.toString(tableName);
+ boolean disabled = tables.contains(searchStr);
+ return online? !disabled: disabled;
+ } catch (KeeperException e) {
+ throw new IOException("Failed listing disabled tables", e);
+ }
}
private static class HTableDescriptorFinder
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/io/HbaseObjectWritable.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/io/HbaseObjectWritable.java?rev=987351&r1=987350&r2=987351&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/io/HbaseObjectWritable.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/io/HbaseObjectWritable.java Thu Aug 19 23:51:51 2010
@@ -23,9 +23,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.lang.reflect.Array;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -45,22 +43,36 @@ import org.apache.hadoop.hbase.HTableDes
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Get;
+import org.apache.hadoop.hbase.client.MultiPut;
+import org.apache.hadoop.hbase.client.MultiPutResponse;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.MultiPutResponse;
-import org.apache.hadoop.hbase.client.MultiPut;
-import org.apache.hadoop.hbase.filter.*;
-import org.apache.hadoop.hbase.io.HbaseMapWritable;
+import org.apache.hadoop.hbase.filter.BinaryComparator;
+import org.apache.hadoop.hbase.filter.ColumnCountGetFilter;
+import org.apache.hadoop.hbase.filter.CompareFilter;
+import org.apache.hadoop.hbase.filter.DependentColumnFilter;
+import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
+import org.apache.hadoop.hbase.filter.InclusiveStopFilter;
+import org.apache.hadoop.hbase.filter.PageFilter;
+import org.apache.hadoop.hbase.filter.PrefixFilter;
+import org.apache.hadoop.hbase.filter.QualifierFilter;
+import org.apache.hadoop.hbase.filter.RowFilter;
+import org.apache.hadoop.hbase.filter.SingleColumnValueExcludeFilter;
+import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;
+import org.apache.hadoop.hbase.filter.SkipFilter;
+import org.apache.hadoop.hbase.filter.ValueFilter;
+import org.apache.hadoop.hbase.filter.WhileMatchFilter;
+import org.apache.hadoop.hbase.filter.WritableByteArrayComparable;
+import org.apache.hadoop.hbase.regionserver.HRegion;
+import org.apache.hadoop.hbase.regionserver.wal.HLog;
+import org.apache.hadoop.hbase.regionserver.wal.HLogKey;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.MapWritable;
import org.apache.hadoop.io.ObjectWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableFactories;
-import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.apache.hadoop.hbase.regionserver.wal.HLog;
-import org.apache.hadoop.hbase.regionserver.wal.HLogKey;
-import org.apache.hadoop.hbase.util.Bytes;
/**
* This is a customized version of the polymorphic hadoop
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java?rev=987351&r1=987350&r2=987351&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/DisableTableHandler.java Thu Aug 19 23:51:51 2010
@@ -38,6 +38,7 @@ public class DisableTableHandler extends
private static final Log LOG = LogFactory.getLog(DisableTableHandler.class);
private final byte [] tableName;
+ private final String tableNameStr;
private final CatalogTracker catalogTracker;
private final AssignmentManager assignmentManager;
@@ -45,6 +46,7 @@ public class DisableTableHandler extends
CatalogTracker catalogTracker, AssignmentManager assignmentManager) {
super(server, EventType.C2M_DISABLE_TABLE);
this.tableName = tableName;
+ this.tableNameStr = Bytes.toString(this.tableName);
this.catalogTracker = catalogTracker;
this.assignmentManager = assignmentManager;
}
@@ -52,49 +54,27 @@ public class DisableTableHandler extends
@Override
public void process() {
try {
- LOG.info("Attemping to disable the table " + Bytes.toString(tableName));
+ LOG.info("Attemping to disable the table " + this.tableNameStr);
handleDisableTable();
} catch (IOException e) {
- LOG.error("Error trying to disable the table " + Bytes.toString(tableName),
- e);
+ LOG.error("Error trying to disable the table " + this.tableNameStr, e);
}
}
- // Meta scan
- @SuppressWarnings("unused")
- private void oldDisableTable() throws IOException {
- // Check if table exists
- if(!MetaReader.tableExists(catalogTracker, Bytes.toString(tableName))) {
- throw new TableNotFoundException(Bytes.toString(tableName));
- }
- // Set the table as disabled so it doesn't get re-onlined
- assignmentManager.disableTable(Bytes.toString(tableName));
- // Get the regions of this table
- // TODO: should we use in-memory state? need to deal with concurrent splits
- List<HRegionInfo> regions = MetaReader.getTableRegions(catalogTracker,
- tableName);
- // Verify all regions of table are offline
- for(HRegionInfo region : regions) {
- if(region.isOffline()) {
- continue;
- }
- // Unassign any regions still online
- assignmentManager.unassign(region);
- }
- }
-
- // In-memory scan
private void handleDisableTable() throws IOException {
// Check if table exists
// TODO: do we want to keep this in-memory as well? i guess this is
// part of old master rewrite, schema to zk to check for table
// existence and such
- if(!MetaReader.tableExists(catalogTracker, Bytes.toString(tableName))) {
+ if(!MetaReader.tableExists(catalogTracker, this.tableNameStr)) {
throw new TableNotFoundException(Bytes.toString(tableName));
}
// Set the table as disabled so it doesn't get re-onlined
- assignmentManager.disableTable(Bytes.toString(tableName));
- // Get the online regions of this table
+ assignmentManager.disableTable(this.tableNameStr);
+ // Get the online regions of this table.
+ // TODO: What if region splitting at the time we get this listing?
+ // TODO: Remove offline flag from HRI
+ // TODO: Confirm we have parallel closing going on.
List<HRegionInfo> regions = assignmentManager.getRegionsOfTable(tableName);
// Unassign the online regions
for(HRegionInfo region : regions) {
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java?rev=987351&r1=987350&r2=987351&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java Thu Aug 19 23:51:51 2010
@@ -38,6 +38,7 @@ public class EnableTableHandler extends
private static final Log LOG = LogFactory.getLog(EnableTableHandler.class);
private final byte [] tableName;
+ private final String tableNameStr;
private final CatalogTracker catalogTracker;
private final AssignmentManager assignmentManager;
@@ -45,6 +46,7 @@ public class EnableTableHandler extends
CatalogTracker catalogTracker, AssignmentManager assignmentManager) {
super(server, EventType.C2M_ENABLE_TABLE);
this.tableName = tableName;
+ this.tableNameStr = Bytes.toString(tableName);
this.catalogTracker = catalogTracker;
this.assignmentManager = assignmentManager;
}
@@ -52,27 +54,25 @@ public class EnableTableHandler extends
@Override
public void process() {
try {
- LOG.info("Attemping to enable the table " + Bytes.toString(tableName));
+ LOG.info("Attemping to enable the table " + this.tableNameStr);
handleEnableTable();
} catch (IOException e) {
- LOG.error("Error trying to enable the table " + Bytes.toString(tableName),
- e);
+ LOG.error("Error trying to enable the table " + this.tableNameStr, e);
}
}
private void handleEnableTable() throws IOException {
// Check if table exists
- if(!MetaReader.tableExists(catalogTracker, Bytes.toString(tableName))) {
+ if(!MetaReader.tableExists(catalogTracker, this.tableNameStr)) {
throw new TableNotFoundException(Bytes.toString(tableName));
}
// Get the regions of this table
List<HRegionInfo> regions = MetaReader.getTableRegions(catalogTracker,
tableName);
+ // Set the table as disabled so it doesn't get re-onlined
+ assignmentManager.undisableTable(this.tableNameStr);
// Verify all regions of table are disabled
- for(HRegionInfo region : regions) {
- if(!region.isOffline()) {
- continue;
- }
+ for (HRegionInfo region : regions) {
assignmentManager.assign(region);
}
}
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java?rev=987351&r1=987350&r2=987351&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/master/handler/ModifyTableHandler.java Thu Aug 19 23:51:51 2010
@@ -29,8 +29,8 @@ import org.apache.hadoop.hbase.catalog.M
import org.apache.hadoop.hbase.master.MasterFileSystem;
public class ModifyTableHandler extends TableEventHandler {
- public ModifyTableHandler(byte [] tableName, Server server,
- CatalogTracker catalogTracker, MasterFileSystem fileManager) {
+ public ModifyTableHandler(final byte [] tableName, final Server server,
+ final CatalogTracker catalogTracker, final MasterFileSystem fileManager) {
super(EventType.C2M_MODIFY_TABLE, tableName, server, catalogTracker,
fileManager);
}
@@ -38,11 +38,11 @@ public class ModifyTableHandler extends
@Override
protected void handleTableOperation(List<HRegionInfo> regions)
throws IOException {
- for(HRegionInfo region : regions) {
+ for (HRegionInfo region : regions) {
// Update region info in META
MetaEditor.updateRegionInfo(catalogTracker, region);
// Update region info in FS
- fileManager.updateRegionInfo(region);
+ this.fileManager.updateRegionInfo(region);
}
}
}
Modified: hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTableDisable.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTableDisable.java?rev=987351&r1=987350&r2=987351&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTableDisable.java (original)
+++ hbase/branches/0.90_master_rewrite/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTableDisable.java Thu Aug 19 23:51:51 2010
@@ -67,4 +67,4 @@ public class ZKTableDisable {
throws KeeperException {
return ZKUtil.listChildrenNoWatch(zkw, zkw.tableZNode);
}
-}
+}
\ No newline at end of file
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java?rev=987351&r1=987350&r2=987351&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java Thu Aug 19 23:51:51 2010
@@ -22,7 +22,6 @@ package org.apache.hadoop.hbase.client;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.Iterator;
@@ -267,7 +266,7 @@ public class TestAdmin {
} catch (RetriesExhaustedException e) {
ok = true;
}
- assertEquals(true, ok);
+ assertTrue(ok);
this.admin.enableTable(table);
//Test that table is enabled
@@ -276,7 +275,7 @@ public class TestAdmin {
} catch (RetriesExhaustedException e) {
ok = false;
}
- assertEquals(true, ok);
+ assertTrue(ok);
}
@Test
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java?rev=987351&r1=987350&r2=987351&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java Thu Aug 19 23:51:51 2010
@@ -72,7 +72,8 @@ public class TestMaster {
HBaseAdmin admin = TEST_UTIL.getHBaseAdmin();
TEST_UTIL.createTable(TABLENAME, FAMILYNAME);
- TEST_UTIL.loadTable(new HTable(TABLENAME), FAMILYNAME);
+ TEST_UTIL.loadTable(new HTable(TEST_UTIL.getConfiguration(), TABLENAME),
+ FAMILYNAME);
List<Pair<HRegionInfo, HServerAddress>> tableRegions =
MetaReader.getTableRegionsAndLocations(m.getCatalogTracker(),
@@ -89,7 +90,8 @@ public class TestMaster {
CountDownLatch aboutToOpen = new CountDownLatch(1);
CountDownLatch proceed = new CountDownLatch(1);
RegionOpenListener list = new RegionOpenListener(aboutToOpen, proceed);
- EventHandler.registerListener(list);
+ cluster.getMaster().executorService.
+ registerListener(EventType.RS2ZK_REGION_OPENED, list);
LOG.info("Splitting table");
admin.split(TABLENAME);
@@ -143,5 +145,4 @@ public class TestMaster {
public void beforeProcess(EventHandler event) {
}
}
-
-}
+}
\ No newline at end of file
Modified: hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java?rev=987351&r1=987350&r2=987351&view=diff
==============================================================================
--- hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java (original)
+++ hbase/branches/0.90_master_rewrite/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java Thu Aug 19 23:51:51 2010
@@ -25,9 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.hadoop.hbase.HBaseTestCase;
-import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.KeyValueTestUtil;
import org.apache.hadoop.hbase.KeyValue.KeyComparator;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.regionserver.QueryMatcher.MatchCode;