diff --git a/bin/hbase b/bin/hbase index c90b2263e48..5810702bfc4 100755 --- a/bin/hbase +++ b/bin/hbase @@ -162,7 +162,7 @@ if [ "$COMMAND" = "shell" ] ; then elif [ "$COMMAND" = "master" ] ; then CLASS='org.apache.hadoop.hbase.master.HMaster' elif [ "$COMMAND" = "regionserver" ] ; then - CLASS='org.apache.hadoop.hbase.HRegionServer' + CLASS='org.apache.hadoop.hbase.regionserver.HRegionServer' elif [ "$COMMAND" = "rest" ] ; then CLASS='org.apache.hadoop.hbase.rest.Dispatcher' elif [ "$COMMAND" = "thrift" ] ; then diff --git a/conf/hbase-default.xml b/conf/hbase-default.xml index f40527bb530..716c267b77d 100644 --- a/conf/hbase-default.xml +++ b/conf/hbase-default.xml @@ -72,7 +72,7 @@ hbase.regionserver.class - org.apache.hadoop.hbase.HRegionInterface + org.apache.hadoop.hbase.regionserver.HRegionInterface An interface that is assignable to HRegionInterface. Used in HClient for opening proxy to remote region server. diff --git a/src/java/org/apache/hadoop/hbase/HConstants.java b/src/java/org/apache/hadoop/hbase/HConstants.java index f9087a179b9..27e9d9cfa81 100644 --- a/src/java/org/apache/hadoop/hbase/HConstants.java +++ b/src/java/org/apache/hadoop/hbase/HConstants.java @@ -20,6 +20,7 @@ package org.apache.hadoop.hbase; import org.apache.hadoop.io.Text; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; /** * HConstants holds a bunch of HBase-related constants diff --git a/src/java/org/apache/hadoop/hbase/HMerge.java b/src/java/org/apache/hadoop/hbase/HMerge.java index aee4cd5868c..d8889326d13 100644 --- a/src/java/org/apache/hadoop/hbase/HMerge.java +++ b/src/java/org/apache/hadoop/hbase/HMerge.java @@ -37,6 +37,11 @@ import org.apache.hadoop.hbase.io.BatchUpdate; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.client.HConnectionManager; + +import org.apache.hadoop.hbase.regionserver.HLog; +import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.HStoreKey; + /** * A non-instantiable class that has a static method capable of compacting * a table by merging adjacent regions that have grown too small. diff --git a/src/java/org/apache/hadoop/hbase/HScannerInterface.java b/src/java/org/apache/hadoop/hbase/HScannerInterface.java index fe147294500..e5302d4132e 100644 --- a/src/java/org/apache/hadoop/hbase/HScannerInterface.java +++ b/src/java/org/apache/hadoop/hbase/HScannerInterface.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.SortedMap; import org.apache.hadoop.io.Text; +import org.apache.hadoop.hbase.regionserver.HStoreKey; /** * HScannerInterface iterates through a set of rows. It's implemented by diff --git a/src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java index ab2f0c86556..b7a9d9e4c2b 100644 --- a/src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java +++ b/src/java/org/apache/hadoop/hbase/LocalHBaseCluster.java @@ -32,6 +32,8 @@ import org.apache.hadoop.util.ReflectionUtils; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.regionserver.HRegionServer; + /** * This class creates a single process HBase cluster. One thread is created for * a master and one per region server. @@ -159,7 +161,7 @@ public class LocalHBaseCluster implements HConstants { while (regionServerThread.isAlive()) { try { LOG.info("Waiting on " + - regionServerThread.getRegionServer().serverInfo.toString()); + regionServerThread.getRegionServer().getServerInfo().toString()); regionServerThread.join(); } catch (InterruptedException e) { e.printStackTrace(); diff --git a/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index c43fdaf4fd7..6d4e58e87e3 100644 --- a/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ b/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -41,10 +41,11 @@ import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.TableExistsException; import org.apache.hadoop.hbase.RemoteExceptionHandler; -import org.apache.hadoop.hbase.HRegionInterface; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; -import org.apache.hadoop.hbase.HStoreKey; + +import org.apache.hadoop.hbase.regionserver.HRegionInterface; +import org.apache.hadoop.hbase.regionserver.HStoreKey; /** * Provides administrative functions for HBase diff --git a/src/java/org/apache/hadoop/hbase/client/HConnection.java b/src/java/org/apache/hadoop/hbase/client/HConnection.java index 456fdf0478e..eda2124d5b4 100644 --- a/src/java/org/apache/hadoop/hbase/client/HConnection.java +++ b/src/java/org/apache/hadoop/hbase/client/HConnection.java @@ -28,7 +28,8 @@ import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HServerAddress; -import org.apache.hadoop.hbase.HRegionInterface; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; + /** * */ diff --git a/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java b/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java index c42ed9f8dab..76d42a2a8b2 100644 --- a/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java +++ b/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java @@ -42,20 +42,19 @@ import org.apache.hadoop.hbase.util.SoftSortedMap; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.HRegionInterface; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HServerAddress; import org.apache.hadoop.hbase.LocalHBaseCluster; -import org.apache.hadoop.hbase.HStoreKey; -import org.apache.hadoop.hbase.HRegionInterface; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.HStoreKey; import org.apache.hadoop.hbase.NoServerForRegionException; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.RemoteExceptionHandler; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; +import org.apache.hadoop.hbase.regionserver.HStoreKey; + /** * A non-instantiable class that manages connections to multiple tables in * multiple HBase instances diff --git a/src/java/org/apache/hadoop/hbase/client/HTable.java b/src/java/org/apache/hadoop/hbase/client/HTable.java index 1e8ec5fcc5f..8eac663b112 100644 --- a/src/java/org/apache/hadoop/hbase/client/HTable.java +++ b/src/java/org/apache/hadoop/hbase/client/HTable.java @@ -47,14 +47,13 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HScannerInterface; -import org.apache.hadoop.hbase.HRegionInterface; -import org.apache.hadoop.hbase.HStoreKey; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.RemoteExceptionHandler; import org.apache.hadoop.hbase.NotServingRegionException; -import org.apache.hadoop.hbase.HRegionInterface; -import org.apache.hadoop.hbase.HStoreKey; + +import org.apache.hadoop.hbase.regionserver.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; /** * Used to communicate with a single HBase table diff --git a/src/java/org/apache/hadoop/hbase/filter/RegExpRowFilter.java b/src/java/org/apache/hadoop/hbase/filter/RegExpRowFilter.java index 034fc7bfccb..0080f4b0f27 100644 --- a/src/java/org/apache/hadoop/hbase/filter/RegExpRowFilter.java +++ b/src/java/org/apache/hadoop/hbase/filter/RegExpRowFilter.java @@ -35,7 +35,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.io.Text; -import org.apache.hadoop.hbase.HLogEdit; +import org.apache.hadoop.hbase.regionserver.HLogEdit; /** * Implementation of RowFilterInterface that can filter by rowkey regular diff --git a/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java b/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java index aa0ea36da6f..9bacf1048dc 100644 --- a/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java +++ b/src/java/org/apache/hadoop/hbase/generated/regionserver/regionserver_jsp.java @@ -6,8 +6,8 @@ import javax.servlet.jsp.*; import java.util.*; import org.apache.hadoop.io.Text; import org.apache.hadoop.util.VersionInfo; -import org.apache.hadoop.hbase.HRegionServer; -import org.apache.hadoop.hbase.HRegion; +import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HServerInfo; import org.apache.hadoop.hbase.HRegionInfo; diff --git a/src/java/org/apache/hadoop/hbase/hql/SelectCommand.java b/src/java/org/apache/hadoop/hbase/hql/SelectCommand.java index a4926febcd3..da4ecbdb0ec 100644 --- a/src/java/org/apache/hadoop/hbase/hql/SelectCommand.java +++ b/src/java/org/apache/hadoop/hbase/hql/SelectCommand.java @@ -31,7 +31,7 @@ import java.util.TreeMap; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HScannerInterface; -import org.apache.hadoop.hbase.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HStoreKey; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.Shell; import org.apache.hadoop.hbase.filter.RowFilterInterface; diff --git a/src/java/org/apache/hadoop/hbase/io/HbaseMapWritable.java b/src/java/org/apache/hadoop/hbase/io/HbaseMapWritable.java index 1486ac4ace4..246785da623 100644 --- a/src/java/org/apache/hadoop/hbase/io/HbaseMapWritable.java +++ b/src/java/org/apache/hadoop/hbase/io/HbaseMapWritable.java @@ -30,11 +30,12 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.HStoreKey; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; import org.apache.hadoop.util.ReflectionUtils; +import org.apache.hadoop.hbase.regionserver.HStoreKey; + /** * A Writable Map. * Like {@link org.apache.hadoop.io.MapWritable} but dumb. It will fail diff --git a/src/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java b/src/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java index 2816ffbc9f2..a862c717032 100644 --- a/src/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java +++ b/src/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Map; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HStoreKey; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.io.MapWritable; import org.apache.hadoop.io.Text; diff --git a/src/java/org/apache/hadoop/hbase/mapred/IdentityTableMap.java b/src/java/org/apache/hadoop/hbase/mapred/IdentityTableMap.java index 1bb255f1a33..810a12293db 100644 --- a/src/java/org/apache/hadoop/hbase/mapred/IdentityTableMap.java +++ b/src/java/org/apache/hadoop/hbase/mapred/IdentityTableMap.java @@ -21,7 +21,7 @@ package org.apache.hadoop.hbase.mapred; import java.io.IOException; -import org.apache.hadoop.hbase.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HStoreKey; import org.apache.hadoop.io.MapWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.OutputCollector; diff --git a/src/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java b/src/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java index ae8b729f1e5..f5d141c61f2 100644 --- a/src/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java +++ b/src/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java @@ -38,7 +38,7 @@ import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HScannerInterface; -import org.apache.hadoop.hbase.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HStoreKey; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.client.HTable; diff --git a/src/java/org/apache/hadoop/hbase/mapred/TableMap.java b/src/java/org/apache/hadoop/hbase/mapred/TableMap.java index d4c53154950..66f91224df6 100644 --- a/src/java/org/apache/hadoop/hbase/mapred/TableMap.java +++ b/src/java/org/apache/hadoop/hbase/mapred/TableMap.java @@ -22,7 +22,7 @@ package org.apache.hadoop.hbase.mapred; import java.io.IOException; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HStoreKey; import org.apache.hadoop.io.MapWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; diff --git a/src/java/org/apache/hadoop/hbase/master/AddColumn.java b/src/java/org/apache/hadoop/hbase/master/AddColumn.java index d4e1586d16c..78ff05cd06a 100644 --- a/src/java/org/apache/hadoop/hbase/master/AddColumn.java +++ b/src/java/org/apache/hadoop/hbase/master/AddColumn.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.HRegionInterface; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; import org.apache.hadoop.io.Text; /** Instantiated to add a column family to a table */ diff --git a/src/java/org/apache/hadoop/hbase/master/BaseScanner.java b/src/java/org/apache/hadoop/hbase/master/BaseScanner.java index 10da6f3f515..0091a6a8572 100644 --- a/src/java/org/apache/hadoop/hbase/master/BaseScanner.java +++ b/src/java/org/apache/hadoop/hbase/master/BaseScanner.java @@ -32,8 +32,6 @@ import org.apache.hadoop.ipc.RemoteException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.Chore; -import org.apache.hadoop.hbase.HRegion; -import org.apache.hadoop.hbase.HRegionInterface; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HServerInfo; import org.apache.hadoop.io.Text; @@ -44,11 +42,15 @@ import org.apache.hadoop.hbase.RemoteExceptionHandler; import org.apache.hadoop.hbase.UnknownScannerException; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.HColumnDescriptor; -import org.apache.hadoop.hbase.HStoreFile; -import org.apache.hadoop.hbase.HStore; -import org.apache.hadoop.hbase.HLog; import org.apache.hadoop.hbase.io.BatchUpdate; +import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.HStoreFile; +import org.apache.hadoop.hbase.regionserver.HStore; +import org.apache.hadoop.hbase.regionserver.HLog; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; + + /** * Base HRegion scanner class. Holds utilty common to ROOT and * META HRegion scanners. diff --git a/src/java/org/apache/hadoop/hbase/master/ChangeTableState.java b/src/java/org/apache/hadoop/hbase/master/ChangeTableState.java index cb035231222..d119f5a924f 100644 --- a/src/java/org/apache/hadoop/hbase/master/ChangeTableState.java +++ b/src/java/org/apache/hadoop/hbase/master/ChangeTableState.java @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.Map; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.HRegionInterface; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; import org.apache.hadoop.hbase.io.BatchUpdate; import org.apache.hadoop.hbase.util.Writables; import org.apache.hadoop.io.Text; diff --git a/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java b/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java index 68e1fbfbf3a..36593b7ce9a 100644 --- a/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java +++ b/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java @@ -22,7 +22,7 @@ package org.apache.hadoop.hbase.master; import java.io.IOException; import org.apache.hadoop.io.Text; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.HRegionInterface; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; import org.apache.hadoop.hbase.io.BatchUpdate; import org.apache.hadoop.hbase.TableNotDisabledException; import org.apache.hadoop.hbase.util.Writables; diff --git a/src/java/org/apache/hadoop/hbase/master/DeleteColumn.java b/src/java/org/apache/hadoop/hbase/master/DeleteColumn.java index 69fec3efa1f..efc68df1ca5 100644 --- a/src/java/org/apache/hadoop/hbase/master/DeleteColumn.java +++ b/src/java/org/apache/hadoop/hbase/master/DeleteColumn.java @@ -23,9 +23,9 @@ import java.io.IOException; import org.apache.hadoop.io.Text; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.HRegionInterface; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.HStoreFile; +import org.apache.hadoop.hbase.regionserver.HStoreFile; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; /** Instantiated to remove a column family from a table */ class DeleteColumn extends ColumnOperation { diff --git a/src/java/org/apache/hadoop/hbase/master/HMaster.java b/src/java/org/apache/hadoop/hbase/master/HMaster.java index 7d641b36a4e..015d5bea8f0 100644 --- a/src/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/src/java/org/apache/hadoop/hbase/master/HMaster.java @@ -62,24 +62,26 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.Leases; import org.apache.hadoop.hbase.HServerAddress; -import org.apache.hadoop.hbase.client.HConnection; -import org.apache.hadoop.hbase.client.HConnectionManager; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.HRegionInterface; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HServerLoad; -import org.apache.hadoop.hbase.HRegion; import org.apache.hadoop.hbase.RemoteExceptionHandler; import org.apache.hadoop.hbase.HMsg; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.LocalHBaseCluster; -import org.apache.hadoop.hbase.HStoreKey; import org.apache.hadoop.hbase.HServerInfo; import org.apache.hadoop.hbase.TableExistsException; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.LeaseListener; +import org.apache.hadoop.hbase.client.HConnection; +import org.apache.hadoop.hbase.client.HConnectionManager; +import org.apache.hadoop.hbase.client.HBaseAdmin; + +import org.apache.hadoop.hbase.regionserver.HRegionInterface; +import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.HStoreKey; + /** * HMaster is the "master server" for a HBase. * There is only one HMaster for a single HBase deployment. diff --git a/src/java/org/apache/hadoop/hbase/master/ModifyColumn.java b/src/java/org/apache/hadoop/hbase/master/ModifyColumn.java index 500678afc23..b9015654e3e 100644 --- a/src/java/org/apache/hadoop/hbase/master/ModifyColumn.java +++ b/src/java/org/apache/hadoop/hbase/master/ModifyColumn.java @@ -22,7 +22,7 @@ package org.apache.hadoop.hbase.master; import java.util.Map; import java.io.IOException; import org.apache.hadoop.hbase.HColumnDescriptor; -import org.apache.hadoop.hbase.HRegionInterface; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.io.Text; diff --git a/src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java b/src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java index 5c4b7c2db9c..c43335acb14 100644 --- a/src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java +++ b/src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java @@ -21,7 +21,7 @@ package org.apache.hadoop.hbase.master; import java.io.IOException; -import org.apache.hadoop.hbase.HRegion; +import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.RemoteExceptionHandler; diff --git a/src/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java b/src/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java index 3ec995a6f7d..18641daa0a0 100644 --- a/src/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java +++ b/src/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java @@ -25,7 +25,7 @@ import org.apache.hadoop.hbase.HServerAddress; import org.apache.hadoop.hbase.HServerInfo; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.util.Writables; -import org.apache.hadoop.hbase.HRegionInterface; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; import org.apache.hadoop.hbase.io.BatchUpdate; import org.apache.hadoop.hbase.RemoteExceptionHandler; diff --git a/src/java/org/apache/hadoop/hbase/master/ProcessRegionStatusChange.java b/src/java/org/apache/hadoop/hbase/master/ProcessRegionStatusChange.java index 8a38c9f0c67..8c0ee653a6f 100644 --- a/src/java/org/apache/hadoop/hbase/master/ProcessRegionStatusChange.java +++ b/src/java/org/apache/hadoop/hbase/master/ProcessRegionStatusChange.java @@ -22,7 +22,7 @@ package org.apache.hadoop.hbase.master; import java.io.IOException; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.HRegionInterface; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; import org.apache.hadoop.hbase.HServerAddress; import org.apache.hadoop.io.Text; diff --git a/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java b/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java index e8d45b8fdd7..cd6c9f38fb7 100644 --- a/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java +++ b/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java @@ -31,13 +31,14 @@ import org.apache.hadoop.hbase.HServerAddress; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HServerInfo; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.HRegionInterface; -import org.apache.hadoop.hbase.HRegion; import org.apache.hadoop.io.Text; import org.apache.hadoop.hbase.io.HbaseMapWritable; import org.apache.hadoop.hbase.RemoteExceptionHandler; import org.apache.hadoop.hbase.util.Writables; -import org.apache.hadoop.hbase.HLog; + +import org.apache.hadoop.hbase.regionserver.HRegionInterface; +import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.HLog; /** * Instantiated when a server's lease has expired, meaning it has crashed. diff --git a/src/java/org/apache/hadoop/hbase/master/RegionManager.java b/src/java/org/apache/hadoop/hbase/master/RegionManager.java index a1bfc63abad..81226015756 100644 --- a/src/java/org/apache/hadoop/hbase/master/RegionManager.java +++ b/src/java/org/apache/hadoop/hbase/master/RegionManager.java @@ -45,8 +45,8 @@ import org.apache.hadoop.hbase.HServerAddress; import org.apache.hadoop.hbase.HServerInfo; import org.apache.hadoop.hbase.HServerLoad; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.HRegion; -import org.apache.hadoop.hbase.HRegionInterface; +import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; import org.apache.hadoop.hbase.HMsg; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.io.BatchUpdate; diff --git a/src/java/org/apache/hadoop/hbase/master/RowMap.java b/src/java/org/apache/hadoop/hbase/master/RowMap.java index 43e9153d3af..83bc3630045 100644 --- a/src/java/org/apache/hadoop/hbase/master/RowMap.java +++ b/src/java/org/apache/hadoop/hbase/master/RowMap.java @@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.io.Text; import org.apache.hadoop.hbase.io.HbaseMapWritable; import org.apache.hadoop.io.Writable; -import org.apache.hadoop.hbase.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HStoreKey; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; /* diff --git a/src/java/org/apache/hadoop/hbase/master/TableDelete.java b/src/java/org/apache/hadoop/hbase/master/TableDelete.java index d33a3bdeb4c..10cb6df5bcc 100644 --- a/src/java/org/apache/hadoop/hbase/master/TableDelete.java +++ b/src/java/org/apache/hadoop/hbase/master/TableDelete.java @@ -23,13 +23,14 @@ import java.io.IOException; import java.util.HashSet; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.HRegion; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.HRegionInterface; import org.apache.hadoop.hbase.RemoteExceptionHandler; import org.apache.hadoop.hbase.io.BatchUpdate; import org.apache.hadoop.io.Text; +import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; + /** * Instantiated to delete a table * Note that it extends ChangeTableState, which takes care of disabling diff --git a/src/java/org/apache/hadoop/hbase/master/TableOperation.java b/src/java/org/apache/hadoop/hbase/master/TableOperation.java index 2c607e5df79..146553e4273 100644 --- a/src/java/org/apache/hadoop/hbase/master/TableOperation.java +++ b/src/java/org/apache/hadoop/hbase/master/TableOperation.java @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.HRegionInterface; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; import org.apache.hadoop.hbase.HServerInfo; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.RemoteExceptionHandler; diff --git a/src/java/org/apache/hadoop/hbase/CacheFlushListener.java b/src/java/org/apache/hadoop/hbase/regionserver/CacheFlushListener.java similarity index 96% rename from src/java/org/apache/hadoop/hbase/CacheFlushListener.java rename to src/java/org/apache/hadoop/hbase/regionserver/CacheFlushListener.java index c1d736c68ef..9cdea138bf7 100644 --- a/src/java/org/apache/hadoop/hbase/CacheFlushListener.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/CacheFlushListener.java @@ -18,7 +18,7 @@ * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; /** * Implementors of this interface want to be notified when an HRegion diff --git a/src/java/org/apache/hadoop/hbase/HAbstractScanner.java b/src/java/org/apache/hadoop/hbase/regionserver/HAbstractScanner.java similarity index 99% rename from src/java/org/apache/hadoop/hbase/HAbstractScanner.java rename to src/java/org/apache/hadoop/hbase/regionserver/HAbstractScanner.java index f5a8f34ee3d..9fcb6333eae 100644 --- a/src/java/org/apache/hadoop/hbase/HAbstractScanner.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HAbstractScanner.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.Iterator; diff --git a/src/java/org/apache/hadoop/hbase/HInternalScannerInterface.java b/src/java/org/apache/hadoop/hbase/regionserver/HInternalScannerInterface.java similarity index 94% rename from src/java/org/apache/hadoop/hbase/HInternalScannerInterface.java rename to src/java/org/apache/hadoop/hbase/regionserver/HInternalScannerInterface.java index 6832c53e5a1..fff0b58abff 100644 --- a/src/java/org/apache/hadoop/hbase/HInternalScannerInterface.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HInternalScannerInterface.java @@ -17,7 +17,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; + +import org.apache.hadoop.hbase.HScannerInterface; /** * Internally, we need to be able to determine if the scanner is doing wildcard diff --git a/src/java/org/apache/hadoop/hbase/HLog.java b/src/java/org/apache/hadoop/hbase/regionserver/HLog.java similarity index 98% rename from src/java/org/apache/hadoop/hbase/HLog.java rename to src/java/org/apache/hadoop/hbase/regionserver/HLog.java index b362f88501a..c53e8b5c097 100644 --- a/src/java/org/apache/hadoop/hbase/HLog.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HLog.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.File; import java.io.FileNotFoundException; @@ -43,6 +43,11 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.io.SequenceFile.CompressionType; import org.apache.hadoop.io.SequenceFile.Reader; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.HBaseConfiguration; + /** * HLog stores all the edits to the HStore. * diff --git a/src/java/org/apache/hadoop/hbase/HLogEdit.java b/src/java/org/apache/hadoop/hbase/regionserver/HLogEdit.java similarity index 97% rename from src/java/org/apache/hadoop/hbase/HLogEdit.java rename to src/java/org/apache/hadoop/hbase/regionserver/HLogEdit.java index dcb17ab7dc2..49087ca7fdd 100644 --- a/src/java/org/apache/hadoop/hbase/HLogEdit.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HLogEdit.java @@ -17,13 +17,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.io.*; import java.io.*; +import org.apache.hadoop.hbase.HConstants; + /** * A log value. * diff --git a/src/java/org/apache/hadoop/hbase/HLogKey.java b/src/java/org/apache/hadoop/hbase/regionserver/HLogKey.java similarity index 98% rename from src/java/org/apache/hadoop/hbase/HLogKey.java rename to src/java/org/apache/hadoop/hbase/regionserver/HLogKey.java index 663d40b85f6..496a35a9349 100644 --- a/src/java/org/apache/hadoop/hbase/HLogKey.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HLogKey.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.io.*; diff --git a/src/java/org/apache/hadoop/hbase/HRegion.java b/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java similarity index 98% rename from src/java/org/apache/hadoop/hbase/HRegion.java rename to src/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 88ef1cc925b..8178b4db629 100644 --- a/src/java/org/apache/hadoop/hbase/HRegion.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.ArrayList; @@ -47,6 +47,15 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.io.WritableUtils; import org.apache.hadoop.util.StringUtils; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.HColumnDescriptor; +import org.apache.hadoop.hbase.HScannerInterface; +import org.apache.hadoop.hbase.DroppedSnapshotException; +import org.apache.hadoop.hbase.WrongRegionException; + /** * HRegion stores data for a certain region of a table. It stores all columns * for each row. A given table consists of one or more HRegions. @@ -96,7 +105,7 @@ public class HRegion implements HConstants { * HRegionServer. Returns a brand-new active HRegion, also * running on the current HRegionServer. */ - static HRegion closeAndMerge(final HRegion srcA, final HRegion srcB) + public static HRegion closeAndMerge(final HRegion srcA, final HRegion srcB) throws IOException { HRegion a = srcA; @@ -482,7 +491,7 @@ public class HRegion implements HConstants { } /** @return region id */ - long getRegionId() { + public long getRegionId() { return this.regionInfo.getRegionId(); } @@ -492,7 +501,7 @@ public class HRegion implements HConstants { } /** @return HTableDescriptor for this region */ - HTableDescriptor getTableDesc() { + public HTableDescriptor getTableDesc() { return this.regionInfo.getTableDesc(); } @@ -502,17 +511,17 @@ public class HRegion implements HConstants { } /** @return Configuration object */ - HBaseConfiguration getConf() { + public HBaseConfiguration getConf() { return this.conf; } /** @return region directory Path */ - Path getRegionDir() { + public Path getRegionDir() { return this.regiondir; } /** @return FileSystem being used by this region */ - FileSystem getFilesystem() { + public FileSystem getFilesystem() { return this.fs; } @@ -533,11 +542,11 @@ public class HRegion implements HConstants { * splitable or not (Its not splitable if region has a store that has a * reference store file). */ - HStore.HStoreSize largestHStore(Text midkey) { - HStore.HStoreSize biggest = null; + public HStoreSize largestHStore(Text midkey) { + HStoreSize biggest = null; boolean splitable = true; for (HStore h: stores.values()) { - HStore.HStoreSize size = h.size(midkey); + HStoreSize size = h.size(midkey); // If we came across a reference down in the store, then propagate // fact that region is not splitable. if (splitable) { @@ -670,7 +679,7 @@ public class HRegion implements HConstants { * Check it for a midKey value on return. */ boolean needsSplit(Text midKey) { - HStore.HStoreSize biggest = largestHStore(midKey); + HStoreSize biggest = largestHStore(midKey); if (biggest == null || midKey.getLength() == 0 || (midKey.equals(getStartKey()) && midKey.equals(getEndKey())) ) { return false; @@ -701,7 +710,7 @@ public class HRegion implements HConstants { * @return * @throws IOException */ - boolean compactIfNeeded() throws IOException { + public boolean compactIfNeeded() throws IOException { boolean needsCompaction = false; for (HStore store: stores.values()) { if (store.needsCompaction()) { @@ -761,7 +770,7 @@ public class HRegion implements HConstants { * conflicts with a region split, and that cannot happen because the region * server does them sequentially and not in parallel. */ - boolean compactStores() throws IOException { + public boolean compactStores() throws IOException { if (this.closed.get()) { return false; } @@ -821,7 +830,7 @@ public class HRegion implements HConstants { * @throws DroppedSnapshotException Thrown when replay of hlog is required * because a Snapshot was not properly persisted. */ - boolean flushcache() throws IOException { + public boolean flushcache() throws IOException { if (this.closed.get()) { return false; } @@ -1603,7 +1612,7 @@ public class HRegion implements HConstants { return regionInfo.getRegionName().toString(); } - private Path getBaseDir() { + public Path getBaseDir() { return this.basedir; } @@ -1903,7 +1912,7 @@ public class HRegion implements HConstants { * @return Path of HRegion directory * @see HRegionInfo#encodeRegionName(Text) */ - static Path getRegionDir(final Path tabledir, final String name) { + public static Path getRegionDir(final Path tabledir, final String name) { return new Path(tabledir, name); } diff --git a/src/java/org/apache/hadoop/hbase/HRegionInterface.java b/src/java/org/apache/hadoop/hbase/regionserver/HRegionInterface.java similarity index 97% rename from src/java/org/apache/hadoop/hbase/HRegionInterface.java rename to src/java/org/apache/hadoop/hbase/regionserver/HRegionInterface.java index 14b7610f863..e1c0d5189ba 100644 --- a/src/java/org/apache/hadoop/hbase/HRegionInterface.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HRegionInterface.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; @@ -27,6 +27,8 @@ import org.apache.hadoop.hbase.io.BatchUpdate; import org.apache.hadoop.hbase.io.HbaseMapWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.ipc.VersionedProtocol; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.NotServingRegionException; /** * Clients interact with HRegionServers using a handle to the HRegionInterface. diff --git a/src/java/org/apache/hadoop/hbase/HRegionServer.java b/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java similarity index 98% rename from src/java/org/apache/hadoop/hbase/HRegionServer.java rename to src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index c94ad529b01..2c64a8cff8d 100644 --- a/src/java/org/apache/hadoop/hbase/HRegionServer.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.lang.Thread.UncaughtExceptionHandler; @@ -66,9 +66,28 @@ import org.apache.hadoop.io.Writable; import org.apache.hadoop.ipc.Server; import org.apache.hadoop.net.DNS; import org.apache.hadoop.util.StringUtils; -import org.apache.hadoop.hbase.master.HMasterRegionInterface; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HServerInfo; +import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HMsg; +import org.apache.hadoop.hbase.Leases; +import org.apache.hadoop.hbase.HServerAddress; +import org.apache.hadoop.hbase.RegionServerRunningException; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.NotServingRegionException; +import org.apache.hadoop.hbase.HScannerInterface; +import org.apache.hadoop.hbase.LeaseListener; +import org.apache.hadoop.hbase.RemoteExceptionHandler; +import org.apache.hadoop.hbase.DroppedSnapshotException; +import org.apache.hadoop.hbase.HServerLoad; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.UnknownScannerException; +import org.apache.hadoop.hbase.LocalHBaseCluster; + import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.master.HMasterRegionInterface; + /** * HRegionServer makes a set of HRegions available to clients. It checks in with * the HMaster. There are many HRegionServers in a single HBase deployment. @@ -971,7 +990,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable { * in an orderly fashion. Used by unit tests and called by {@link Flusher} * if it judges server needs to be restarted. */ - synchronized void stop() { + public synchronized void stop() { this.stopRequested.set(true); notifyAll(); // Wakes run() if it is sleeping } @@ -982,7 +1001,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable { * Used unit testing and on catastrophic events such as HDFS is yanked out * from under hbase or we OOME. */ - synchronized void abort() { + public synchronized void abort() { this.abortRequested = true; stop(); } @@ -1570,6 +1589,10 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable { public HServerInfo getServerInfo() { return this.serverInfo; } + + public InfoServer getInfoServer() { + return infoServer; + } /** * @return Immutable list of this servers regions. diff --git a/src/java/org/apache/hadoop/hbase/HStore.java b/src/java/org/apache/hadoop/hbase/regionserver/HStore.java similarity index 98% rename from src/java/org/apache/hadoop/hbase/HStore.java rename to src/java/org/apache/hadoop/hbase/regionserver/HStore.java index f76d1e1f473..1dc76d11c69 100644 --- a/src/java/org/apache/hadoop/hbase/HStore.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HStore.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -50,11 +50,19 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.util.StringUtils; +import org.apache.hadoop.hbase.BloomFilterDescriptor; import org.onelab.filter.BloomFilter; import org.onelab.filter.CountingBloomFilter; import org.onelab.filter.Filter; import org.onelab.filter.RetouchedBloomFilter; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.HColumnDescriptor; +import org.apache.hadoop.hbase.RemoteExceptionHandler; + + /** * HStore maintains a bunch of data files. It is responsible for maintaining * the memory/file hierarchy and for periodic flushes to disk and compacting @@ -932,7 +940,7 @@ public class HStore implements HConstants { } BloomFilterDescriptor.BloomFilterType type = - family.getBloomFilter().filterType; + family.getBloomFilter().getType(); switch(type) { @@ -964,25 +972,25 @@ public class HStore implements HConstants { } BloomFilterDescriptor.BloomFilterType type = - family.getBloomFilter().filterType; + family.getBloomFilter().getType(); switch(type) { case BLOOMFILTER: - bloomFilter = new BloomFilter(family.getBloomFilter().vectorSize, - family.getBloomFilter().nbHash); + bloomFilter = new BloomFilter(family.getBloomFilter().getVectorSize(), + family.getBloomFilter().getNbHash()); break; case COUNTING_BLOOMFILTER: bloomFilter = - new CountingBloomFilter(family.getBloomFilter().vectorSize, - family.getBloomFilter().nbHash); + new CountingBloomFilter(family.getBloomFilter().getVectorSize(), + family.getBloomFilter().getNbHash()); break; case RETOUCHED_BLOOMFILTER: bloomFilter = - new RetouchedBloomFilter(family.getBloomFilter().vectorSize, - family.getBloomFilter().nbHash); + new RetouchedBloomFilter(family.getBloomFilter().getVectorSize(), + family.getBloomFilter().getNbHash()); } } return bloomFilter; @@ -1963,37 +1971,6 @@ public class HStore implements HConstants { return target.matchesRowCol(origin); } - /* - * Data structure to hold result of a look at store file sizes. - */ - static class HStoreSize { - final long aggregate; - final long largest; - boolean splitable; - - HStoreSize(final long a, final long l, final boolean s) { - this.aggregate = a; - this.largest = l; - this.splitable = s; - } - - long getAggregate() { - return this.aggregate; - } - - long getLargest() { - return this.largest; - } - - boolean isSplitable() { - return this.splitable; - } - - void setSplitable(final boolean s) { - this.splitable = s; - } - } - /** * Gets size for the store. * diff --git a/src/java/org/apache/hadoop/hbase/HStoreFile.java b/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java similarity index 99% rename from src/java/org/apache/hadoop/hbase/HStoreFile.java rename to src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java index e89851e131f..164e5d05633 100644 --- a/src/java/org/apache/hadoop/hbase/HStoreFile.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.DataInput; import java.io.DataInputStream; @@ -46,6 +46,8 @@ import org.apache.hadoop.io.WritableComparable; import org.onelab.filter.Filter; import org.onelab.filter.Key; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HBaseConfiguration; /** * A HStore data file. HStores usually have one or more of these files. They diff --git a/src/java/org/apache/hadoop/hbase/HStoreKey.java b/src/java/org/apache/hadoop/hbase/regionserver/HStoreKey.java similarity index 98% rename from src/java/org/apache/hadoop/hbase/HStoreKey.java rename to src/java/org/apache/hadoop/hbase/regionserver/HStoreKey.java index 38103504c2b..8847765cf62 100644 --- a/src/java/org/apache/hadoop/hbase/HStoreKey.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HStoreKey.java @@ -17,10 +17,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.io.TextSequence; +import org.apache.hadoop.hbase.InvalidColumnNameException; import org.apache.hadoop.io.*; +import org.apache.hadoop.hbase.HConstants; import java.io.*; import java.nio.ByteBuffer; diff --git a/src/java/org/apache/hadoop/hbase/regionserver/HStoreSize.java b/src/java/org/apache/hadoop/hbase/regionserver/HStoreSize.java new file mode 100644 index 00000000000..f45f3c3089c --- /dev/null +++ b/src/java/org/apache/hadoop/hbase/regionserver/HStoreSize.java @@ -0,0 +1,33 @@ + +package org.apache.hadoop.hbase.regionserver; + +/* + * Data structure to hold result of a look at store file sizes. + */ +public class HStoreSize { + final long aggregate; + final long largest; + boolean splitable; + + HStoreSize(final long a, final long l, final boolean s) { + this.aggregate = a; + this.largest = l; + this.splitable = s; + } + + public long getAggregate() { + return this.aggregate; + } + + public long getLargest() { + return this.largest; + } + + public boolean isSplitable() { + return this.splitable; + } + + public void setSplitable(final boolean s) { + this.splitable = s; + } +} \ No newline at end of file diff --git a/src/java/org/apache/hadoop/hbase/LogRollListener.java b/src/java/org/apache/hadoop/hbase/regionserver/LogRollListener.java similarity index 95% rename from src/java/org/apache/hadoop/hbase/LogRollListener.java rename to src/java/org/apache/hadoop/hbase/regionserver/LogRollListener.java index fbec1c853f1..588c9fef275 100644 --- a/src/java/org/apache/hadoop/hbase/LogRollListener.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/LogRollListener.java @@ -18,7 +18,7 @@ * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; /** * Mechanism by which the HLog requests a log roll diff --git a/src/java/org/apache/hadoop/hbase/RegionUnavailableListener.java b/src/java/org/apache/hadoop/hbase/regionserver/RegionUnavailableListener.java similarity index 97% rename from src/java/org/apache/hadoop/hbase/RegionUnavailableListener.java rename to src/java/org/apache/hadoop/hbase/regionserver/RegionUnavailableListener.java index 05aa2eb8e4b..b76afa7d3cb 100644 --- a/src/java/org/apache/hadoop/hbase/RegionUnavailableListener.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/RegionUnavailableListener.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.io.Text; diff --git a/src/java/org/apache/hadoop/hbase/rest/ScannerHandler.java b/src/java/org/apache/hadoop/hbase/rest/ScannerHandler.java index 0aba262dc9c..80837ef64a1 100644 --- a/src/java/org/apache/hadoop/hbase/rest/ScannerHandler.java +++ b/src/java/org/apache/hadoop/hbase/rest/ScannerHandler.java @@ -35,7 +35,7 @@ import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HScannerInterface; -import org.apache.hadoop.hbase.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HStoreKey; import org.apache.hadoop.hbase.util.JenkinsHash; import org.apache.hadoop.io.Text; import org.mortbay.servlet.MultiPartResponse; diff --git a/src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java b/src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java index 49ec15c0a3b..fcf84eb30f1 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java +++ b/src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java @@ -35,7 +35,7 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HScannerInterface; -import org.apache.hadoop.hbase.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HStoreKey; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.thrift.generated.AlreadyExists; diff --git a/src/java/org/apache/hadoop/hbase/util/Migrate.java b/src/java/org/apache/hadoop/hbase/util/Migrate.java index dd386efa32d..809f453ac11 100644 --- a/src/java/org/apache/hadoop/hbase/util/Migrate.java +++ b/src/java/org/apache/hadoop/hbase/util/Migrate.java @@ -56,14 +56,15 @@ import org.apache.hadoop.util.ToolRunner; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.HLog; -import org.apache.hadoop.hbase.HRegion; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HScannerInterface; -import org.apache.hadoop.hbase.HStore; -import org.apache.hadoop.hbase.HStoreKey; import org.apache.hadoop.hbase.MasterNotRunningException; +import org.apache.hadoop.hbase.regionserver.HLog; +import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.HStore; +import org.apache.hadoop.hbase.regionserver.HStoreKey; + /** * Perform a file system upgrade to convert older file layouts to that * supported by HADOOP-2478, and then to the form supported by HBASE-69 diff --git a/src/test/org/apache/hadoop/hbase/AbstractMergeTestBase.java b/src/test/org/apache/hadoop/hbase/AbstractMergeTestBase.java index 872b0b93fa3..56795e997a9 100644 --- a/src/test/org/apache/hadoop/hbase/AbstractMergeTestBase.java +++ b/src/test/org/apache/hadoop/hbase/AbstractMergeTestBase.java @@ -28,6 +28,8 @@ import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; +import org.apache.hadoop.hbase.regionserver.HRegion; + /** Abstract base class for merge tests */ public abstract class AbstractMergeTestBase extends HBaseTestCase { static final Logger LOG = diff --git a/src/test/org/apache/hadoop/hbase/DisabledTestScanner2.java b/src/test/org/apache/hadoop/hbase/DisabledTestScanner2.java index e438f6abb79..3894e1ec32e 100644 --- a/src/test/org/apache/hadoop/hbase/DisabledTestScanner2.java +++ b/src/test/org/apache/hadoop/hbase/DisabledTestScanner2.java @@ -46,6 +46,10 @@ import org.apache.hadoop.io.Writable; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HRegionInterface; + /** * Additional scanner tests. * {@link TestScanner} does a custom setup/takedown not conducive diff --git a/src/test/org/apache/hadoop/hbase/HBaseTestCase.java b/src/test/org/apache/hadoop/hbase/HBaseTestCase.java index 7affda90dc4..bc16b4f8129 100644 --- a/src/test/org/apache/hadoop/hbase/HBaseTestCase.java +++ b/src/test/org/apache/hadoop/hbase/HBaseTestCase.java @@ -34,6 +34,8 @@ import org.apache.hadoop.hbase.io.BatchUpdate; import org.apache.hadoop.io.Text; import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.regionserver.HRegion; + /** * Abstract base class for test cases. Performs all static initialization */ @@ -157,7 +159,7 @@ public abstract class HBaseTestCase extends TestCase { protected HRegion openClosedRegion(final HRegion closedRegion) throws IOException { - return new HRegion(closedRegion.basedir, closedRegion.getLog(), + return new HRegion(closedRegion.getBaseDir(), closedRegion.getLog(), closedRegion.getFilesystem(), closedRegion.getConf(), closedRegion.getRegionInfo(), null, null); } diff --git a/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java b/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java index 1140d69b2b6..e26848377d5 100644 --- a/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java +++ b/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java @@ -30,6 +30,8 @@ import org.apache.log4j.Logger; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.master.HMaster; +import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.regionserver.HRegion; /** * This class creates a single process HBase cluster. One thread is created for @@ -196,7 +198,7 @@ public class MiniHBaseCluster implements HConstants { public void abortRegionServer(int serverNumber) { HRegionServer server = this.hbaseCluster.getRegionServers().get(serverNumber).getRegionServer(); - LOG.info("Aborting " + server.serverInfo.toString()); + LOG.info("Aborting " + server.getServerInfo().toString()); server.abort(); } @@ -262,10 +264,10 @@ public class MiniHBaseCluster implements HConstants { * Call flushCache on all regions on all participating regionservers. * @throws IOException */ - void flushcache() throws IOException { + public void flushcache() throws IOException { for (LocalHBaseCluster.RegionServerThread t: this.hbaseCluster.getRegionServers()) { - for(HRegion r: t.getRegionServer().onlineRegions.values() ) { + for(HRegion r: t.getRegionServer().getOnlineRegions().values() ) { r.flushcache(); } } diff --git a/src/test/org/apache/hadoop/hbase/MultiRegionTable.java b/src/test/org/apache/hadoop/hbase/MultiRegionTable.java index f7fd5de9178..b85733b7f17 100644 --- a/src/test/org/apache/hadoop/hbase/MultiRegionTable.java +++ b/src/test/org/apache/hadoop/hbase/MultiRegionTable.java @@ -33,6 +33,10 @@ import org.apache.hadoop.hbase.util.Writables; import org.apache.hadoop.io.Text; import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.regionserver.HStoreKey; + /** * Utility class to build a table of multiple regions. */ @@ -99,7 +103,7 @@ public class MultiRegionTable extends HBaseTestCase { continue; } LOG.info("Region location: " + hri); - r = server.onlineRegions.get(hri.getRegionName()); + r = server.getOnlineRegions().get(hri.getRegionName()); if (r != null) { break; } @@ -335,7 +339,7 @@ public class MultiRegionTable extends HBaseTestCase { LOG.info("Starting compaction"); for (LocalHBaseCluster.RegionServerThread thread: cluster.getRegionThreads()) { - SortedMap regions = thread.getRegionServer().onlineRegions; + SortedMap regions = thread.getRegionServer().getOnlineRegions(); // Retry if ConcurrentModification... alternative of sync'ing is not // worth it for sake of unit test. diff --git a/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java b/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java index 6a7c644b7ab..82fcfe9a6b4 100644 --- a/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java +++ b/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java @@ -49,6 +49,8 @@ import org.apache.log4j.Logger; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.regionserver.HStoreKey; + /** * Script used evaluating HBase performance and scalability. Runs a HBase * client that steps through one of a set of hardcoded tests or 'experiments' diff --git a/src/test/org/apache/hadoop/hbase/TestCompare.java b/src/test/org/apache/hadoop/hbase/TestCompare.java index 3b0e8d22e15..c2436d605c4 100644 --- a/src/test/org/apache/hadoop/hbase/TestCompare.java +++ b/src/test/org/apache/hadoop/hbase/TestCompare.java @@ -21,6 +21,7 @@ package org.apache.hadoop.hbase; import org.apache.hadoop.io.Text; import junit.framework.TestCase; +import org.apache.hadoop.hbase.regionserver.HStoreKey; /** * Test comparing HBase objects. diff --git a/src/test/org/apache/hadoop/hbase/TestHBaseCluster.java b/src/test/org/apache/hadoop/hbase/TestHBaseCluster.java index 69d4aeb9b2d..0d17fe6030f 100644 --- a/src/test/org/apache/hadoop/hbase/TestHBaseCluster.java +++ b/src/test/org/apache/hadoop/hbase/TestHBaseCluster.java @@ -27,6 +27,7 @@ import java.util.TreeMap; import org.apache.hadoop.io.Text; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.regionserver.HStoreKey; /** * Test HBase Master and Region servers, client API diff --git a/src/test/org/apache/hadoop/hbase/TestInfoServers.java b/src/test/org/apache/hadoop/hbase/TestInfoServers.java index af9db013328..25524db6e10 100644 --- a/src/test/org/apache/hadoop/hbase/TestInfoServers.java +++ b/src/test/org/apache/hadoop/hbase/TestInfoServers.java @@ -63,7 +63,7 @@ public class TestInfoServers extends HBaseTestCase { assertHasExpectedContent(new URL("http://localhost:" + port + "/index.html"), "Master"); port = miniHbase.getRegionThreads().get(0).getRegionServer(). - infoServer.getPort(); + getInfoServer().getPort(); assertHasExpectedContent(new URL("http://localhost:" + port + "/index.html"), "Region Server"); } finally { diff --git a/src/test/org/apache/hadoop/hbase/TestScannerAPI.java b/src/test/org/apache/hadoop/hbase/TestScannerAPI.java index 9594df87a09..b8fe26d0a9b 100644 --- a/src/test/org/apache/hadoop/hbase/TestScannerAPI.java +++ b/src/test/org/apache/hadoop/hbase/TestScannerAPI.java @@ -30,6 +30,8 @@ import java.util.TreeMap; import org.apache.hadoop.io.Text; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.regionserver.HStoreKey; import org.apache.hadoop.hbase.io.BatchUpdate; /** test the scanner API at all levels */ diff --git a/src/test/org/apache/hadoop/hbase/client/TestBatchUpdate.java b/src/test/org/apache/hadoop/hbase/client/TestBatchUpdate.java index fd59a35e697..2e2e0bbac8a 100644 --- a/src/test/org/apache/hadoop/hbase/client/TestBatchUpdate.java +++ b/src/test/org/apache/hadoop/hbase/client/TestBatchUpdate.java @@ -28,7 +28,7 @@ import org.apache.hadoop.hbase.HBaseClusterTestCase; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HScannerInterface; -import org.apache.hadoop.hbase.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HStoreKey; import org.apache.hadoop.hbase.HColumnDescriptor; /** diff --git a/src/test/org/apache/hadoop/hbase/client/TestHTable.java b/src/test/org/apache/hadoop/hbase/client/TestHTable.java index 027fc3e7470..19877f67cbd 100644 --- a/src/test/org/apache/hadoop/hbase/client/TestHTable.java +++ b/src/test/org/apache/hadoop/hbase/client/TestHTable.java @@ -33,7 +33,7 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.HScannerInterface; -import org.apache.hadoop.hbase.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HStoreKey; /** * Tests HTable diff --git a/src/test/org/apache/hadoop/hbase/filter/TestRegExpRowFilter.java b/src/test/org/apache/hadoop/hbase/filter/TestRegExpRowFilter.java index 7eb570d7cdc..2bd77fab70d 100644 --- a/src/test/org/apache/hadoop/hbase/filter/TestRegExpRowFilter.java +++ b/src/test/org/apache/hadoop/hbase/filter/TestRegExpRowFilter.java @@ -30,7 +30,7 @@ import java.util.TreeMap; import junit.framework.TestCase; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.HLogEdit; +import org.apache.hadoop.hbase.regionserver.HLogEdit; import org.apache.hadoop.io.Text; /** diff --git a/src/test/org/apache/hadoop/hbase/mapred/TestTableIndex.java b/src/test/org/apache/hadoop/hbase/mapred/TestTableIndex.java index 0c671d4e818..f7a0b15f68e 100644 --- a/src/test/org/apache/hadoop/hbase/mapred/TestTableIndex.java +++ b/src/test/org/apache/hadoop/hbase/mapred/TestTableIndex.java @@ -37,9 +37,9 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.HRegion; +import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.HScannerInterface; -import org.apache.hadoop.hbase.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HStoreKey; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.MiniHBaseCluster; diff --git a/src/test/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java b/src/test/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java index 2f0b652d4ad..a22b1969a0f 100644 --- a/src/test/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java +++ b/src/test/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java @@ -32,7 +32,7 @@ import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HScannerInterface; -import org.apache.hadoop.hbase.HStoreKey; +import org.apache.hadoop.hbase.regionserver.HStoreKey; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.MiniHBaseCluster; diff --git a/src/test/org/apache/hadoop/hbase/OOMERegionServer.java b/src/test/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java similarity index 93% rename from src/test/org/apache/hadoop/hbase/OOMERegionServer.java rename to src/test/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java index 940b2a71fdc..8c7bc3d2cdf 100644 --- a/src/test/org/apache/hadoop/hbase/OOMERegionServer.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/OOMERegionServer.java @@ -17,13 +17,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.ArrayList; import java.util.List; import org.apache.hadoop.hbase.io.BatchUpdate; +import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.HServerAddress; import org.apache.hadoop.io.Text; /** diff --git a/src/test/org/apache/hadoop/hbase/TestCompaction.java b/src/test/org/apache/hadoop/hbase/regionserver/TestCompaction.java similarity index 96% rename from src/test/org/apache/hadoop/hbase/TestCompaction.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestCompaction.java index a18fd76a683..56737a2c7e5 100644 --- a/src/test/org/apache/hadoop/hbase/TestCompaction.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestCompaction.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; @@ -26,9 +26,14 @@ import org.apache.hadoop.dfs.MiniDFSCluster; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; +import org.apache.hadoop.hbase.HBaseTestCase; import org.apache.hadoop.io.MapFile; import org.apache.hadoop.io.Text; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.StaticTestEnvironment; + /** * Test compactions */ diff --git a/src/test/org/apache/hadoop/hbase/TestDeleteAll.java b/src/test/org/apache/hadoop/hbase/regionserver/TestDeleteAll.java similarity index 96% rename from src/test/org/apache/hadoop/hbase/TestDeleteAll.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestDeleteAll.java index 3a81132f143..d4d8de7b046 100644 --- a/src/test/org/apache/hadoop/hbase/TestDeleteAll.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestDeleteAll.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.Map; @@ -25,6 +25,10 @@ import java.util.Map; import org.apache.hadoop.dfs.MiniDFSCluster; import org.apache.hadoop.io.Text; import org.apache.commons.logging.*; +import org.apache.hadoop.hbase.HBaseTestCase; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.StaticTestEnvironment; /** * Test the functionality of deleteAll. diff --git a/src/test/org/apache/hadoop/hbase/TestDeleteFamily.java b/src/test/org/apache/hadoop/hbase/regionserver/TestDeleteFamily.java similarity index 96% rename from src/test/org/apache/hadoop/hbase/TestDeleteFamily.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestDeleteFamily.java index 62b10a15406..158d93e8031 100644 --- a/src/test/org/apache/hadoop/hbase/TestDeleteFamily.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestDeleteFamily.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.Map; @@ -26,6 +26,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.dfs.MiniDFSCluster; import org.apache.hadoop.io.Text; +import org.apache.hadoop.hbase.HBaseTestCase; + +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.StaticTestEnvironment; /** * Test the functionality of deleteFamily. diff --git a/src/test/org/apache/hadoop/hbase/TestGet.java b/src/test/org/apache/hadoop/hbase/regionserver/TestGet.java similarity index 93% rename from src/test/org/apache/hadoop/hbase/TestGet.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestGet.java index 8abebaabd25..5e984df4bfd 100644 --- a/src/test/org/apache/hadoop/hbase/TestGet.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestGet.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.Iterator; @@ -27,9 +27,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.dfs.MiniDFSCluster; import org.apache.hadoop.io.Text; +import org.apache.hadoop.hbase.HBaseTestCase; import org.apache.hadoop.hbase.util.Writables; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.HColumnDescriptor; +import org.apache.hadoop.hbase.HServerAddress; +import org.apache.hadoop.hbase.StaticTestEnvironment; + + /** Test case for get */ public class TestGet extends HBaseTestCase { private static final Log LOG = LogFactory.getLog(TestGet.class.getName()); diff --git a/src/test/org/apache/hadoop/hbase/TestGet2.java b/src/test/org/apache/hadoop/hbase/regionserver/TestGet2.java similarity index 96% rename from src/test/org/apache/hadoop/hbase/TestGet2.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestGet2.java index 1281a229aae..37c1c4bf1c2 100644 --- a/src/test/org/apache/hadoop/hbase/TestGet2.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestGet2.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.Map; @@ -27,6 +27,11 @@ import org.apache.hadoop.dfs.MiniDFSCluster; import org.apache.hadoop.hbase.filter.StopRowFilter; import org.apache.hadoop.hbase.filter.WhileMatchRowFilter; import org.apache.hadoop.io.Text; +import org.apache.hadoop.hbase.HBaseTestCase; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HScannerInterface; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.HRegionInfo; /** diff --git a/src/test/org/apache/hadoop/hbase/TestHLog.java b/src/test/org/apache/hadoop/hbase/regionserver/TestHLog.java similarity index 96% rename from src/test/org/apache/hadoop/hbase/TestHLog.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestHLog.java index 62640686306..e8e1cc27fb5 100644 --- a/src/test/org/apache/hadoop/hbase/TestHLog.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestHLog.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.TreeMap; @@ -28,6 +28,10 @@ import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.SequenceFile.Reader; +import org.apache.hadoop.hbase.HBaseTestCase; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.StaticTestEnvironment; + /** JUnit test case for HLog */ public class TestHLog extends HBaseTestCase implements HConstants { private Path dir; diff --git a/src/test/org/apache/hadoop/hbase/TestHMemcache.java b/src/test/org/apache/hadoop/hbase/regionserver/TestHMemcache.java similarity index 98% rename from src/test/org/apache/hadoop/hbase/TestHMemcache.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestHMemcache.java index d2a6ba0d95d..677874a1e06 100644 --- a/src/test/org/apache/hadoop/hbase/TestHMemcache.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestHMemcache.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -28,6 +28,8 @@ import junit.framework.TestCase; import org.apache.hadoop.io.Text; +import org.apache.hadoop.hbase.HConstants; + /** memcache test case */ public class TestHMemcache extends TestCase { diff --git a/src/test/org/apache/hadoop/hbase/TestHRegion.java b/src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java similarity index 98% rename from src/test/org/apache/hadoop/hbase/TestHRegion.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java index f2301b2ed2d..2f0f79c9795 100644 --- a/src/test/org/apache/hadoop/hbase/TestHRegion.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.File; import java.io.IOException; @@ -29,8 +29,14 @@ import java.util.TreeMap; import org.apache.hadoop.dfs.MiniDFSCluster; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; - +import org.apache.hadoop.hbase.HBaseTestCase; +import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.log4j.Logger; +import org.apache.hadoop.hbase.StaticTestEnvironment; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.HColumnDescriptor; +import org.apache.hadoop.hbase.HScannerInterface; /** * Basic stand-alone testing of HRegion. diff --git a/src/test/org/apache/hadoop/hbase/TestHStoreFile.java b/src/test/org/apache/hadoop/hbase/regionserver/TestHStoreFile.java similarity index 98% rename from src/test/org/apache/hadoop/hbase/TestHStoreFile.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestHStoreFile.java index 168218fa41d..68704415b9d 100644 --- a/src/test/org/apache/hadoop/hbase/TestHStoreFile.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestHStoreFile.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; @@ -30,7 +30,10 @@ import org.apache.hadoop.io.MapFile; import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.WritableComparable; +import org.apache.hadoop.hbase.HBaseTestCase; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.StaticTestEnvironment; /** * Test HStoreFile */ diff --git a/src/test/org/apache/hadoop/hbase/TestLogRolling.java b/src/test/org/apache/hadoop/hbase/regionserver/TestLogRolling.java similarity index 94% rename from src/test/org/apache/hadoop/hbase/TestLogRolling.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestLogRolling.java index cc73a9a76b5..6629a90519c 100644 --- a/src/test/org/apache/hadoop/hbase/TestLogRolling.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestLogRolling.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.util.ArrayList; import java.util.List; @@ -28,6 +28,13 @@ import org.apache.hadoop.dfs.MiniDFSCluster; import org.apache.hadoop.io.Text; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.HBaseTestCase; +import org.apache.hadoop.hbase.MiniHBaseCluster; + +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.StaticTestEnvironment; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.HColumnDescriptor; /** * Test log deletion as logs are rolled. diff --git a/src/test/org/apache/hadoop/hbase/TestRegionServerExit.java b/src/test/org/apache/hadoop/hbase/regionserver/TestRegionServerExit.java similarity index 95% rename from src/test/org/apache/hadoop/hbase/TestRegionServerExit.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestRegionServerExit.java index f85a734cfd1..d2a94eb1af3 100644 --- a/src/test/org/apache/hadoop/hbase/TestRegionServerExit.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestRegionServerExit.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.Collection; @@ -32,6 +32,13 @@ import org.apache.hadoop.hbase.io.BatchUpdate; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.HBaseClusterTestCase; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.HColumnDescriptor; +import org.apache.hadoop.hbase.LocalHBaseCluster; +import org.apache.hadoop.hbase.HScannerInterface; + /** * Tests region server failover when a region server exits both cleanly and * when it aborts. diff --git a/src/test/org/apache/hadoop/hbase/TestScanner.java b/src/test/org/apache/hadoop/hbase/regionserver/TestScanner.java similarity index 95% rename from src/test/org/apache/hadoop/hbase/TestScanner.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestScanner.java index 1ed8b9f176a..f0de0a4fb24 100644 --- a/src/test/org/apache/hadoop/hbase/TestScanner.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestScanner.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; @@ -27,6 +27,13 @@ import java.util.TreeMap; import org.apache.hadoop.dfs.MiniDFSCluster; import org.apache.hadoop.hbase.util.Writables; import org.apache.hadoop.io.Text; +import org.apache.hadoop.hbase.HBaseTestCase; +import org.apache.hadoop.hbase.HRegionInfo; + +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HScannerInterface; +import org.apache.hadoop.hbase.HServerAddress; +import org.apache.hadoop.hbase.StaticTestEnvironment; /** * Test of a long-lived scanner validating as we go. diff --git a/src/test/org/apache/hadoop/hbase/TestSplit.java b/src/test/org/apache/hadoop/hbase/regionserver/TestSplit.java similarity index 96% rename from src/test/org/apache/hadoop/hbase/TestSplit.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestSplit.java index c30c52ba666..91062e8bcac 100644 --- a/src/test/org/apache/hadoop/hbase/TestSplit.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestSplit.java @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.TreeMap; @@ -28,6 +28,11 @@ import org.apache.hadoop.dfs.MiniDFSCluster; import org.apache.hadoop.io.Text; import org.apache.log4j.Level; import org.apache.log4j.Logger; +import org.apache.hadoop.hbase.MultiRegionTable; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.HScannerInterface; +import org.apache.hadoop.hbase.StaticTestEnvironment; /** * {@Link TestHRegion} does a split but this TestCase adds testing of fast diff --git a/src/test/org/apache/hadoop/hbase/TestTimestamp.java b/src/test/org/apache/hadoop/hbase/regionserver/TestTimestamp.java similarity index 96% rename from src/test/org/apache/hadoop/hbase/TestTimestamp.java rename to src/test/org/apache/hadoop/hbase/regionserver/TestTimestamp.java index ad9551db2e8..164d435bfa7 100644 --- a/src/test/org/apache/hadoop/hbase/TestTimestamp.java +++ b/src/test/org/apache/hadoop/hbase/regionserver/TestTimestamp.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.hbase; +package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.TreeMap; @@ -28,6 +28,13 @@ import org.apache.hadoop.hbase.util.Writables; import org.apache.hadoop.io.Text; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.HBaseTestCase; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.StaticTestEnvironment; +import org.apache.hadoop.hbase.MiniHBaseCluster; +import org.apache.hadoop.hbase.HScannerInterface; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.HColumnDescriptor; /** * Tests user specifiable time stamps putting, getting and scanning. Also diff --git a/src/webapps/regionserver/regionserver.jsp b/src/webapps/regionserver/regionserver.jsp index c0a96e6009b..d797e51f87e 100644 --- a/src/webapps/regionserver/regionserver.jsp +++ b/src/webapps/regionserver/regionserver.jsp @@ -2,8 +2,8 @@ import="java.util.*" import="org.apache.hadoop.io.Text" import="org.apache.hadoop.util.VersionInfo" - import="org.apache.hadoop.hbase.HRegionServer" - import="org.apache.hadoop.hbase.HRegion" + import="org.apache.hadoop.hbase.regionserver.HRegionServer" + import="org.apache.hadoop.hbase.regionserver.HRegion" import="org.apache.hadoop.hbase.HConstants" import="org.apache.hadoop.hbase.HServerInfo" import="org.apache.hadoop.hbase.HRegionInfo" %><%