diff -r 6c857ff63b03 bin/HBase.rb --- a/bin/HBase.rb Fri Feb 12 16:25:24 2010 +0100 +++ b/bin/HBase.rb Fri Feb 12 16:43:58 2010 +0100 @@ -241,7 +241,7 @@ @admin.modifyColumn(tableName, descriptor.getNameAsString(), descriptor); else - @admin.addColumn(tableName, descriptor); + @admin.addColumnFamily(tableName, descriptor); end end @formatter.header() diff -r 6c857ff63b03 src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/SchemaResource.java --- a/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/SchemaResource.java Fri Feb 12 16:25:24 2010 +0100 +++ b/src/contrib/stargate/src/java/org/apache/hadoop/hbase/stargate/SchemaResource.java Fri Feb 12 16:43:58 2010 +0100 @@ -157,7 +157,7 @@ if (htd.hasFamily(hcd.getName())) { admin.modifyColumn(tableName, hcd.getName(), hcd); } else { - admin.addColumn(model.getName(), hcd); + admin.addColumnFamily(model.getName(), hcd); } } } catch (IOException e) { diff -r 6c857ff63b03 src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java --- a/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Fri Feb 12 16:25:24 2010 +0100 +++ b/src/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Fri Feb 12 16:43:58 2010 +0100 @@ -464,34 +464,67 @@ } /** - * Add a column to an existing table. + * Add a column family to an existing table. * Asynchronous operation. * * @param tableName name of the table to add column to * @param column column descriptor of column to be added * @throws IOException + * + * @deprecated use {@link #addColumnFamily(String, org.apache.hadoop.hbase.HColumnDescriptor)} ()} */ + @Deprecated public void addColumn(final String tableName, HColumnDescriptor column) throws IOException { - addColumn(Bytes.toBytes(tableName), column); + addColumnFamily(Bytes.toBytes(tableName), column); } /** - * Add a column to an existing table. + * Add a column family to an existing table. * Asynchronous operation. * * @param tableName name of the table to add column to * @param column column descriptor of column to be added * @throws IOException + * + * @deprecated use {@link #addColumnFamily(byte[], org.apache.hadoop.hbase.HColumnDescriptor)} */ + @Deprecated public void addColumn(final byte [] tableName, HColumnDescriptor column) throws IOException { + addColumnFamily(tableName, column); + } + + /** + * Add a column family to an existing table. + * Asynchronous operation. + * + * @param tableName name of the table to add columnFamily to + * @param columnFamily descriptor of the column family to be added + * @throws IOException + */ + public void addColumnFamily(final String tableName, HColumnDescriptor columnFamily) + throws IOException { + addColumnFamily(Bytes.toBytes(tableName), columnFamily); + } + + /** + * Add a column family to an existing table. + * Asynchronous operation. + * + * @param tableName name of the table to add columnFamily to + * @param columnFamily descriptor of the column family to be added + * @throws IOException + */ + public void addColumnFamily(final byte[] tableName, HColumnDescriptor columnFamily) + throws IOException { if (this.master == null) { throw new MasterNotRunningException("master has been shut down"); } + HTableDescriptor.isLegalTableName(tableName); try { - this.master.addColumn(tableName, column); + this.master.addColumn(tableName, columnFamily); } catch (RemoteException e) { throw RemoteExceptionHandler.decodeRemoteException(e); } diff -r 6c857ff63b03 src/test/org/apache/hadoop/hbase/client/TestAdmin.java --- a/src/test/org/apache/hadoop/hbase/client/TestAdmin.java Fri Feb 12 16:25:24 2010 +0100 +++ b/src/test/org/apache/hadoop/hbase/client/TestAdmin.java Fri Feb 12 16:43:58 2010 +0100 @@ -236,7 +236,7 @@ } catch (org.apache.hadoop.hbase.client.RegionOfflineException e) { // Expected } - this.admin.addColumn(tableName, new HColumnDescriptor("col2")); + this.admin.addColumnFamily(tableName, new HColumnDescriptor("col2")); this.admin.enableTable(tableName); try { this.admin.deleteColumn(tableName, Bytes.toBytes("col2"));