Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B74CF1892C for ; Fri, 11 Dec 2015 16:43:07 +0000 (UTC) Received: (qmail 50077 invoked by uid 500); 11 Dec 2015 16:39:23 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 48613 invoked by uid 500); 11 Dec 2015 16:39:22 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 46047 invoked by uid 99); 11 Dec 2015 16:31:31 -0000 Received: from Unknown (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2015 16:31:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 676B3E2C2D; Fri, 11 Dec 2015 16:30:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: misty@apache.org To: commits@hbase.apache.org Date: Fri, 11 Dec 2015 16:31:38 -0000 Message-Id: <1209eb13c7ac483599fea8bda80c4f53@git.apache.org> In-Reply-To: <30edfa6e54394a378028ad3e3c4e06ca@git.apache.org> References: <30edfa6e54394a378028ad3e3c4e06ca@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [46/51] [partial] hbase-site git commit: Published site at 22b95aebcd7fc742412ab514520008fda5e327de. http://git-wip-us.apache.org/repos/asf/hbase-site/blob/900a9477/apidocs/src-html/org/apache/hadoop/hbase/client/Result.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/Result.html b/apidocs/src-html/org/apache/hadoop/hbase/client/Result.html index be97f89..6563727 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/client/Result.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/client/Result.html @@ -847,113 +847,116 @@ 839 */ 840 public static long getTotalSizeOfCells(Result result) { 841 long size = 0; -842 for (Cell c : result.rawCells()) { -843 size += CellUtil.estimatedHeapSizeOf(c); +842 if (result.isEmpty()) { +843 return size; 844 } -845 return size; -846 } -847 -848 /** -849 * Copy another Result into this one. Needed for the old Mapred framework -850 * @throws UnsupportedOperationException if invoked on instance of EMPTY_RESULT -851 * (which is supposed to be immutable). -852 * @param other -853 */ -854 public void copyFrom(Result other) { -855 checkReadonly(); -856 this.row = null; -857 this.familyMap = null; -858 this.cells = other.cells; -859 } -860 -861 @Override -862 public CellScanner cellScanner() { -863 // Reset -864 this.cellScannerIndex = INITIAL_CELLSCANNER_INDEX; -865 return this; -866 } -867 -868 @Override -869 public Cell current() { -870 if (cells == null) return null; -871 return (cellScannerIndex < 0)? null: this.cells[cellScannerIndex]; -872 } -873 -874 @Override -875 public boolean advance() { -876 if (cells == null) return false; -877 return ++cellScannerIndex < this.cells.length; -878 } -879 -880 public Boolean getExists() { -881 return exists; -882 } -883 -884 public void setExists(Boolean exists) { -885 checkReadonly(); -886 this.exists = exists; -887 } -888 -889 /** -890 * Whether or not the results are coming from possibly stale data. Stale results -891 * might be returned if {@link Consistency} is not STRONG for the query. -892 * @return Whether or not the results are coming from possibly stale data. -893 */ -894 public boolean isStale() { -895 return stale; -896 } -897 -898 /** -899 * Whether or not the result is a partial result. Partial results contain a subset of the cells -900 * for a row and should be combined with a result representing the remaining cells in that row to -901 * form a complete (non-partial) result. -902 * @return Whether or not the result is a partial result -903 */ -904 public boolean isPartial() { -905 return partial; -906 } -907 -908 /** -909 * Add load information about the region to the information about the result -910 * @param loadStats statistics about the current region from which this was returned -911 * @deprecated use {@link #setStatistics(ClientProtos.RegionLoadStats)} instead -912 * @throws UnsupportedOperationException if invoked on instance of EMPTY_RESULT -913 * (which is supposed to be immutable). -914 */ -915 @InterfaceAudience.Private -916 @Deprecated -917 public void addResults(ClientProtos.RegionLoadStats loadStats) { -918 checkReadonly(); -919 this.stats = loadStats; -920 } -921 -922 /** -923 * Set load information about the region to the information about the result -924 * @param loadStats statistics about the current region from which this was returned -925 */ -926 @InterfaceAudience.Private -927 public void setStatistics(ClientProtos.RegionLoadStats loadStats) { -928 this.stats = loadStats; -929 } -930 -931 /** -932 * @return the associated statistics about the region from which this was returned. Can be -933 * <tt>null</tt> if stats are disabled. -934 */ -935 public ClientProtos.RegionLoadStats getStats() { -936 return stats; -937 } -938 -939 /** -940 * All methods modifying state of Result object must call this method -941 * to ensure that special purpose immutable Results can't be accidentally modified. -942 */ -943 private void checkReadonly() { -944 if (readonly == true) { -945 throw new UnsupportedOperationException("Attempting to modify readonly EMPTY_RESULT!"); -946 } -947 } -948} +845 for (Cell c : result.rawCells()) { +846 size += CellUtil.estimatedHeapSizeOf(c); +847 } +848 return size; +849 } +850 +851 /** +852 * Copy another Result into this one. Needed for the old Mapred framework +853 * @throws UnsupportedOperationException if invoked on instance of EMPTY_RESULT +854 * (which is supposed to be immutable). +855 * @param other +856 */ +857 public void copyFrom(Result other) { +858 checkReadonly(); +859 this.row = null; +860 this.familyMap = null; +861 this.cells = other.cells; +862 } +863 +864 @Override +865 public CellScanner cellScanner() { +866 // Reset +867 this.cellScannerIndex = INITIAL_CELLSCANNER_INDEX; +868 return this; +869 } +870 +871 @Override +872 public Cell current() { +873 if (cells == null) return null; +874 return (cellScannerIndex < 0)? null: this.cells[cellScannerIndex]; +875 } +876 +877 @Override +878 public boolean advance() { +879 if (cells == null) return false; +880 return ++cellScannerIndex < this.cells.length; +881 } +882 +883 public Boolean getExists() { +884 return exists; +885 } +886 +887 public void setExists(Boolean exists) { +888 checkReadonly(); +889 this.exists = exists; +890 } +891 +892 /** +893 * Whether or not the results are coming from possibly stale data. Stale results +894 * might be returned if {@link Consistency} is not STRONG for the query. +895 * @return Whether or not the results are coming from possibly stale data. +896 */ +897 public boolean isStale() { +898 return stale; +899 } +900 +901 /** +902 * Whether or not the result is a partial result. Partial results contain a subset of the cells +903 * for a row and should be combined with a result representing the remaining cells in that row to +904 * form a complete (non-partial) result. +905 * @return Whether or not the result is a partial result +906 */ +907 public boolean isPartial() { +908 return partial; +909 } +910 +911 /** +912 * Add load information about the region to the information about the result +913 * @param loadStats statistics about the current region from which this was returned +914 * @deprecated use {@link #setStatistics(ClientProtos.RegionLoadStats)} instead +915 * @throws UnsupportedOperationException if invoked on instance of EMPTY_RESULT +916 * (which is supposed to be immutable). +917 */ +918 @InterfaceAudience.Private +919 @Deprecated +920 public void addResults(ClientProtos.RegionLoadStats loadStats) { +921 checkReadonly(); +922 this.stats = loadStats; +923 } +924 +925 /** +926 * Set load information about the region to the information about the result +927 * @param loadStats statistics about the current region from which this was returned +928 */ +929 @InterfaceAudience.Private +930 public void setStatistics(ClientProtos.RegionLoadStats loadStats) { +931 this.stats = loadStats; +932 } +933 +934 /** +935 * @return the associated statistics about the region from which this was returned. Can be +936 * <tt>null</tt> if stats are disabled. +937 */ +938 public ClientProtos.RegionLoadStats getStats() { +939 return stats; +940 } +941 +942 /** +943 * All methods modifying state of Result object must call this method +944 * to ensure that special purpose immutable Results can't be accidentally modified. +945 */ +946 private void checkReadonly() { +947 if (readonly == true) { +948 throw new UnsupportedOperationException("Attempting to modify readonly EMPTY_RESULT!"); +949 } +950 } +951} http://git-wip-us.apache.org/repos/asf/hbase-site/blob/900a9477/book.html ---------------------------------------------------------------------- diff --git a/book.html b/book.html index 63642a6..c3d02ad 100644 --- a/book.html +++ b/book.html @@ -3111,13 +3111,13 @@ Configuration that it is thought rare anyone would change can exist only in code -
+
-
hbase.hregion.percolumnfamilyflush.size.lower.bound
+
hbase.hregion.percolumnfamilyflush.size.lower.bound.min
Description
-

If FlushLargeStoresPolicy is used, then every time that we hit the total memstore limit, we find out all the column families whose memstores exceed this value, and only flush them, while retaining the others whose memstores are lower than this limit. If none of the families have their memstore size more than this, all the memstores will be flushed (just as usual). This value should be less than half of the total memstore threshold (hbase.hregion.memstore.flush.size).

+

If FlushLargeStoresPolicy is used and there are multiple column families, then every time that we hit the total memstore limit, we find out all the column families whose memstores exceed a "lower bound" and only flush them while retaining the others in memory. The "lower bound" will be "hbase.hregion.memstore.flush.size / column_family_number" by default unless value of this property is larger than that. If none of the families have their memstore size more than lower bound, all the memstores will be flushed (just as usual).

Default
@@ -7756,7 +7756,7 @@ modeling on HBase.

Configuration config = HBaseConfiguration.create();
 Admin admin = new Admin(conf);
-String table = "myTable";
+TableName table = TableName.valueOf("myTable");
 
 admin.disableTable(table);
 
@@ -17403,7 +17403,7 @@ the data, and deletes the table.

 

 

 
import java.lang
-from org.apache.hadoop.hbase import HBaseConfiguration, HTableDescriptor, HColumnDescriptor, HConstants
+from org.apache.hadoop.hbase import HBaseConfiguration, HTableDescriptor, HColumnDescriptor, HConstants, TableName
 from org.apache.hadoop.hbase.client import HBaseAdmin, HTable, Get
 from org.apache.hadoop.hbase.io import Cell, RowResult
 
@@ -17415,7 +17415,7 @@ conf = HBaseConfiguration()
 # Create a table named 'test' that has two column families,
 # one named 'content, and the other 'anchor'.  The colons
 # are required for column family names.
-tablename = "test"
+tablename = TableName.valueOf("test")
 
 desc = HTableDescriptor(tablename)
 desc.addFamily(HColumnDescriptor("content:"))
@@ -19030,7 +19030,7 @@ admin.enableTable(tableName);

 onwards.

 

 

-
String tableName = "users";
+
TableName tableName = TableName.valueOf("users");
 String path = "hdfs://<namenode>:<port>/user/<hadoop-user>/coprocessor.jar";
 Configuration conf = HBaseConfiguration.create();
 HBaseAdmin admin = new HBaseAdmin(conf);
@@ -25762,7 +25762,7 @@ hbase shell> drop 'tableName'

 

 

 

-
void rename(Admin admin, String oldTableName, String newTableName) {
+
void rename(Admin admin, String oldTableName, TableName newTableName) {
   String snapshotName = randomName();
   admin.disableTable(oldTableName);
   admin.snapshot(snapshotName, oldTableName);
@@ -32882,7 +32882,7 @@ The server will return cellblocks compressed using this same compressor as long
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/900a9477/bulk-loads.html
----------------------------------------------------------------------
diff --git a/bulk-loads.html b/bulk-loads.html
index ec675fc..a737f1f 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -7,7 +7,7 @@
   
     
     
-    
+    
     
     Apache HBase –  
       Bulk Loads in Apache HBase (TM)
@@ -305,7 +305,7 @@ under the License. -->
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 2015-12-10</li>
+                  <li id="publishDate" class="pull-right">Last Published: 2015-12-11</li>
             </p>
                 </div>