IMPALA-3402: [DOCS] Remove/reword all CDH 4 references

Along the way, remove nearby references to CDH 5
and especially the CDH version numbers in the
'Fixed Issues' titles. The fixed issues titles
are not amenable to the keydef/keyref substitution
technique because they are all 3-part numbers
like Impala 2.2.1 that don't have substitution
variables defined for them.

Change-Id: I9ffb400a244930134705b0f0039087506f5e70d3
Reviewed-on: http://gerrit.cloudera.org:8080/6146
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/0ad55ba5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/0ad55ba5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/0ad55ba5

Branch: refs/heads/master
Commit: 0ad55ba5a95ccdb9c514fa0c98996bd2ecbe606e
Parents: c87ab35
Author: John Russell <[email protected]>
Authored: Fri Feb 24 15:57:13 2017 -0800
Committer: Impala Public Jenkins <[email protected]>
Committed: Thu Mar 2 21:05:01 2017 +0000

----------------------------------------------------------------------
 docs/topics/impala_avro.xml                 |  5 +-
 docs/topics/impala_char.xml                 |  3 +-
 docs/topics/impala_decimal.xml              |  4 --
 docs/topics/impala_fixed_issues.xml         | 84 ++++++++++--------------
 docs/topics/impala_incompatible_changes.xml |  7 --
 docs/topics/impala_install.xml              |  9 +--
 docs/topics/impala_new_features.xml         | 15 +----
 docs/topics/impala_noncm_installation.xml   |  6 +-
 docs/topics/impala_parquet.xml              |  4 +-
 docs/topics/impala_perf_resources.xml       |  4 +-
 docs/topics/impala_scalability.xml          | 14 ++--
 docs/topics/impala_subqueries.xml           |  2 +-
 docs/topics/impala_txtfile.xml              |  4 +-
 docs/topics/impala_udf.xml                  | 18 +++--
 14 files changed, 68 insertions(+), 111 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_avro.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_avro.xml b/docs/topics/impala_avro.xml
index 852cf8c..3ec7b99 100644
--- a/docs/topics/impala_avro.xml
+++ b/docs/topics/impala_avro.xml
@@ -216,8 +216,7 @@ for this information.
         <li>
           The <codeph>DECIMAL</codeph> type is defined in Avro as a 
<codeph>BYTE</codeph> type with the
           <codeph>logicalType</codeph> property set to 
<codeph>"decimal"</codeph> and a specified precision and
-          scale. Use <codeph>DECIMAL</codeph> in Avro tables only under CDH 5. 
The infrastructure and components
-          under CDH 4 do not have reliable <codeph>DECIMAL</codeph> support.
+          scale.
         </li>
 
         <li>
@@ -255,7 +254,7 @@ for this information.
           An Impala <codeph>TIMESTAMP</codeph> column definition maps to an 
Avro <codeph>STRING</codeph> and is presented as a <codeph>STRING</codeph>
           in the reconciled schema, because Avro has no binary 
<codeph>TIMESTAMP</codeph> representation.
           As a result, no Avro table can have a <codeph>TIMESTAMP</codeph> 
column; this restriction is the same as
-          in earlier CDH and Impala releases.
+          in earlier Impala releases.
         </li>
         </ul>
       </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_char.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_char.xml b/docs/topics/impala_char.xml
index dc8ad5a..9204812 100644
--- a/docs/topics/impala_char.xml
+++ b/docs/topics/impala_char.xml
@@ -125,8 +125,7 @@ under the License.
     <p conref="../shared/impala_common.xml#common/compatibility_blurb"/>
 
     <p>
-      This type is available using Impala 2.0 or higher under CDH 4, or with 
Impala on CDH 5.2 or higher. There are
-      no compatibility issues with other components when exchanging data files 
or running Impala on CDH 4.
+      This type is available using <keyword keyref="impala20_full"/> or higher.
     </p>
 
     <p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_decimal.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_decimal.xml b/docs/topics/impala_decimal.xml
index 36b149d..80e8130 100644
--- a/docs/topics/impala_decimal.xml
+++ b/docs/topics/impala_decimal.xml
@@ -717,10 +717,6 @@ Expression '1' (type: INT) would need to be cast to 
DECIMAL(9,0) for column 'x'
         depending on the precision specified for the <codeph>DECIMAL</codeph> 
column.
       </li>
 
