HBASE-12918 Backport asciidoc changes (apurtell and enis)

Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cb77a925
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cb77a925
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cb77a925

Branch: refs/heads/branch-1.0
Commit: cb77a925e5988e60533e9439e8b8694997c3478b
Parents: e8578c6
Author: Enis Soztutar <e...@apache.org>
Authored: Tue Jan 27 19:09:06 2015 -0800
Committer: Enis Soztutar <e...@apache.org>
Committed: Tue Jan 27 19:09:06 2015 -0800

----------------------------------------------------------------------
 hbase-annotations/src/main/asciidoc/.gitignore  |    0
 hbase-assembly/src/main/asciidoc/.gitignore     |    0
 .../src/main/asciidoc/asciidoc/.gitignore       |    0
 hbase-checkstyle/src/main/asciidoc/.gitignore   |    0
 hbase-client/src/main/asciidoc/.gitignore       |    0
 hbase-common/src/main/asciidoc/.gitignore       |    0
 hbase-examples/src/main/asciidoc/.gitignore     |    0
 .../src/main/asciidoc/.gitignore                |    0
 .../src/main/asciidoc/.gitignore                |    0
 hbase-it/src/main/asciidoc/.gitignore           |    0
 hbase-prefix-tree/src/main/asciidoc/.gitignore  |    0
 hbase-protocol/src/main/asciidoc/.gitignore     |    0
 hbase-rest/src/main/asciidoc/.gitignore         |    0
 hbase-server/src/main/asciidoc/.gitignore       |    0
 hbase-shell/src/main/asciidoc/.gitignore        |    0
 hbase-testing-util/src/main/asciidoc/.gitignore |    0
 hbase-thrift/src/main/asciidoc/.gitignore       |    0
 pom.xml                                         |  123 +-
 .../asciidoc/_chapters/appendix_acl_matrix.adoc |  133 +
 .../appendix_contributing_to_documentation.adoc |  395 ++
 .../_chapters/appendix_hfile_format.adoc        |  355 +
 src/main/asciidoc/_chapters/architecture.adoc   | 2432 +++++++
 src/main/asciidoc/_chapters/asf.adoc            |   47 +
 src/main/asciidoc/_chapters/case_studies.adoc   |  168 +
 src/main/asciidoc/_chapters/community.adoc      |  111 +
 src/main/asciidoc/_chapters/compression.adoc    |  459 ++
 src/main/asciidoc/_chapters/configuration.adoc  | 1094 ++++
 src/main/asciidoc/_chapters/cp.adoc             |  233 +
 src/main/asciidoc/_chapters/datamodel.adoc      |  571 ++
 src/main/asciidoc/_chapters/developer.adoc      | 1960 ++++++
 src/main/asciidoc/_chapters/external_apis.adoc  |   66 +
 src/main/asciidoc/_chapters/faq.adoc            |  141 +
 .../asciidoc/_chapters/getting_started.adoc     |  641 ++
 src/main/asciidoc/_chapters/hbase-default.adoc  | 2254 +++++++
 src/main/asciidoc/_chapters/hbase_apis.adoc     |  137 +
 src/main/asciidoc/_chapters/hbase_history.adoc  |   37 +
 src/main/asciidoc/_chapters/hbck_in_depth.adoc  |  212 +
 src/main/asciidoc/_chapters/mapreduce.adoc      |  586 ++
 src/main/asciidoc/_chapters/ops_mgt.adoc        | 2008 ++++++
 src/main/asciidoc/_chapters/orca.adoc           |   39 +
 src/main/asciidoc/_chapters/other_info.adoc     |   80 +
 src/main/asciidoc/_chapters/performance.adoc    |  896 +++
 src/main/asciidoc/_chapters/preface.adoc        |   64 +
 src/main/asciidoc/_chapters/rpc.adoc            |  222 +
 src/main/asciidoc/_chapters/schema_design.adoc  |  974 +++
 src/main/asciidoc/_chapters/security.adoc       | 1629 +++++
 src/main/asciidoc/_chapters/shell.adoc          |  392 ++
 src/main/asciidoc/_chapters/sql.adoc            |   42 +
 .../_chapters/thrift_filter_language.adoc       |  289 +
 src/main/asciidoc/_chapters/tracing.adoc        |  193 +
 .../asciidoc/_chapters/troubleshooting.adoc     | 1488 +++++
 src/main/asciidoc/_chapters/unit_testing.adoc   |  349 +
 src/main/asciidoc/_chapters/upgrading.adoc      |  450 ++
 src/main/asciidoc/_chapters/ycsb.adoc           |   42 +
 src/main/asciidoc/_chapters/zookeeper.adoc      |  451 ++
 src/main/asciidoc/book.adoc                     |   84 +
 src/main/asciidoc/hbase.css                     |  400 ++
 src/main/docbkx/appendix_acl_matrix.xml         |  662 --
 .../appendix_contributing_to_documentation.xml  |  426 --
 src/main/docbkx/appendix_hfile_format.xml       |  657 --
 src/main/docbkx/book.xml                        | 6107 ------------------
 src/main/docbkx/case_studies.xml                |  239 -
 src/main/docbkx/community.xml                   |  149 -
 src/main/docbkx/configuration.xml               | 1653 -----
 src/main/docbkx/cp.xml                          |  431 --
 src/main/docbkx/customization.xsl               |   49 -
 src/main/docbkx/developer.xml                   | 2346 -------
 src/main/docbkx/external_apis.xml               |   79 -
 src/main/docbkx/getting_started.xml             |  728 ---
 src/main/docbkx/hbase_apis.xml                  |  133 -
 src/main/docbkx/ops_mgt.xml                     | 2600 --------
 src/main/docbkx/performance.xml                 | 1207 ----
 src/main/docbkx/preface.xml                     |   83 -
 src/main/docbkx/rpc.xml                         |  301 -
 src/main/docbkx/schema_design.xml               | 1262 ----
 src/main/docbkx/security.xml                    | 1925 ------
 src/main/docbkx/shell.xml                       |  386 --
 src/main/docbkx/thrift_filter_language.xml      |  757 ---
 src/main/docbkx/tracing.xml                     |  187 -
 src/main/docbkx/troubleshooting.xml             | 1700 -----
 src/main/docbkx/unit_testing.xml                |  330 -
 src/main/docbkx/upgrading.xml                   |  833 ---
 src/main/docbkx/zookeeper.xml                   |  513 --
 src/main/site/asciidoc/acid-semantics.adoc      |  114 +
 src/main/site/asciidoc/bulk-loads.adoc          |   19 +
 src/main/site/asciidoc/cygwin.adoc              |  193 +
 src/main/site/asciidoc/export_control.adoc      |   40 +
 src/main/site/asciidoc/index.adoc               |   71 +
 src/main/site/asciidoc/metrics.adoc             |   97 +
 src/main/site/asciidoc/old_news.adoc            |  117 +
 src/main/site/asciidoc/pseudo-distributed.adoc  |   19 +
 src/main/site/asciidoc/replication.adoc         |   18 +
 src/main/site/asciidoc/resources.adoc           |   22 +
 src/main/site/asciidoc/sponsors.adoc            |   30 +
 src/main/site/resources/.htaccess               |    8 +
 src/main/site/resources/book/.empty             |    1 +
 src/main/site/resources/css/site.css            |    3 +
 src/main/site/site.xml                          |   53 +-
 src/main/site/xdoc/index.xml                    |    8 +
 src/main/site/xdoc/replication.xml              |  516 +-
 .../xslt/configuration_to_asciidoc_chapter.xsl  |   92 +
 101 files changed, 23069 insertions(+), 26342 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-annotations/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-annotations/src/main/asciidoc/.gitignore 
