From 1bf0e281673af65ed5e9928a595fac07302c49b5 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Wed, 22 Jul 2009 19:39:28 +0000
Subject: [PATCH] HBASE-1215 migration; metautils scan of meta region was
 broken; wouldn't see first row

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@796856 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/hadoop/hbase/HTableDescriptor.java | 7 +++++++
 src/java/org/apache/hadoop/hbase/util/Migrate.java     | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/java/org/apache/hadoop/hbase/HTableDescriptor.java b/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
index f580563b261..ecfa9b0b4b0 100644
--- a/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
+++ b/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
@@ -350,6 +350,13 @@ ISerializable {
     setValue(Bytes.toBytes(key), Bytes.toBytes(value));
   }
 
+  /**
+   * @param key Key whose key and value we're to remove from HTD parameters.
+   */
+  public void remove(final byte [] key) {
+    values.remove(new ImmutableBytesWritable(key));
+  }
+
   /**
    * @return true if all columns in the table should be read only
    */
diff --git a/src/java/org/apache/hadoop/hbase/util/Migrate.java b/src/java/org/apache/hadoop/hbase/util/Migrate.java
index d5ded12a668..e6e6b72b734 100644
--- a/src/java/org/apache/hadoop/hbase/util/Migrate.java
+++ b/src/java/org/apache/hadoop/hbase/util/Migrate.java
@@ -427,14 +427,14 @@ public class Migrate extends Configured implements Tool {
       hri.getTableDesc().setMemStoreFlushSize(catalogMemStoreFlushSize);
       result = true;
     }
+    // Remove the old MEMCACHE_FLUSHSIZE if present
+    hri.getTableDesc().remove(Bytes.toBytes("MEMCACHE_FLUSHSIZE"));
     for (HColumnDescriptor hcd: hri.getTableDesc().getFamilies()) {
       // Set block cache on all tables.
       hcd.setBlockCacheEnabled(true);
       // Set compression to none.  Previous was 'none'.  Needs to be upper-case.
       // Any other compression we are turning off.  Have user enable it.
       hcd.setCompressionType(Algorithm.NONE);
-      // Remove the old MEMCACHE_FLUSHSIZE if present
-      hcd.remove(Bytes.toBytes("MEMCACHE_FLUSHSIZE"));
       result = true;
     }
     return result;