Merge branch 'v1.4.0' into v1.4.1

Author: zoudaokoulife

.gitignore

@@ -1,8 +1,7 @@
 target
 .idea/
 /.idea/*
-/target
-target
+target/
 .class
 .project
 .classpath

README.md

@@ -37,8 +37,6 @@
 
 ```
 mvn clean package -Dmaven.test.skip
-
-所有插件包会生成到plugins下
 ```
 
 打包结束后，项目根目录下会产生plugins目录，plugins目录下存放编译好的数据同步插件包

core/pom.xml

@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>flink.sql</artifactId>
-        <groupId>com.dtstack.flinkx</groupId>
+        <groupId>com.dtstack.flink</groupId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

core/src/main/java/com/dtstack/flink/sql/parser/SqlParser.java

@@ -51,7 +51,7 @@ public static void setLocalSqlPluginRoot(String localSqlPluginRoot){
     }
 
     /**
-     * ------flink 支持的 sql 语法包括--------
+     * flink support sql syntax
      * CREATE TABLE sls_stream() with ();
      * CREATE (TABLE|SCALA) FUNCTION fcnName WITH com.dtstack.com;
      * insert into tb1 select * from tb2;
@@ -76,12 +76,9 @@ public static SqlTree parseSql(String sql) throws Exception {
         SqlTree sqlTree = new SqlTree();
 
         for(String childSql : sqlArr){
-
-
             if(Strings.isNullOrEmpty(childSql)){
                 continue;
             }
-
             boolean result = false;
             for(IParser sqlParser : sqlParserList){
                 if(!sqlParser.verify(childSql)){
@@ -99,7 +96,7 @@ public static SqlTree parseSql(String sql) throws Exception {
 
         //解析exec-sql
         if(sqlTree.getExecSqlList().size() == 0){
-            throw new RuntimeException("sql中没有可执行语句");
+            throw new RuntimeException("sql no executable statement");
         }
 
         for(InsertSqlParser.SqlParseResult result : sqlTree.getExecSqlList()){

elasticsearch/pom.xml

@@ -3,30 +3,16 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>sql.elasticsearch</artifactId>
-        <groupId>com.dtstack.flinkx</groupId>
+        <artifactId>sql.elasticsearch5</artifactId>
+        <groupId>com.dtstack.flink</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>sql.sink.elasticsearch</artifactId>
-    <name>elasticsearch-sink</name>
+    <artifactId>sql.sink.elasticsearch5</artifactId>
+    <name>elasticsearch5-sink</name>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.dtstack.flinkx</groupId>
-            <artifactId>sql.core</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-elasticsearch5_2.11</artifactId>