Merge branch 'v1.8.0_dev' of ssh://git.dtstack.cn:10022/dtstack/dt-center-flinkStreamSQL into '1.8_polardb'

Author: dengdejiushini

README.md

@@ -56,9 +56,16 @@
 ```
 mvn clean package -Dmaven.test.skip
 
-打包结束后，项目根目录下会产生plugins目录，plugins目录下存放编译好的数据同步插件包,在lib目下存放job提交的包
 ```
 
+打包完成后的包结构：
+
+> * dt-center-flinkStreamSQL  
+>  >  * bin: 任务启动脚本
+>  >  * lib: launcher包存储路径，是任务提交的入口
+>  >  * plugins:  插件包存储路径
+>  >  * ........   :  core及插件代码
+
 ### 1.4 启动
 
 #### 1.4.1 启动命令

cassandra/cassandra-side/cassandra-all-side/pom.xml

@@ -36,6 +36,7 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <artifactSet>
                                 <excludes>
                                     <exclude>org.slf4j</exclude>

cassandra/cassandra-side/cassandra-async-side/pom.xml

@@ -52,6 +52,7 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <artifactSet>
                                 <excludes>
                                     <exclude>org.slf4j</exclude>

cassandra/cassandra-side/cassandra-side-core/src/main/java/com/dtstack/flink/sql/side/cassandra/table/CassandraSideParser.java

@@ -68,9 +68,8 @@ public class CassandraSideParser extends AbsSideTableParser {
 
     public static final String POOL_TIMEOUT_MILLIS_KEY = "poolTimeoutMillis";
 
-    static {
-        keyPatternMap.put(SIDE_SIGN_KEY, SIDE_TABLE_SIGN);
-        keyHandlerMap.put(SIDE_SIGN_KEY, CassandraSideParser::dealSideSign);
+    public CassandraSideParser() {
+        addParserHandler(SIDE_SIGN_KEY, SIDE_TABLE_SIGN, this::dealSideSign);
     }
 
     @Override
@@ -97,7 +96,7 @@ public TableInfo getTableInfo(String tableName, String fieldsInfo, Map<String, O
         return cassandraSideTableInfo;
     }
 
-    private static void dealSideSign(Matcher matcher, TableInfo tableInfo) {
+    private void dealSideSign(Matcher matcher, TableInfo tableInfo) {
     }
 
     public Class dbTypeConvertToJavaType(String fieldType) {

console/console-sink/src/test/java/com/dtstack/flinkx/AppTest.java

@@ -116,6 +116,7 @@
             <version>${flink.version}</version>
         </dependency>
 
+
     </dependencies>
 
     <build>

core/pom.xml

@@ -0,0 +1,142 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.dtstack.flink.sql.side;
+
+import java.io.Serializable;
+
+/**
+ *   Predicate base info
+ *
+ * Date: 2019/12/11
+ * Company: www.dtstack.com
+ * @author maqi
+ */
+public class PredicateInfo implements Serializable {
+
+    private String operatorName;
+    private String operatorKind;
+    private String ownerTable;
+    private String fieldName;
+    private String condition;
+
+    public PredicateInfo(String operatorName, String operatorKind, String ownerTable, String fieldName, String condition) {
+        this.operatorName = operatorName;
+        this.operatorKind = operatorKind;
+        this.ownerTable = ownerTable;
+        this.fieldName = fieldName;
+        this.condition = condition;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+
+    public String getOperatorKind() {
+        return operatorKind;
+    }
+
+    public void setOperatorKind(String operatorKind) {
+        this.operatorKind = operatorKind;
+    }
+
+    public String getOwnerTable() {
+        return ownerTable;
+    }
+
+    public void setOwnerTable(String ownerTable) {
+        this.ownerTable = ownerTable;
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public void setFieldName(String fieldName) {
+        this.fieldName = fieldName;
+    }
+
+    public String getCondition() {
+        return condition;
+    }
+
+    public void setCondition(String condition) {
+        this.condition = condition;
+    }
+
+    @Override
+    public String toString() {
+        return "PredicateInfo{" +
+                "operatorName='" + operatorName + '\'' +
+                ", operatorKind='" + operatorKind + '\'' +
+                ", ownerTable='" + ownerTable + '\'' +
+                ", fieldName='" + fieldName + '\'' +
+                ", condition='" + condition + '\'' +
+                '}';
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+
+    public static class Builder {
+
+        private String operatorName;
+        private String operatorKind;
+        private String ownerTable;
+        private String fieldName;
+        private String condition;
+
+        public Builder setOperatorName(String operatorName) {
+            this.operatorName = operatorName;
+            return this;
+        }
+
+        public Builder setOperatorKind(String operatorKind) {
+            this.operatorKind = operatorKind;
+            return this;
+        }
+
+        public Builder setOwnerTable(String ownerTable) {
+            this.ownerTable = ownerTable;
+            return this;
+        }
+
+        public Builder setFieldName(String fieldName) {
+            this.fieldName = fieldName;
+            return this;
+        }
+
+        public Builder setCondition(String condition) {
+            this.condition = condition;
+            return this;
+        }
+
+        public PredicateInfo build() {
+            return new PredicateInfo(
+                    operatorName, operatorKind, ownerTable, fieldName, condition);
+        }
+    }
+
+
+}