-      <li>
-        Parquet files containing <codeph>DECIMAL</codeph> columns are not 
expected to be readable under CDH 4. See
-        the <b>Compatibility</b> section for details.
-      </li>
     </ul>
 
     <p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_fixed_issues.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_fixed_issues.xml 
b/docs/topics/impala_fixed_issues.xml
index a1f4de0..a063ff3 100644
--- a/docs/topics/impala_fixed_issues.xml
+++ b/docs/topics/impala_fixed_issues.xml
@@ -2200,7 +2200,7 @@ ce601ec : Enable using isilon as the underlying 
filesystem.
 
   <concept rev="2.2.0" id="fixed_issues_220">
 
-    <title>Issues Fixed in the 2.2.0 Release / CDH 5.4.0</title>
+    <title>Issues Fixed in <keyword keyref="impala22_full"/></title>
 
     <conbody>
 
@@ -2210,13 +2210,6 @@ ce601ec : Enable using isilon as the underlying 
filesystem.
 
       <p>
         For the full list of fixed issues in Impala 2.2.0, including over 40 
critical issues, see
-<!--
-  In maintenance releases, the CDH fixed issues topics did include a nice 
compact list of Impala JIRAs.
-  But now in 5.4, it's back to lengthy descriptions for fixed issues and the 
Impala ones don't have a
-  complete compact list anywhere in the docs. So returning to the practice of 
linking to the list in
-  the JIRA system like was done before.
--->
-        <!-- <xref audience="standalone" 
href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_540.html";
 format="html" scope="external">the CDH 5.4.0 release notes</xref><xref 
audience="integrated" href="cdh_rn_fixed_in_540.xml"/>. -->
         <xref 
href="https://issues.cloudera.org/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project%3Dimpala+and+fixVersion%3D%22Impala+2.2%22+and+resolution%3D%22Fixed%22";
 format="html" scope="external">
         this report in the JIRA system</xref>.
       </p>
@@ -2422,12 +2415,12 @@ IMPALA-1607
 
   <concept rev="2.1.7" id="fixed_issues_217">
 
-    <title>Issues Fixed in the 2.1.7 Release / CDH 5.3.9</title>
+    <title>Issues Fixed in Impala 2.1.7</title>
 
     <conbody>
 
       <p>
-        This section lists the most significant Impala issues fixed in Impala 
2.1.7 for CDH 5.3.9.
+        This section lists the most significant Impala issues fixed in Impala 
2.1.7.
       </p>
 
       <p> For the full list of Impala fixed issues in this release, see <xref
@@ -2520,12 +2513,12 @@ e591cf4 IMPALA-2141: UnionNode::GetNext() doesn't check 
for query errors
 
   <concept rev="2.1.6" id="fixed_issues_216">
 
-    <title>Issues Fixed in the 2.1.6 Release / CDH 5.3.8</title>
+    <title>Issues Fixed in Impala 2.1.6</title>
 
     <conbody>
 
       <p>
-        This section lists the most significant Impala issues fixed in Impala 
2.1.6 for CDH 5.3.8.
+        This section lists the most significant Impala issues fixed in Impala 
2.1.6.
       </p>
 
       <p> For the full list of Impala fixed issues in this release, see <!-- 
Don't think we have quite the right combination of conditional options to make 
this reference be a web link in Impala PDF and a normal xref in Release Notes 
PDF. -->
@@ -2608,12 +2601,12 @@ e591cf4 IMPALA-2141: UnionNode::GetNext() doesn't check 
for query errors
 
   <concept rev="2.1.5" id="fixed_issues_215">
 
-    <title>Issues Fixed in the 2.1.5 Release / CDH 5.3.6</title>
+    <title>Issues Fixed in Impala 2.1.5</title>
 
     <conbody>
 
       <p>
-        This section lists the most significant Impala issues fixed in Impala 
2.1.5 for CDH 5.3.6.
+        This section lists the most significant Impala issues fixed in Impala 
2.1.5.
       </p>
 
       <p> For the full list of Impala fixed issues in this release, see <!-- 
Don't think we have quite the right combination of conditional options to make 
this reference be a web link in Impala PDF and a normal xref in Release Notes 
PDF. -->
@@ -2650,17 +2643,17 @@ e591cf4 IMPALA-2141: UnionNode::GetNext() doesn't check 
for query errors
 
   <concept rev="2.1.4" id="fixed_issues_214">
 
