Index: src/main/java/org/apache/hadoop/hbase/HConstants.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/HConstants.java (revision 1172056) +++ src/main/java/org/apache/hadoop/hbase/HConstants.java (working copy) @@ -188,6 +188,11 @@ /** The metaupdated column qualifier */ public static final byte [] META_MIGRATION_QUALIFIER = Bytes.toBytes("metamigrated"); + /** version for metaupdated column where HTD is attached to HRI (pre-0.92)*/ + public static final byte [] HTD_IN_HRI_VERSION = Bytes.toBytes((short)0); + + /** version for metaupdated column where HTD is detached from HRI */ + public static final byte [] NO_HTD_IN_HRI_VERSION = Bytes.toBytes((short)1); /** Default maximum file size */ public static final long DEFAULT_MAX_FILE_SIZE = 256 * 1024 * 1024; Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1172056) +++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy) @@ -512,8 +512,8 @@ { byte[] metaMigrated = r.getValue(HConstants.CATALOG_FAMILY, HConstants.META_MIGRATION_QUALIFIER); - String migrated = Bytes.toString(metaMigrated); - metaUpdated = new Boolean(migrated).booleanValue(); + metaUpdated = Bytes.compareTo(metaMigrated, + HConstants.NO_HTD_IN_HRI_VERSION) == 0; } else { LOG.info("metaUpdated = NULL."); } Index: src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java (revision 1172056) +++ src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java (working copy) @@ -369,16 +369,10 @@ return info; } - private static Put addMetaUpdateStatus(final Put p) { - p.add(HConstants.CATALOG_FAMILY, HConstants.META_MIGRATION_QUALIFIER, - Bytes.toBytes("true")); - return p; - } - - private static Put addMetaUpdateStatus(final Put p, final boolean metaUpdated) { p.add(HConstants.CATALOG_FAMILY, HConstants.META_MIGRATION_QUALIFIER, - Bytes.toBytes(metaUpdated)); + metaUpdated ? HConstants.NO_HTD_IN_HRI_VERSION : + HConstants.HTD_IN_HRI_VERSION); return p; }