HBASE-1727 HTD and HCD versions need update

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@799992 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -309,6 +309,7 @@ Release 0.20.0 - Unreleased
    HBASE-1725  Old TableMap interface's definitions are not generic enough
                (Doğacan Güney via Stack)
    HBASE-1732  Flag to disable regionserver restart
+   HBASE-1727  HTD and HCD versions need update
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage

src/java/org/apache/hadoop/hbase/HColumnDescriptor.java

@@ -54,6 +54,7 @@ public class HColumnDescriptor implements ISerializable, WritableComparable<HCol
   // Time-to-live feature.  Version 4 was when we moved to byte arrays, HBASE-82.
   // Version 5 was when bloom filter descriptors were removed.
   // Version 6 adds metadata as a map where keys and values are byte[].
+  // Version 7 -- add new compression and hfile blocksize to HColumnDescriptor (HBASE-1217)
   private static final byte COLUMN_DESCRIPTOR_VERSION = (byte)7;
 
   /** 

src/java/org/apache/hadoop/hbase/HTableDescriptor.java

@@ -51,8 +51,8 @@ ISerializable {
   // Changes prior to version 3 were not recorded here.
   // Version 3 adds metadata as a map where keys and values are byte[].
   // Version 4 adds indexes
-  // FIXME version 5 should remove indexes
-  public static final byte TABLE_DESCRIPTOR_VERSION = 4;
+  // Version 5 removed transactional pollution -- e.g. indexes
+  public static final byte TABLE_DESCRIPTOR_VERSION = 5;
 
   private byte [] name = HConstants.EMPTY_BYTE_ARRAY;
   private String nameAsString = "";