Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStoreFile.java =================================================================== --- src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStoreFile.java (revision 605384) +++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStoreFile.java (working copy) @@ -493,10 +493,7 @@ } FSDataOutputStream out = fs.create(p); try { - out.writeUTF(getReference().getEncodedRegionName()); - getReference().getMidkey().write(out); - out.writeLong(getReference().getFileId()); - out.writeBoolean(isTopFileRegion(getReference().getFileRegion())); + reference.write(out); } finally { out.close(); } @@ -507,19 +504,14 @@ */ static Reference readSplitInfo(final Path p, final FileSystem fs) throws IOException { - Reference r = null; FSDataInputStream in = fs.open(p); try { - String rn = in.readUTF(); - HStoreKey midkey = new HStoreKey(); - midkey.readFields(in); - long fid = in.readLong(); - boolean tmp = in.readBoolean(); - r = new Reference(rn, fid, midkey, tmp? Range.top: Range.bottom); + Reference r = new Reference(); + r.readFields(in); + return r; } finally { in.close(); } - return r; } private void createOrFail(final FileSystem fs, final Path p) Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java =================================================================== --- src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java (revision 605384) +++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java (working copy) @@ -343,6 +343,8 @@ b.delete(lockid, COL_REGIONINFO); b.delete(lockid, COL_SERVER); b.delete(lockid, COL_STARTCODE); + b.delete(lockid, COL_SPLITA); + b.delete(lockid, COL_SPLITB); srvr.batchUpdate(metaRegionName, System.currentTimeMillis(), b); result = true; } else if (LOG.isDebugEnabled()) {