You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by bl...@apache.org on 2019/08/16 20:57:10 UTC

[flink] branch master updated: [hotfix][hive] refine Hive related documentations

This is an automated email from the ASF dual-hosted git repository.

bli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 76482f5  [hotfix][hive] refine Hive related documentations
76482f5 is described below

commit 76482f574aca79eef89d616f51a1673d9d55c3f8
Author: bowen.li <bo...@gmail.com>
AuthorDate: Wed Aug 14 20:46:46 2019 -0700

    [hotfix][hive] refine Hive related documentations
---
 docs/dev/table/catalogs.md      |  6 +++---
 docs/dev/table/catalogs.zh.md   |  6 +++---
 docs/dev/table/hive/index.md    | 10 +++++++---
 docs/dev/table/hive/index.zh.md | 10 +++++++---
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/docs/dev/table/catalogs.md b/docs/dev/table/catalogs.md
index 97c07e7..52503e6 100644
--- a/docs/dev/table/catalogs.md
+++ b/docs/dev/table/catalogs.md
@@ -23,11 +23,11 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-Catalogs provide metadata, such as database, tables, partitions, views, and functions and information needed to access data stored in a database or other external systems.
+Catalogs provide metadata, such as databases, tables, partitions, views, and functions and information needed to access data stored in a database or other external systems.
 
 One of the most crucial aspects of data processing is managing metadata.
-It may be transient metadata like temporary tables, or UDF's registered against the table environment.
-Or permanent metadata, like a Hive Metastore. Catalogs provide a unified API for managing metadata and making it accessible from the Table API and SQL Queries. 
+It may be transient metadata like temporary tables, or UDFs registered against the table environment.
+Or permanent metadata, like that in a Hive Metastore. Catalogs provide a unified API for managing metadata and making it accessible from the Table API and SQL Queries. 
 
 * This will be replaced by the TOC
 {:toc}
diff --git a/docs/dev/table/catalogs.zh.md b/docs/dev/table/catalogs.zh.md
index 97c07e7..52503e6 100644
--- a/docs/dev/table/catalogs.zh.md
+++ b/docs/dev/table/catalogs.zh.md
@@ -23,11 +23,11 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-Catalogs provide metadata, such as database, tables, partitions, views, and functions and information needed to access data stored in a database or other external systems.
+Catalogs provide metadata, such as databases, tables, partitions, views, and functions and information needed to access data stored in a database or other external systems.
 
 One of the most crucial aspects of data processing is managing metadata.
-It may be transient metadata like temporary tables, or UDF's registered against the table environment.
-Or permanent metadata, like a Hive Metastore. Catalogs provide a unified API for managing metadata and making it accessible from the Table API and SQL Queries. 
+It may be transient metadata like temporary tables, or UDFs registered against the table environment.
+Or permanent metadata, like that in a Hive Metastore. Catalogs provide a unified API for managing metadata and making it accessible from the Table API and SQL Queries. 
 
 * This will be replaced by the TOC
 {:toc}
