Repository: hbase Updated Branches: refs/heads/branch-1 ff835d5ae -> e407e1e81
HBASE-15605 Remove PB references from HCD and HTD for 2.0 (Ram_ Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e407e1e8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e407e1e8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e407e1e8 Branch: refs/heads/branch-1 Commit: e407e1e81d82984d4c52b88a9b4ee582f25c7792 Parents: ff835d5 Author: Vasudevan <ramkrishna.s.vasude...@intel.com> Authored: Mon Apr 11 14:14:06 2016 +0530 Committer: Vasudevan <ramkrishna.s.vasude...@intel.com> Committed: Mon Apr 11 14:15:09 2016 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java | 2 ++ .../src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e407e1e8/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java index 17ca37a..6912ab5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java @@ -1434,6 +1434,7 @@ public class HColumnDescriptor implements WritableComparable<HColumnDescriptor> * @param cfs * @return An {@link HColumnDescriptor} made from the passed in <code>cfs</code> */ + @Deprecated public static HColumnDescriptor convert(final ColumnFamilySchema cfs) { // Use the empty constructor so we preserve the initial values set on construction for things // like maxVersion. Otherwise, we pick up wrong values on deserialization which makes for @@ -1452,6 +1453,7 @@ public class HColumnDescriptor implements WritableComparable<HColumnDescriptor> /** * @return Convert this instance to a the pb column family type */ + @Deprecated public ColumnFamilySchema convert() { ColumnFamilySchema.Builder builder = ColumnFamilySchema.newBuilder(); builder.setName(ByteStringer.wrap(getName())); http://git-wip-us.apache.org/repos/asf/hbase/blob/e407e1e8/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java index a6c08c3..d4c4c2b 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java @@ -1642,6 +1642,7 @@ public class HTableDescriptor implements WritableComparable<HTableDescriptor> { /** * @return Convert the current {@link HTableDescriptor} into a pb TableSchema instance. */ + @Deprecated public TableSchema convert() { TableSchema.Builder builder = TableSchema.newBuilder(); builder.setTableName(ProtobufUtil.toProtoTableName(getTableName())); @@ -1667,6 +1668,7 @@ public class HTableDescriptor implements WritableComparable<HTableDescriptor> { * @param ts A pb TableSchema instance. * @return An {@link HTableDescriptor} made from the passed in pb <code>ts</code>. */ + @Deprecated public static HTableDescriptor convert(final TableSchema ts) { List<ColumnFamilySchema> list = ts.getColumnFamiliesList(); HColumnDescriptor [] hcds = new HColumnDescriptor[list.size()];