-    <title>Issues Fixed in the 2.1.4 Release /  CDH 5.3.4</title>
+    <title>Issues Fixed in Impala 2.1.4</title>
 
     <conbody>
 
       <p>
-        This section lists the most significant Impala issues fixed in Impala 
2.1.4 for CDH 5.3.4.
+        This section lists the most significant Impala issues fixed in Impala 
2.1.4.
         <ph conref="../shared/impala_common.xml#common/impala_214_redux"/>
       </p>
 
-      <p> For the full list of Impala fixed issues in Impala 2.1.4 for CDH
-        5.3.4, see <xref audience="standalone"
+      <p> For the full list of Impala fixed issues in Impala 2.1.4,
+        see <xref audience="standalone"
           
href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_534.html";
           format="html" scope="external">the CDH 5.3.4 release 
notes</xref><xref
           href="cdh_rn_fixed_in_53.xml#fixed_issues_534" audience="integrated"
@@ -2796,7 +2789,7 @@ c132c75 IMPALA-1808: AnalyticEvalNode cannot handle 
partition/order by exprs wit
 
   <concept rev="2.1.3" id="fixed_issues_213">
 
-    <title>Issues Fixed in the 2.1.3 Release / CDH 5.3.3</title>
+    <title>Issues Fixed in Impala 2.1.3</title>
 
     <conbody>
 
@@ -2940,7 +2933,7 @@ c132c75 IMPALA-1808: AnalyticEvalNode cannot handle 
partition/order by exprs wit
 
   <concept rev="2.1.2" id="fixed_issues_212">
 
-    <title>Issues Fixed in the 2.1.2 Release / CDH 5.3.2</title>
+    <title>Issues Fixed in Impala 2.1.2</title>
 
     <conbody>
 
@@ -3010,7 +3003,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API - also in 5.2.4 /
 
   <concept rev="2.1.1" id="fixed_issues_211">
 
-    <title>Issues Fixed in the 2.1.1 Release / CDH 5.3.1</title>
+    <title>Issues Fixed in Impala 2.1.1</title>
 
     <conbody>
 
@@ -3073,7 +3066,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API - also in 5.2.4 /
 
   <concept rev="2.1.0" id="fixed_issues_210">
 
-    <title>Issues Fixed in the 2.1.0 Release / CDH 5.3.0</title>
+    <title>Issues Fixed in Impala 2.1.0</title>
 
     <conbody>
 
@@ -3193,7 +3186,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API - also in 5.2.4 /
 
   <concept rev="2.0.5" id="fixed_issues_205">
 
-    <title>Issues Fixed in the 2.0.5 Release / CDH 5.2.6</title>
+    <title>Issues Fixed in Impala 2.0.5</title>
 
     <conbody>
 
@@ -3210,7 +3203,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API - also in 5.2.4 /
 
   <concept rev="2.0.4" id="fixed_issues_204">
 
-    <title>Issues Fixed in the 2.0.4 Release / CDH 5.2.5</title>
+    <title>Issues Fixed in Impala 2.0.4</title>
 
     <conbody>
 
@@ -3279,7 +3272,7 @@ db3362f IMPALA-1801: external-data-source-executor 
leaking global jni refs
 
   <concept rev="2.0.3" id="fixed_issues_203">
 
-    <title>Issues Fixed in the 2.0.3 Release / CDH 5.2.4</title>
+    <title>Issues Fixed in Impala 2.0.3</title>
 
     <conbody>
 
@@ -3338,7 +3331,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
 
   <concept rev="2.0.2" id="fixed_issues_202">
 
-    <title>Issues Fixed in the 2.0.2 Release / CDH 5.2.3</title>
+    <title>Issues Fixed in Impala 2.0.2</title>
 
     <conbody>
 
@@ -3357,8 +3350,6 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
       <p outputclass="toc inpage"/>
     </conbody>
 
-<!-- These fixed JIRAs are copied from from impala_fixed_issues.xml. Going 
forward, the content in this file is the baseline for future changes. -->
-
     <concept id="IMPALA-1453">
 
       <title>GROUP BY on STRING column produces inconsistent results</title>
@@ -3467,7 +3458,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
 
   <concept rev="2.0.1" id="fixed_issues_201">
 
-    <title>Issues Fixed in the 2.0.1 Release / CDH 5.2.1</title>
+    <title>Issues Fixed in Impala 2.0.1</title>
 
     <conbody>
 
@@ -3515,7 +3506,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
 
   <concept rev="2.0.0" id="fixed_issues_200">
 