diff --git a/docs/dev/table/hive/index.md b/docs/dev/table/hive/index.md
index 89511f3..927f323 100644
--- a/docs/dev/table/hive/index.md
+++ b/docs/dev/table/hive/index.md
@@ -26,7 +26,7 @@ under the License.
 -->
 
 [Apache Hive](https://hive.apache.org/) has established itself as a focal point of the data warehousing ecosystem.
-It serves only not only a SQL engine for big data analytics and ETL, but also a data management platform, where data is discovered, defined, and evolved.
+It serves as not only a SQL engine for big data analytics and ETL, but also a data management platform, where data is discovered, defined, and evolved.
 
 Flink offers a two-fold integration with Hive.
 The first is to leverage Hive's Metastore as a persistent catalog for storing Flink specific metadata across sessions.
@@ -44,7 +44,7 @@ Flink supports Hive `2.3.4` and `1.2.1` and relies on Hive's compatibility guara
 
 ### Depedencies 
 
-To integrate with Hive users need the following dependencies in their project.
+To integrate with Hive, users need the following dependencies in their project.
 
 <div class="codetabs" markdown="1">
 <div data-lang="Hive 2.3.4" markdown="1">
@@ -65,6 +65,8 @@ To integrate with Hive users need the following dependencies in their project.
   <scope>provided</scope>
 </dependency>
 
+<!-- Hive 2.3.4 is built with Hadoop 2.7.2. We pick 2.7.5 which flink-shaded-hadoop is pre-built with, but users can pick their own hadoop version, as long as it's compatible with Hadoop 2.7.2 -->
+
 <dependency>
   <groupId>org.apache.flink</groupId>
   <artifactId>flink-shaded-hadoop-2-uber-2.7.5-{{site.version}}</artifactId>
@@ -99,9 +101,11 @@ To integrate with Hive users need the following dependencies in their project.
   <scope>provided</scope>
 </dependency>
 
+<!-- Hive 1.2.1 is built with Hadoop 2.6.0. We pick 2.6.5 which flink-shaded-hadoop is pre-built with, but users can pick their own hadoop version, as long as it's compatible with Hadoop 2.6.0 -->
+
 <dependency>
   <groupId>org.apache.flink</groupId>
-  <artifactId>flink-shaded-hadoop-2-uber-2.7.5-{{site.version}}</artifactId>
+  <artifactId>flink-shaded-hadoop-2-uber-2.6.5-{{site.version}}</artifactId>
   <version>{{site.version}}</version>
   <scope>provided</scope>
 </dependency>
diff --git a/docs/dev/table/hive/index.zh.md b/docs/dev/table/hive/index.zh.md
index ab86482..eaffaf6 100644
--- a/docs/dev/table/hive/index.zh.md
+++ b/docs/dev/table/hive/index.zh.md
@@ -26,7 +26,7 @@ under the License.
 -->
 
 [Apache Hive](https://hive.apache.org/) has established itself as a focal point of the data warehousing ecosystem.
-It serves only not only a SQL engine for big data analytics and ETL, but also a data management platform, where data is discovered, defined, and evolved.
+It serves as not only a SQL engine for big data analytics and ETL, but also a data management platform, where data is discovered, defined, and evolved.
 
 Flink offers a two-fold integration with Hive.
 The first is to leverage Hive's Metastore as a persistent catalog for storing Flink specific metadata across sessions.
@@ -44,7 +44,7 @@ Flink supports Hive `2.3.4` and `1.2.1` and relies on Hive's compatibility guara
 
 ### Depedencies 
 
-To integrate with Hive users need the following dependencies in their project.
+To integrate with Hive, users need the following dependencies in their project.
 
 <div class="codetabs" markdown="1">
 <div data-lang="Hive 2.3.4" markdown="1">
@@ -65,6 +65,8 @@ To integrate with Hive users need the following dependencies in their project.
   <scope>provided</scope>
 </dependency>
 
+<!-- Hive 2.3.4 is built with Hadoop 2.7.2. We pick 2.7.5 which flink-shaded-hadoop is pre-built with, but users can pick their own hadoop version, as long as it's compatible with Hadoop 2.7.2 -->
+
 <dependency>
   <groupId>org.apache.flink</groupId>
   <artifactId>flink-shaded-hadoop-2-uber-2.7.5-{{site.version}}</artifactId>
@@ -99,9 +101,11 @@ To integrate with Hive users need the following dependencies in their project.
   <scope>provided</scope>
 </dependency>
 
+<!-- Hive 1.2.1 is built with Hadoop 2.6.0. We pick 2.6.5 which flink-shaded-hadoop is pre-built with, but users can pick their own hadoop version, as long as it's compatible with Hadoop 2.6.0 -->
+
 <dependency>
   <groupId>org.apache.flink</groupId>
-  <artifactId>flink-shaded-hadoop-2-uber-2.7.5-{{site.version}}</artifactId>
+  <artifactId>flink-shaded-hadoop-2-uber-2.6.5-{{site.version}}</artifactId>
   <version>{{site.version}}</version>
   <scope>provided</scope>
 </dependency>