Repository: incubator-impala
Updated Branches:
  refs/heads/master 1d933919e -> 6a9df5409


[DOCS] Genericize HBase page

2x links that point to archive.cloudera.com mirror of HBase
docs, point to Apache HBase doc site instead.

Remove a little Cloudera-specific verbiage, esp. in banners of
hive / impala-shell output.

Change-Id: I1b832d23be7182d88c99ee169976ad9aeed746b1
Reviewed-on: http://gerrit.cloudera.org:8080/5900
Reviewed-by: Ambreen Kazi <[email protected]>
Reviewed-by: John Russell <[email protected]>
Tested-by: Impala Public Jenkins


Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/7704b64d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/7704b64d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/7704b64d

Branch: refs/heads/master
Commit: 7704b64df0bce05a73b33825c404498ef9fbba48
Parents: 1d93391
Author: John Russell <[email protected]>
Authored: Fri Feb 3 14:57:08 2017 -0800
Committer: Impala Public Jenkins <[email protected]>
Committed: Sat Feb 4 00:23:19 2017 +0000

----------------------------------------------------------------------
 docs/impala_keydefs.ditamap  | 12 +++++++++---
 docs/topics/impala_hbase.xml | 25 ++++++-------------------
 2 files changed, 15 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/7704b64d/docs/impala_keydefs.ditamap
----------------------------------------------------------------------
diff --git a/docs/impala_keydefs.ditamap b/docs/impala_keydefs.ditamap
index da62dd1..232d3d1 100644
--- a/docs/impala_keydefs.ditamap
+++ b/docs/impala_keydefs.ditamap
@@ -26,6 +26,15 @@ under the License.
   <keydef keys="support_org"><topicmeta><keywords><keyword>Cloudera 
Support</keyword></keywords></topicmeta></keydef>
 
 <!-- URLs used in external links. Many, perhaps most, to be turned into 
keydefs to genericize and optionally re-point. -->
+
+  <keydef keys="upstream_hbase_docs" href="https://hbase.apache.org/book.html"; 
scope="external" format="html">
+    <topicmeta><linktext>the Apache HBase documentation</linktext></topicmeta>
+  </keydef>
+
+  <keydef keys="upstream_hbase_security_docs" 
href="https://hbase.apache.org/book.html#security"; scope="external" 
format="html">
+    <topicmeta><linktext>the Security chapter in the Apache HBase 
documentation</linktext></topicmeta>
+  </keydef>
+
 <!--
 http://aws.amazon.com/cli/
 http://aws.amazon.com/s3/
@@ -38,7 +47,6 @@ http://google-glog.googlecode.com/svn/trunk/doc/glog.html
 
http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/FairScheduler.html#Configuration
 http://hadoop.apache.org/docs/r0.19.0/distcp.html
 http://haproxy.1wt.eu/
-http://hbase.apache.org/book/ch08s04.html
 http://jdbc.postgresql.org/download.html
 
http://radar.oreilly.com/2013/10/cloudera-impala-bringing-the-sql-and-hadoop-worlds-together.html
 http://s3tools.org/s3cmd
@@ -69,10 +77,8 @@ http://www.tpc.org/tpcds/
 https://archive.cloudera.com/cdh/3/hadoop/hdfs_permissions_guide.html
 
https://archive.cloudera.com/cdh4/cdh/4/hadoop/hadoop-project-dist/hadoop-common/FileSystemShell.html
 
https://archive.cloudera.com/cdh4/cdh/4/hadoop/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html
-https://archive.cloudera.com/cdh4/cdh/4/hbase/
 https://archive.cloudera.com/cdh5/
 
https://archive.cloudera.com/cdh5/cdh/5/hadoop/hadoop-yarn/hadoop-yarn-site/FairScheduler.html#Configuration
-https://archive.cloudera.com/cdh5/cdh/5/hbase/
 