-    <title>Issues Fixed in the 2.0.0 Release / CDH 5.2.0</title>
+    <title>Issues Fixed in Impala 2.0.0</title>
 
     <conbody>
 
@@ -3845,12 +3836,11 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 
bulk API    this one fix th
   </concept>
 
   <concept rev="1.4.4" id="fixed_issues_144">
-  <title>Issues Fixed in the 1.4.4 Release / CDH 5.1.5</title>
+  <title>Issues Fixed in Impala 1.4.4</title>
     <conbody>
       <p>
         For the list of fixed issues, see
-        <xref 
href="http://www.cloudera.com/documentation/enterprise/release-notes/topics/cdh_rn_fixed_in_51.html";
 scope="external" format="html">Issues Fixed in CDH 5.1.5</xref>
-        in the <cite>CDH 5 Release Notes</cite>.
+        <xref 
href="http://www.cloudera.com/documentation/enterprise/release-notes/topics/cdh_rn_fixed_in_51.html";
 scope="external" format="html">Issues Fixed in CDH 5.1.5</xref>.
       </p>
 
       <note conref="../shared/impala_common.xml#common/only_cdh5_144"/>
@@ -3860,7 +3850,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
 
   <concept rev="1.4.3" id="fixed_issues_143">
 
-    <title>Issues Fixed in the 1.4.3 Release / CDH 5.1.4</title>
+    <title>Issues Fixed in Impala 1.4.3</title>
 
     <conbody>
 
@@ -3876,7 +3866,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
 
   <concept rev="1.4.2" id="fixed_issues_142">
 
-    <title>Issues Fixed in the 1.4.2 Release / CDH 5.1.3</title>
+    <title>Issues Fixed in Impala 1.4.2</title>
 
     <conbody>
 
@@ -3898,7 +3888,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
 
   <concept rev="1.4.1" id="fixed_issues_141">
 
-    <title>Issues Fixed in the 1.4.1 Release / CDH 5.1.2</title>
+    <title>Issues Fixed in Impala 1.4.1</title>
 
     <conbody>
 
@@ -4065,7 +4055,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
 
   <concept rev="1.4.0" id="fixed_issues_140">
 
-    <title>Issues Fixed in the 1.4.0 Release / CDH 5.1.0</title>
+    <title>Issues Fixed in Impala 1.4.0</title>
 
     <conbody>
 
@@ -4328,7 +4318,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
 
   <concept rev="1.3.3" id="fixed_issues_133">
 
-    <title>Issues Fixed in the 1.3.3 Release / CDH 5.0.5</title>
+    <title>Issues Fixed in Impala 1.3.3</title>
 
     <conbody>
 
@@ -4345,7 +4335,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
 
   <concept rev="1.3.2" id="fixed_issues_132">
 
-    <title>Issues Fixed in the 1.3.2 Release / CDH 5.0.4</title>
+    <title>Issues Fixed in Impala 1.3.2</title>
 
     <conbody>
 
@@ -4383,8 +4373,8 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
         </p>
 
         <p>
-          <b>Workaround:</b> On CDH 5.0.x, upgrade to CDH 5.0.4 with Impala 
1.3.2, where this issue is fixed. In
-          Impala 1.3.0 or 1.3.1 on CDH 5.0.x, do not use HDFS caching for 
Impala data files in Impala internal or
+          <b>Workaround:</b> Upgrade to CDH 5.0.4 with Impala 1.3.2, where 
this issue is fixed. In
+          Impala 1.3.0 or 1.3.1, do not use HDFS caching for Impala data files 
in Impala internal or
           external tables. If some of these data files are cached (for example 
because they are used by other
           components that take advantage of HDFS caching), set the query option
           <codeph>DISABLE_CACHED_READS=true</codeph>. To set that option for 
all Impala queries across all
@@ -4394,8 +4384,8 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
         </p>
 
         <p>
-          <b>Resolution:</b> This issue is fixed in Impala 1.3.2 for CDH 
5.0.4. The addition of HDFS caching
-          support in Impala 1.4 means that this issue does not apply to any 
new level of Impala on CDH 5.
+          <b>Resolution:</b> This issue is fixed in Impala 1.3.2. The addition 
of HDFS caching
+          support in Impala 1.4 means that this issue does not apply to any 
new level of Impala.
         </p>
       </conbody>
     </concept>
@@ -4403,7 +4393,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
 
   <concept rev="1.3.1" id="fixed_issues_131">
 
