You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2021/02/17 15:01:21 UTC

[zeppelin] branch master updated: [ZEPPELIN-5229] - bump flink 1.10 minor version

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4a25272  [ZEPPELIN-5229] - bump flink 1.10 minor version
4a25272 is described below

commit 4a25272d822c6d2de09fbcb405e073f35dabf5be
Author: OmriK <om...@dynamicyield.com>
AuthorDate: Thu Feb 11 09:50:08 2021 +0200

    [ZEPPELIN-5229] - bump flink 1.10 minor version
    
    ### What is this PR for?
    Bumping flink minor version, fixing minor flink doc typos
    
    ### What type of PR is it?
    Improvement
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    https://issues.apache.org/jira/browse/ZEPPELIN-5229
    
    ### How should this be tested?
    Automation and builds
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update? - no
    * Is there breaking changes for older versions? - no
    * Does this needs documentation? - no
    
    Author: OmriK <om...@dynamicyield.com>
    
    Closes #4052 from omrisk/ZEPPELIN-5229-upgrade-flink-version and squashes the following commits:
    
    7e883818d [OmriK] bump flink 1.10 minor version in integration tests
    d86c374cb [OmriK] Minor readme fixes for flink docs
    8bc7d7a18 [OmriK] bump flink 1.10 minor version
---
 docs/interpreter/flink.md                                  | 14 +++++++-------
 flink/pom.xml                                              |  2 +-
 .../zeppelin/integration/FlinkIntegrationTest110.java      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/interpreter/flink.md b/docs/interpreter/flink.md
index 0d68f6e..dcfc625 100644
--- a/docs/interpreter/flink.md
+++ b/docs/interpreter/flink.md
@@ -26,8 +26,8 @@ limitations under the License.
 ## Overview
 [Apache Flink](https://flink.apache.org) is an open source platform for distributed stream and batch data processing. Flinkā€™s core is a streaming dataflow engine that provides data distribution, communication, and fault tolerance for distributed computations over data streams. Flink also builds batch processing on top of the streaming engine, overlaying native iteration support, managed memory, and program optimization.
 
-In Zeppelin 0.9, we refactor the Flink interpreter in Zeppelin to support the latest version of Flink. **Only Flink 1.10+ is supported, old version of flink won't work.**
-Apache Flink is supported in Zeppelin with Flink interpreter group which consists of below five interpreters.
+In Zeppelin 0.9, we refactor the Flink interpreter in Zeppelin to support the latest version of Flink. **Only Flink 1.10+ is supported, old versions of flink won't work.**
+Apache Flink is supported in Zeppelin with the Flink interpreter group which consists of the five interpreters listed below.
 
 <table class="table-configuration">
   <tr>
@@ -251,7 +251,7 @@ And will create 6 variables as pyflink (`%flink.pyflink` or `%flink.ipyflink`) e
 
 ## Blink/Flink Planner
 
-There're 2 planners supported by Flink's table api: `flink` & `blink`.
+There are 2 planners supported by Flink's table api: `flink` & `blink`.
 
 * If you want to use DataSet api, and convert it to flink table then please use flink planner (`btenv_2` and `stenv_2`).
 * In other cases, we would always recommend you to use `blink` planner. This is also what flink batch/streaming sql interpreter use (`%flink.bsql` & `%flink.ssql`)
@@ -275,7 +275,7 @@ because by default it is only 4 TM with 1 Slots which may not be enough for some
 
 ### Run Flink in Remote Mode
 
-Running Flink in remote mode will connect to a existing flink cluster which could be standalone cluster or yarn session cluster. Besides specifying `flink.execution.mode` to be `remote`. You also need to specify
+Running Flink in remote mode will connect to an existing flink cluster which could be standalone cluster or yarn session cluster. Besides specifying `flink.execution.mode` to be `remote`. You also need to specify
 `flink.execution.remote.host` and `flink.execution.remote.port` to point to flink job manager.
 
 ### Run Flink in Yarn Mode
@@ -377,8 +377,8 @@ bt_env.register_function("python_upper", udf(PythonUpper(), DataTypes.STRING(),
 
 ```
 
-Zeppelin only supports scala and python for flink interpreter, if you want to write java udf or the udf is pretty complicated which make it not suitable to write in Zeppelin,
-then you can write the udf in IDE and build a udf jar.
+Zeppelin only supports scala and python for flink interpreter, if you want to write a java udf or the udf is pretty complicated which make it not suitable to write in Zeppelin,
+then you can write the udf in IDE and build an udf jar.
 In Zeppelin you just need to specify `flink.udf.jars` to this jar, and flink
 interpreter will detect all the udfs in this jar and register all the udfs to TableEnvironment, the udf name is the class name.
 
@@ -485,7 +485,7 @@ In this section, we will list and explain all the supported local properties in
 
 ## Tutorial Notes
 
-Zeppelin is shipped with several Flink tutorial notes which may be helpful for you. You check more features in the tutorial notes.
+Zeppelin is shipped with several Flink tutorial notes which may be helpful for you. You can check for more features in the tutorial notes.
 
 
 
diff --git a/flink/pom.xml b/flink/pom.xml
index 99b2b9e..3b5d1cd 100644
--- a/flink/pom.xml
+++ b/flink/pom.xml
@@ -43,7 +43,7 @@
     </modules>
 
     <properties>
-        <flink1.10.version>1.10.2</flink1.10.version>
+        <flink1.10.version>1.10.3</flink1.10.version>
         <flink1.11.version>1.11.3</flink1.11.version>
         <flink1.12.version>1.12.0</flink1.12.version>
     </properties>
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/FlinkIntegrationTest110.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/FlinkIntegrationTest110.java
index 7779d2f..ab68068 100644
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/FlinkIntegrationTest110.java
+++ b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/FlinkIntegrationTest110.java
@@ -29,7 +29,7 @@ public class FlinkIntegrationTest110 extends FlinkIntegrationTest {
   @Parameterized.Parameters
   public static List<Object[]> data() {
     return Arrays.asList(new Object[][]{
-            {"1.10.2"}
+            {"1.10.3"}
     });
   }