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

HADOOP-1148. More re-indentation. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk/src/contrib/hbase@529756 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug Cutting 2007-04-17 20:37:59 +00:00
parent 89af8294f4
commit 4a8d243f4e
13 changed files with 165 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/java/org/apache/hadoop/hbase/HAbstractScanner.java
View File

@ -180,7 +180,7 @@ public abstract class HAbstractScanner implements HScannerInterface {
* @see org.apache.hadoop.hbase.HScannerInterface#next(org.apache.hadoop.hbase.HStoreKey, java.util.TreeMap) * @see org.apache.hadoop.hbase.HScannerInterface#next(org.apache.hadoop.hbase.HStoreKey, java.util.TreeMap)
*/ */
public boolean next(HStoreKey key, TreeMap<Text, byte[]> results) public boolean next(HStoreKey key, TreeMap<Text, byte[]> results)
throws IOException { throws IOException {
// Find the next row label (and timestamp) // Find the next row label (and timestamp)
@ -188,12 +188,12 @@ public abstract class HAbstractScanner implements HScannerInterface {
long chosenTimestamp = -1; long chosenTimestamp = -1;
for(int i = 0; i < keys.length; i++) { for(int i = 0; i < keys.length; i++) {
while((keys[i] != null) while((keys[i] != null)
&& (columnMatch(i)) && (columnMatch(i))
&& (keys[i].getTimestamp() <= this.timestamp) && (keys[i].getTimestamp() <= this.timestamp)
&& ((chosenRow == null) && ((chosenRow == null)
|| (keys[i].getRow().compareTo(chosenRow) < 0) || (keys[i].getRow().compareTo(chosenRow) < 0)
|| ((keys[i].getRow().compareTo(chosenRow) == 0) || ((keys[i].getRow().compareTo(chosenRow) == 0)
&& (keys[i].getTimestamp() > chosenTimestamp)))) { && (keys[i].getTimestamp() > chosenTimestamp)))) {
chosenRow = new Text(keys[i].getRow()); chosenRow = new Text(keys[i].getRow());
chosenTimestamp = keys[i].getTimestamp(); chosenTimestamp = keys[i].getTimestamp();
@ -212,8 +212,8 @@ public abstract class HAbstractScanner implements HScannerInterface {
// Fetch the data // Fetch the data
while((keys[i] != null) while((keys[i] != null)
&& (keys[i].getRow().compareTo(chosenRow) == 0) && (keys[i].getRow().compareTo(chosenRow) == 0)
&& (keys[i].getTimestamp() == chosenTimestamp)) { && (keys[i].getTimestamp() == chosenTimestamp)) {
if(columnMatch(i)) { if(columnMatch(i)) {
outbuf.reset(); outbuf.reset();
@ -235,9 +235,9 @@ public abstract class HAbstractScanner implements HScannerInterface {
// a valid timestamp, so we're ready next time. // a valid timestamp, so we're ready next time.
while((keys[i] != null) while((keys[i] != null)
&& ((keys[i].getRow().compareTo(chosenRow) <= 0) && ((keys[i].getRow().compareTo(chosenRow) <= 0)
|| (keys[i].getTimestamp() > this.timestamp) || (keys[i].getTimestamp() > this.timestamp)
|| (! columnMatch(i)))) { || (! columnMatch(i)))) {
getNext(i); getNext(i);
} }

22
src/java/org/apache/hadoop/hbase/HClient.java
View File

@ -146,8 +146,8 @@ public class HClient extends HGlobals implements HConstants {
private void locateRootRegion() throws IOException { private void locateRootRegion() throws IOException {
if(master == null) { if(master == null) {
master = (HMasterInterface)RPC.getProxy(HMasterInterface.class, master = (HMasterInterface)RPC.getProxy(HMasterInterface.class,
HMasterInterface.versionID, HMasterInterface.versionID,
masterLocation.getInetSocketAddress(), conf); masterLocation.getInetSocketAddress(), conf);
} }
int tries = 0; int tries = 0;
@ -229,7 +229,7 @@ public class HClient extends HGlobals implements HConstants {
String serverName = new String(serverBytes, UTF8_ENCODING); String serverName = new String(serverBytes, UTF8_ENCODING);
tableServers.put(regionInfo.startKey, tableServers.put(regionInfo.startKey,
new TableInfo(regionInfo, new HServerAddress(serverName))); new TableInfo(regionInfo, new HServerAddress(serverName)));
results.clear(); results.clear();
} }
@ -239,16 +239,16 @@ public class HClient extends HGlobals implements HConstants {
} }
public synchronized HRegionInterface getHRegionConnection(HServerAddress regionServer) public synchronized HRegionInterface getHRegionConnection(HServerAddress regionServer)
throws IOException { throws IOException {
// See if we already have a connection // See if we already have a connection
HRegionInterface server = servers.get(regionServer.toString()); HRegionInterface server = servers.get(regionServer.toString());
if(server == null) { // Get a connection if(server == null) { // Get a connection
server = (HRegionInterface)RPC.waitForProxy(HRegionInterface.class, server = (HRegionInterface)RPC.waitForProxy(HRegionInterface.class,
HRegionInterface.versionID, regionServer.getInetSocketAddress(), conf); HRegionInterface.versionID, regionServer.getInetSocketAddress(), conf);
servers.put(regionServer.toString(), server); servers.put(regionServer.toString(), server);
} }
@ -325,14 +325,14 @@ public class HClient extends HGlobals implements HConstants {
public byte[] get(Text row, Text column) throws IOException { public byte[] get(Text row, Text column) throws IOException {
TableInfo info = getTableInfo(row); TableInfo info = getTableInfo(row);
return getHRegionConnection(info.serverAddress).get( return getHRegionConnection(info.serverAddress).get(
info.regionInfo.regionName, row, column).get(); info.regionInfo.regionName, row, column).get();
} }
/** Get the specified number of versions of the specified row and column */ /** Get the specified number of versions of the specified row and column */
public byte[][] get(Text row, Text column, int numVersions) throws IOException { public byte[][] get(Text row, Text column, int numVersions) throws IOException {
TableInfo info = getTableInfo(row); TableInfo info = getTableInfo(row);
BytesWritable[] values = getHRegionConnection(info.serverAddress).get( BytesWritable[] values = getHRegionConnection(info.serverAddress).get(
info.regionInfo.regionName, row, column, numVersions); info.regionInfo.regionName, row, column, numVersions);
ArrayList<byte[]> bytes = new ArrayList<byte[]>(); ArrayList<byte[]> bytes = new ArrayList<byte[]>();
for(int i = 0 ; i < values.length; i++) { for(int i = 0 ; i < values.length; i++) {
@ -348,7 +348,7 @@ public class HClient extends HGlobals implements HConstants {
public byte[][] get(Text row, Text column, long timestamp, int numVersions) throws IOException { public byte[][] get(Text row, Text column, long timestamp, int numVersions) throws IOException {
TableInfo info = getTableInfo(row); TableInfo info = getTableInfo(row);
BytesWritable[] values = getHRegionConnection(info.serverAddress).get( BytesWritable[] values = getHRegionConnection(info.serverAddress).get(
info.regionInfo.regionName, row, column, timestamp, numVersions); info.regionInfo.regionName, row, column, timestamp, numVersions);
ArrayList<byte[]> bytes = new ArrayList<byte[]>(); ArrayList<byte[]> bytes = new ArrayList<byte[]>();
for(int i = 0 ; i < values.length; i++) { for(int i = 0 ; i < values.length; i++) {
@ -361,7 +361,7 @@ public class HClient extends HGlobals implements HConstants {
public LabelledData[] getRow(Text row) throws IOException { public LabelledData[] getRow(Text row) throws IOException {
TableInfo info = getTableInfo(row); TableInfo info = getTableInfo(row);
return getHRegionConnection(info.serverAddress).getRow( return getHRegionConnection(info.serverAddress).getRow(
info.regionInfo.regionName, row); info.regionInfo.regionName, row);
} }
/** /**
@ -492,7 +492,7 @@ public class HClient extends HGlobals implements HConstants {
try { try {
server = getHRegionConnection(regions[currentRegion].serverAddress); server = getHRegionConnection(regions[currentRegion].serverAddress);
scanner = server.openScanner(regions[currentRegion].regionInfo.regionName, scanner = server.openScanner(regions[currentRegion].regionInfo.regionName,
columns, startRow); columns, startRow);
} catch(IOException e) { } catch(IOException e) {
close(); close();

2
src/java/org/apache/hadoop/hbase/HLog.java
View File

@ -342,7 +342,7 @@ public class HLog {
} }
writer.append(new HLogKey(regionName, tableName, HLog.METAROW, logSeqId), writer.append(new HLogKey(regionName, tableName, HLog.METAROW, logSeqId),
new HLogEdit(HLog.METACOLUMN, HStoreKey.COMPLETE_CACHEFLUSH, System.currentTimeMillis())); new HLogEdit(HLog.METACOLUMN, HStoreKey.COMPLETE_CACHEFLUSH, System.currentTimeMillis()));
numEntries++; numEntries++;
// Remember the most-recent flush for each region. // Remember the most-recent flush for each region.

40
src/java/org/apache/hadoop/hbase/HMaster.java
View File

@ -104,7 +104,7 @@ public class HMaster extends HGlobals
public void run() { public void run() {
Text cols[] = { Text cols[] = {
ROOT_COLUMN_FAMILY ROOT_COLUMN_FAMILY
}; };
Text firstRow = new Text(); Text firstRow = new Text();
@ -156,7 +156,7 @@ public class HMaster extends HGlobals
synchronized(serversToServerInfo) { synchronized(serversToServerInfo) {
storedInfo = serversToServerInfo.get(serverName); storedInfo = serversToServerInfo.get(serverName);
if(storedInfo == null if(storedInfo == null
|| storedInfo.getStartCode() != startCode) { || storedInfo.getStartCode() != startCode) {
// The current assignment is no good; load the region. // The current assignment is no good; load the region.
@ -216,7 +216,7 @@ public class HMaster extends HGlobals
*/ */
private class MetaScanner implements Runnable { private class MetaScanner implements Runnable {
private final Text cols[] = { private final Text cols[] = {
META_COLUMN_FAMILY META_COLUMN_FAMILY
}; };
private final Text firstRow = new Text(); private final Text firstRow = new Text();
@ -262,7 +262,7 @@ public class HMaster extends HGlobals
synchronized(serversToServerInfo) { synchronized(serversToServerInfo) {
storedInfo = serversToServerInfo.get(serverName); storedInfo = serversToServerInfo.get(serverName);
if(storedInfo == null if(storedInfo == null
|| storedInfo.getStartCode() != startCode) { || storedInfo.getStartCode() != startCode) {
// The current assignment is no good; load the region. // The current assignment is no good; load the region.
@ -370,8 +370,8 @@ public class HMaster extends HGlobals
/** Build the HMaster out of a raw configuration item. */ /** Build the HMaster out of a raw configuration item. */
public HMaster(Configuration conf) throws IOException { public HMaster(Configuration conf) throws IOException {
this(new Path(conf.get(HREGION_DIR, DEFAULT_HREGION_DIR)), this(new Path(conf.get(HREGION_DIR, DEFAULT_HREGION_DIR)),
new HServerAddress(conf.get(MASTER_DEFAULT_NAME)), new HServerAddress(conf.get(MASTER_DEFAULT_NAME)),
conf); conf);
} }
/** /**
@ -410,9 +410,9 @@ public class HMaster extends HGlobals
this.maxRegionOpenTime = conf.getLong("hbase.hbasemaster.maxregionopen", 30 * 1000); this.maxRegionOpenTime = conf.getLong("hbase.hbasemaster.maxregionopen", 30 * 1000);
this.msgQueue = new Vector<PendingOperation>(); this.msgQueue = new Vector<PendingOperation>();
this.serverLeases = new Leases(conf.getLong("hbase.master.lease.period", 15 * 1000), this.serverLeases = new Leases(conf.getLong("hbase.master.lease.period", 15 * 1000),
conf.getLong("hbase.master.lease.thread.wakefrequency", 15 * 1000)); conf.getLong("hbase.master.lease.thread.wakefrequency", 15 * 1000));
this.server = RPC.getServer(this, address.getBindAddress(), this.server = RPC.getServer(this, address.getBindAddress(),
address.getPort(), conf.getInt("hbase.hregionserver.handler.count", 10), false, conf); address.getPort(), conf.getInt("hbase.hregionserver.handler.count", 10), false, conf);
this.client = new HClient(conf); this.client = new HClient(conf);
this.metaRescanInterval this.metaRescanInterval
@ -714,7 +714,7 @@ public class HMaster extends HGlobals
default: default:
throw new IOException("Impossible state during msg processing. Instruction: " throw new IOException("Impossible state during msg processing. Instruction: "
+ incomingMsgs[i].getMsg()); + incomingMsgs[i].getMsg());
} }
} }
@ -725,13 +725,13 @@ public class HMaster extends HGlobals
// Open new regions as necessary // Open new regions as necessary
int targetForServer = (int) Math.ceil(unassignedRegions.size() int targetForServer = (int) Math.ceil(unassignedRegions.size()
/ (1.0 * serversToServerInfo.size())); / (1.0 * serversToServerInfo.size()));
int counter = 0; int counter = 0;
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
for(Iterator<Text> it = unassignedRegions.keySet().iterator(); for(Iterator<Text> it = unassignedRegions.keySet().iterator();
it.hasNext(); ) { it.hasNext(); ) {
Text curRegionName = it.next(); Text curRegionName = it.next();
HRegionInfo regionInfo = unassignedRegions.get(curRegionName); HRegionInfo regionInfo = unassignedRegions.get(curRegionName);
@ -790,7 +790,7 @@ public class HMaster extends HGlobals
abstract class PendingOperation { abstract class PendingOperation {
protected final Text[] columns = { protected final Text[] columns = {
META_COLUMN_FAMILY META_COLUMN_FAMILY
}; };
protected final Text startRow = new Text(); protected final Text startRow = new Text();
protected long clientId; protected long clientId;
@ -813,7 +813,7 @@ public class HMaster extends HGlobals
} }
private void scanMetaRegion(HRegionInterface server, HScannerInterface scanner, private void scanMetaRegion(HRegionInterface server, HScannerInterface scanner,
Text regionName) throws IOException { Text regionName) throws IOException {
Vector<HStoreKey> toDoList = new Vector<HStoreKey>(); Vector<HStoreKey> toDoList = new Vector<HStoreKey>();
TreeMap<Text, HRegionInfo> regions = new TreeMap<Text, HRegionInfo>(); TreeMap<Text, HRegionInfo> regions = new TreeMap<Text, HRegionInfo>();
@ -899,7 +899,7 @@ public class HMaster extends HGlobals
HRegionInterface server = client.getHRegionConnection(rootRegionLocation); HRegionInterface server = client.getHRegionConnection(rootRegionLocation);
HScannerInterface scanner = server.openScanner(rootRegionInfo.regionName, HScannerInterface scanner = server.openScanner(rootRegionInfo.regionName,
columns, startRow); columns, startRow);
scanMetaRegion(server, scanner, rootRegionInfo.regionName); scanMetaRegion(server, scanner, rootRegionInfo.regionName);
for(Iterator<MetaRegion> i = knownMetaRegions.values().iterator(); for(Iterator<MetaRegion> i = knownMetaRegions.values().iterator();
@ -1003,10 +1003,10 @@ public class HMaster extends HGlobals
try { try {
this.serverAddress = new BytesWritable( this.serverAddress = new BytesWritable(
info.getServerAddress().toString().getBytes(UTF8_ENCODING)); info.getServerAddress().toString().getBytes(UTF8_ENCODING));
this.startCode = new BytesWritable( this.startCode = new BytesWritable(
String.valueOf(info.getStartCode()).getBytes(UTF8_ENCODING)); String.valueOf(info.getStartCode()).getBytes(UTF8_ENCODING));
} catch(UnsupportedEncodingException e) { } catch(UnsupportedEncodingException e) {
} }
@ -1100,7 +1100,7 @@ public class HMaster extends HGlobals
long clientId = rand.nextLong(); long clientId = rand.nextLong();
long lockid = server.startUpdate(metaRegionName, clientId, regionName); long lockid = server.startUpdate(metaRegionName, clientId, regionName);
server.put(metaRegionName, clientId, lockid, META_COL_REGIONINFO, server.put(metaRegionName, clientId, lockid, META_COL_REGIONINFO,
new BytesWritable(byteValue.toByteArray())); new BytesWritable(byteValue.toByteArray()));
server.commit(metaRegionName, clientId, lockid); server.commit(metaRegionName, clientId, lockid);
// 4. Get it assigned to a server // 4. Get it assigned to a server
@ -1122,14 +1122,14 @@ public class HMaster extends HGlobals
* @throws IOException * @throws IOException
*/ */
private HRegion createNewHRegion(HTableDescriptor desc, long regionId) private HRegion createNewHRegion(HTableDescriptor desc, long regionId)
throws IOException { throws IOException {
HRegionInfo info = new HRegionInfo(regionId, desc, null, null); HRegionInfo info = new HRegionInfo(regionId, desc, null, null);
Path regionDir = HStoreFile.getHRegionDir(dir, info.regionName); Path regionDir = HStoreFile.getHRegionDir(dir, info.regionName);
fs.mkdirs(regionDir); fs.mkdirs(regionDir);
return new HRegion(dir, new HLog(fs, new Path(regionDir, "log"), conf), fs, return new HRegion(dir, new HLog(fs, new Path(regionDir, "log"), conf), fs,
conf, info, null, null); conf, info, null, null);
} }
/** /**
@ -1168,7 +1168,7 @@ public class HMaster extends HGlobals
public void deleteTable(Text tableName) throws IOException { public void deleteTable(Text tableName) throws IOException {
Text[] columns = { Text[] columns = {
META_COLUMN_FAMILY META_COLUMN_FAMILY
}; };
// We can not access any meta region if they have not already been assigned // We can not access any meta region if they have not already been assigned

14
src/java/org/apache/hadoop/hbase/HMemcache.java
View File

@ -31,10 +31,10 @@ public class HMemcache {
private static final Log LOG = LogFactory.getLog(HMemcache.class); private static final Log LOG = LogFactory.getLog(HMemcache.class);
TreeMap<HStoreKey, BytesWritable> memcache TreeMap<HStoreKey, BytesWritable> memcache
= new TreeMap<HStoreKey, BytesWritable>(); = new TreeMap<HStoreKey, BytesWritable>();
Vector<TreeMap<HStoreKey, BytesWritable>> history Vector<TreeMap<HStoreKey, BytesWritable>> history
= new Vector<TreeMap<HStoreKey, BytesWritable>>(); = new Vector<TreeMap<HStoreKey, BytesWritable>>();
TreeMap<HStoreKey, BytesWritable> snapshot = null; TreeMap<HStoreKey, BytesWritable> snapshot = null;
@ -199,7 +199,7 @@ public class HMemcache {
} }
void internalGetFull(TreeMap<HStoreKey, BytesWritable> map, HStoreKey key, void internalGetFull(TreeMap<HStoreKey, BytesWritable> map, HStoreKey key,
TreeMap<Text, byte[]> results) { TreeMap<Text, byte[]> results) {
SortedMap<HStoreKey, BytesWritable> tailMap = map.tailMap(key); SortedMap<HStoreKey, BytesWritable> tailMap = map.tailMap(key);
@ -208,7 +208,7 @@ public class HMemcache {
Text itCol = itKey.getColumn(); Text itCol = itKey.getColumn();
if(results.get(itCol) == null if(results.get(itCol) == null
&& key.matchesWithoutColumn(itKey)) { && key.matchesWithoutColumn(itKey)) {
BytesWritable val = tailMap.get(itKey); BytesWritable val = tailMap.get(itKey);
results.put(itCol, val.get()); results.put(itCol, val.get());
@ -251,7 +251,7 @@ public class HMemcache {
* Return a scanner over the keys in the HMemcache * Return a scanner over the keys in the HMemcache
*/ */
public HScannerInterface getScanner(long timestamp, Text targetCols[], Text firstRow) public HScannerInterface getScanner(long timestamp, Text targetCols[], Text firstRow)
throws IOException { throws IOException {
return new HMemcacheScanner(timestamp, targetCols, firstRow); return new HMemcacheScanner(timestamp, targetCols, firstRow);
} }
@ -266,8 +266,8 @@ public class HMemcache {
Iterator<HStoreKey> keyIterators[]; Iterator<HStoreKey> keyIterators[];
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public HMemcacheScanner(long timestamp, Text targetCols[], Text firstRow) public HMemcacheScanner(long timestamp, Text targetCols[], Text firstRow)
throws IOException { throws IOException {
super(timestamp, targetCols); super(timestamp, targetCols);

16
src/java/org/apache/hadoop/hbase/HMsg.java
View File

@ -67,13 +67,13 @@ public class HMsg implements Writable {
// Writable // Writable
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeByte(msg); out.writeByte(msg);
info.write(out); info.write(out);
} }
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
this.msg = in.readByte(); this.msg = in.readByte();
this.info.readFields(in); this.info.readFields(in);
} }
} }

4
src/java/org/apache/hadoop/hbase/HRegionInfo.java
View File

@ -38,7 +38,7 @@ public class HRegionInfo implements Writable {
} }
public HRegionInfo(long regionId, HTableDescriptor tableDesc, Text startKey, public HRegionInfo(long regionId, HTableDescriptor tableDesc, Text startKey,
Text endKey) throws IllegalArgumentException { Text endKey) throws IllegalArgumentException {
this.regionId = regionId; this.regionId = regionId;
@ -59,7 +59,7 @@ public class HRegionInfo implements Writable {
} }
this.regionName = new Text(tableDesc.getName() + "_" this.regionName = new Text(tableDesc.getName() + "_"
+ (startKey == null ? "" : startKey.toString()) + "_" + regionId); + (startKey == null ? "" : startKey.toString()) + "_" + regionId);
} }
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////

76
src/java/org/apache/hadoop/hbase/HRegionServer.java
View File

@ -111,7 +111,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
Text tableToUpdate Text tableToUpdate
= (oldRegion.find(META_TABLE_NAME.toString()) == 0) = (oldRegion.find(META_TABLE_NAME.toString()) == 0)
? ROOT_TABLE_NAME : META_TABLE_NAME; ? ROOT_TABLE_NAME : META_TABLE_NAME;
client.openTable(tableToUpdate); client.openTable(tableToUpdate);
long lockid = client.startUpdate(oldRegion); long lockid = client.startUpdate(oldRegion);
@ -249,13 +249,13 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
/** Start a HRegionServer at the default location */ /** Start a HRegionServer at the default location */
public HRegionServer(Configuration conf) throws IOException { public HRegionServer(Configuration conf) throws IOException {
this(new Path(conf.get(HREGION_DIR, DEFAULT_HREGION_DIR)), this(new Path(conf.get(HREGION_DIR, DEFAULT_HREGION_DIR)),
new HServerAddress(conf.get("hbase.regionserver.default.name")), new HServerAddress(conf.get("hbase.regionserver.default.name")),
conf); conf);
} }
/** Start a HRegionServer at an indicated location */ /** Start a HRegionServer at an indicated location */
public HRegionServer(Path regionDir, HServerAddress address, Configuration conf) public HRegionServer(Path regionDir, HServerAddress address, Configuration conf)
throws IOException { throws IOException {
// Basic setup // Basic setup
@ -302,10 +302,10 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
// Remote HMaster // Remote HMaster
this.hbaseMaster = (HMasterRegionInterface) this.hbaseMaster = (HMasterRegionInterface)
RPC.waitForProxy(HMasterRegionInterface.class, RPC.waitForProxy(HMasterRegionInterface.class,
HMasterRegionInterface.versionId, HMasterRegionInterface.versionId,
new HServerAddress(conf.get(MASTER_DEFAULT_NAME)).getInetSocketAddress(), new HServerAddress(conf.get(MASTER_DEFAULT_NAME)).getInetSocketAddress(),
conf); conf);
// Threads // Threads
@ -313,12 +313,12 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
this.splitCheckerThread.start(); this.splitCheckerThread.start();
this.logRollerThread.start(); this.logRollerThread.start();
this.leases = new Leases(conf.getLong("hbase.hregionserver.lease.period", this.leases = new Leases(conf.getLong("hbase.hregionserver.lease.period",
3 * 60 * 1000), threadWakeFrequency); 3 * 60 * 1000), threadWakeFrequency);
// Server // Server
this.server = RPC.getServer(this, address.getBindAddress().toString(), this.server = RPC.getServer(this, address.getBindAddress().toString(),
address.getPort(), conf.getInt("hbase.hregionserver.handler.count", 10), false, conf); address.getPort(), conf.getInt("hbase.hregionserver.handler.count", 10), false, conf);
this.server.start(); this.server.start();
} catch(IOException e) { } catch(IOException e) {
@ -523,7 +523,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
} }
private void closeRegion(HRegionInfo info, boolean reportWhenCompleted) private void closeRegion(HRegionInfo info, boolean reportWhenCompleted)
throws IOException { throws IOException {
locking.obtainWriteLock(); locking.obtainWriteLock();
try { try {
@ -580,24 +580,24 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
* *
* For now, we do not do merging. Splits are driven by the HRegionServer. * For now, we do not do merging. Splits are driven by the HRegionServer.
****************************************************************************/ ****************************************************************************/
/* /*
private void mergeRegions(Text regionNameA, Text regionNameB) throws IOException { private void mergeRegions(Text regionNameA, Text regionNameB) throws IOException {
locking.obtainWriteLock(); locking.obtainWriteLock();
try { try {
HRegion srcA = regions.remove(regionNameA); HRegion srcA = regions.remove(regionNameA);
HRegion srcB = regions.remove(regionNameB); HRegion srcB = regions.remove(regionNameB);
HRegion newRegion = HRegion.closeAndMerge(srcA, srcB); HRegion newRegion = HRegion.closeAndMerge(srcA, srcB);
regions.put(newRegion.getRegionName(), newRegion); regions.put(newRegion.getRegionName(), newRegion);
reportClose(srcA); reportClose(srcA);
reportClose(srcB); reportClose(srcB);
reportOpen(newRegion); reportOpen(newRegion);
} finally { } finally {
locking.releaseWriteLock(); locking.releaseWriteLock();
} }
} }
*/ */
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// HRegionInterface // HRegionInterface
@ -614,7 +614,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
/** Start a scanner for a given HRegion. */ /** Start a scanner for a given HRegion. */
public HScannerInterface openScanner(Text regionName, Text[] cols, public HScannerInterface openScanner(Text regionName, Text[] cols,
Text firstRow) throws IOException { Text firstRow) throws IOException {
HRegion r = getRegion(regionName); HRegion r = getRegion(regionName);
if(r == null) { if(r == null) {
@ -639,7 +639,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
/** Get multiple versions of the indicated row/col */ /** Get multiple versions of the indicated row/col */
public BytesWritable[] get(Text regionName, Text row, Text column, public BytesWritable[] get(Text regionName, Text row, Text column,
int numVersions) throws IOException { int numVersions) throws IOException {
HRegion region = getRegion(regionName); HRegion region = getRegion(regionName);
if(region == null) { if(region == null) {
@ -661,7 +661,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
/** Get multiple timestamped versions of the indicated row/col */ /** Get multiple timestamped versions of the indicated row/col */
public BytesWritable[] get(Text regionName, Text row, Text column, public BytesWritable[] get(Text regionName, Text row, Text column,
long timestamp, int numVersions) throws IOException { long timestamp, int numVersions) throws IOException {
HRegion region = getRegion(regionName); HRegion region = getRegion(regionName);
if(region == null) { if(region == null) {
@ -723,7 +723,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
} }
public long startUpdate(Text regionName, long clientid, Text row) public long startUpdate(Text regionName, long clientid, Text row)
throws IOException { throws IOException {
HRegion region = getRegion(regionName); HRegion region = getRegion(regionName);
if(region == null) { if(region == null) {
@ -732,15 +732,15 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
long lockid = region.startUpdate(row); long lockid = region.startUpdate(row);
leases.createLease(new Text(String.valueOf(clientid)), leases.createLease(new Text(String.valueOf(clientid)),
new Text(String.valueOf(lockid)), new Text(String.valueOf(lockid)),
new RegionListener(region, lockid)); new RegionListener(region, lockid));
return lockid; return lockid;
} }
/** Add something to the HBase. */ /** Add something to the HBase. */
public void put(Text regionName, long clientid, long lockid, Text column, public void put(Text regionName, long clientid, long lockid, Text column,
BytesWritable val) throws IOException { BytesWritable val) throws IOException {
HRegion region = getRegion(regionName); HRegion region = getRegion(regionName);
if(region == null) { if(region == null) {
@ -748,14 +748,14 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
} }
leases.renewLease(new Text(String.valueOf(clientid)), leases.renewLease(new Text(String.valueOf(clientid)),
new Text(String.valueOf(lockid))); new Text(String.valueOf(lockid)));
region.put(lockid, column, val.get()); region.put(lockid, column, val.get());
} }
/** Remove a cell from the HBase. */ /** Remove a cell from the HBase. */
public void delete(Text regionName, long clientid, long lockid, Text column) public void delete(Text regionName, long clientid, long lockid, Text column)
throws IOException { throws IOException {
HRegion region = getRegion(regionName); HRegion region = getRegion(regionName);
if(region == null) { if(region == null) {
@ -763,14 +763,14 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
} }
leases.renewLease(new Text(String.valueOf(clientid)), leases.renewLease(new Text(String.valueOf(clientid)),
new Text(String.valueOf(lockid))); new Text(String.valueOf(lockid)));
region.delete(lockid, column); region.delete(lockid, column);
} }
/** Abandon the transaction */ /** Abandon the transaction */
public void abort(Text regionName, long clientid, long lockid) public void abort(Text regionName, long clientid, long lockid)
throws IOException { throws IOException {
HRegion region = getRegion(regionName); HRegion region = getRegion(regionName);
if(region == null) { if(region == null) {
@ -778,14 +778,14 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
} }
leases.cancelLease(new Text(String.valueOf(clientid)), leases.cancelLease(new Text(String.valueOf(clientid)),
new Text(String.valueOf(lockid))); new Text(String.valueOf(lockid)));
region.abort(lockid); region.abort(lockid);
} }
/** Confirm the transaction */ /** Confirm the transaction */
public void commit(Text regionName, long clientid, long lockid) public void commit(Text regionName, long clientid, long lockid)
throws IOException { throws IOException {
HRegion region = getRegion(regionName); HRegion region = getRegion(regionName);
if(region == null) { if(region == null) {
@ -793,7 +793,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
} }
leases.cancelLease(new Text(String.valueOf(clientid)), leases.cancelLease(new Text(String.valueOf(clientid)),
new Text(String.valueOf(lockid))); new Text(String.valueOf(lockid)));
region.commit(lockid); region.commit(lockid);
} }
@ -801,7 +801,7 @@ public class HRegionServer implements HConstants, HRegionInterface, Runnable {
/** Don't let the client's lease expire just yet... */ /** Don't let the client's lease expire just yet... */
public void renewLease(long lockid, long clientid) throws IOException { public void renewLease(long lockid, long clientid) throws IOException {
leases.renewLease(new Text(String.valueOf(clientid)), leases.renewLease(new Text(String.valueOf(clientid)),
new Text(String.valueOf(lockid))); new Text(String.valueOf(lockid)));
} }
/** Private utility method for safely obtaining an HRegion handle. */ /** Private utility method for safely obtaining an HRegion handle. */

24
src/java/org/apache/hadoop/hbase/HStore.java
View File

@ -88,7 +88,7 @@ public class HStore {
* will be deleted (by whoever has instantiated the HStore). * will be deleted (by whoever has instantiated the HStore).
*/ */
public HStore(Path dir, Text regionName, Text colFamily, int maxVersions, public HStore(Path dir, Text regionName, Text colFamily, int maxVersions,
FileSystem fs, Path reconstructionLog, Configuration conf) throws IOException { FileSystem fs, Path reconstructionLog, Configuration conf) throws IOException {
this.dir = dir; this.dir = dir;
this.regionName = regionName; this.regionName = regionName;
@ -174,7 +174,7 @@ public class HStore {
continue; continue;
} }
reconstructedCache.put(new HStoreKey(key.getRow(), val.getColumn(), reconstructedCache.put(new HStoreKey(key.getRow(), val.getColumn(),
val.getTimestamp()), val.getVal()); val.getTimestamp()), val.getVal());
} }
} finally { } finally {
@ -252,13 +252,13 @@ public class HStore {
* Return the entire list of HStoreFiles currently used by the HStore. * Return the entire list of HStoreFiles currently used by the HStore.
*/ */
public Vector<HStoreFile> flushCache(TreeMap<HStoreKey, BytesWritable> inputCache, public Vector<HStoreFile> flushCache(TreeMap<HStoreKey, BytesWritable> inputCache,
long logCacheFlushId) throws IOException { long logCacheFlushId) throws IOException {
return flushCacheHelper(inputCache, logCacheFlushId, true); return flushCacheHelper(inputCache, logCacheFlushId, true);
} }
Vector<HStoreFile> flushCacheHelper(TreeMap<HStoreKey, BytesWritable> inputCache, Vector<HStoreFile> flushCacheHelper(TreeMap<HStoreKey, BytesWritable> inputCache,
long logCacheFlushId, boolean addToAvailableMaps) throws IOException { long logCacheFlushId, boolean addToAvailableMaps) throws IOException {
synchronized(flushLock) { synchronized(flushLock) {
LOG.debug("flushing HStore " + this.regionName + "/" + this.colFamily); LOG.debug("flushing HStore " + this.regionName + "/" + this.colFamily);
@ -270,7 +270,7 @@ public class HStore {
Path mapfile = flushedFile.getMapFilePath(); Path mapfile = flushedFile.getMapFilePath();
MapFile.Writer out = new MapFile.Writer(conf, fs, mapfile.toString(), MapFile.Writer out = new MapFile.Writer(conf, fs, mapfile.toString(),
HStoreKey.class, BytesWritable.class); HStoreKey.class, BytesWritable.class);
try { try {
for(Iterator<HStoreKey> it = inputCache.keySet().iterator(); it.hasNext(); ) { for(Iterator<HStoreKey> it = inputCache.keySet().iterator(); it.hasNext(); ) {
@ -392,8 +392,8 @@ public class HStore {
// Step through them, writing to the brand-new TreeMap // Step through them, writing to the brand-new TreeMap
MapFile.Writer compactedOut = new MapFile.Writer(conf, fs, MapFile.Writer compactedOut = new MapFile.Writer(conf, fs,
compactedOutputFile.getMapFilePath().toString(), HStoreKey.class, compactedOutputFile.getMapFilePath().toString(), HStoreKey.class,
BytesWritable.class); BytesWritable.class);
try { try {
@ -464,7 +464,7 @@ public class HStore {
HStoreKey sk = keys[smallestKey]; HStoreKey sk = keys[smallestKey];
if(lastRow.equals(sk.getRow()) if(lastRow.equals(sk.getRow())
&& lastColumn.equals(sk.getColumn())) { && lastColumn.equals(sk.getColumn())) {
timesSeen++; timesSeen++;
@ -478,7 +478,7 @@ public class HStore {
// Then just skip them. // Then just skip them.
if(sk.getRow().getLength() != 0 if(sk.getRow().getLength() != 0
&& sk.getColumn().getLength() != 0) { && sk.getColumn().getLength() != 0) {
// Only write out objects which have a non-zero length key and value // Only write out objects which have a non-zero length key and value
@ -683,7 +683,7 @@ public class HStore {
mapFiles.put(orderVal, finalCompactedFile); mapFiles.put(orderVal, finalCompactedFile);
maps.put(orderVal, new MapFile.Reader(fs, maps.put(orderVal, new MapFile.Reader(fs,
finalCompactedFile.getMapFilePath().toString(), conf)); finalCompactedFile.getMapFilePath().toString(), conf));
} finally { } finally {
@ -721,7 +721,7 @@ public class HStore {
do { do {
Text readcol = readkey.getColumn(); Text readcol = readkey.getColumn();
if(results.get(readcol) == null if(results.get(readcol) == null
&& key.matchesWithoutColumn(readkey)) { && key.matchesWithoutColumn(readkey)) {
results.put(new Text(readcol), readval.get()); results.put(new Text(readcol), readval.get());
readval = new BytesWritable(); readval = new BytesWritable();
@ -850,7 +850,7 @@ public class HStore {
* These should be closed after the user is done with them. * These should be closed after the user is done with them.
*/ */
public HScannerInterface getScanner(long timestamp, Text targetCols[], public HScannerInterface getScanner(long timestamp, Text targetCols[],
Text firstRow) throws IOException { Text firstRow) throws IOException {
return new HStoreScanner(timestamp, targetCols, firstRow); return new HStoreScanner(timestamp, targetCols, firstRow);
} }

26
src/java/org/apache/hadoop/hbase/HStoreFile.java
View File

@ -61,7 +61,7 @@ public class HStoreFile implements HConstants, WritableComparable {
} }
public HStoreFile(Configuration conf, Path dir, Text regionName, public HStoreFile(Configuration conf, Path dir, Text regionName,
Text colFamily, long fileId) { Text colFamily, long fileId) {
this.conf = conf; this.conf = conf;
this.dir = dir; this.dir = dir;
@ -92,12 +92,12 @@ public class HStoreFile implements HConstants, WritableComparable {
public Path getMapFilePath() { public Path getMapFilePath() {
return new Path(HStoreFile.getMapDir(dir, regionName, colFamily), return new Path(HStoreFile.getMapDir(dir, regionName, colFamily),
HSTORE_DATFILE_PREFIX + fileId); HSTORE_DATFILE_PREFIX + fileId);
} }
public Path getInfoFilePath() { public Path getInfoFilePath() {
return new Path(HStoreFile.getInfoDir(dir, regionName, colFamily), return new Path(HStoreFile.getInfoDir(dir, regionName, colFamily),
HSTORE_INFOFILE_PREFIX + fileId); HSTORE_INFOFILE_PREFIX + fileId);
} }
// Static methods to build partial paths to internal directories. Useful for // Static methods to build partial paths to internal directories. Useful for
@ -105,17 +105,17 @@ public class HStoreFile implements HConstants, WritableComparable {
public static Path getMapDir(Path dir, Text regionName, Text colFamily) { public static Path getMapDir(Path dir, Text regionName, Text colFamily) {
return new Path(dir, new Path(HREGIONDIR_PREFIX + regionName, return new Path(dir, new Path(HREGIONDIR_PREFIX + regionName,
new Path(colFamily.toString(), HSTORE_DATFILE_DIR))); new Path(colFamily.toString(), HSTORE_DATFILE_DIR)));
} }
public static Path getInfoDir(Path dir, Text regionName, Text colFamily) { public static Path getInfoDir(Path dir, Text regionName, Text colFamily) {
return new Path(dir, new Path(HREGIONDIR_PREFIX + regionName, return new Path(dir, new Path(HREGIONDIR_PREFIX + regionName,
new Path(colFamily.toString(), HSTORE_INFO_DIR))); new Path(colFamily.toString(), HSTORE_INFO_DIR)));
} }
public static Path getHStoreDir(Path dir, Text regionName, Text colFamily) { public static Path getHStoreDir(Path dir, Text regionName, Text colFamily) {
return new Path(dir, new Path(HREGIONDIR_PREFIX + regionName, return new Path(dir, new Path(HREGIONDIR_PREFIX + regionName,
colFamily.toString())); colFamily.toString()));
} }
public static Path getHRegionDir(Path dir, Text regionName) { public static Path getHRegionDir(Path dir, Text regionName) {
@ -127,7 +127,7 @@ public class HStoreFile implements HConstants, WritableComparable {
* filesystem if the file already exists. * filesystem if the file already exists.
*/ */
static HStoreFile obtainNewHStoreFile(Configuration conf, Path dir, static HStoreFile obtainNewHStoreFile(Configuration conf, Path dir,
Text regionName, Text colFamily, FileSystem fs) throws IOException { Text regionName, Text colFamily, FileSystem fs) throws IOException {
Path mapdir = HStoreFile.getMapDir(dir, regionName, colFamily); Path mapdir = HStoreFile.getMapDir(dir, regionName, colFamily);
long fileId = Math.abs(rand.nextLong()); long fileId = Math.abs(rand.nextLong());
@ -149,7 +149,7 @@ public class HStoreFile implements HConstants, WritableComparable {
* If only one exists, we'll delete it. * If only one exists, we'll delete it.
*/ */
static Vector<HStoreFile> loadHStoreFiles(Configuration conf, Path dir, static Vector<HStoreFile> loadHStoreFiles(Configuration conf, Path dir,
Text regionName, Text colFamily, FileSystem fs) throws IOException { Text regionName, Text colFamily, FileSystem fs) throws IOException {
Vector<HStoreFile> results = new Vector<HStoreFile>(); Vector<HStoreFile> results = new Vector<HStoreFile>();
Path mapdir = HStoreFile.getMapDir(dir, regionName, colFamily); Path mapdir = HStoreFile.getMapDir(dir, regionName, colFamily);
@ -200,18 +200,18 @@ public class HStoreFile implements HConstants, WritableComparable {
* brand-new HRegions. * brand-new HRegions.
*/ */
public void splitStoreFile(Text midKey, HStoreFile dstA, HStoreFile dstB, public void splitStoreFile(Text midKey, HStoreFile dstA, HStoreFile dstB,
FileSystem fs, Configuration conf) throws IOException { FileSystem fs, Configuration conf) throws IOException {
// Copy the appropriate tuples to one MapFile or the other. // Copy the appropriate tuples to one MapFile or the other.
MapFile.Reader in = new MapFile.Reader(fs, getMapFilePath().toString(), conf); MapFile.Reader in = new MapFile.Reader(fs, getMapFilePath().toString(), conf);
try { try {
MapFile.Writer outA = new MapFile.Writer(conf, fs, MapFile.Writer outA = new MapFile.Writer(conf, fs,
dstA.getMapFilePath().toString(), HStoreKey.class, BytesWritable.class); dstA.getMapFilePath().toString(), HStoreKey.class, BytesWritable.class);
try { try {
MapFile.Writer outB = new MapFile.Writer(conf, fs, MapFile.Writer outB = new MapFile.Writer(conf, fs,
dstB.getMapFilePath().toString(), HStoreKey.class, BytesWritable.class); dstB.getMapFilePath().toString(), HStoreKey.class, BytesWritable.class);
try { try {
HStoreKey readkey = new HStoreKey(); HStoreKey readkey = new HStoreKey();
@ -252,12 +252,12 @@ public class HStoreFile implements HConstants, WritableComparable {
* We are merging multiple regions into a single new one. * We are merging multiple regions into a single new one.
*/ */
public void mergeStoreFiles(Vector<HStoreFile> srcFiles, FileSystem fs, public void mergeStoreFiles(Vector<HStoreFile> srcFiles, FileSystem fs,
Configuration conf) throws IOException { Configuration conf) throws IOException {
// Copy all the source MapFile tuples into this HSF's MapFile // Copy all the source MapFile tuples into this HSF's MapFile
MapFile.Writer out = new MapFile.Writer(conf, fs, getMapFilePath().toString(), MapFile.Writer out = new MapFile.Writer(conf, fs, getMapFilePath().toString(),
HStoreKey.class, BytesWritable.class); HStoreKey.class, BytesWritable.class);
try { try {
for(Iterator<HStoreFile> it = srcFiles.iterator(); it.hasNext(); ) { for(Iterator<HStoreFile> it = srcFiles.iterator(); it.hasNext(); ) {

4
src/java/org/apache/hadoop/hbase/HStoreKey.java
View File

@ -95,7 +95,7 @@ public class HStoreKey implements WritableComparable {
public boolean matchesRowCol(HStoreKey other) { public boolean matchesRowCol(HStoreKey other) {
if(this.row.compareTo(other.row) == 0 && if(this.row.compareTo(other.row) == 0 &&
this.column.compareTo(other.column) == 0) { this.column.compareTo(other.column) == 0) {
return true; return true;
} else { } else {
@ -105,7 +105,7 @@ public class HStoreKey implements WritableComparable {
public boolean matchesWithoutColumn(HStoreKey other) { public boolean matchesWithoutColumn(HStoreKey other) {
if((this.row.compareTo(other.row) == 0) && if((this.row.compareTo(other.row) == 0) &&
(this.timestamp >= other.getTimestamp())) { (this.timestamp >= other.getTimestamp())) {
return true; return true;
} else { } else {

2
src/java/org/apache/hadoop/hbase/Leases.java
View File

@ -137,7 +137,7 @@ public class Leases {
synchronized(sortedLeases) { synchronized(sortedLeases) {
Lease top; Lease top;
while((sortedLeases.size() > 0) while((sortedLeases.size() > 0)
&& ((top = sortedLeases.first()) != null)) { && ((top = sortedLeases.first()) != null)) {
if(top.shouldExpire()) { if(top.shouldExpire()) {
leases.remove(top.getLeaseId()); leases.remove(top.getLeaseId());

76
src/test/org/apache/hadoop/hbase/TestHRegion.java
View File

@ -103,7 +103,7 @@ public class TestHRegion extends TestCase {
rootLogger.setLevel(Level.WARN); rootLogger.setLevel(Level.WARN);
PatternLayout consoleLayout PatternLayout consoleLayout
= (PatternLayout)rootLogger.getAppender("console").getLayout(); = (PatternLayout)rootLogger.getAppender("console").getLayout();
consoleLayout.setConversionPattern("%d %-5p [%t] %l: %m%n"); consoleLayout.setConversionPattern("%d %-5p [%t] %l: %m%n");
Logger.getLogger("org.apache.hadoop.hbase").setLevel(Environment.logLevel); Logger.getLogger("org.apache.hadoop.hbase").setLevel(Environment.logLevel);
@ -121,7 +121,7 @@ public class TestHRegion extends TestCase {
desc.addFamily(new Text("contents")); desc.addFamily(new Text("contents"));
desc.addFamily(new Text("anchor")); desc.addFamily(new Text("anchor"));
region = new HRegion(parentdir, log, fs, conf, region = new HRegion(parentdir, log, fs, conf,
new HRegionInfo(1, desc, null, null), null, oldlogfile); new HRegionInfo(1, desc, null, null), null, oldlogfile);
} catch(IOException e) { } catch(IOException e) {
failures = true; failures = true;
@ -160,27 +160,27 @@ public class TestHRegion extends TestCase {
String bodystr = new String(bodydata).toString().trim(); String bodystr = new String(bodydata).toString().trim();
String teststr = CONTENTSTR + k; String teststr = CONTENTSTR + k;
assertEquals("Incorrect value for key: (" + rowlabel + "," + CONTENTS_BASIC assertEquals("Incorrect value for key: (" + rowlabel + "," + CONTENTS_BASIC
+ "), expected: '" + teststr + "' got: '" + bodystr + "'", + "), expected: '" + teststr + "' got: '" + bodystr + "'",
bodystr, teststr); bodystr, teststr);
collabel = new Text(ANCHORNUM + k); collabel = new Text(ANCHORNUM + k);
bodydata = region.get(rowlabel, collabel); bodydata = region.get(rowlabel, collabel);
bodystr = new String(bodydata).toString().trim(); bodystr = new String(bodydata).toString().trim();
teststr = ANCHORSTR + k; teststr = ANCHORSTR + k;
assertEquals("Incorrect value for key: (" + rowlabel + "," + collabel assertEquals("Incorrect value for key: (" + rowlabel + "," + collabel
+ "), expected: '" + teststr + "' got: '" + bodystr + "'", + "), expected: '" + teststr + "' got: '" + bodystr + "'",
bodystr, teststr); bodystr, teststr);
/* /*
// Check to make sure that null values are actually null // Check to make sure that null values are actually null
for (int j = 0; j < Math.min(15, NUM_VALS); j++) { for (int j = 0; j < Math.min(15, NUM_VALS); j++) {
if (k != j) { if (k != j) {
collabel = new Text(ANCHORNUM + j); collabel = new Text(ANCHORNUM + j);
byte results[] = region.get(rowlabel, collabel); byte results[] = region.get(rowlabel, collabel);
if (results != null) { if (results != null) {
throw new IOException("Found incorrect value at [" + rowlabel + ", " + collabel + "] == " + new String(results).toString().trim()); throw new IOException("Found incorrect value at [" + rowlabel + ", " + collabel + "] == " + new String(results).toString().trim());
}
}
} }
*/ }
}
*/
} }
} catch(IOException e) { } catch(IOException e) {
failures = true; failures = true;
@ -196,8 +196,8 @@ public class TestHRegion extends TestCase {
} }
Text cols[] = new Text[] { Text cols[] = new Text[] {
CONTENTS_FIRSTCOL, CONTENTS_FIRSTCOL,
ANCHOR_SECONDCOL ANCHOR_SECONDCOL
}; };
// Test the Scanner!!! // Test the Scanner!!!
@ -233,8 +233,8 @@ public class TestHRegion extends TestCase {
for(int j = 0; j < cols.length; j++) { for(int j = 0; j < cols.length; j++) {
if(col.compareTo(cols[j]) == 0) { if(col.compareTo(cols[j]) == 0) {
assertEquals("Error at:" + curKey.getRow() + "/" + curKey.getTimestamp() assertEquals("Error at:" + curKey.getRow() + "/" + curKey.getTimestamp()
+ ", Value for " + col + " should be: " + k + ", Value for " + col + " should be: " + k
+ ", but was fetched as: " + curval, k, curval); + ", but was fetched as: " + curval, k, curval);
numFetched++; numFetched++;
} }
} }
@ -266,8 +266,8 @@ public class TestHRegion extends TestCase {
for(int j = 0; j < cols.length; j++) { for(int j = 0; j < cols.length; j++) {
if(col.compareTo(cols[j]) == 0) { if(col.compareTo(cols[j]) == 0) {
assertEquals("Error at:" + curKey.getRow() + "/" + curKey.getTimestamp() assertEquals("Error at:" + curKey.getRow() + "/" + curKey.getTimestamp()
+ ", Value for " + col + " should be: " + k + ", Value for " + col + " should be: " + k
+ ", but was fetched as: " + curval, k, curval); + ", but was fetched as: " + curval, k, curval);
numFetched++; numFetched++;
} }
} }
@ -307,8 +307,8 @@ public class TestHRegion extends TestCase {
for(int j = 0; j < cols.length; j++) { for(int j = 0; j < cols.length; j++) {
if(col.compareTo(cols[j]) == 0) { if(col.compareTo(cols[j]) == 0) {
assertEquals("Error at:" + curKey.getRow() + "/" + curKey.getTimestamp() assertEquals("Error at:" + curKey.getRow() + "/" + curKey.getTimestamp()
+ ", Value for " + col + " should be: " + k + ", Value for " + col + " should be: " + k
+ ", but was fetched as: " + curval, k, curval); + ", but was fetched as: " + curval, k, curval);
numFetched++; numFetched++;
} }
} }
@ -340,7 +340,7 @@ public class TestHRegion extends TestCase {
for (int j = 0; j < cols.length; j++) { for (int j = 0; j < cols.length; j++) {
if (col.compareTo(cols[j]) == 0) { if (col.compareTo(cols[j]) == 0) {
assertEquals("Value for " + col + " should be: " + k assertEquals("Value for " + col + " should be: " + k
+ ", but was fetched as: " + curval, curval, k); + ", but was fetched as: " + curval, curval, k);
numFetched++; numFetched++;
} }
} }
@ -370,7 +370,7 @@ public class TestHRegion extends TestCase {
for (int j = 0; j < cols.length; j++) { for (int j = 0; j < cols.length; j++) {
if (col.compareTo(cols[j]) == 0) { if (col.compareTo(cols[j]) == 0) {
assertEquals("Value for " + col + " should be: " + k assertEquals("Value for " + col + " should be: " + k
+ ", but was fetched as: " + curval, curval, k); + ", but was fetched as: " + curval, curval, k);
numFetched++; numFetched++;
} }
} }
@ -511,8 +511,8 @@ public class TestHRegion extends TestCase {
// First verify the data written by testBasic() // First verify the data written by testBasic()
Text[] cols = new Text[] { Text[] cols = new Text[] {
new Text(ANCHORNUM + "[0-9]+"), new Text(ANCHORNUM + "[0-9]+"),
new Text(CONTENTS_BASIC) new Text(CONTENTS_BASIC)
}; };
HScannerInterface s = region.getScanner(cols, new Text()); HScannerInterface s = region.getScanner(cols, new Text());
@ -532,16 +532,16 @@ public class TestHRegion extends TestCase {
if(col.compareTo(CONTENTS_BASIC) == 0) { if(col.compareTo(CONTENTS_BASIC) == 0) {
assertTrue("Error at:" + curKey.getRow() + "/" + curKey.getTimestamp() assertTrue("Error at:" + curKey.getRow() + "/" + curKey.getTimestamp()
+ ", Value for " + col + " should start with: " + CONTENTSTR + ", Value for " + col + " should start with: " + CONTENTSTR
+ ", but was fetched as: " + curval, + ", but was fetched as: " + curval,
curval.startsWith(CONTENTSTR)); curval.startsWith(CONTENTSTR));
contentsFetched++; contentsFetched++;
} else if(col.toString().startsWith(ANCHORNUM)) { } else if(col.toString().startsWith(ANCHORNUM)) {
assertTrue("Error at:" + curKey.getRow() + "/" + curKey.getTimestamp() assertTrue("Error at:" + curKey.getRow() + "/" + curKey.getTimestamp()
+ ", Value for " + col + " should start with: " + ANCHORSTR + ", Value for " + col + " should start with: " + ANCHORSTR
+ ", but was fetched as: " + curval, + ", but was fetched as: " + curval,
curval.startsWith(ANCHORSTR)); curval.startsWith(ANCHORSTR));
anchorFetched++; anchorFetched++;
} else { } else {
@ -561,8 +561,8 @@ public class TestHRegion extends TestCase {
// Verify testScan data // Verify testScan data
cols = new Text[] { cols = new Text[] {
CONTENTS_FIRSTCOL, CONTENTS_FIRSTCOL,
ANCHOR_SECONDCOL ANCHOR_SECONDCOL
}; };
s = region.getScanner(cols, new Text()); s = region.getScanner(cols, new Text());
@ -580,7 +580,7 @@ public class TestHRegion extends TestCase {
for (int j = 0; j < cols.length; j++) { for (int j = 0; j < cols.length; j++) {
if (col.compareTo(cols[j]) == 0) { if (col.compareTo(cols[j]) == 0) {
assertEquals("Value for " + col + " should be: " + k assertEquals("Value for " + col + " should be: " + k
+ ", but was fetched as: " + curval, curval, k); + ", but was fetched as: " + curval, curval, k);
numFetched++; numFetched++;
} }
} }
@ -625,7 +625,7 @@ public class TestHRegion extends TestCase {
// Test a scanner which only specifies the column family name // Test a scanner which only specifies the column family name
cols = new Text[] { cols = new Text[] {
new Text("anchor:") new Text("anchor:")
}; };
s = region.getScanner(cols, new Text()); s = region.getScanner(cols, new Text());
@ -672,5 +672,5 @@ public class TestHRegion extends TestCase {
deleteFile(new File(System.getProperty("test.build.data"), "dfs")); deleteFile(new File(System.getProperty("test.build.data"), "dfs"));
} }
} }