-    <title>Issues Fixed in the 1.3.1 Release / CDH 5.0.3</title>
+    <title>Issues Fixed in Impala 1.3.1</title>
 
     <conbody>
 
@@ -4414,9 +4404,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
       <p>
         For the full list of fixed issues in Impala 1.3.1, see
         <xref 
href="https://issues.cloudera.org/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project%3Dimpala+and+fixVersion%3D%22Impala+1.3.1%22+and+resolution%3D%22Fixed%22";
 format="html" scope="external">
-        this report in the JIRA system</xref>. Because 1.3.1 is the first 
1.3.x release for CDH 4, if you are on
-        CDH 4, also consult <xref 
href="impala_fixed_issues.xml#fixed_issues_130"/>.
-<!--      <xref 
href="https://issues.cloudera.org/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project%3Dimpala+and+fixVersion%3D%22Impala+1.3%22+and+resolution%3D%22Fixed%22";
 format="html" scope="external">list of issues fixed in 1.3.0</xref>. -->
+        this report in the JIRA system</xref>.
       </p>
 
       <p outputclass="toc inpage"/>
@@ -4642,7 +4630,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk 
API    this one fix th
 
   <concept rev="1.3.0" id="fixed_issues_130">
 
-    <title>Issues Fixed in the 1.3.0 Release / CDH 5.0.0</title>
+    <title>Issues Fixed in Impala 1.3.0</title>
 
     <conbody>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_incompatible_changes.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_incompatible_changes.xml 
b/docs/topics/impala_incompatible_changes.xml
index 897d973..c10555c 100644
--- a/docs/topics/impala_incompatible_changes.xml
+++ b/docs/topics/impala_incompatible_changes.xml
@@ -1226,7 +1226,6 @@ select * from `cross`;</codeblock>
         to Impala 1.2.x in general.
       </p>
 
-<!-- <note conref="common.xml#common/cdh4_cdh5_upgrade"/> -->
     </conbody>
   </concept>
 
@@ -1251,12 +1250,6 @@ select * from `cross`;</codeblock>
       </ul>
 
       <p>
-        Impala 1.2.1 goes along with CDH 4.5 and Cloudera Manager 4.8. If you 
used the beta version Impala 1.2.0
-        that came with the beta of CDH 5, Impala 1.2.1 includes all the 
features of Impala 1.2.0 except for
-        resource management, which relies on the YARN framework from CDH 5.
-      </p>
-
-      <p>
         The new <cmdname>catalogd</cmdname> service might require changes to 
any user-written scripts that stop,
         start, or restart Impala services, install or upgrade Impala packages, 
or issue <codeph>REFRESH</codeph> or
         <codeph>INVALIDATE METADATA</codeph> statements:

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_install.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_install.xml b/docs/topics/impala_install.xml
index adb502c..24d37ab 100644
--- a/docs/topics/impala_install.xml
+++ b/docs/topics/impala_install.xml
@@ -41,17 +41,10 @@ under the License.
       <indexterm audience="hidden">impalad</indexterm>
       <indexterm audience="hidden">impala-shell</indexterm>
       <indexterm audience="hidden">statestored</indexterm>
-      Impala is an open-source add-on to the Cloudera Enterprise Core that 
returns rapid responses to
+      Impala is an open-source project that returns rapid responses to
       queries.
     </p>
 
-    <note>
-      <p>
-        Under CDH 5, Impala is included as part of the CDH installation and no 
separate steps are needed.
-        <ph audience="standalone">Therefore, the instruction steps in this 
section apply to CDH 4 only.</ph>
-      </p>
-    </note>
-
     <p outputclass="toc inpage"/>
   </conbody>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_new_features.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_new_features.xml 
b/docs/topics/impala_new_features.xml
index 4a237f7..ed908b6 100644
--- a/docs/topics/impala_new_features.xml
+++ b/docs/topics/impala_new_features.xml
@@ -3060,8 +3060,9 @@ under the License.
     <conbody>
 
       <note>
-        Impala 1.2.1 works with CDH 4. Its feature set is a superset of 
features in the Impala 1.2.0 beta, with the
-        exception of resource management, which relies on CDH 5.
+        The Impala 1.2.1 feature set is a superset of features in the Impala 
1.2.0 beta, with the
+        exception of resource management, which relies on resource management 
infrastructure in the
+        underlying Hadoop distribution.
       </note>
 
       <p>