b/hbase-annotations/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-assembly/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-assembly/src/main/asciidoc/.gitignore 
b/hbase-assembly/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-assembly/src/main/asciidoc/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-assembly/src/main/asciidoc/asciidoc/.gitignore 
b/hbase-assembly/src/main/asciidoc/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-checkstyle/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-checkstyle/src/main/asciidoc/.gitignore 
b/hbase-checkstyle/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-client/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/asciidoc/.gitignore 
b/hbase-client/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-common/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/asciidoc/.gitignore 
b/hbase-common/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-examples/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-examples/src/main/asciidoc/.gitignore 
b/hbase-examples/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-hadoop-compat/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-hadoop-compat/src/main/asciidoc/.gitignore 
b/hbase-hadoop-compat/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-hadoop2-compat/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/asciidoc/.gitignore 
b/hbase-hadoop2-compat/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-it/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-it/src/main/asciidoc/.gitignore 
b/hbase-it/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-prefix-tree/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-prefix-tree/src/main/asciidoc/.gitignore 
b/hbase-prefix-tree/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-protocol/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-protocol/src/main/asciidoc/.gitignore 
b/hbase-protocol/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-rest/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-rest/src/main/asciidoc/.gitignore 
b/hbase-rest/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-server/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/asciidoc/.gitignore 
b/hbase-server/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-shell/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/asciidoc/.gitignore 
b/hbase-shell/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-testing-util/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-testing-util/src/main/asciidoc/.gitignore 
b/hbase-testing-util/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/hbase-thrift/src/main/asciidoc/.gitignore
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/asciidoc/.gitignore 
b/hbase-thrift/src/main/asciidoc/.gitignore
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2ebc82f..330150d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -671,6 +671,7 @@
               <exclude>**/*.svg</exclude>
               <exclude>**/META-INF/services/**</exclude>
               <!-- MIT: https://github.com/twbs/bootstrap/blob/master/LICENSE 
-->
+              <exclude>**/src/main/asciidoc/hbase.css</exclude>
               <exclude>**/bootstrap-theme.css</exclude>
               <exclude>**/bootstrap-theme.min.css</exclude>
               <!-- MIT http://jquery.org/license -->
@@ -793,8 +794,14 @@
               <includes>
                 <include>hbase-default.xml</include>
               </includes>
-              
<stylesheet>${basedir}/src/main/xslt/configuration_to_docbook_section.xsl</stylesheet>
-              <outputDir>${basedir}/target/docbkx</outputDir>
+              
<stylesheet>${basedir}/src/main/xslt/configuration_to_asciidoc_chapter.xsl</stylesheet>
+              <fileMappers>
+                <fileMapper 
implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
+                  <pattern>^(.*)\.xml$</pattern>
+                  <replacement>$1.adoc</replacement>
+                </fileMapper>
+              </fileMappers>
+              <outputDir>${basedir}/target/asciidoc</outputDir>
             </transformationSet>
           </transformationSets>
         </configuration>
@@ -831,62 +838,6 @@
           
<suppressionsLocation>hbase/checkstyle-suppressions.xml</suppressionsLocation>
         </configuration>
       </plugin>
-      <!--Build the documentation.  We build it twice.  Once as a single page 
and then
-           again as multipage.-->
-      <plugin>
-        <groupId>com.agilejava.docbkx</groupId>
-        <artifactId>docbkx-maven-plugin</artifactId>
-        <version>2.0.15</version>
-        <inherited>false</inherited>
-        <dependencies>
-          <dependency>
-            <groupId>org.docbook</groupId>
-            <artifactId>docbook-xml</artifactId>
-            <version>4.4</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
-        <configuration>
-          <sourceDirectory>${basedir}/src/main/docbkx</sourceDirectory>
-          <xincludeSupported>true</xincludeSupported>
-          <useIdAsFilename>true</useIdAsFilename>
-          <sectionAutolabelMaxDepth>100</sectionAutolabelMaxDepth>
-          <sectionAutolabel>true</sectionAutolabel>
-          
<sectionLabelIncludesComponentLabel>true</sectionLabelIncludesComponentLabel>
-          
<htmlCustomization>${basedir}/src/main/docbkx/customization.xsl</htmlCustomization>
-          <tocMaxDepth>2</tocMaxDepth>
-          <insertXrefPageNumber>yes</insertXrefPageNumber>
-          <chunkerOutputEncoding>UTF-8</chunkerOutputEncoding>
-        </configuration>
-        <executions>
-          <execution>
-            <id>multipage</id>
-            <goals>
-              <goal>generate-html</goal>
-            </goals>
-            <phase>pre-site</phase>
-            <configuration>
-              <navigShowtitles>true</navigShowtitles>
-              <chunkedOutput>true</chunkedOutput>
-              <imgSrcPath>../images/</imgSrcPath>
-              <htmlStylesheet>../css/freebsd_docbook.css</htmlStylesheet>
-              <targetDirectory>${basedir}/target/docbkx/book</targetDirectory>
-            </configuration>
-          </execution>
-          <execution>
-            <id>onepage</id>
-            <goals>
-              <goal>generate-html</goal>
-            </goals>
-            <phase>pre-site</phase>
-            <configuration>
-              <imgSrcPath>images/</imgSrcPath>
-              <htmlStylesheet>css/freebsd_docbook.css</htmlStylesheet>
-              <targetDirectory>${basedir}/target/docbkx/</targetDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
@@ -912,18 +863,37 @@
             </configuration>
           </execution>
           <execution>
-            <id>copy-docbkx</id>
+            <id>copy-htaccess</id>
             <goals>
               <goal>copy-resources</goal>
             </goals>
-            <phase>site</phase>
+            <phase>post-site</phase>
             <configuration>
-              <outputDirectory>target/site</outputDirectory>
+              <outputDirectory>${basedir}/target/site</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${basedir}/target/docbkx</directory>
+                  <directory>${basedir}/src/main/site/resources/</directory>
                   <includes>
