http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html index 4bd98f4..046cb95 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html @@ -212,7 +212,7 @@ <span class="sourceLineNo">204</span>import org.apache.hadoop.util.StringUtils;<a name="line.204"></a> <span class="sourceLineNo">205</span>import org.apache.zookeeper.KeeperException;<a name="line.205"></a> <span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span>import com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> +<span class="sourceLineNo">207</span>import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a name="line.208"></a> <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a name="line.209"></a> <span class="sourceLineNo">210</span>import com.google.protobuf.RpcController;<a name="line.210"></a> @@ -1008,7 +1008,7 @@ <span class="sourceLineNo">1000</span> /**<a name="line.1000"></a> <span class="sourceLineNo">1001</span> * {@inheritDoc}<a name="line.1001"></a> <span class="sourceLineNo">1002</span> * @deprecated Since 2.0. Will be removed in 3.0. Use<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a> +<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1003"></a> <span class="sourceLineNo">1004</span> */<a name="line.1004"></a> <span class="sourceLineNo">1005</span> @Override<a name="line.1005"></a> <span class="sourceLineNo">1006</span> @Deprecated<a name="line.1006"></a> @@ -1018,14 +1018,14 @@ <span class="sourceLineNo">1010</span> }<a name="line.1010"></a> <span class="sourceLineNo">1011</span><a name="line.1011"></a> <span class="sourceLineNo">1012</span> @Override<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.1013"></a> +<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.1013"></a> <span class="sourceLineNo">1014</span> throws IOException {<a name="line.1014"></a> <span class="sourceLineNo">1015</span> get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a> <span class="sourceLineNo">1016</span> }<a name="line.1016"></a> <span class="sourceLineNo">1017</span><a name="line.1017"></a> <span class="sourceLineNo">1018</span> @Override<a name="line.1018"></a> <span class="sourceLineNo">1019</span> public Future<Void> addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1020"></a> +<span class="sourceLineNo">1020</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1020"></a> <span class="sourceLineNo">1021</span> AddColumnResponse response =<a name="line.1021"></a> <span class="sourceLineNo">1022</span> executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),<a name="line.1022"></a> <span class="sourceLineNo">1023</span> getRpcControllerFactory()) {<a name="line.1023"></a> @@ -1106,7 +1106,7 @@ <span class="sourceLineNo">1098</span> /**<a name="line.1098"></a> <span class="sourceLineNo">1099</span> * {@inheritDoc}<a name="line.1099"></a> <span class="sourceLineNo">1100</span> * @deprecated As of 2.0. Will be removed in 3.0. Use<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1101"></a> +<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1101"></a> <span class="sourceLineNo">1102</span> */<a name="line.1102"></a> <span class="sourceLineNo">1103</span> @Override<a name="line.1103"></a> <span class="sourceLineNo">1104</span> @Deprecated<a name="line.1104"></a> @@ -1117,13 +1117,13 @@ <span class="sourceLineNo">1109</span><a name="line.1109"></a> <span class="sourceLineNo">1110</span> @Override<a name="line.1110"></a> <span class="sourceLineNo">1111</span> public void modifyColumnFamily(final TableName tableName,<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1112"></a> +<span class="sourceLineNo">1112</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1112"></a> <span class="sourceLineNo">1113</span> get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1113"></a> <span class="sourceLineNo">1114</span> }<a name="line.1114"></a> <span class="sourceLineNo">1115</span><a name="line.1115"></a> <span class="sourceLineNo">1116</span> @Override<a name="line.1116"></a> <span class="sourceLineNo">1117</span> public Future<Void> modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1118"></a> +<span class="sourceLineNo">1118</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1118"></a> <span class="sourceLineNo">1119</span> ModifyColumnResponse response =<a name="line.1119"></a> <span class="sourceLineNo">1120</span> executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),<a name="line.1120"></a> <span class="sourceLineNo">1121</span> getRpcControllerFactory()) {<a name="line.1121"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html index 4bd98f4..046cb95 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html @@ -212,7 +212,7 @@ <span class="sourceLineNo">204</span>import org.apache.hadoop.util.StringUtils;<a name="line.204"></a> <span class="sourceLineNo">205</span>import org.apache.zookeeper.KeeperException;<a name="line.205"></a> <span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span>import com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> +<span class="sourceLineNo">207</span>import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a name="line.208"></a> <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a name="line.209"></a> <span class="sourceLineNo">210</span>import com.google.protobuf.RpcController;<a name="line.210"></a> @@ -1008,7 +1008,7 @@ <span class="sourceLineNo">1000</span> /**<a name="line.1000"></a> <span class="sourceLineNo">1001</span> * {@inheritDoc}<a name="line.1001"></a> <span class="sourceLineNo">1002</span> * @deprecated Since 2.0. Will be removed in 3.0. Use<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a> +<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1003"></a> <span class="sourceLineNo">1004</span> */<a name="line.1004"></a> <span class="sourceLineNo">1005</span> @Override<a name="line.1005"></a> <span class="sourceLineNo">1006</span> @Deprecated<a name="line.1006"></a> @@ -1018,14 +1018,14 @@ <span class="sourceLineNo">1010</span> }<a name="line.1010"></a> <span class="sourceLineNo">1011</span><a name="line.1011"></a> <span class="sourceLineNo">1012</span> @Override<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.1013"></a> +<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.1013"></a> <span class="sourceLineNo">1014</span> throws IOException {<a name="line.1014"></a> <span class="sourceLineNo">1015</span> get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a> <span class="sourceLineNo">1016</span> }<a name="line.1016"></a> <span class="sourceLineNo">1017</span><a name="line.1017"></a> <span class="sourceLineNo">1018</span> @Override<a name="line.1018"></a> <span class="sourceLineNo">1019</span> public Future<Void> addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1020"></a> +<span class="sourceLineNo">1020</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1020"></a> <span class="sourceLineNo">1021</span> AddColumnResponse response =<a name="line.1021"></a> <span class="sourceLineNo">1022</span> executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),<a name="line.1022"></a> <span class="sourceLineNo">1023</span> getRpcControllerFactory()) {<a name="line.1023"></a> @@ -1106,7 +1106,7 @@ <span class="sourceLineNo">1098</span> /**<a name="line.1098"></a> <span class="sourceLineNo">1099</span> * {@inheritDoc}<a name="line.1099"></a> <span class="sourceLineNo">1100</span> * @deprecated As of 2.0. Will be removed in 3.0. Use<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1101"></a> +<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1101"></a> <span class="sourceLineNo">1102</span> */<a name="line.1102"></a> <span class="sourceLineNo">1103</span> @Override<a name="line.1103"></a> <span class="sourceLineNo">1104</span> @Deprecated<a name="line.1104"></a> @@ -1117,13 +1117,13 @@ <span class="sourceLineNo">1109</span><a name="line.1109"></a> <span class="sourceLineNo">1110</span> @Override<a name="line.1110"></a> <span class="sourceLineNo">1111</span> public void modifyColumnFamily(final TableName tableName,<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1112"></a> +<span class="sourceLineNo">1112</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1112"></a> <span class="sourceLineNo">1113</span> get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1113"></a> <span class="sourceLineNo">1114</span> }<a name="line.1114"></a> <span class="sourceLineNo">1115</span><a name="line.1115"></a> <span class="sourceLineNo">1116</span> @Override<a name="line.1116"></a> <span class="sourceLineNo">1117</span> public Future<Void> modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1118"></a> +<span class="sourceLineNo">1118</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1118"></a> <span class="sourceLineNo">1119</span> ModifyColumnResponse response =<a name="line.1119"></a> <span class="sourceLineNo">1120</span> executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),<a name="line.1120"></a> <span class="sourceLineNo">1121</span> getRpcControllerFactory()) {<a name="line.1121"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html index 4bd98f4..046cb95 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html @@ -212,7 +212,7 @@ <span class="sourceLineNo">204</span>import org.apache.hadoop.util.StringUtils;<a name="line.204"></a> <span class="sourceLineNo">205</span>import org.apache.zookeeper.KeeperException;<a name="line.205"></a> <span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span>import com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> +<span class="sourceLineNo">207</span>import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a name="line.208"></a> <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a name="line.209"></a> <span class="sourceLineNo">210</span>import com.google.protobuf.RpcController;<a name="line.210"></a> @@ -1008,7 +1008,7 @@ <span class="sourceLineNo">1000</span> /**<a name="line.1000"></a> <span class="sourceLineNo">1001</span> * {@inheritDoc}<a name="line.1001"></a> <span class="sourceLineNo">1002</span> * @deprecated Since 2.0. Will be removed in 3.0. Use<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a> +<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1003"></a> <span class="sourceLineNo">1004</span> */<a name="line.1004"></a> <span class="sourceLineNo">1005</span> @Override<a name="line.1005"></a> <span class="sourceLineNo">1006</span> @Deprecated<a name="line.1006"></a> @@ -1018,14 +1018,14 @@ <span class="sourceLineNo">1010</span> }<a name="line.1010"></a> <span class="sourceLineNo">1011</span><a name="line.1011"></a> <span class="sourceLineNo">1012</span> @Override<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.1013"></a> +<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.1013"></a> <span class="sourceLineNo">1014</span> throws IOException {<a name="line.1014"></a> <span class="sourceLineNo">1015</span> get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a> <span class="sourceLineNo">1016</span> }<a name="line.1016"></a> <span class="sourceLineNo">1017</span><a name="line.1017"></a> <span class="sourceLineNo">1018</span> @Override<a name="line.1018"></a> <span class="sourceLineNo">1019</span> public Future<Void> addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1020"></a> +<span class="sourceLineNo">1020</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1020"></a> <span class="sourceLineNo">1021</span> AddColumnResponse response =<a name="line.1021"></a> <span class="sourceLineNo">1022</span> executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),<a name="line.1022"></a> <span class="sourceLineNo">1023</span> getRpcControllerFactory()) {<a name="line.1023"></a> @@ -1106,7 +1106,7 @@ <span class="sourceLineNo">1098</span> /**<a name="line.1098"></a> <span class="sourceLineNo">1099</span> * {@inheritDoc}<a name="line.1099"></a> <span class="sourceLineNo">1100</span> * @deprecated As of 2.0. Will be removed in 3.0. Use<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1101"></a> +<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1101"></a> <span class="sourceLineNo">1102</span> */<a name="line.1102"></a> <span class="sourceLineNo">1103</span> @Override<a name="line.1103"></a> <span class="sourceLineNo">1104</span> @Deprecated<a name="line.1104"></a> @@ -1117,13 +1117,13 @@ <span class="sourceLineNo">1109</span><a name="line.1109"></a> <span class="sourceLineNo">1110</span> @Override<a name="line.1110"></a> <span class="sourceLineNo">1111</span> public void modifyColumnFamily(final TableName tableName,<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1112"></a> +<span class="sourceLineNo">1112</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1112"></a> <span class="sourceLineNo">1113</span> get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1113"></a> <span class="sourceLineNo">1114</span> }<a name="line.1114"></a> <span class="sourceLineNo">1115</span><a name="line.1115"></a> <span class="sourceLineNo">1116</span> @Override<a name="line.1116"></a> <span class="sourceLineNo">1117</span> public Future<Void> modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1118"></a> +<span class="sourceLineNo">1118</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1118"></a> <span class="sourceLineNo">1119</span> ModifyColumnResponse response =<a name="line.1119"></a> <span class="sourceLineNo">1120</span> executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),<a name="line.1120"></a> <span class="sourceLineNo">1121</span> getRpcControllerFactory()) {<a name="line.1121"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html index 4bd98f4..046cb95 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html @@ -212,7 +212,7 @@ <span class="sourceLineNo">204</span>import org.apache.hadoop.util.StringUtils;<a name="line.204"></a> <span class="sourceLineNo">205</span>import org.apache.zookeeper.KeeperException;<a name="line.205"></a> <span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span>import com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> +<span class="sourceLineNo">207</span>import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a name="line.208"></a> <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a name="line.209"></a> <span class="sourceLineNo">210</span>import com.google.protobuf.RpcController;<a name="line.210"></a> @@ -1008,7 +1008,7 @@ <span class="sourceLineNo">1000</span> /**<a name="line.1000"></a> <span class="sourceLineNo">1001</span> * {@inheritDoc}<a name="line.1001"></a> <span class="sourceLineNo">1002</span> * @deprecated Since 2.0. Will be removed in 3.0. Use<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a> +<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1003"></a> <span class="sourceLineNo">1004</span> */<a name="line.1004"></a> <span class="sourceLineNo">1005</span> @Override<a name="line.1005"></a> <span class="sourceLineNo">1006</span> @Deprecated<a name="line.1006"></a> @@ -1018,14 +1018,14 @@ <span class="sourceLineNo">1010</span> }<a name="line.1010"></a> <span class="sourceLineNo">1011</span><a name="line.1011"></a> <span class="sourceLineNo">1012</span> @Override<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.1013"></a> +<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.1013"></a> <span class="sourceLineNo">1014</span> throws IOException {<a name="line.1014"></a> <span class="sourceLineNo">1015</span> get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a> <span class="sourceLineNo">1016</span> }<a name="line.1016"></a> <span class="sourceLineNo">1017</span><a name="line.1017"></a> <span class="sourceLineNo">1018</span> @Override<a name="line.1018"></a> <span class="sourceLineNo">1019</span> public Future<Void> addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1020"></a> +<span class="sourceLineNo">1020</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1020"></a> <span class="sourceLineNo">1021</span> AddColumnResponse response =<a name="line.1021"></a> <span class="sourceLineNo">1022</span> executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),<a name="line.1022"></a> <span class="sourceLineNo">1023</span> getRpcControllerFactory()) {<a name="line.1023"></a> @@ -1106,7 +1106,7 @@ <span class="sourceLineNo">1098</span> /**<a name="line.1098"></a> <span class="sourceLineNo">1099</span> * {@inheritDoc}<a name="line.1099"></a> <span class="sourceLineNo">1100</span> * @deprecated As of 2.0. Will be removed in 3.0. Use<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1101"></a> +<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1101"></a> <span class="sourceLineNo">1102</span> */<a name="line.1102"></a> <span class="sourceLineNo">1103</span> @Override<a name="line.1103"></a> <span class="sourceLineNo">1104</span> @Deprecated<a name="line.1104"></a> @@ -1117,13 +1117,13 @@ <span class="sourceLineNo">1109</span><a name="line.1109"></a> <span class="sourceLineNo">1110</span> @Override<a name="line.1110"></a> <span class="sourceLineNo">1111</span> public void modifyColumnFamily(final TableName tableName,<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1112"></a> +<span class="sourceLineNo">1112</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1112"></a> <span class="sourceLineNo">1113</span> get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1113"></a> <span class="sourceLineNo">1114</span> }<a name="line.1114"></a> <span class="sourceLineNo">1115</span><a name="line.1115"></a> <span class="sourceLineNo">1116</span> @Override<a name="line.1116"></a> <span class="sourceLineNo">1117</span> public Future<Void> modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1118"></a> +<span class="sourceLineNo">1118</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1118"></a> <span class="sourceLineNo">1119</span> ModifyColumnResponse response =<a name="line.1119"></a> <span class="sourceLineNo">1120</span> executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),<a name="line.1120"></a> <span class="sourceLineNo">1121</span> getRpcControllerFactory()) {<a name="line.1121"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html index 4bd98f4..046cb95 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html @@ -212,7 +212,7 @@ <span class="sourceLineNo">204</span>import org.apache.hadoop.util.StringUtils;<a name="line.204"></a> <span class="sourceLineNo">205</span>import org.apache.zookeeper.KeeperException;<a name="line.205"></a> <span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span>import com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> +<span class="sourceLineNo">207</span>import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a name="line.208"></a> <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a name="line.209"></a> <span class="sourceLineNo">210</span>import com.google.protobuf.RpcController;<a name="line.210"></a> @@ -1008,7 +1008,7 @@ <span class="sourceLineNo">1000</span> /**<a name="line.1000"></a> <span class="sourceLineNo">1001</span> * {@inheritDoc}<a name="line.1001"></a> <span class="sourceLineNo">1002</span> * @deprecated Since 2.0. Will be removed in 3.0. Use<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a> +<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1003"></a> <span class="sourceLineNo">1004</span> */<a name="line.1004"></a> <span class="sourceLineNo">1005</span> @Override<a name="line.1005"></a> <span class="sourceLineNo">1006</span> @Deprecated<a name="line.1006"></a> @@ -1018,14 +1018,14 @@ <span class="sourceLineNo">1010</span> }<a name="line.1010"></a> <span class="sourceLineNo">1011</span><a name="line.1011"></a> <span class="sourceLineNo">1012</span> @Override<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.1013"></a> +<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.1013"></a> <span class="sourceLineNo">1014</span> throws IOException {<a name="line.1014"></a> <span class="sourceLineNo">1015</span> get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a> <span class="sourceLineNo">1016</span> }<a name="line.1016"></a> <span class="sourceLineNo">1017</span><a name="line.1017"></a> <span class="sourceLineNo">1018</span> @Override<a name="line.1018"></a> <span class="sourceLineNo">1019</span> public Future<Void> addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1020"></a> +<span class="sourceLineNo">1020</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1020"></a> <span class="sourceLineNo">1021</span> AddColumnResponse response =<a name="line.1021"></a> <span class="sourceLineNo">1022</span> executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),<a name="line.1022"></a> <span class="sourceLineNo">1023</span> getRpcControllerFactory()) {<a name="line.1023"></a> @@ -1106,7 +1106,7 @@ <span class="sourceLineNo">1098</span> /**<a name="line.1098"></a> <span class="sourceLineNo">1099</span> * {@inheritDoc}<a name="line.1099"></a> <span class="sourceLineNo">1100</span> * @deprecated As of 2.0. Will be removed in 3.0. Use<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1101"></a> +<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1101"></a> <span class="sourceLineNo">1102</span> */<a name="line.1102"></a> <span class="sourceLineNo">1103</span> @Override<a name="line.1103"></a> <span class="sourceLineNo">1104</span> @Deprecated<a name="line.1104"></a> @@ -1117,13 +1117,13 @@ <span class="sourceLineNo">1109</span><a name="line.1109"></a> <span class="sourceLineNo">1110</span> @Override<a name="line.1110"></a> <span class="sourceLineNo">1111</span> public void modifyColumnFamily(final TableName tableName,<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1112"></a> +<span class="sourceLineNo">1112</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1112"></a> <span class="sourceLineNo">1113</span> get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1113"></a> <span class="sourceLineNo">1114</span> }<a name="line.1114"></a> <span class="sourceLineNo">1115</span><a name="line.1115"></a> <span class="sourceLineNo">1116</span> @Override<a name="line.1116"></a> <span class="sourceLineNo">1117</span> public Future<Void> modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1118"></a> +<span class="sourceLineNo">1118</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1118"></a> <span class="sourceLineNo">1119</span> ModifyColumnResponse response =<a name="line.1119"></a> <span class="sourceLineNo">1120</span> executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),<a name="line.1120"></a> <span class="sourceLineNo">1121</span> getRpcControllerFactory()) {<a name="line.1121"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html index 4bd98f4..046cb95 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html @@ -212,7 +212,7 @@ <span class="sourceLineNo">204</span>import org.apache.hadoop.util.StringUtils;<a name="line.204"></a> <span class="sourceLineNo">205</span>import org.apache.zookeeper.KeeperException;<a name="line.205"></a> <span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span>import com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> +<span class="sourceLineNo">207</span>import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a name="line.208"></a> <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a name="line.209"></a> <span class="sourceLineNo">210</span>import com.google.protobuf.RpcController;<a name="line.210"></a> @@ -1008,7 +1008,7 @@ <span class="sourceLineNo">1000</span> /**<a name="line.1000"></a> <span class="sourceLineNo">1001</span> * {@inheritDoc}<a name="line.1001"></a> <span class="sourceLineNo">1002</span> * @deprecated Since 2.0. Will be removed in 3.0. Use<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a> +<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1003"></a> <span class="sourceLineNo">1004</span> */<a name="line.1004"></a> <span class="sourceLineNo">1005</span> @Override<a name="line.1005"></a> <span class="sourceLineNo">1006</span> @Deprecated<a name="line.1006"></a> @@ -1018,14 +1018,14 @@ <span class="sourceLineNo">1010</span> }<a name="line.1010"></a> <span class="sourceLineNo">1011</span><a name="line.1011"></a> <span class="sourceLineNo">1012</span> @Override<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.1013"></a> +<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.1013"></a> <span class="sourceLineNo">1014</span> throws IOException {<a name="line.1014"></a> <span class="sourceLineNo">1015</span> get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a> <span class="sourceLineNo">1016</span> }<a name="line.1016"></a> <span class="sourceLineNo">1017</span><a name="line.1017"></a> <span class="sourceLineNo">1018</span> @Override<a name="line.1018"></a> <span class="sourceLineNo">1019</span> public Future<Void> addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1020"></a> +<span class="sourceLineNo">1020</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1020"></a> <span class="sourceLineNo">1021</span> AddColumnResponse response =<a name="line.1021"></a> <span class="sourceLineNo">1022</span> executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),<a name="line.1022"></a> <span class="sourceLineNo">1023</span> getRpcControllerFactory()) {<a name="line.1023"></a> @@ -1106,7 +1106,7 @@ <span class="sourceLineNo">1098</span> /**<a name="line.1098"></a> <span class="sourceLineNo">1099</span> * {@inheritDoc}<a name="line.1099"></a> <span class="sourceLineNo">1100</span> * @deprecated As of 2.0. Will be removed in 3.0. Use<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1101"></a> +<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1101"></a> <span class="sourceLineNo">1102</span> */<a name="line.1102"></a> <span class="sourceLineNo">1103</span> @Override<a name="line.1103"></a> <span class="sourceLineNo">1104</span> @Deprecated<a name="line.1104"></a> @@ -1117,13 +1117,13 @@ <span class="sourceLineNo">1109</span><a name="line.1109"></a> <span class="sourceLineNo">1110</span> @Override<a name="line.1110"></a> <span class="sourceLineNo">1111</span> public void modifyColumnFamily(final TableName tableName,<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1112"></a> +<span class="sourceLineNo">1112</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1112"></a> <span class="sourceLineNo">1113</span> get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1113"></a> <span class="sourceLineNo">1114</span> }<a name="line.1114"></a> <span class="sourceLineNo">1115</span><a name="line.1115"></a> <span class="sourceLineNo">1116</span> @Override<a name="line.1116"></a> <span class="sourceLineNo">1117</span> public Future<Void> modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1118"></a> +<span class="sourceLineNo">1118</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1118"></a> <span class="sourceLineNo">1119</span> ModifyColumnResponse response =<a name="line.1119"></a> <span class="sourceLineNo">1120</span> executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),<a name="line.1120"></a> <span class="sourceLineNo">1121</span> getRpcControllerFactory()) {<a name="line.1121"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html index 4bd98f4..046cb95 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html @@ -212,7 +212,7 @@ <span class="sourceLineNo">204</span>import org.apache.hadoop.util.StringUtils;<a name="line.204"></a> <span class="sourceLineNo">205</span>import org.apache.zookeeper.KeeperException;<a name="line.205"></a> <span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span>import com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> +<span class="sourceLineNo">207</span>import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a name="line.208"></a> <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a name="line.209"></a> <span class="sourceLineNo">210</span>import com.google.protobuf.RpcController;<a name="line.210"></a> @@ -1008,7 +1008,7 @@ <span class="sourceLineNo">1000</span> /**<a name="line.1000"></a> <span class="sourceLineNo">1001</span> * {@inheritDoc}<a name="line.1001"></a> <span class="sourceLineNo">1002</span> * @deprecated Since 2.0. Will be removed in 3.0. Use<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a> +<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1003"></a> <span class="sourceLineNo">1004</span> */<a name="line.1004"></a> <span class="sourceLineNo">1005</span> @Override<a name="line.1005"></a> <span class="sourceLineNo">1006</span> @Deprecated<a name="line.1006"></a> @@ -1018,14 +1018,14 @@ <span class="sourceLineNo">1010</span> }<a name="line.1010"></a> <span class="sourceLineNo">1011</span><a name="line.1011"></a> <span class="sourceLineNo">1012</span> @Override<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.1013"></a> +<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.1013"></a> <span class="sourceLineNo">1014</span> throws IOException {<a name="line.1014"></a> <span class="sourceLineNo">1015</span> get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a> <span class="sourceLineNo">1016</span> }<a name="line.1016"></a> <span class="sourceLineNo">1017</span><a name="line.1017"></a> <span class="sourceLineNo">1018</span> @Override<a name="line.1018"></a> <span class="sourceLineNo">1019</span> public Future<Void> addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1020"></a> +<span class="sourceLineNo">1020</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1020"></a> <span class="sourceLineNo">1021</span> AddColumnResponse response =<a name="line.1021"></a> <span class="sourceLineNo">1022</span> executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),<a name="line.1022"></a> <span class="sourceLineNo">1023</span> getRpcControllerFactory()) {<a name="line.1023"></a> @@ -1106,7 +1106,7 @@ <span class="sourceLineNo">1098</span> /**<a name="line.1098"></a> <span class="sourceLineNo">1099</span> * {@inheritDoc}<a name="line.1099"></a> <span class="sourceLineNo">1100</span> * @deprecated As of 2.0. Will be removed in 3.0. Use<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1101"></a> +<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1101"></a> <span class="sourceLineNo">1102</span> */<a name="line.1102"></a> <span class="sourceLineNo">1103</span> @Override<a name="line.1103"></a> <span class="sourceLineNo">1104</span> @Deprecated<a name="line.1104"></a> @@ -1117,13 +1117,13 @@ <span class="sourceLineNo">1109</span><a name="line.1109"></a> <span class="sourceLineNo">1110</span> @Override<a name="line.1110"></a> <span class="sourceLineNo">1111</span> public void modifyColumnFamily(final TableName tableName,<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1112"></a> +<span class="sourceLineNo">1112</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1112"></a> <span class="sourceLineNo">1113</span> get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1113"></a> <span class="sourceLineNo">1114</span> }<a name="line.1114"></a> <span class="sourceLineNo">1115</span><a name="line.1115"></a> <span class="sourceLineNo">1116</span> @Override<a name="line.1116"></a> <span class="sourceLineNo">1117</span> public Future<Void> modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1118"></a> +<span class="sourceLineNo">1118</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1118"></a> <span class="sourceLineNo">1119</span> ModifyColumnResponse response =<a name="line.1119"></a> <span class="sourceLineNo">1120</span> executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),<a name="line.1120"></a> <span class="sourceLineNo">1121</span> getRpcControllerFactory()) {<a name="line.1121"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html index 4bd98f4..046cb95 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html @@ -212,7 +212,7 @@ <span class="sourceLineNo">204</span>import org.apache.hadoop.util.StringUtils;<a name="line.204"></a> <span class="sourceLineNo">205</span>import org.apache.zookeeper.KeeperException;<a name="line.205"></a> <span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span>import com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> +<span class="sourceLineNo">207</span>import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a name="line.208"></a> <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a name="line.209"></a> <span class="sourceLineNo">210</span>import com.google.protobuf.RpcController;<a name="line.210"></a> @@ -1008,7 +1008,7 @@ <span class="sourceLineNo">1000</span> /**<a name="line.1000"></a> <span class="sourceLineNo">1001</span> * {@inheritDoc}<a name="line.1001"></a> <span class="sourceLineNo">1002</span> * @deprecated Since 2.0. Will be removed in 3.0. Use<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a> +<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1003"></a> <span class="sourceLineNo">1004</span> */<a name="line.1004"></a> <span class="sourceLineNo">1005</span> @Override<a name="line.1005"></a> <span class="sourceLineNo">1006</span> @Deprecated<a name="line.1006"></a> @@ -1018,14 +1018,14 @@ <span class="sourceLineNo">1010</span> }<a name="line.1010"></a> <span class="sourceLineNo">1011</span><a name="line.1011"></a> <span class="sourceLineNo">1012</span> @Override<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.1013"></a> +<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.1013"></a> <span class="sourceLineNo">1014</span> throws IOException {<a name="line.1014"></a> <span class="sourceLineNo">1015</span> get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a> <span class="sourceLineNo">1016</span> }<a name="line.1016"></a> <span class="sourceLineNo">1017</span><a name="line.1017"></a> <span class="sourceLineNo">1018</span> @Override<a name="line.1018"></a> <span class="sourceLineNo">1019</span> public Future<Void> addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1020"></a> +<span class="sourceLineNo">1020</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1020"></a> <span class="sourceLineNo">1021</span> AddColumnResponse response =<a name="line.1021"></a> <span class="sourceLineNo">1022</span> executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),<a name="line.1022"></a> <span class="sourceLineNo">1023</span> getRpcControllerFactory()) {<a name="line.1023"></a> @@ -1106,7 +1106,7 @@ <span class="sourceLineNo">1098</span> /**<a name="line.1098"></a> <span class="sourceLineNo">1099</span> * {@inheritDoc}<a name="line.1099"></a> <span class="sourceLineNo">1100</span> * @deprecated As of 2.0. Will be removed in 3.0. Use<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1101"></a> +<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1101"></a> <span class="sourceLineNo">1102</span> */<a name="line.1102"></a> <span class="sourceLineNo">1103</span> @Override<a name="line.1103"></a> <span class="sourceLineNo">1104</span> @Deprecated<a name="line.1104"></a> @@ -1117,13 +1117,13 @@ <span class="sourceLineNo">1109</span><a name="line.1109"></a> <span class="sourceLineNo">1110</span> @Override<a name="line.1110"></a> <span class="sourceLineNo">1111</span> public void modifyColumnFamily(final TableName tableName,<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1112"></a> +<span class="sourceLineNo">1112</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1112"></a> <span class="sourceLineNo">1113</span> get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1113"></a> <span class="sourceLineNo">1114</span> }<a name="line.1114"></a> <span class="sourceLineNo">1115</span><a name="line.1115"></a> <span class="sourceLineNo">1116</span> @Override<a name="line.1116"></a> <span class="sourceLineNo">1117</span> public Future<Void> modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1118"></a> +<span class="sourceLineNo">1118</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1118"></a> <span class="sourceLineNo">1119</span> ModifyColumnResponse response =<a name="line.1119"></a> <span class="sourceLineNo">1120</span> executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),<a name="line.1120"></a> <span class="sourceLineNo">1121</span> getRpcControllerFactory()) {<a name="line.1121"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html index 4bd98f4..046cb95 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html @@ -212,7 +212,7 @@ <span class="sourceLineNo">204</span>import org.apache.hadoop.util.StringUtils;<a name="line.204"></a> <span class="sourceLineNo">205</span>import org.apache.zookeeper.KeeperException;<a name="line.205"></a> <span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span>import com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> +<span class="sourceLineNo">207</span>import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a name="line.208"></a> <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a name="line.209"></a> <span class="sourceLineNo">210</span>import com.google.protobuf.RpcController;<a name="line.210"></a> @@ -1008,7 +1008,7 @@ <span class="sourceLineNo">1000</span> /**<a name="line.1000"></a> <span class="sourceLineNo">1001</span> * {@inheritDoc}<a name="line.1001"></a> <span class="sourceLineNo">1002</span> * @deprecated Since 2.0. Will be removed in 3.0. Use<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a> +<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1003"></a> <span class="sourceLineNo">1004</span> */<a name="line.1004"></a> <span class="sourceLineNo">1005</span> @Override<a name="line.1005"></a> <span class="sourceLineNo">1006</span> @Deprecated<a name="line.1006"></a> @@ -1018,14 +1018,14 @@ <span class="sourceLineNo">1010</span> }<a name="line.1010"></a> <span class="sourceLineNo">1011</span><a name="line.1011"></a> <span class="sourceLineNo">1012</span> @Override<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.1013"></a> +<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.1013"></a> <span class="sourceLineNo">1014</span> throws IOException {<a name="line.1014"></a> <span class="sourceLineNo">1015</span> get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a> <span class="sourceLineNo">1016</span> }<a name="line.1016"></a> <span class="sourceLineNo">1017</span><a name="line.1017"></a> <span class="sourceLineNo">1018</span> @Override<a name="line.1018"></a> <span class="sourceLineNo">1019</span> public Future<Void> addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1020"></a> +<span class="sourceLineNo">1020</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1020"></a> <span class="sourceLineNo">1021</span> AddColumnResponse response =<a name="line.1021"></a> <span class="sourceLineNo">1022</span> executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),<a name="line.1022"></a> <span class="sourceLineNo">1023</span> getRpcControllerFactory()) {<a name="line.1023"></a> @@ -1106,7 +1106,7 @@ <span class="sourceLineNo">1098</span> /**<a name="line.1098"></a> <span class="sourceLineNo">1099</span> * {@inheritDoc}<a name="line.1099"></a> <span class="sourceLineNo">1100</span> * @deprecated As of 2.0. Will be removed in 3.0. Use<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1101"></a> +<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1101"></a> <span class="sourceLineNo">1102</span> */<a name="line.1102"></a> <span class="sourceLineNo">1103</span> @Override<a name="line.1103"></a> <span class="sourceLineNo">1104</span> @Deprecated<a name="line.1104"></a> @@ -1117,13 +1117,13 @@ <span class="sourceLineNo">1109</span><a name="line.1109"></a> <span class="sourceLineNo">1110</span> @Override<a name="line.1110"></a> <span class="sourceLineNo">1111</span> public void modifyColumnFamily(final TableName tableName,<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1112"></a> +<span class="sourceLineNo">1112</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1112"></a> <span class="sourceLineNo">1113</span> get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1113"></a> <span class="sourceLineNo">1114</span> }<a name="line.1114"></a> <span class="sourceLineNo">1115</span><a name="line.1115"></a> <span class="sourceLineNo">1116</span> @Override<a name="line.1116"></a> <span class="sourceLineNo">1117</span> public Future<Void> modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1118"></a> +<span class="sourceLineNo">1118</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1118"></a> <span class="sourceLineNo">1119</span> ModifyColumnResponse response =<a name="line.1119"></a> <span class="sourceLineNo">1120</span> executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),<a name="line.1120"></a> <span class="sourceLineNo">1121</span> getRpcControllerFactory()) {<a name="line.1121"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html index 4bd98f4..046cb95 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html @@ -212,7 +212,7 @@ <span class="sourceLineNo">204</span>import org.apache.hadoop.util.StringUtils;<a name="line.204"></a> <span class="sourceLineNo">205</span>import org.apache.zookeeper.KeeperException;<a name="line.205"></a> <span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span>import com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> +<span class="sourceLineNo">207</span>import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a name="line.208"></a> <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a name="line.209"></a> <span class="sourceLineNo">210</span>import com.google.protobuf.RpcController;<a name="line.210"></a> @@ -1008,7 +1008,7 @@ <span class="sourceLineNo">1000</span> /**<a name="line.1000"></a> <span class="sourceLineNo">1001</span> * {@inheritDoc}<a name="line.1001"></a> <span class="sourceLineNo">1002</span> * @deprecated Since 2.0. Will be removed in 3.0. Use<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a> +<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1003"></a> <span class="sourceLineNo">1004</span> */<a name="line.1004"></a> <span class="sourceLineNo">1005</span> @Override<a name="line.1005"></a> <span class="sourceLineNo">1006</span> @Deprecated<a name="line.1006"></a> @@ -1018,14 +1018,14 @@ <span class="sourceLineNo">1010</span> }<a name="line.1010"></a> <span class="sourceLineNo">1011</span><a name="line.1011"></a> <span class="sourceLineNo">1012</span> @Override<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.1013"></a> +<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.1013"></a> <span class="sourceLineNo">1014</span> throws IOException {<a name="line.1014"></a> <span class="sourceLineNo">1015</span> get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a> <span class="sourceLineNo">1016</span> }<a name="line.1016"></a> <span class="sourceLineNo">1017</span><a name="line.1017"></a> <span class="sourceLineNo">1018</span> @Override<a name="line.1018"></a> <span class="sourceLineNo">1019</span> public Future<Void> addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1020"></a> +<span class="sourceLineNo">1020</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1020"></a> <span class="sourceLineNo">1021</span> AddColumnResponse response =<a name="line.1021"></a> <span class="sourceLineNo">1022</span> executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),<a name="line.1022"></a> <span class="sourceLineNo">1023</span> getRpcControllerFactory()) {<a name="line.1023"></a> @@ -1106,7 +1106,7 @@ <span class="sourceLineNo">1098</span> /**<a name="line.1098"></a> <span class="sourceLineNo">1099</span> * {@inheritDoc}<a name="line.1099"></a> <span class="sourceLineNo">1100</span> * @deprecated As of 2.0. Will be removed in 3.0. Use<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1101"></a> +<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1101"></a> <span class="sourceLineNo">1102</span> */<a name="line.1102"></a> <span class="sourceLineNo">1103</span> @Override<a name="line.1103"></a> <span class="sourceLineNo">1104</span> @Deprecated<a name="line.1104"></a> @@ -1117,13 +1117,13 @@ <span class="sourceLineNo">1109</span><a name="line.1109"></a> <span class="sourceLineNo">1110</span> @Override<a name="line.1110"></a> <span class="sourceLineNo">1111</span> public void modifyColumnFamily(final TableName tableName,<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1112"></a> +<span class="sourceLineNo">1112</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1112"></a> <span class="sourceLineNo">1113</span> get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1113"></a> <span class="sourceLineNo">1114</span> }<a name="line.1114"></a> <span class="sourceLineNo">1115</span><a name="line.1115"></a> <span class="sourceLineNo">1116</span> @Override<a name="line.1116"></a> <span class="sourceLineNo">1117</span> public Future<Void> modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1118"></a> +<span class="sourceLineNo">1118</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1118"></a> <span class="sourceLineNo">1119</span> ModifyColumnResponse response =<a name="line.1119"></a> <span class="sourceLineNo">1120</span> executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),<a name="line.1120"></a> <span class="sourceLineNo">1121</span> getRpcControllerFactory()) {<a name="line.1121"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html index 4bd98f4..046cb95 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html @@ -212,7 +212,7 @@ <span class="sourceLineNo">204</span>import org.apache.hadoop.util.StringUtils;<a name="line.204"></a> <span class="sourceLineNo">205</span>import org.apache.zookeeper.KeeperException;<a name="line.205"></a> <span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span>import com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> +<span class="sourceLineNo">207</span>import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a name="line.208"></a> <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a name="line.209"></a> <span class="sourceLineNo">210</span>import com.google.protobuf.RpcController;<a name="line.210"></a> @@ -1008,7 +1008,7 @@ <span class="sourceLineNo">1000</span> /**<a name="line.1000"></a> <span class="sourceLineNo">1001</span> * {@inheritDoc}<a name="line.1001"></a> <span class="sourceLineNo">1002</span> * @deprecated Since 2.0. Will be removed in 3.0. Use<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a> +<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1003"></a> <span class="sourceLineNo">1004</span> */<a name="line.1004"></a> <span class="sourceLineNo">1005</span> @Override<a name="line.1005"></a> <span class="sourceLineNo">1006</span> @Deprecated<a name="line.1006"></a> @@ -1018,14 +1018,14 @@ <span class="sourceLineNo">1010</span> }<a name="line.1010"></a> <span class="sourceLineNo">1011</span><a name="line.1011"></a> <span class="sourceLineNo">1012</span> @Override<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.1013"></a> +<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.1013"></a> <span class="sourceLineNo">1014</span> throws IOException {<a name="line.1014"></a> <span class="sourceLineNo">1015</span> get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a> <span class="sourceLineNo">1016</span> }<a name="line.1016"></a> <span class="sourceLineNo">1017</span><a name="line.1017"></a> <span class="sourceLineNo">1018</span> @Override<a name="line.1018"></a> <span class="sourceLineNo">1019</span> public Future<Void> addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1020"></a> +<span class="sourceLineNo">1020</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1020"></a> <span class="sourceLineNo">1021</span> AddColumnResponse response =<a name="line.1021"></a> <span class="sourceLineNo">1022</span> executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),<a name="line.1022"></a> <span class="sourceLineNo">1023</span> getRpcControllerFactory()) {<a name="line.1023"></a> @@ -1106,7 +1106,7 @@ <span class="sourceLineNo">1098</span> /**<a name="line.1098"></a> <span class="sourceLineNo">1099</span> * {@inheritDoc}<a name="line.1099"></a> <span class="sourceLineNo">1100</span> * @deprecated As of 2.0. Will be removed in 3.0. Use<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1101"></a> +<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1101"></a> <span class="sourceLineNo">1102</span> */<a name="line.1102"></a> <span class="sourceLineNo">1103</span> @Override<a name="line.1103"></a> <span class="sourceLineNo">1104</span> @Deprecated<a name="line.1104"></a> @@ -1117,13 +1117,13 @@ <span class="sourceLineNo">1109</span><a name="line.1109"></a> <span class="sourceLineNo">1110</span> @Override<a name="line.1110"></a> <span class="sourceLineNo">1111</span> public void modifyColumnFamily(final TableName tableName,<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1112"></a> +<span class="sourceLineNo">1112</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1112"></a> <span class="sourceLineNo">1113</span> get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1113"></a> <span class="sourceLineNo">1114</span> }<a name="line.1114"></a> <span class="sourceLineNo">1115</span><a name="line.1115"></a> <span class="sourceLineNo">1116</span> @Override<a name="line.1116"></a> <span class="sourceLineNo">1117</span> public Future<Void> modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1118"></a> +<span class="sourceLineNo">1118</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1118"></a> <span class="sourceLineNo">1119</span> ModifyColumnResponse response =<a name="line.1119"></a> <span class="sourceLineNo">1120</span> executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),<a name="line.1120"></a> <span class="sourceLineNo">1121</span> getRpcControllerFactory()) {<a name="line.1121"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html index 4bd98f4..046cb95 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html @@ -212,7 +212,7 @@ <span class="sourceLineNo">204</span>import org.apache.hadoop.util.StringUtils;<a name="line.204"></a> <span class="sourceLineNo">205</span>import org.apache.zookeeper.KeeperException;<a name="line.205"></a> <span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span>import com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> +<span class="sourceLineNo">207</span>import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a name="line.208"></a> <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a name="line.209"></a> <span class="sourceLineNo">210</span>import com.google.protobuf.RpcController;<a name="line.210"></a> @@ -1008,7 +1008,7 @@ <span class="sourceLineNo">1000</span> /**<a name="line.1000"></a> <span class="sourceLineNo">1001</span> * {@inheritDoc}<a name="line.1001"></a> <span class="sourceLineNo">1002</span> * @deprecated Since 2.0. Will be removed in 3.0. Use<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a> +<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1003"></a> <span class="sourceLineNo">1004</span> */<a name="line.1004"></a> <span class="sourceLineNo">1005</span> @Override<a name="line.1005"></a> <span class="sourceLineNo">1006</span> @Deprecated<a name="line.1006"></a> @@ -1018,14 +1018,14 @@ <span class="sourceLineNo">1010</span> }<a name="line.1010"></a> <span class="sourceLineNo">1011</span><a name="line.1011"></a> <span class="sourceLineNo">1012</span> @Override<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.1013"></a> +<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.1013"></a> <span class="sourceLineNo">1014</span> throws IOException {<a name="line.1014"></a> <span class="sourceLineNo">1015</span> get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a> <span class="sourceLineNo">1016</span> }<a name="line.1016"></a> <span class="sourceLineNo">1017</span><a name="line.1017"></a> <span class="sourceLineNo">1018</span> @Override<a name="line.1018"></a> <span class="sourceLineNo">1019</span> public Future<Void> addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1020"></a> +<span class="sourceLineNo">1020</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1020"></a> <span class="sourceLineNo">1021</span> AddColumnResponse response =<a name="line.1021"></a> <span class="sourceLineNo">1022</span> executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),<a name="line.1022"></a> <span class="sourceLineNo">1023</span> getRpcControllerFactory()) {<a name="line.1023"></a> @@ -1106,7 +1106,7 @@ <span class="sourceLineNo">1098</span> /**<a name="line.1098"></a> <span class="sourceLineNo">1099</span> * {@inheritDoc}<a name="line.1099"></a> <span class="sourceLineNo">1100</span> * @deprecated As of 2.0. Will be removed in 3.0. Use<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1101"></a> +<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1101"></a> <span class="sourceLineNo">1102</span> */<a name="line.1102"></a> <span class="sourceLineNo">1103</span> @Override<a name="line.1103"></a> <span class="sourceLineNo">1104</span> @Deprecated<a name="line.1104"></a> @@ -1117,13 +1117,13 @@ <span class="sourceLineNo">1109</span><a name="line.1109"></a> <span class="sourceLineNo">1110</span> @Override<a name="line.1110"></a> <span class="sourceLineNo">1111</span> public void modifyColumnFamily(final TableName tableName,<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1112"></a> +<span class="sourceLineNo">1112</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1112"></a> <span class="sourceLineNo">1113</span> get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1113"></a> <span class="sourceLineNo">1114</span> }<a name="line.1114"></a> <span class="sourceLineNo">1115</span><a name="line.1115"></a> <span class="sourceLineNo">1116</span> @Override<a name="line.1116"></a> <span class="sourceLineNo">1117</span> public Future<Void> modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1118"></a> +<span class="sourceLineNo">1118</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1118"></a> <span class="sourceLineNo">1119</span> ModifyColumnResponse response =<a name="line.1119"></a> <span class="sourceLineNo">1120</span> executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),<a name="line.1120"></a> <span class="sourceLineNo">1121</span> getRpcControllerFactory()) {<a name="line.1121"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ca5b0275/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html index 4bd98f4..046cb95 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html @@ -212,7 +212,7 @@ <span class="sourceLineNo">204</span>import org.apache.hadoop.util.StringUtils;<a name="line.204"></a> <span class="sourceLineNo">205</span>import org.apache.zookeeper.KeeperException;<a name="line.205"></a> <span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span>import com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> +<span class="sourceLineNo">207</span>import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;<a name="line.207"></a> <span class="sourceLineNo">208</span>import com.google.protobuf.Descriptors;<a name="line.208"></a> <span class="sourceLineNo">209</span>import com.google.protobuf.Message;<a name="line.209"></a> <span class="sourceLineNo">210</span>import com.google.protobuf.RpcController;<a name="line.210"></a> @@ -1008,7 +1008,7 @@ <span class="sourceLineNo">1000</span> /**<a name="line.1000"></a> <span class="sourceLineNo">1001</span> * {@inheritDoc}<a name="line.1001"></a> <span class="sourceLineNo">1002</span> * @deprecated Since 2.0. Will be removed in 3.0. Use<a name="line.1002"></a> -<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1003"></a> +<span class="sourceLineNo">1003</span> * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1003"></a> <span class="sourceLineNo">1004</span> */<a name="line.1004"></a> <span class="sourceLineNo">1005</span> @Override<a name="line.1005"></a> <span class="sourceLineNo">1006</span> @Deprecated<a name="line.1006"></a> @@ -1018,14 +1018,14 @@ <span class="sourceLineNo">1010</span> }<a name="line.1010"></a> <span class="sourceLineNo">1011</span><a name="line.1011"></a> <span class="sourceLineNo">1012</span> @Override<a name="line.1012"></a> -<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final HColumnDescriptor columnFamily)<a name="line.1013"></a> +<span class="sourceLineNo">1013</span> public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily)<a name="line.1013"></a> <span class="sourceLineNo">1014</span> throws IOException {<a name="line.1014"></a> <span class="sourceLineNo">1015</span> get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1015"></a> <span class="sourceLineNo">1016</span> }<a name="line.1016"></a> <span class="sourceLineNo">1017</span><a name="line.1017"></a> <span class="sourceLineNo">1018</span> @Override<a name="line.1018"></a> <span class="sourceLineNo">1019</span> public Future<Void> addColumnFamilyAsync(final TableName tableName,<a name="line.1019"></a> -<span class="sourceLineNo">1020</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1020"></a> +<span class="sourceLineNo">1020</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1020"></a> <span class="sourceLineNo">1021</span> AddColumnResponse response =<a name="line.1021"></a> <span class="sourceLineNo">1022</span> executeCallable(new MasterCallable<AddColumnResponse>(getConnection(),<a name="line.1022"></a> <span class="sourceLineNo">1023</span> getRpcControllerFactory()) {<a name="line.1023"></a> @@ -1106,7 +1106,7 @@ <span class="sourceLineNo">1098</span> /**<a name="line.1098"></a> <span class="sourceLineNo">1099</span> * {@inheritDoc}<a name="line.1099"></a> <span class="sourceLineNo">1100</span> * @deprecated As of 2.0. Will be removed in 3.0. Use<a name="line.1100"></a> -<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, HColumnDescriptor)} instead.<a name="line.1101"></a> +<span class="sourceLineNo">1101</span> * {@link #modifyColumnFamily(TableName, ColumnFamilyDescriptor)} instead.<a name="line.1101"></a> <span class="sourceLineNo">1102</span> */<a name="line.1102"></a> <span class="sourceLineNo">1103</span> @Override<a name="line.1103"></a> <span class="sourceLineNo">1104</span> @Deprecated<a name="line.1104"></a> @@ -1117,13 +1117,13 @@ <span class="sourceLineNo">1109</span><a name="line.1109"></a> <span class="sourceLineNo">1110</span> @Override<a name="line.1110"></a> <span class="sourceLineNo">1111</span> public void modifyColumnFamily(final TableName tableName,<a name="line.1111"></a> -<span class="sourceLineNo">1112</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1112"></a> +<span class="sourceLineNo">1112</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1112"></a> <span class="sourceLineNo">1113</span> get(modifyColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS);<a name="line.1113"></a> <span class="sourceLineNo">1114</span> }<a name="line.1114"></a> <span class="sourceLineNo">1115</span><a name="line.1115"></a> <span class="sourceLineNo">1116</span> @Override<a name="line.1116"></a> <span class="sourceLineNo">1117</span> public Future<Void> modifyColumnFamilyAsync(final TableName tableName,<a name="line.1117"></a> -<span class="sourceLineNo">1118</span> final HColumnDescriptor columnFamily) throws IOException {<a name="line.1118"></a> +<span class="sourceLineNo">1118</span> final ColumnFamilyDescriptor columnFamily) throws IOException {<a name="line.1118"></a> <span class="sourceLineNo">1119</span> ModifyColumnResponse response =<a name="line.1119"></a> <span class="sourceLineNo">1120</span> executeCallable(new MasterCallable<ModifyColumnResponse>(getConnection(),<a name="line.1120"></a> <span class="sourceLineNo">1121</span> getRpcControllerFactory()) {<a name="line.1121"></a>