@@ -3797,12 +3798,6 @@ under the License.
         </li>
       </ul>
 
-      <p>
-        In this version, both CDH 4.1 and 4.2 are supported, but due to 
performance improvements added, we highly
-        recommend you use CDH 4.2 or higher to see the full benefit. If you 
are using Cloudera Manager, version 4.5
-        is required.
-      </p>
-
     </conbody>
 
   </concept>
@@ -3836,10 +3831,6 @@ under the License.
         </li>
 
         <li>
-          Cloudera Manager 4.5 and CDH 4.2 support Impala 0.6.
-        </li>
-
-        <li>
           Support for the RCFile file format. For more information on file 
formats, see
           <xref href="impala_file_formats.xml#file_formats">Understanding File 
Formats</xref>.
         </li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_noncm_installation.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_noncm_installation.xml 
b/docs/topics/impala_noncm_installation.xml
index 518f917..ca2ba06 100644
--- a/docs/topics/impala_noncm_installation.xml
+++ b/docs/topics/impala_noncm_installation.xml
@@ -75,8 +75,8 @@ under the License.
           described in the CDH Installation Guide).
         </p>
         <p>
-          <ph rev="upstream">Cloudera</ph> recommends setting up a Hive 
metastore service rather than connecting directly to the metastore
-          database; this configuration is required when running Impala under 
CDH 4.1. Make sure the
+          Whenever practical, set up a Hive metastore service rather than 
connecting directly to the metastore
+          database. Make sure the
           <filepath>/etc/impala/conf/hive-site.xml</filepath> file contains 
the following setting, substituting the
           appropriate hostname for <varname>metastore_server_host</varname>:
         </p>
@@ -106,7 +106,7 @@ $</codeblock>
 
       <li>
         Confirm that your package management command is aware of the Impala 
repository settings, as described in
-        <xref href="impala_prereqs.xml#prereqs"/>. (For CDH 4, this is a 
different repository than for CDH.) You
+        <xref href="impala_prereqs.xml#prereqs"/>. You
         might need to download a repo or list file into a system directory 
underneath <filepath>/etc</filepath>.
       </li>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_parquet.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_parquet.xml b/docs/topics/impala_parquet.xml
index 0a0f4f5..e4f8a7f 100644
--- a/docs/topics/impala_parquet.xml
+++ b/docs/topics/impala_parquet.xml
@@ -714,7 +714,7 @@ Returned 1 row(s) in 13.35s
     <conbody>
 
       <p>
-        Starting in CDH 4.5, you can read and write Parquet data files from 
other CDH components.
+        You can read and write Parquet data files from other CDH components.
         <ph audience="integrated">See <xref 
href="cdh_ig_parquet.xml#parquet_format"/> for details.</ph>
       </p>
 
@@ -728,7 +728,7 @@ Returned 1 row(s) in 13.35s
 
       <p>
         Previously, it was not possible to create Parquet data through Impala 
and reuse that table within Hive. Now
-        that Parquet support is available for Hive in CDH 4.5, reusing 
existing Impala Parquet data files in Hive
+        that Parquet support is available for Hive, reusing existing Impala 
Parquet data files in Hive
         requires updating the table metadata. Use the following command if you 
are already running Impala 1.1.1 or
         higher:
       </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_perf_resources.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_perf_resources.xml 
b/docs/topics/impala_perf_resources.xml
index 6ca1c08..3c1f8f3 100644
--- a/docs/topics/impala_perf_resources.xml
+++ b/docs/topics/impala_perf_resources.xml
@@ -51,8 +51,8 @@ under the License.
         limits on the number of concurrent queries or the amount of memory 
used. The queries are queued, and
         executed as other queries finish and resources become available. You 
can control the concurrency limits,
         and specify different limits for different groups of users to divide 
cluster resources according to the
-        priorities of different classes of users. This feature is new in 
Impala 1.3, and works with both CDH 4 and
-        CDH 5. See <xref href="impala_admission.xml#admission_control"/> for 
details.
+        priorities of different classes of users. This feature is new in 
Impala 1.3.
+        See <xref href="impala_admission.xml#admission_control"/> for details.
       </li>
 
       <li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_scalability.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_scalability.xml 
b/docs/topics/impala_scalability.xml
index 2362110..9bc8b7c 100644
--- a/docs/topics/impala_scalability.xml
+++ b/docs/topics/impala_scalability.xml
@@ -200,7 +200,7 @@ Memory Usage: Additional Notes
     <conbody>
 
       <p>
