Author: stack
Date: Mon Sep 19 21:37:58 2011
New Revision: 1172852

URL: http://svn.apache.org/viewvc?rev=1172852&view=rev
Log:
HBASE-4444 Miscommit of HBASE-4195 to 0.90 branch (committed as though it were 
hbase-4423)

Modified:
    
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java

Modified: 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1172852&r1=1172851&r2=1172852&view=diff
==============================================================================
--- 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
 (original)
+++ 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
 Mon Sep 19 21:37:58 2011
@@ -715,6 +715,22 @@ public class HBaseAdmin implements Abort
    * Asynchronous operation.
    *
    * @param tableName name of table
+   * @param columnName name of column to be modified
+   * @param descriptor new column descriptor to use
+   * @throws IOException if a remote or network exception occurs
+   * @deprecated The <code>columnName</code> is redundant. Use {@link 
#addColumn(String, HColumnDescriptor)}
+   */
+  public void modifyColumn(final String tableName, final String columnName,
+      HColumnDescriptor descriptor)
+  throws IOException {
+    modifyColumn(tableName,  descriptor);
+  }
+
+  /**
+   * Modify an existing column family on a table.
+   * Asynchronous operation.
+   *
+   * @param tableName name of table
    * @param descriptor new column descriptor to use
    * @throws IOException if a remote or network exception occurs
    */
@@ -728,6 +744,22 @@ public class HBaseAdmin implements Abort
    * Asynchronous operation.
    *
    * @param tableName name of table
+   * @param columnName name of column to be modified
+   * @param descriptor new column descriptor to use
+   * @throws IOException if a remote or network exception occurs
+   * @deprecated The <code>columnName</code> is redundant. Use {@link 
#modifyColumn(byte[], HColumnDescriptor)}
+   */
+  public void modifyColumn(final byte [] tableName, final byte [] columnName,
+    HColumnDescriptor descriptor)
+  throws IOException {
+    modifyColumn(tableName, descriptor);
+  }
+
+  /**
+   * Modify an existing column family on a table.
+   * Asynchronous operation.
+   *
+   * @param tableName name of table
    * @param descriptor new column descriptor to use
    * @throws IOException if a remote or network exception occurs
    */


Reply via email to