-                    <include>**/**</include>
+                    <include>.htaccess</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <!-- needed to make the redirect above work -->
+          <execution>
+            <id>copy-empty-book-dir</id>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <phase>post-site</phase>
+            <configuration>
+              <outputDirectory>${basedir}/target/site</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}/src/main/site/resources/</directory>
+                  <includes>
+                    <include>book/**</include>
                   </includes>
                 </resource>
               </resources>
@@ -954,6 +924,31 @@
           <templateFile>${basedir}/src/main/site/site.vm</templateFile>
         </configuration>
       </plugin>
+      <!-- For AsciiDoc docs building -->
+      <plugin>
+        <groupId>org.asciidoctor</groupId>
+        <artifactId>asciidoctor-maven-plugin</artifactId>
+        <version>1.5.2</version> 
+        <executions>
+          <execution>
+            <id>output-html</id> 
+            <goals>
+              <goal>process-asciidoc</goal> 
+            </goals>
+            <phase>site</phase>
+            <configuration>
+              <imagesDir>./images</imagesDir>
+              <doctype>book</doctype>
+              <attributes>
+                <stylesheet>hbase.css</stylesheet>
+              </attributes>
+              <backend>html5</backend>
+              <sourceHighlighter>coderay</sourceHighlighter>
+              <outputDirectory>target/site</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
@@ -2203,6 +2198,8 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.9.1</version>
         <configuration>
+          <sourceFilesExclude>**/generated</sourceFilesExclude>
+          
<excludePackageNames>org.apache.hadoop.hbase.generated.master</excludePackageNames>
           <maxmemory>2048m</maxmemory>
           <notimestamp>true</notimestamp>
         </configuration>

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/src/main/asciidoc/_chapters/appendix_acl_matrix.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/appendix_acl_matrix.adoc 
b/src/main/asciidoc/_chapters/appendix_acl_matrix.adoc
new file mode 100644
index 0000000..7cf70b2
--- /dev/null
+++ b/src/main/asciidoc/_chapters/appendix_acl_matrix.adoc
@@ -0,0 +1,133 @@
+////
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+////
+
+[appendix]
+[[appendix_acl_matrix]]
+== Access Control Matrix
+:doctype: book
+:numbered:
+:toc: left
+:icons: font
+:experimental:
+:toc: left
+:source-language: java
+
+The following matrix shows the minimum permission set required to perform 
operations in HBase.
+Before using the table, read through the information about how to interpret it.
+
+.Interpreting the ACL Matrix Table
+The following conventions are used in the ACL Matrix table:
+
+=== Scopes
+Permissions are evaluated starting at the widest scope and working to the 
narrowest scope.
+
+A scope corresponds to a level of the data model. From broadest to narrowest, 
the scopes are as follows:
+
+.Scopes
+* Global
+* Namespace (NS)
+* Table
+* Column Family (CF)
+* Column Qualifier (CQ)
+* Cell
+
+For instance, a permission granted at table level dominates any grants done at 
the Column Family, Column Qualifier, or cell level. The user can do what that 
grant implies at any location in the table. A permission granted at global 
scope dominates all: the user is always allowed to take that action everywhere.
+
+=== Permissions
+Possible permissions include the following:
+
+.Permissions
+* Superuser - a special user that belongs to group "supergroup" and has 
unlimited access
+* Admin (A)
+* Create \(C)
+* Write (W)
+* Read \(R)
+* Execute (X)
+
+For the most part, permissions work in an expected way, with the following 
caveats:
+
+Having Write permission does not imply Read permission.::
+  It is possible and sometimes desirable for a user to be able to write data 
that same user cannot read. One such example is a log-writing process. 
+The [systemitem]+hbase:meta+ table is readable by every user, regardless of 
the user's other grants or restrictions.::
+  This is a requirement for HBase to function correctly.
+`CheckAndPut` and `CheckAndDelete` operations will fail if the user does not 
have both Write and Read permission.::
+`Increment` and `Append` operations do not require Read access.::
+
+The following table is sorted by the interface that provides each operation.
+In case the table goes out of date, the unit tests which check for accuracy of 
permissions can be found in 
_hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java_,
 and the access controls themselves can be examined in 
_hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java_.
+
+.ACL Matrix
+[cols="1,1,1,1", frame="all", options="header"]
+|===
+| Interface | Operation | Minimum Scope | Minimum Permission
+| Master | createTable | Global | C
+|        | modifyTable | Table | A\|C                    
+|        | deleteTable | Table | A\|C                   
+| | truncateTable | Table | A\|C                   
+| | addColumn | Table | A\|C
+| | modifyColumn | Table | A\|C
+| | deleteColumn | Table | A\|C
+| | disableTable | Table | A\|C
+| | disableAclTable | None | Not allowed
+| | enableTable | Table | A\|C
+| | move | Global | A
+| | assign | Global | A
+| | unassign | Global | A
+| | regionOffline | Global | A
+| | balance | Global | A
+| | balanceSwitch | Global | A
+| | shutdown | Global | A
+| | stopMaster | Global | A
+| | snapshot | Global | A
+| | clone | Global | A
+| | restore | Global | A
+| | deleteSnapshot | Global | A
+| | createNamespace | Global | A
+| | deleteNamespace | Namespace | A
+| | modifyNamespace | Namespace | A
+| | flushTable | Table | A\|C
+| | getTableDescriptors | Global\|Table | A
+| | mergeRegions | Global | A
+| Region | openRegion | Global | A
+| | closeRegion | Global | A
+| | stopRegionServer | Global | A
+| | rollHLog | Global | A
+| | mergeRegions | Global | A
+| | flush | Global\|Table | A\|C 
+| | split | Global\|Table | A
+| | compact | Global\|Table | A\|C
+| | bulkLoadHFile    | Table | W
+| | prepareBulkLoad  | Table |C
+| | cleanupBulkLoad  | Table |W
+| | checkAndDelete   | Table\|CF\|CQ | RW
+| | checkAndPut | Table\|CF\|CQ | RW
+| | incrementColumnValue  | Table\|CF\|CQ | RW
+| | scannerClose |     Table | R
+| | scannerNext | Table |  R
+| | scannerOpen | Table\|CF\|CQ | R     
+| Endpoint | invoke | Endpoint | X
+| AccessController | grant | Global\|Table\|NS | A 
+| | revoke | Global\|Table\|NS | A                   
+| | getUserPermissions | Global\|Table\|NS | A
+| | checkPermissions | Global\|Table\|NS | A                 
+|===
+
+:numbered:

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
----------------------------------------------------------------------
diff --git 
a/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc 
b/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
new file mode 100644
index 0000000..6b31059
--- /dev/null
+++ b/src/main/asciidoc/_chapters/appendix_contributing_to_documentation.adoc
@@ -0,0 +1,395 @@
+////
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+////
+
+[appendix]
+[[appendix_contributing_to_documentation]]
+== Contributing to Documentation
+:doctype: book
+:numbered:
+:toc: left
+:icons: font
+:experimental:
+:toc: left
+:source-language: java
+
+The Apache HBase project welcomes contributions to all aspects of the project, 
including the documentation.
+
+In HBase, documentation includes the following areas, and probably some others:
+
+* The link:http://hbase.apache.org/book.html[HBase Reference
+  Guide] (this book)
+* The link:http://hbase.apache.org/[HBase website]
+* The link:http://wiki.apache.org/hadoop/Hbase[HBase
+  Wiki]
+* API documentation
+* Command-line utility output and help text
+* Web UI strings, explicit help text, context-sensitive strings, and others
+* Log messages
+* Comments in source files, configuration files, and others
+* Localization of any of the above into target languages other than English
+
+No matter which area you want to help out with, the first step is almost 
always to download (typically by cloning the Git repository) and familiarize 
yourself with the HBase source code.
+The only exception in the list above is the HBase Wiki, which is edited online.
+For information on downloading and building the source, see 
<<developer,developer>>.
+
+=== Getting Access to the Wiki
+
+The HBase Wiki is not well-maintained and much of its content has been moved 
into the HBase Reference Guide (this guide). However, some pages on the Wiki 
are well maintained, and it would be great to have some volunteers willing to 
help out with the Wiki.
+To request access to the Wiki, register a new account at 
link:https://wiki.apache.org/hadoop/Hbase?action=newaccount[https://wiki.apache.org/hadoop/Hbase?action=newaccount].
+Contact one of the HBase committers, who can either give you access or refer 
you to someone who can.
+
+=== Contributing to Documentation or Other Strings
+
+If you spot an error in a string in a UI, utility, script, log message, or 
elsewhere, or you think something could be made more clear, or you think text 
needs to be added where it doesn't currently exist, the first step is to file a 
JIRA.
+Be sure to set the component to `Documentation` in addition any other involved 
components.
+Most components have one or more default owners, who monitor new issues which 
come into those queues.
+Regardless of whether you feel able to fix the bug, you should still file bugs 
where you see them.
+
+If you want to try your hand at fixing your newly-filed bug, assign it to 
yourself.
+You will need to clone the HBase Git repository to your local system and work 
on the issue there.
+When you have developed a potential fix, submit it for review.
+If it addresses the issue and is seen as an improvement, one of the HBase 
committers will commit it to one or more branches, as appropriate.
+
+.Procedure: Suggested Work flow for Submitting Patches
+This procedure goes into more detail than Git pros will need, but is included 
in this appendix so that people unfamiliar with Git can feel confident 
contributing to HBase while they learn.
+
+. If you have not already done so, clone the Git repository locally.
+  You only need to do this once.
+. Fairly often, pull remote changes into your local repository by using the 
`git pull` command, while your master branch is checked out.
+. For each issue you work on, create a new branch.
+  One convention that works well for naming the branches is to name a given 
branch the same as the JIRA it relates to:
++
+----
+$ git checkout -b HBASE-123456
+----
+
+. Make your suggested changes on your branch, committing your changes to your 
local repository often.
+  If you need to switch to working on a different issue, remember to check out 
the appropriate branch.
+. When you are ready to submit your patch, first be sure that HBase builds 
cleanly and behaves as expected in your modified branch.
+  If you have made documentation changes, be sure the documentation and 
website builds by running `mvn clean site`.
++
+NOTE: Before you use the `site` target the very first time, be sure you have 
built HBase at least once, in order to fetch all the Maven dependencies you 
need.
++
+----
+$ mvn clean install -DskipTests               # Builds HBase
+----
++
+----
+$ mvn clean site -DskipTests                  # Builds the website and 
documentation
+----
++
+If any errors occur, address them.
+
+. If it takes you several days or weeks to implement your fix, or you know 
that the area of the code you are working in has had a lot of changes lately, 
make sure you rebase your branch against the remote master and take care of any 
conflicts before submitting your patch.
++
+----
+
+$ git checkout HBASE-123456
+$ git rebase origin/master
+----
+
+. Generate your patch against the remote master.
+  Run the following command from the top level of your git repository (usually 
called `hbase`):
++
+----
+$ git format-patch --stdout origin/master > HBASE-123456.patch
+----
++
+The name of the patch should contain the JIRA ID.
+Look over the patch file to be sure that you did not change any additional 
files by accident and that there are no other surprises.
+When you are satisfied, attach the patch to the JIRA and click the btn:[Patch 
Available] button.
+A reviewer will review your patch.
+If you need to submit a new version of the patch, leave the old one on the 
JIRA and add a version number to the name of the new patch.
+
+. After a change has been committed, there is no need to keep your local 
branch around.
+  Instead you should run `git pull` to get the new change into your master 
branch.
+
+=== Editing the HBase Website
+
+The source for the HBase website is in the HBase source, in the 
_src/main/site/_ directory.
+Within this directory, source for the individual pages is in the _xdocs/_ 
directory, and images referenced in those pages are in the _images/_ directory.
+This directory also stores images used in the HBase Reference Guide.
+
+The website's pages are written in an HTML-like XML dialect called xdoc, which 
has a reference guide at 
link:http://maven.apache.org/archives/maven-1.x/plugins/xdoc/reference/xdocs.html.
+You can edit these files in a plain-text editor, an IDE, or an XML editor such 
as XML Mind XML Editor (XXE) or Oxygen XML Author. 
+
+To preview your changes, build the website using the +mvn clean site
+                -DskipTests+ command.
+The HTML output resides in the _target/site/_ directory.
+When you are satisfied with your changes, follow the procedure in 
<<submit_doc_patch_procedure,submit doc patch procedure>> to submit your patch.
+
+=== HBase Reference Guide Style Guide and Cheat Sheet
+
+The HBase Reference Guide is written in Asciidoc and built using 
link:http://asciidoctor.org[AsciiDoctor]. The following cheat sheet is included 
for your reference. More nuanced and comprehensive documentation is available 
at link:http://asciidoctor.org/docs/user-manual/.
+
+.AsciiDoc Cheat Sheet
+[cols="1,1,a",options="header"]
+|===
+| Element Type | Desired Rendering | How to do it
+| A paragraph | a paragraph | Just type some text with a blank line at the top 
and bottom.
+| Add line breaks within a paragraph without adding blank lines | Manual line 
breaks | This will break + at the plus sign. Or prefix the whole paragraph with 
a line containing '[%hardbreaks]'
+| Give a title to anything | Colored italic bold differently-sized text | 
.MyTitle (no space between the period and the words) on the line before the 
thing to be titled
+| In-Line Code or commands | monospace | \`text`  
+| In-line literal content (things to be typed exactly as shown) | bold mono | 
\*\`typethis`*
+| In-line replaceable content (things to substitute with your own values) | 
bold italic mono | \*\_typesomething_*
+| Code blocks with highlighting | monospace, highlighted, preserve space | 
+........
+[source,java]
+---- 
+  myAwesomeCode() { 
+} 
+----
+........
+| Code block included from a separate file | included just as though it were 
part of the main file |
+................
+[source,ruby]
+----
+include\::path/to/app.rb[]
+----
+................
+| Include only part of a separate file | Similar to Javadoc | See 
link:http://asciidoctor.org/docs/user-manual/#by-tagged-regions
+| Filenames, directory names, new terms | italic | \_hbase-default.xml_
+| External naked URLs | A link with the URL as link text | 
+----
+link:http://www.google.com
+----
+
+| External URLs with text | A link with arbitrary link text | 
+----
+link:http://www.google.com[Google]
+----
+
+| Create an internal anchor to cross-reference | not rendered | 
+----
+[[anchor_name]]
+----
+| Cross-reference an existing anchor using its default title| an internal 
hyperlink using the element title if available, otherwise using the anchor name 
| 
+----
+<<anchor_name>>
+----
+| Cross-reference an existing anchor using custom text | an internal hyperlink 
using arbitrary text | 
+----
+<<anchor_name,Anchor Text>>
+----
+| A block image | The image with alt text | 
+----
+image::sunset.jpg[Alt Text] 
+----
+(put the image in the src/main/site/resources/images directory)
+| An inline image | The image with alt text, as part of the text flow | 
+----
+image:sunset.jpg [Alt Text]
+----
+(only one colon)
+| Link to a remote image | show an image hosted elsewhere | 
+----
+image::http://inkscape.org/doc/examples/tux.svg[Tux,250,350] 
+----
+(or `image:`)
+| Add dimensions or a URL to the image | depends | inside the brackets after 
the alt text, specify width, height and/or link="http://my_link.com";
+| A footnote | subscript link which takes you to the footnote | 
+----
+Some text.footnote:[The footnote text.]
+----
+| A note or warning with no title | The admonition image followed by the 
admonition | 
+----
+NOTE:My note here
+----
+
+----
+WARNING:My warning here
+----
+| A complex note | The note has a title and/or multiple paragraphs and/or code 
blocks or lists, etc | 
+........
+.The Title
+[NOTE]
+====
+Here is the note text. Everything until the second set of four equals signs is 
part of the note.
+----
+some source code
+----
+====
+........
+| Bullet lists | bullet lists | 
+----
+* list item 1
+----
+(see http://asciidoctor.org/docs/user-manual/#unordered-lists)
+| Numbered lists | numbered list | 
+----
+. list item 2 
+----
+(see http://asciidoctor.org/docs/user-manual/#ordered-lists)
+| Checklists | Checked or unchecked boxes | 
+Checked:
+----
+- [*] 
+----
+Unchecked:
+----
+- [ ]
+----
+| Multiple levels of lists | bulleted or numbered or combo | 
+----
+. Numbered (1), at top level
+* Bullet (2), nested under 1
+* Bullet (3), nested under 1
+. Numbered (4), at top level
+* Bullet (5), nested under 4
+** Bullet (6), nested under 5
+- [x] Checked (7), at top level
+----
+| Labelled lists / variablelists | a list item title or summary followed by 
content | 
+----
+Title:: content 
+
+Title::
+  content
+----
+| Sidebars, quotes, or other blocks of text | a block of text, formatted 
differently from the default | Delimited using different delimiters, see 
link:http://asciidoctor.org/docs/user-manual/#built-in-blocks-summary. Some of 
the examples above use delimiters like \...., ----,====.
+........
+[example]
+====
+This is an example block.
+====
+
+[source]
+----
+This is a source block.
+----
+
+[note]
+====
+This is a note block.
+====
+
+[quote]
+____
+This is a quote block.
+____
+........
+
+If you want to insert literal Asciidoc content that keeps being interpreted, 
when in doubt, use eight dots as the delimiter at the top and bottom.
+| Nested Sections | chapter, section, sub-section, etc | 
+----
+= Book (or chapter if the chapter can be built alone, see the leveloffset info 
below)
+
+== Chapter (or section if the chapter is standalone)
+
+=== Section (or subsection, etc)
+
+==== Subsection 
+----
+
+and so on up to 6 levels (think carefully about going deeper than 4 levels, 
maybe you can just titled paragraphs or lists instead). Note that you can 
include a book inside another book by adding the `:leveloffset:+1` macro 
directive directly before your include, and resetting it to 0 directly after. 
See the _book.adoc_ source for examples, as this is how this guide handles 
chapters. *Don't do it for prefaces, glossaries, appendixes, or other special 
types of chapters.*
+
+| Include one file from another | Content is included as though it were inline 
|
+
+----
+include::[/path/to/file.adoc]
+----
+
+For plenty of examples. see _book.adoc_.
+| A table | a table | See http://asciidoctor.org/docs/user-manual/#tables. 
Generally rows are separated by newlines and columns by pipes
+| Comment out a single line | A  line is skipped during rendering | 
+`+//+ This line won't show up`
+| Comment out a block | A section of the file is skipped during rendering |
+----
+////
+Nothing between the slashes will show up.
+////
+----
+| Highlight text for review | text shows up with yellow background | 
+----
+Test between #hash marks# is highlighted yellow.
+----
+|===
+
+
+=== Auto-Generated Content
+
+Some parts of the HBase Reference Guide, most notably 
<<config.files,config.files>>, are generated automatically, so that this area 
of the documentation stays in sync with the code.
+This is done by means of an XSLT transform, which you can examine in the 
source at _src/main/xslt/configuration_to_asciidoc_chapter.xsl_.
+This transforms the _hbase-common/src/main/resources/hbase-default.xml_        
    file into an Asciidoc output which can be included in the Reference Guide.
+Sometimes, it is necessary to add configuration parameters or modify their 
descriptions.
+Make the modifications to the source file, and they will be included in the 
Reference Guide when it is rebuilt.
+
+It is possible that other types of content can and will be automatically 
generated from HBase source files in the future.
+
+
+=== Images in the HBase Reference Guide
+
+You can include images in the HBase Reference Guide. It is important to 
include an image title if possible, and alternate text always. 
+This allows screen readers to navigate to the image and also provides 
alternative text for the image.
+The following is an example of an image with a title and alternate text. 
Notice the double colon.
+
+[source,asciidoc]
+----
+.My Image Title
+image::sunset.jpg[Alt Text]
+----
+
+Here is an example of an inline image with alternate text. Notice the single 
colon. Inline images cannot have titles. They are generally small images like 
GUI buttons.
+
+[source,asciidoc]
+----
+image:sunset.jpg[Alt Text]
+----
+
+
+When doing a local build, save the image to the 
_src/main/site/resources/images/_ directory.
+When you link to the image, do not include the directory portion of the path.
+The image will be copied to the appropriate target location during the build 
of the output.
+
+When you submit a patch which includes adding an image to the HBase Reference 
Guide, attach the image to the JIRA.
+If the committer asks where the image should be committed, it should go into 
the above directory.
+
+=== Adding a New Chapter to the HBase Reference Guide
+
+If you want to add a new chapter to the HBase Reference Guide, the easiest way 
is to copy an existing chapter file, rename it, and change the ID (in double 
brackets) and title. Chapters are located in the _src/main/asciidoc/_chapters/_ 
directory.
+
+Delete the existing content and create the new content.
+Then open the _src/main/asciidoc/book.adoc_ file, which is the main file for 
the HBase Reference Guide, and copy an existing `include` element to include 
your new chapter in the appropriate location.
+Be sure to add your new file to your Git repository before creating your patch.
+
+When in doubt, check to see how other files have been included.
+
+=== Common Documentation Issues
+
+The following documentation issues come up often.
+Some of these are preferences, but others can create mysterious build errors 
or other problems.
+
+[qanda]
+Isolate Changes for Easy Diff Review.::
+  Be careful with pretty-printing or re-formatting an entire XML file, even if 
the formatting has degraded over time. If you need to reformat a file, do that 
in a separate JIRA where you do not change any content. Be careful because some 
XML editors do a bulk-reformat when you open a new file, especially if you use 
GUI mode in the editor.
+
+Syntax Highlighting::
+  The HBase Reference Guide uses `coderay` for syntax highlighting. To enable 
syntax highlighting for a given code listing, use the following type of syntax:
++
+........
+[source,xml]
+----
+<name>My Name</name>
+----
+........
++
+Several syntax types are supported. The most interesting ones for the HBase 
Reference Guide are `java`, `xml`, `sql`, and `bash`.
+

http://git-wip-us.apache.org/repos/asf/hbase/blob/cb77a925/src/main/asciidoc/_chapters/appendix_hfile_format.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/appendix_hfile_format.adoc 
b/src/main/asciidoc/_chapters/appendix_hfile_format.adoc
new file mode 100644
index 0000000..b74763c
--- /dev/null
+++ b/src/main/asciidoc/_chapters/appendix_hfile_format.adoc
@@ -0,0 +1,355 @@
+////
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+////
+
+[appendix]
+== HFile format
+:doctype: book
+:numbered:
+:toc: left
+:icons: font
+:experimental:
+:toc: left
+:source-language: java
+
+This appendix describes the evolution of the HFile format.
+
+[[hfilev1]]
+=== HBase File Format (version 1)
+
+As we will be discussing changes to the HFile format, it is useful to give a 
short overview of the original (HFile version 1) format.
+
+[[hfilev1.overview]]
+==== Overview of Version 1
+
+An HFile in version 1 format is structured as follows:
+
+.HFile V1 Format
+image::hfile.png[HFile Version 1]
+
+====  Block index format in version 1 
+
+The block index in version 1 is very straightforward.
+For each entry, it contains: 
+
+. Offset (long)
+. Uncompressed size (int)
+. Key (a serialized byte array written using Bytes.writeByteArray) 
+.. Key length as a variable-length integer (VInt) 
+.. Key bytes 
+
+
+The number of entries in the block index is stored in the fixed file trailer, 
and has to be passed in to the method that reads the block index.
+One of the limitations of the block index in version 1 is that it does not 
provide the compressed size of a block, which turns out to be necessary for 
decompression.
+Therefore, the HFile reader has to infer this compressed size from the offset 
difference between blocks.
+We fix this limitation in version 2, where we store on-disk block size instead 
of uncompressed size, and get uncompressed size from the block header.
+
+[[hfilev2]]
+=== HBase file format with inline blocks (version 2)
+
+Note:  this feature was introduced in HBase 0.92
+
+==== Motivation 
+
+We found it necessary to revise the HFile format after encountering high 
memory usage and slow startup times caused by large Bloom filters and block 
indexes in the region server.
+Bloom filters can get as large as 100 MB per HFile, which adds up to 2 GB when 
aggregated over 20 regions.
+Block indexes can grow as large as 6 GB in aggregate size over the same set of 
regions.
+A region is not considered opened until all of its block index data is loaded.
+Large Bloom filters produce a different performance problem: the first get 
request that requires a Bloom filter lookup will incur the latency of loading 
the entire Bloom filter bit array.
+
+To speed up region server startup we break Bloom filters and block indexes 
into multiple blocks and write those blocks out as they fill up, which also 
reduces the HFile writer's memory footprint.
+In the Bloom filter case, "filling up a block" means accumulating enough keys 
to efficiently utilize a fixed-size bit array, and in the block index case we 
accumulate an "index block" of the desired size.
+Bloom filter blocks and index blocks (we call these "inline blocks") become 
interspersed with data blocks, and as a side effect we can no longer rely on 
the difference between block offsets to determine data block length, as it was 
done in version 1.
+
+HFile is a low-level file format by design, and it should not deal with 
application-specific details such as Bloom filters, which are handled at 
StoreFile level.
+Therefore, we call Bloom filter blocks in an HFile "inline" blocks.
+We also supply HFile with an interface to write those inline blocks. 
+
+Another format modification aimed at reducing the region server startup time 
is to use a contiguous "load-on-open" section that has to be loaded in memory 
at the time an HFile is being opened.
+Currently, as an HFile opens, there are separate seek operations to read the 
trailer, data/meta indexes, and file info.
+To read the Bloom filter, there are two more seek operations for its "data" 
and "meta" portions.
+In version 2, we seek once to read the trailer and seek again to read 
everything else we need to open the file from a contiguous block.
+
+[[hfilev2.overview]]
+==== Overview of Version 2
+
+The version of HBase introducing the above features reads both version 1 and 2 
HFiles, but only writes version 2 HFiles.
+A version 2 HFile is structured as follows: 
+
+.HFile Version 2 Structure
+image:hfilev2.png[HFile Version 2]   
+
+==== Unified version 2 block format
+
+In the version 2 every block in the data section contains the following 
fields: 
+
+. 8 bytes: Block type, a sequence of bytes equivalent to version 1's "magic 
records". Supported block types are: 
+.. DATA – data blocks 
+.. LEAF_INDEX – leaf-level index blocks in a multi-level-block-index 
+.. BLOOM_CHUNK – Bloom filter chunks 
+.. META – meta blocks (not used for Bloom filters in version 2 anymore) 
+.. INTERMEDIATE_INDEX – intermediate-level index blocks in a multi-level 
blockindex 
+.. ROOT_INDEX – root>level index blocks in a multi>level block index 
+.. FILE_INFO – the ``file info'' block, a small key>value map of metadata 
+.. BLOOM_META – a Bloom filter metadata block in the load>on>open section 
+.. TRAILER – a fixed>size file trailer.
+  As opposed to the above, this is not an HFile v2 block but a fixed>size (for 
each HFile version) data structure 
+.. INDEX_V1 – this block type is only used for legacy HFile v1 block 
+. Compressed size of the block's data, not including the header (int). 
++
+Can be used for skipping the current data block when scanning HFile data. 
+. Uncompressed size of the block's data, not including the header (int)
++
+This is equal to the compressed size if the compression algorithm is NONE 
+. File offset of the previous block of the same type (long)
++
+Can be used for seeking to the previous data/index block 
+. Compressed data (or uncompressed data if the compression algorithm is NONE).
+
+The above format of blocks is used in the following HFile sections:
+
+Scanned block section::
+  The section is named so because it contains all data blocks that need to be 
read when an HFile is scanned sequentially.
+  Also contains leaf block index and Bloom chunk blocks. 
+Non-scanned block section::
+  This section still contains unified-format v2 blocks but it does not have to 
be read when doing a sequential scan.
+  This section contains "meta" blocks and intermediate-level index blocks. 
+
+We are supporting "meta" blocks in version 2 the same way they were supported 
in version 1, even though we do not store Bloom filter data in these blocks 
anymore. 
+
+====  Block index in version 2
+
+There are three types of block indexes in HFile version 2, stored in two 
different formats (root and non-root): 
+
+. Data index -- version 2 multi-level block index, consisting of:
+.. Version 2 root index, stored in the data block index section of the file 
+.. Optionally, version 2 intermediate levels, stored in the non%root format in 
  the data index section of the file. Intermediate levels can only be present 
if leaf level blocks are present 
+.. Optionally, version 2 leaf levels, stored in the non%root format inline 
with   data blocks 
+. Meta index -- version 2 root index format only, stored in the meta index 
section of the file
+. Bloom index -- version 2 root index format only, stored in the 
``load-on-open'' section as part of Bloom filter metadata.
+
+==== Root block index format in version 2
+
+This format applies to:
+
+. Root level of the version 2 data index
+. Entire meta and Bloom indexes in version 2, which are always single-level. 
+
+A version 2 root index block is a sequence of entries of the following format, 
similar to entries of a version 1 block index, but storing on-disk size instead 
of uncompressed size. 
+
+. Offset (long) 
++
+This offset may point to a data block or to a deeper>level index block. 
+
+. On-disk size (int) 
+. Key (a serialized byte array stored using Bytes.writeByteArray) 
++
+. Key (VInt) 
+. Key bytes 
+
+
+A single-level version 2 block index consists of just a single root index 
block.
+To read a root index block of version 2, one needs to know the number of 
entries.
+For the data index and the meta index the number of entries is stored in the 
trailer, and for the Bloom index it is stored in the compound Bloom filter 
metadata.
+
+For a multi-level block index we also store the following fields in the root 
index block in the load-on-open section of the HFile, in addition to the data 
structure described above:
+
+. Middle leaf index block offset
+. Middle leaf block on-disk size (meaning the leaf index block containing the 
reference to the ``middle'' data block of the file) 
+. The index of the mid-key (defined below) in the middle leaf-level block.
+
+
+
+These additional fields are used to efficiently retrieve the mid-key of the 
HFile used in HFile splits, which we define as the first key of the block with 
a zero-based index of (n – 1) / 2, if the total number of blocks in the HFile 
is n.
+This definition is consistent with how the mid-key was determined in HFile 
version 1, and is reasonable in general, because blocks are likely to be the 
same size on average, but we don't have any estimates on individual key/value 
pair sizes. 
+
+
+
+When writing a version 2 HFile, the total number of data blocks pointed to by 
every leaf-level index block is kept track of.
+When we finish writing and the total number of leaf-level blocks is 
determined, it is clear which leaf-level block contains the mid-key, and the 
fields listed above are computed.
+When reading the HFile and the mid-key is requested, we retrieve the middle 
leaf index block (potentially from the block cache) and get the mid-key value 
from the appropriate position inside that leaf block.
+
+==== Non-root block index format in version 2
+
+This format applies to intermediate-level and leaf index blocks of a version 2 
multi-level data block index.
+Every non-root index block is structured as follows. 
+
+. numEntries: the number of entries (int). 
+. entryOffsets: the ``secondary index'' of offsets of entries in the block, to 
facilitate a quick binary search on the key (numEntries + 1 int values). The 
last value is the total length of all entries in this index block.
+  For example, in a non-root index block with entry sizes 60, 80, 50 the 
``secondary index'' will contain the following int array: {0, 60, 140, 190}.
+. Entries.
+  Each entry contains: 
++
+. Offset of the block referenced by this entry in the file (long) 
+. On>disk size of the referenced block (int) 
+. Key.
+  The length can be calculated from entryOffsets. 
+
+
+==== Bloom filters in version 2
+
+In contrast with version 1, in a version 2 HFile Bloom filter metadata is 
stored in the load-on-open section of the HFile for quick startup. 
+
+. A compound Bloom filter. 
++
+. Bloom filter version = 3 (int). There used to be a DynamicByteBloomFilter 
class that had the Bloom   filter version number 2 
+. The total byte size of all compound Bloom filter chunks (long) 
+. Number of hash functions (int 
+. Type of hash functions (int) 
+. The total key count inserted into the Bloom filter (long) 
+. The maximum total number of keys in the Bloom filter (long) 
+. The number of chunks (int) 
+. Comparator class used for Bloom filter keys, a UTF>8 encoded string stored   
using Bytes.writeByteArray 
+. Bloom block index in the version 2 root block index format 
+
+
+==== File Info format in versions 1 and 2
+
+The file info block is a serialized 
link:http://hbase.apache.org/apidocs/org/apache/hadoop/hbase/io/HbaseMapWritable.html[HbaseMapWritable]
 (essentially a map from byte arrays to byte arrays) with the following keys, 
among others.
+StoreFile-level logic adds more keys to this.
+
+[cols="1,1", frame="all"]
+|===
+|hfile.LASTKEY| The last key of the file (byte array)
+|hfile.AVG_KEY_LEN| The average key length in the file (int)
+|hfile.AVG_VALUE_LEN| The average value length in the file (int)           
+|===
+
+File info format did not change in version 2.
+However, we moved the file info to the final section of the file, which can be 
loaded as one block at the time the HFile is being opened.
+Also, we do not store comparator in the version 2 file info anymore.
+Instead, we store it in the fixed file trailer.
+This is because we need to know the comparator at the time of parsing the 
load-on-open section of the HFile.
+
+==== Fixed file trailer format differences between versions 1 and 2
+
+The following table shows common and different fields between fixed file 
trailers in versions 1 and 2.
+Note that the size of the trailer is different depending on the version, so it 
is ``fixed'' only within one version.
+However, the version is always stored as the last four-byte integer in the 
file. 
+
+.Differences between HFile Versions 1 and 2
+[cols="1,1", frame="all"]
+|===
+| Version 1 | Version 2
+| |File info offset (long)
+| Data index offset (long)| loadOnOpenOffset (long) /The offset of the 
sectionthat we need toload when opening the file./
+| | Number of data index entries (int)
+| metaIndexOffset (long) /This field is not being used by the version 1 
reader, so we removed it from version 2./ | uncompressedDataIndexSize (long) 
/The total uncompressed size of the whole data block index, including 
root-level, intermediate-level, and leaf-level blocks./
+| | Number of meta index entries (int)
+| | Total uncompressed bytes (long)
+| numEntries (int) | numEntries (long)
+| Compression codec: 0 = LZO, 1 = GZ, 2 = NONE (int) | Compression codec: 0 = 
LZO, 1 = GZ, 2 = NONE (int)
+| | The number of levels in the data block index (int)
+| | firstDataBlockOffset (long) /The offset of the first first data block. 
Used when scanning./
+| | lastDataBlockEnd (long) /The offset of the first byte after the last 
key/value data block. We don't need to go beyond this offset when scanning./
+| Version: 1 (int) | Version: 2 (int)
+|===
+
+
+
+==== getShortMidpointKey(an optimization for data index block)
+
+Note: this optimization was introduced in HBase 0.95+
+
+HFiles contain many blocks that contain a range of sorted Cells.
+Each cell has a key.
+To save IO when reading Cells, the HFile also has an index that maps a Cell's 
start key to the offset of the beginning of a particular block.
+Prior to this optimization, HBase would use the key of the first cell in each 
data block as the index key.
+
+In HBASE-7845, we generate a new key that is lexicographically larger than the 
last key of the previous block and lexicographically equal or smaller than the 
start key of the current block.
+While actual keys can potentially be very long, this "fake key" or "virtual 
key" can be much shorter.
+For example, if the stop key of previous block is "the quick brown fox", the 
start key of current block is "the who", we could use "the r" as our virtual 
key in our hfile index.
+
+There are two benefits to this:
+
+* having shorter keys reduces the hfile index size, (allowing us to keep more 
indexes in memory), and
+* using something closer to the end key of the previous block allows us to 
avoid a potential extra IO when the target key lives in between the "virtual 
key" and the key of the first element in the target block.
+
+This optimization (implemented by the getShortMidpointKey method) is inspired 
by LevelDB's ByteWiseComparatorImpl::FindShortestSeparator() and 
FindShortSuccessor().
+
+[[hfilev3]]
+=== HBase File Format with Security Enhancements (version 3)
+
+Note: this feature was introduced in HBase 0.98
+
+[[hfilev3.motivation]]
+==== Motivation 
+
+Version 3 of HFile makes changes needed to ease management of encryption at 
rest and cell-level metadata (which in turn is needed for cell-level ACLs and 
cell-level visibility labels). For more information see 
<<hbase.encryption.server,hbase.encryption.server>>, <<hbase.tags,hbase.tags>>, 
<<hbase.accesscontrol.configuration,hbase.accesscontrol.configuration>>, and 
<<hbase.visibility.labels,hbase.visibility.labels>>. 
+
+[[hfilev3.overview]]
+==== Overview
+
+The version of HBase introducing the above features reads HFiles in versions 
1, 2, and 3 but only writes version 3 HFiles.
+Version 3 HFiles are structured the same as version 2 HFiles.
+For more information see <<hfilev2.overview,hfilev2.overview>>. 
+
+[[hvilev3.infoblock]]
+==== File Info Block in Version 3
+
+Version 3 added two additional pieces of information to the reserved keys in 
the file info block. 
+
+[cols="1,1", frame="all"]
+|===
+| hfile.MAX_TAGS_LEN | The maximum number of bytes needed to store the 
serialized tags for any single cell in this hfile (int)
+ | hfile.TAGS_COMPRESSED | Does the block encoder for this hfile compress 
tags? (boolean). Should only be present if hfile.MAX_TAGS_LEN is also present.
+|===      
+
+When reading a Version 3 HFile the presence of `MAX_TAGS_LEN` is used to 
determine how to deserialize the cells within a data block.
+Therefore, consumers must read the file's info block prior to reading any data 
blocks. 
+
+When writing a Version 3 HFile, HBase will always include `MAX_TAGS_LEN ` when 
flushing the memstore to underlying filesystem and when using prefix tree 
encoding for data blocks, as described in <<compression,compression>>. 
+
+When compacting extant files, the default writer will omit `MAX_TAGS_LEN` if 
all of the files selected do not themselves contain any cells with tags.
+
+See <<compaction,compaction>> for details on the compaction file selection 
algorithm. 
+
+[[hfilev3.datablock]]
+==== Data Blocks in Version 3
+
+Within an HFile, HBase cells are stored in data blocks as a sequence of 
KeyValues (see <<hfilev1.overview,hfilev1.overview>>, or 
link:http://www.larsgeorge.com/2009/10/hbase-architecture-101-storage.html[Lars 
George's
+        excellent introduction to HBase Storage]). In version 3, these 
KeyValue optionally will include a set of 0 or more tags: 
+
+[cols="1,1", frame="all"]
+|===
+| Version 1 & 2,  Version 3 without MAX_TAGS_LEN | Version 3 with MAX_TAGS_LEN
+2+| Key Length (4 bytes)
+2+| Value Length (4 bytes)
+2+| Key bytes (variable)
+2+| Value bytes (variable)
+| | Tags Length (2 bytes)
+| | Tags bytes (variable)                
+|===      
+
+If the info block for a given HFile contains an entry for `MAX_TAGS_LEN` each 
cell will have the length of that cell's tags included, even if that length is 
zero.
+The actual tags are stored as a sequence of tag length (2 bytes), tag type (1 
byte), tag bytes (variable). The format an individual tag's bytes depends on 
the tag type. 
+
+Note that the dependence on the contents of the info block implies that prior 
to reading any data blocks you must first process a file's info block.
+It also implies that prior to writing a data block you must know if the file's 
info block will include `MAX_TAGS_LEN`. 
+
+[[hfilev3.fixedtrailer]]
+==== Fixed File Trailer in Version 3
+
+The fixed file trailers written with HFile version 3 are always serialized 
with protocol buffers.
+Additionally, it adds an optional field to the version 2 protocol buffer named 
encryption_key.
+If HBase is configured to encrypt HFiles this field will store a data 
encryption key for this particular HFile, encrypted with the current cluster 
master key using AES.
+For more information see <<hbase.encryption.server,hbase.encryption.server>>. 
+
+:numbered:

Reply via email to