-        Before CDH 5.3, the statestore sent only one kind of message to its 
subscribers. This message contained all
+        Before <keyword keyref="impala21_full"/>, the statestore sent only one 
kind of message to its subscribers. This message contained all
         updates for any topics that a subscriber had subscribed to. It also 
served to let subscribers know that the
         statestore had not failed, and conversely the statestore used the 
success of sending a heartbeat to a
         subscriber to decide whether or not the subscriber had failed.
@@ -216,7 +216,7 @@ Memory Usage: Additional Notes
       </p>
 
       <p>
-        As of CDH 5.3, the statestore now sends topic updates and heartbeats 
in separate messages. This allows the
+        As of <keyword keyref="impala21_full"/>, the statestore now sends 
topic updates and heartbeats in separate messages. This allows the
         statestore to send and receive a steady stream of lightweight 
heartbeats, and removes the requirement to
         send topic updates according to a fixed schedule, reducing statestore 
network overhead.
       </p>
@@ -424,7 +424,7 @@ Memory Usage: Additional Notes
       </p>
 
       <p rev="2.2.0">
-        Prior to Impala 2.2 (CDH 5.4), the extra memory buffer for an operator 
that might spill to disk
+        Prior to Impala 2.2, the extra memory buffer for an operator that 
might spill to disk
         was allocated when the data structure used by the applicable SQL 
operator reaches 16 MB in size,
         and the memory buffer itself was 512 MB. In Impala 2.2, these values 
are halved: the threshold value
         is 8 MB and the memory buffer is 256 MB. <ph rev="2.3.0">In <keyword 
keyref="impala23_full"/> and higher, the memory for the buffer
@@ -442,10 +442,10 @@ Memory Usage: Additional Notes
       </p>
 
       <p>
-        <b>Added in:</b> This feature was added to the <codeph>ORDER 
BY</codeph> clause in Impala 1.4 for CDH 4,
-        and in CDH 5.1. This feature was extended to cover join queries, 
aggregation functions, and analytic
-        functions in Impala 2.0 for CDH 4, and in CDH 5.2. The size of the 
memory work area required by
-        each operator that spills was reduced from 512 megabytes to 256 
megabytes in Impala 2.2 (CDH 5.4).
+        <b>Added in:</b> This feature was added to the <codeph>ORDER 
BY</codeph> clause in Impala 1.4.
+        This feature was extended to cover join queries, aggregation 
functions, and analytic
+        functions in Impala 2.0. The size of the memory work area required by
+        each operator that spills was reduced from 512 megabytes to 256 
megabytes in Impala 2.2.
       </p>
 
       <p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_subqueries.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_subqueries.xml 
b/docs/topics/impala_subqueries.xml
index b8190bf..d3d509c 100644
--- a/docs/topics/impala_subqueries.xml
+++ b/docs/topics/impala_subqueries.xml
@@ -227,7 +227,7 @@ Therefore, this is not an efficient construct to use with 
Impala queries for HBa
     </p>
 
     <p>
-      <b>Added in:</b> Subqueries are substantially enhanced starting in 
Impala 2.0 for CDH 4, and CDH 5.2.0. Now,
+      <b>Added in:</b> Subqueries are substantially enhanced starting in 
Impala 2.0. Now,
       they can be used in the <codeph>WHERE</codeph> clause, in combination 
with clauses such as
       <codeph>EXISTS</codeph> and <codeph>IN</codeph>, rather than just in the 
<codeph>FROM</codeph> clause.
     </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_txtfile.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_txtfile.xml b/docs/topics/impala_txtfile.xml
index 659d9f0..4b29bf0 100644
--- a/docs/topics/impala_txtfile.xml
+++ b/docs/topics/impala_txtfile.xml
@@ -537,8 +537,8 @@ INSERT INTO csv SELECT * FROM 
other_file_format_table;</codeblock>
 
             <note rev="1.2.0">
               <p rev="1.2.0">
-                <ph rev="upstream">The name of the Hadoop LZO package changed 
between CDH 4 and CDH 5. In CDH 4, the package name was
-                <codeph>hadoop-lzo-cdh4</codeph>. In CDH 5 and higher, the 
package name is <codeph>hadoop-lzo</codeph>.</ph>
+                The name of the Hadoop LZO package changed in the distant past.
+                Currently, the package name is <codeph>hadoop-lzo</codeph>.
               </p>
             </note>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0ad55ba5/docs/topics/impala_udf.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_udf.xml b/docs/topics/impala_udf.xml