https://archive.cloudera.com/gplextras/debian/squeeze/amd64/gplextras/cloudera.list
 https://archive.cloudera.com/gplextras/redhat/5/x86_64/gplextras/
 
https://archive.cloudera.com/gplextras/redhat/5/x86_64/gplextras/cloudera-gplextras4.repo

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/7704b64d/docs/topics/impala_hbase.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_hbase.xml b/docs/topics/impala_hbase.xml
index 429d828..0068e48 100644
--- a/docs/topics/impala_hbase.xml
+++ b/docs/topics/impala_hbase.xml
@@ -51,11 +51,7 @@ under the License.
     </p>
 
     <p>
-      For background information on HBase, see the snapshot of the Apache 
HBase site (including documentation) for
-      the level of HBase that comes with
-      <xref href="https://archive.cloudera.com/cdh5/cdh/5/hbase/"; 
scope="external" format="html">CDH 5</xref>. To
-      install HBase on a CDH cluster, see the installation instructions for
-      <xref 
href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_ig_hbase_installation.html";
 scope="external" format="html">CDH 5</xref>.
+      For background information on HBase, see <xref 
keyref="upstream_hbase_docs"/>.
     </p>
 
     <p outputclass="toc inpage"/>
@@ -123,9 +119,7 @@ under the License.
       <p>
         To work with an HBase table from Impala, ensure that the 
<codeph>impala</codeph> user has read/write
         privileges for the HBase table, using the <codeph>GRANT</codeph> 
command in the HBase shell. For details
-        about HBase security, see the
-        <xref href="http://hbase.apache.org/book/ch08s04.html"; format="html" 
scope="external">Security chapter in
-        the HBase Reference Guide</xref>.
+        about HBase security, see <xref 
keyref="upstream_hbase_security_docs"/>.
       </p>
     </conbody>
   </concept>
@@ -148,8 +142,8 @@ under the License.
 
       <p>
         To avoid delays if HBase is unavailable during Impala startup or after 
an <codeph>INVALIDATE
-        METADATA</codeph> statement, <ph rev="upstream">Cloudera</ph> 
recommends setting timeout values as follows in
-        <filepath>/etc/impala/conf/hbase-site.xml</filepath> (for environments 
not managed by Cloudera Manager):
+        METADATA</codeph> statement, set timeout values similar to the 
following in
+        <filepath>/etc/impala/conf/hbase-site.xml</filepath>:
       </p>
 
 <codeblock>&lt;property&gt;
@@ -832,8 +826,7 @@ hbase(main):006:0> quit
         </note>
 
 <codeblock>$ hive
-Logging initialized using configuration in 
file:/etc/hive/conf.dist/hive-log4j.properties
-Hive history 
file=/tmp/cloudera/hive_job_log_cloudera_201502101610_1980712808.txt
+...
 hive> use hbase;
 OK
 Time taken: 4.095 seconds
@@ -876,12 +869,7 @@ hive> quit;
 <codeblock>$ impala-shell -i localhost -d hbase
 Starting Impala Shell without Kerberos authentication
 Connected to localhost:21000
-Server version: impalad version 2.1.0-cdh4 RELEASE (build 
d520a9cdea2fc97e8d5da9fbb0244e60ee416bfa)
-Welcome to the Impala shell. Press TAB twice to see a list of available 
commands.
-
-Copyright (c) 2012 Cloudera, Inc. All rights reserved.
-
-(Shell build version: Impala Shell v2.1.0-cdh4 (d520a9c) built on Mon Dec  8 
21:41:17 PST 2014)
+...
 Query: use `hbase`
 [localhost:21000] > invalidate metadata hbasestringids;
 Fetched 0 row(s) in 0.09s
@@ -916,7 +904,6 @@ Fetched 1 row(s) in 0.54s
 </codeblock>
 
         <note 
conref="../shared/impala_common.xml#common/invalidate_metadata_hbase"/>
-<!--      </section> -->
     </conbody>
   </concept>
 </concept>

Reply via email to