svn commit: r796856 - in /hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase: HTableDescriptor.java util/Migrate.java

[st...@apache.org]

Author: stack
Date: Wed Jul 22 19:39:28 2009
New Revision: 796856

URL: http://svn.apache.org/viewvc?rev=796856&view=rev
Log:
HBASE-1215 migration; metautils scan of meta region was broken; wouldn't see first row

Modified:
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java?rev=796856&r1=796855&r2=796856&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java Wed Jul 22 19:39:28 2009
@@ -351,6 +351,13 @@
   }
 
   /**
+   * @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
    */
   public boolean isReadOnly() {

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java?rev=796856&r1=796855&r2=796856&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java Wed Jul 22 19:39:28 2009
@@ -427,14 +427,14 @@
       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;