http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e4348f53/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaRetriever.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaRetriever.html b/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaRetriever.html index a6513ad..0da9bb4 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaRetriever.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaRetriever.html @@ -94,101 +94,77 @@ <span class="sourceLineNo">086</span> public QuotaSettings next() throws IOException {<a name="line.86"></a> <span class="sourceLineNo">087</span> if (cache.isEmpty()) {<a name="line.87"></a> <span class="sourceLineNo">088</span> Result result = scanner.next();<a name="line.88"></a> -<span class="sourceLineNo">089</span> if (result == null) return null;<a name="line.89"></a> -<span class="sourceLineNo">090</span><a name="line.90"></a> -<span class="sourceLineNo">091</span> QuotaTableUtil.parseResult(result, new QuotaTableUtil.QuotasVisitor() {<a name="line.91"></a> -<span class="sourceLineNo">092</span> @Override<a name="line.92"></a> -<span class="sourceLineNo">093</span> public void visitUserQuotas(String userName, Quotas quotas) {<a name="line.93"></a> -<span class="sourceLineNo">094</span> cache.addAll(QuotaSettingsFactory.fromUserQuotas(userName, quotas));<a name="line.94"></a> -<span class="sourceLineNo">095</span> }<a name="line.95"></a> +<span class="sourceLineNo">089</span> if (result == null) {<a name="line.89"></a> +<span class="sourceLineNo">090</span> return null;<a name="line.90"></a> +<span class="sourceLineNo">091</span> }<a name="line.91"></a> +<span class="sourceLineNo">092</span> QuotaTableUtil.parseResultToCollection(result, cache);<a name="line.92"></a> +<span class="sourceLineNo">093</span> }<a name="line.93"></a> +<span class="sourceLineNo">094</span> return cache.poll();<a name="line.94"></a> +<span class="sourceLineNo">095</span> }<a name="line.95"></a> <span class="sourceLineNo">096</span><a name="line.96"></a> -<span class="sourceLineNo">097</span> @Override<a name="line.97"></a> -<span class="sourceLineNo">098</span> public void visitUserQuotas(String userName, TableName table, Quotas quotas) {<a name="line.98"></a> -<span class="sourceLineNo">099</span> cache.addAll(QuotaSettingsFactory.fromUserQuotas(userName, table, quotas));<a name="line.99"></a> -<span class="sourceLineNo">100</span> }<a name="line.100"></a> +<span class="sourceLineNo">097</span> @Override<a name="line.97"></a> +<span class="sourceLineNo">098</span> public Iterator<QuotaSettings> iterator() {<a name="line.98"></a> +<span class="sourceLineNo">099</span> return new Iter();<a name="line.99"></a> +<span class="sourceLineNo">100</span> }<a name="line.100"></a> <span class="sourceLineNo">101</span><a name="line.101"></a> -<span class="sourceLineNo">102</span> @Override<a name="line.102"></a> -<span class="sourceLineNo">103</span> public void visitUserQuotas(String userName, String namespace, Quotas quotas) {<a name="line.103"></a> -<span class="sourceLineNo">104</span> cache.addAll(QuotaSettingsFactory.fromUserQuotas(userName, namespace, quotas));<a name="line.104"></a> -<span class="sourceLineNo">105</span> }<a name="line.105"></a> -<span class="sourceLineNo">106</span><a name="line.106"></a> -<span class="sourceLineNo">107</span> @Override<a name="line.107"></a> -<span class="sourceLineNo">108</span> public void visitTableQuotas(TableName tableName, Quotas quotas) {<a name="line.108"></a> -<span class="sourceLineNo">109</span> cache.addAll(QuotaSettingsFactory.fromTableQuotas(tableName, quotas));<a name="line.109"></a> -<span class="sourceLineNo">110</span> }<a name="line.110"></a> -<span class="sourceLineNo">111</span><a name="line.111"></a> -<span class="sourceLineNo">112</span> @Override<a name="line.112"></a> -<span class="sourceLineNo">113</span> public void visitNamespaceQuotas(String namespace, Quotas quotas) {<a name="line.113"></a> -<span class="sourceLineNo">114</span> cache.addAll(QuotaSettingsFactory.fromNamespaceQuotas(namespace, quotas));<a name="line.114"></a> -<span class="sourceLineNo">115</span> }<a name="line.115"></a> -<span class="sourceLineNo">116</span> });<a name="line.116"></a> -<span class="sourceLineNo">117</span> }<a name="line.117"></a> -<span class="sourceLineNo">118</span> return cache.poll();<a name="line.118"></a> -<span class="sourceLineNo">119</span> }<a name="line.119"></a> -<span class="sourceLineNo">120</span><a name="line.120"></a> -<span class="sourceLineNo">121</span> @Override<a name="line.121"></a> -<span class="sourceLineNo">122</span> public Iterator<QuotaSettings> iterator() {<a name="line.122"></a> -<span class="sourceLineNo">123</span> return new Iter();<a name="line.123"></a> -<span class="sourceLineNo">124</span> }<a name="line.124"></a> -<span class="sourceLineNo">125</span><a name="line.125"></a> -<span class="sourceLineNo">126</span> private class Iter implements Iterator<QuotaSettings> {<a name="line.126"></a> -<span class="sourceLineNo">127</span> QuotaSettings cache;<a name="line.127"></a> +<span class="sourceLineNo">102</span> private class Iter implements Iterator<QuotaSettings> {<a name="line.102"></a> +<span class="sourceLineNo">103</span> QuotaSettings cache;<a name="line.103"></a> +<span class="sourceLineNo">104</span><a name="line.104"></a> +<span class="sourceLineNo">105</span> public Iter() {<a name="line.105"></a> +<span class="sourceLineNo">106</span> try {<a name="line.106"></a> +<span class="sourceLineNo">107</span> cache = QuotaRetriever.this.next();<a name="line.107"></a> +<span class="sourceLineNo">108</span> } catch (IOException e) {<a name="line.108"></a> +<span class="sourceLineNo">109</span> LOG.warn(StringUtils.stringifyException(e));<a name="line.109"></a> +<span class="sourceLineNo">110</span> }<a name="line.110"></a> +<span class="sourceLineNo">111</span> }<a name="line.111"></a> +<span class="sourceLineNo">112</span><a name="line.112"></a> +<span class="sourceLineNo">113</span> @Override<a name="line.113"></a> +<span class="sourceLineNo">114</span> public boolean hasNext() {<a name="line.114"></a> +<span class="sourceLineNo">115</span> return cache != null;<a name="line.115"></a> +<span class="sourceLineNo">116</span> }<a name="line.116"></a> +<span class="sourceLineNo">117</span><a name="line.117"></a> +<span class="sourceLineNo">118</span> @Override<a name="line.118"></a> +<span class="sourceLineNo">119</span> public QuotaSettings next() {<a name="line.119"></a> +<span class="sourceLineNo">120</span> QuotaSettings result = cache;<a name="line.120"></a> +<span class="sourceLineNo">121</span> try {<a name="line.121"></a> +<span class="sourceLineNo">122</span> cache = QuotaRetriever.this.next();<a name="line.122"></a> +<span class="sourceLineNo">123</span> } catch (IOException e) {<a name="line.123"></a> +<span class="sourceLineNo">124</span> LOG.warn(StringUtils.stringifyException(e));<a name="line.124"></a> +<span class="sourceLineNo">125</span> }<a name="line.125"></a> +<span class="sourceLineNo">126</span> return result;<a name="line.126"></a> +<span class="sourceLineNo">127</span> }<a name="line.127"></a> <span class="sourceLineNo">128</span><a name="line.128"></a> -<span class="sourceLineNo">129</span> public Iter() {<a name="line.129"></a> -<span class="sourceLineNo">130</span> try {<a name="line.130"></a> -<span class="sourceLineNo">131</span> cache = QuotaRetriever.this.next();<a name="line.131"></a> -<span class="sourceLineNo">132</span> } catch (IOException e) {<a name="line.132"></a> -<span class="sourceLineNo">133</span> LOG.warn(StringUtils.stringifyException(e));<a name="line.133"></a> -<span class="sourceLineNo">134</span> }<a name="line.134"></a> -<span class="sourceLineNo">135</span> }<a name="line.135"></a> -<span class="sourceLineNo">136</span><a name="line.136"></a> -<span class="sourceLineNo">137</span> @Override<a name="line.137"></a> -<span class="sourceLineNo">138</span> public boolean hasNext() {<a name="line.138"></a> -<span class="sourceLineNo">139</span> return cache != null;<a name="line.139"></a> -<span class="sourceLineNo">140</span> }<a name="line.140"></a> -<span class="sourceLineNo">141</span><a name="line.141"></a> -<span class="sourceLineNo">142</span> @Override<a name="line.142"></a> -<span class="sourceLineNo">143</span> public QuotaSettings next() {<a name="line.143"></a> -<span class="sourceLineNo">144</span> QuotaSettings result = cache;<a name="line.144"></a> -<span class="sourceLineNo">145</span> try {<a name="line.145"></a> -<span class="sourceLineNo">146</span> cache = QuotaRetriever.this.next();<a name="line.146"></a> -<span class="sourceLineNo">147</span> } catch (IOException e) {<a name="line.147"></a> -<span class="sourceLineNo">148</span> LOG.warn(StringUtils.stringifyException(e));<a name="line.148"></a> -<span class="sourceLineNo">149</span> }<a name="line.149"></a> -<span class="sourceLineNo">150</span> return result;<a name="line.150"></a> -<span class="sourceLineNo">151</span> }<a name="line.151"></a> -<span class="sourceLineNo">152</span><a name="line.152"></a> -<span class="sourceLineNo">153</span> @Override<a name="line.153"></a> -<span class="sourceLineNo">154</span> public void remove() {<a name="line.154"></a> -<span class="sourceLineNo">155</span> throw new RuntimeException("remove() not supported");<a name="line.155"></a> -<span class="sourceLineNo">156</span> }<a name="line.156"></a> -<span class="sourceLineNo">157</span> }<a name="line.157"></a> -<span class="sourceLineNo">158</span><a name="line.158"></a> -<span class="sourceLineNo">159</span> /**<a name="line.159"></a> -<span class="sourceLineNo">160</span> * Open a QuotaRetriever with no filter, all the quota settings will be returned.<a name="line.160"></a> -<span class="sourceLineNo">161</span> * @param conf Configuration object to use.<a name="line.161"></a> -<span class="sourceLineNo">162</span> * @return the QuotaRetriever<a name="line.162"></a> -<span class="sourceLineNo">163</span> * @throws IOException if a remote or network exception occurs<a name="line.163"></a> -<span class="sourceLineNo">164</span> */<a name="line.164"></a> -<span class="sourceLineNo">165</span> public static QuotaRetriever open(final Configuration conf) throws IOException {<a name="line.165"></a> -<span class="sourceLineNo">166</span> return open(conf, null);<a name="line.166"></a> -<span class="sourceLineNo">167</span> }<a name="line.167"></a> -<span class="sourceLineNo">168</span><a name="line.168"></a> -<span class="sourceLineNo">169</span> /**<a name="line.169"></a> -<span class="sourceLineNo">170</span> * Open a QuotaRetriever with the specified filter.<a name="line.170"></a> -<span class="sourceLineNo">171</span> * @param conf Configuration object to use.<a name="line.171"></a> -<span class="sourceLineNo">172</span> * @param filter the QuotaFilter<a name="line.172"></a> -<span class="sourceLineNo">173</span> * @return the QuotaRetriever<a name="line.173"></a> -<span class="sourceLineNo">174</span> * @throws IOException if a remote or network exception occurs<a name="line.174"></a> -<span class="sourceLineNo">175</span> */<a name="line.175"></a> -<span class="sourceLineNo">176</span> public static QuotaRetriever open(final Configuration conf, final QuotaFilter filter)<a name="line.176"></a> -<span class="sourceLineNo">177</span> throws IOException {<a name="line.177"></a> -<span class="sourceLineNo">178</span> Scan scan = QuotaTableUtil.makeScan(filter);<a name="line.178"></a> -<span class="sourceLineNo">179</span> QuotaRetriever scanner = new QuotaRetriever();<a name="line.179"></a> -<span class="sourceLineNo">180</span> scanner.init(conf, scan);<a name="line.180"></a> -<span class="sourceLineNo">181</span> return scanner;<a name="line.181"></a> -<span class="sourceLineNo">182</span> }<a name="line.182"></a> -<span class="sourceLineNo">183</span>}<a name="line.183"></a> +<span class="sourceLineNo">129</span> @Override<a name="line.129"></a> +<span class="sourceLineNo">130</span> public void remove() {<a name="line.130"></a> +<span class="sourceLineNo">131</span> throw new RuntimeException("remove() not supported");<a name="line.131"></a> +<span class="sourceLineNo">132</span> }<a name="line.132"></a> +<span class="sourceLineNo">133</span> }<a name="line.133"></a> +<span class="sourceLineNo">134</span><a name="line.134"></a> +<span class="sourceLineNo">135</span> /**<a name="line.135"></a> +<span class="sourceLineNo">136</span> * Open a QuotaRetriever with no filter, all the quota settings will be returned.<a name="line.136"></a> +<span class="sourceLineNo">137</span> * @param conf Configuration object to use.<a name="line.137"></a> +<span class="sourceLineNo">138</span> * @return the QuotaRetriever<a name="line.138"></a> +<span class="sourceLineNo">139</span> * @throws IOException if a remote or network exception occurs<a name="line.139"></a> +<span class="sourceLineNo">140</span> */<a name="line.140"></a> +<span class="sourceLineNo">141</span> public static QuotaRetriever open(final Configuration conf) throws IOException {<a name="line.141"></a> +<span class="sourceLineNo">142</span> return open(conf, null);<a name="line.142"></a> +<span class="sourceLineNo">143</span> }<a name="line.143"></a> +<span class="sourceLineNo">144</span><a name="line.144"></a> +<span class="sourceLineNo">145</span> /**<a name="line.145"></a> +<span class="sourceLineNo">146</span> * Open a QuotaRetriever with the specified filter.<a name="line.146"></a> +<span class="sourceLineNo">147</span> * @param conf Configuration object to use.<a name="line.147"></a> +<span class="sourceLineNo">148</span> * @param filter the QuotaFilter<a name="line.148"></a> +<span class="sourceLineNo">149</span> * @return the QuotaRetriever<a name="line.149"></a> +<span class="sourceLineNo">150</span> * @throws IOException if a remote or network exception occurs<a name="line.150"></a> +<span class="sourceLineNo">151</span> */<a name="line.151"></a> +<span class="sourceLineNo">152</span> public static QuotaRetriever open(final Configuration conf, final QuotaFilter filter)<a name="line.152"></a> +<span class="sourceLineNo">153</span> throws IOException {<a name="line.153"></a> +<span class="sourceLineNo">154</span> Scan scan = QuotaTableUtil.makeScan(filter);<a name="line.154"></a> +<span class="sourceLineNo">155</span> QuotaRetriever scanner = new QuotaRetriever();<a name="line.155"></a> +<span class="sourceLineNo">156</span> scanner.init(conf, scan);<a name="line.156"></a> +<span class="sourceLineNo">157</span> return scanner;<a name="line.157"></a> +<span class="sourceLineNo">158</span> }<a name="line.158"></a> +<span class="sourceLineNo">159</span>}<a name="line.159"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e4348f53/book.html ---------------------------------------------------------------------- diff --git a/book.html b/book.html index 17dd4f7..1e01ff8 100644 --- a/book.html +++ b/book.html @@ -10797,10 +10797,9 @@ Set it in the <code>Configuration</code> supplied to <code>Table</code>:</p> <pre class="CodeRay highlight"><code data-lang="java"><span class="predefined-type">Configuration</span> conf = HBaseConfiguration.create(); <span class="predefined-type">Connection</span> connection = ConnectionFactory.createConnection(conf); conf.set(<span class="string"><span class="delimiter">"</span><span class="content">hbase.rpc.protection</span><span class="delimiter">"</span></span>, <span class="string"><span class="delimiter">"</span><span class="content">privacy</span><span class="delimiter">"</span></span>); -<span class="keyword">try</span> (<span class="predefined-type">Connection</span> connection = ConnectionFactory.createConnection(conf)) { - <span class="keyword">try</span> (Table table = connection.getTable(TableName.valueOf(tablename)) { +<span class="keyword">try</span> (<span class="predefined-type">Connection</span> connection = ConnectionFactory.createConnection(conf); + Table table = connection.getTable(TableName.valueOf(tablename))) { .... do your stuff - } }</code></pre> </div> </div> @@ -11933,24 +11932,16 @@ For some examples of scanner specifications, issue the following HBase Shell com SecureTestUtil.updateACLs(util, <span class="keyword">new</span> <span class="predefined-type">Callable</span><<span class="predefined-type">Void</span>>() { <span class="annotation">@Override</span> <span class="directive">public</span> <span class="predefined-type">Void</span> call() <span class="directive">throws</span> <span class="exception">Exception</span> { - <span class="predefined-type">Configuration</span> conf = HBaseConfiguration.create(); - <span class="predefined-type">Connection</span> connection = ConnectionFactory.createConnection(conf); - <span class="keyword">try</span> (<span class="predefined-type">Connection</span> connection = ConnectionFactory.createConnection(conf)) { - <span class="keyword">try</span> (Table table = connection.getTable(TableName.valueOf(tablename)) { - AccessControlLists.ACL_TABLE_NAME); - <span class="keyword">try</span> { - BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); - AccessControlService.BlockingInterface protocol = - AccessControlService.newBlockingStub(service); - ProtobufUtil.grant(protocol, user, table, family, qualifier, actions); - } <span class="keyword">finally</span> { - acl.close(); - } - <span class="keyword">return</span> <span class="predefined-constant">null</span>; - } + <span class="keyword">try</span> (<span class="predefined-type">Connection</span> connection = ConnectionFactory.createConnection(util.getConfiguration()); + Table acl = connection.getTable(AccessControlLists.ACL_TABLE_NAME)) { + BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); + AccessControlService.BlockingInterface protocol = + AccessControlService.newBlockingStub(service); + AccessControlUtil.grant(<span class="predefined-constant">null</span>, protocol, user, table, family, qualifier, <span class="predefined-constant">false</span>, actions); } + <span class="keyword">return</span> <span class="predefined-constant">null</span>; } - } + }); }</code></pre> </div> </div> @@ -13295,10 +13286,9 @@ HTable table2 = <span class="keyword">new</span> HTable(conf2, <span class="stri <div class="content"> <pre class="CodeRay highlight"><code data-lang="java"><span class="comment">// Create a connection to the cluster.</span> <span class="predefined-type">Configuration</span> conf = HBaseConfiguration.create(); -<span class="keyword">try</span> (<span class="predefined-type">Connection</span> connection = ConnectionFactory.createConnection(conf)) { - <span class="keyword">try</span> (Table table = connection.getTable(TableName.valueOf(tablename)) { - <span class="comment">// use table as needed, the table returned is lightweight</span> - } +<span class="keyword">try</span> (<span class="predefined-type">Connection</span> connection = ConnectionFactory.createConnection(conf); + Table table = connection.getTable(TableName.valueOf(tablename))) { + <span class="comment">// use table as needed, the table returned is lightweight</span> }</code></pre> </div> </div> @@ -13313,7 +13303,7 @@ HTable table2 = <span class="keyword">new</span> HTable(conf2, <span class="stri <td class="content"> <div class="title"><code>HTablePool</code> is Deprecated</div> <div class="paragraph"> -<p>Previous versions of this guide discussed <code>HTablePool</code>, which was deprecated in HBase 0.94, 0.95, and 0.96, and removed in 0.98.1, by <a href="https://issues.apache.org/jira/browse/HBASE-6580";>HBASE-6500</a>, or <code>HConnection</code>, which is deprecated in HBase 1.0 by <code>Connection</code>. +<p>Previous versions of this guide discussed <code>HTablePool</code>, which was deprecated in HBase 0.94, 0.95, and 0.96, and removed in 0.98.1, by <a href="https://issues.apache.org/jira/browse/HBASE-6580";>HBASE-6580</a>, or <code>HConnection</code>, which is deprecated in HBase 1.0 by <code>Connection</code>. Please use <a href="http://hbase.apache.org/apidocs/org/apache/hadoop/hbase/client/Connection.html";>Connection</a> instead.</p> </div> </td> @@ -33607,7 +33597,7 @@ DESCRIPTION ENABLED <div class="sect2"> <h3 id="_trafodion"><a class="anchor" href="#_trafodion"></a>F.2. Trafodion</h3> <div class="paragraph"> -<p><a href="https://wiki.trafodion.org/";>Trafodion: Transactional SQL-on-HBase</a></p> +<p><a href="http://trafodion.incubator.apache.org/";>Trafodion: Transactional SQL-on-HBase</a></p> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e4348f53/bulk-loads.html ---------------------------------------------------------------------- diff --git a/bulk-loads.html b/bulk-loads.html index 12c5bbe..d895e9d 100644 --- a/bulk-loads.html +++ b/bulk-loads.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170415" /> + <meta name="Date-Revision-yyyymmdd" content="20170417" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase – Bulk Loads in Apache HBase (TM) @@ -323,7 +323,7 @@ under the License. --> <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-04-15</li> + <li id="publishDate" class="pull-right">Last Published: 2017-04-17</li> </p> </div>