index 7e529a7..1f63ec1 100644
--- a/docs/topics/impala_udf.xml
+++ b/docs/topics/impala_udf.xml
@@ -204,7 +204,7 @@ select real_words(letters) from word_games;</codeblock>
             Typically, a Java UDF will execute several times slower in Impala 
than the equivalent native UDF
             written in C++.
           </li>
-          <li rev="2.5.0 IMPALA-2843 CDH-39148">
+          <li rev="2.5.0 IMPALA-2843">
             In <keyword keyref="impala25_full"/> and higher, you can 
transparently call Hive Java UDFs through Impala,
             or call Impala Java UDFs through Hive. This feature does not apply 
to built-in Hive functions.
             Any Impala Java UDFs created with older versions must be 
re-created using new <codeph>CREATE FUNCTION</codeph>
@@ -282,7 +282,7 @@ select real_words(letters) from word_games;</codeblock>
             <codeph>WHERE</codeph> clause), directly on a column, and on the 
results of a string expression:
           </p>
 
-<!-- To do: adapt for signatureless syntax per CDH-39148 / IMPALA-2843. -->
+<!-- To do: adapt for signatureless syntax per IMPALA-2843. -->
 <codeblock>[localhost:21000] &gt; create database udfs;
 [localhost:21000] &gt; use udfs;
 localhost:21000] &gt; create function lower(string) returns string location 
'/user/hive/udfs/hive.jar' symbol='org.apache.hadoop.hive.ql.udf.UDFLower';
@@ -414,7 +414,7 @@ and other examples demonstrating this technique in
 
     <conbody>
 
-      <p rev="CDH-37080">
+      <p rev="">
         To develop UDFs for Impala, download and install the 
<codeph>impala-udf-devel</codeph> package (RHEL-based
         distributions) or <codeph>impala-udf-dev</codeph> (Ubuntu and Debian). 
This package contains
         header files, sample source, and build configuration files.
@@ -422,18 +422,16 @@ and other examples demonstrating this technique in
 
       <ol>
         <li>
-          Start at <xref href="https://archive.cloudera.com/cdh5/"; 
scope="external" format="html"/> for the CDH 5
-          package, or <xref href="https://archive.cloudera.com/impala/"; 
scope="external" format="html"/> for the CDH
-          4 package.
+          Start at <xref href="https://archive.cloudera.com/cdh5/"; 
scope="external" format="html"/>.
         </li>
 
         <li>
           Locate the appropriate <codeph>.repo</codeph> or list file for your 
operating system version, such as
           <xref 
href="https://archive.cloudera.com/impala/redhat/6/x86_64/impala/cloudera-impala.repo";
 scope="external" format="html">the
-          <codeph>.repo</codeph> file for CDH 4 on RHEL 6</xref>.
+          <codeph>.repo</codeph> file for RHEL 6</xref>.
         </li>
 
-        <li rev="CDH-37080">
+        <li>
           Use the familiar <codeph>yum</codeph>, <codeph>zypper</codeph>, or 
<codeph>apt-get</codeph> commands
           depending on your operating system. For the package name, specify 
<codeph>impala-udf-devel</codeph>
           (RHEL-based distributions) or <codeph>impala-udf-dev</codeph> 
(Ubuntu and Debian).
@@ -1253,7 +1251,7 @@ StringVal StringConcatFinalize(FunctionContext* context, 
const StringVal&amp; va
       </conbody>
     </concept>
 
-    <concept rev="2.3.0 IMPALA-1829 CDH-30572" id="udf_intermediate">
+    <concept rev="2.3.0 IMPALA-1829" id="udf_intermediate">
 
       <title>Intermediate Results for UDAs</title>
 
@@ -1346,7 +1344,7 @@ StringVal StringConcatFinalize(FunctionContext* context, 
const StringVal&amp; va
         Prerequisites for the build environment are:
       </p>
 
-<codeblock rev="CDH-37080"># Use the appropriate package installation command 
for your Linux distribution.
+<codeblock rev=""># Use the appropriate package installation command for your 
Linux distribution.
 sudo yum install gcc-c++ cmake boost-devel
 sudo yum install impala-udf-devel
 # The package name on Ubuntu and Debian is impala-udf-dev.

Reply via email to