Merge branch 'v1.8.0_dev_feature_kudu' into 'v1.8.0_dev'

修改kudu文档说明，去掉代码中无用注释

修改kudu文档说明，去掉代码中无用注释

See merge request !127

Author: simenliuxing

docs/kuduSide.md

@@ -64,18 +64,15 @@ kudu 1.9.0+cdh6.2.0
 
 |参数名称|含义|是否必填|默认值|
 |----|---|---|-----|
-|type | 表明维表的类型[hbase|mysql|kudu]|是||
+| type | 表明维表的类型[hbase|mysql|kudu]|是||
 | kuduMasters | kudu master节点的地址;格式ip[ip，ip2]|是||
 | tableName | kudu 的表名称|是||
 | workerCount | 工作线程数 |否||
-| defaultOperationTimeoutMs | 写入操作超时时间 |否||
+| defaultOperationTimeoutMs | scan操作超时时间 |否||
 | defaultSocketReadTimeoutMs | socket读取超时时间 |否||
 | primaryKey | 需要过滤的主键 ALL模式独有 |否||
 | lowerBoundPrimaryKey | 需要过滤的主键的最小值 ALL模式独有 |否||
 | upperBoundPrimaryKey | 需要过滤的主键的最大值(不包含) ALL模式独有 |否||
-| workerCount | 工作线程数 |否||
-| defaultOperationTimeoutMs | 写入操作超时时间 |否||
-| defaultSocketReadTimeoutMs | socket读取超时时间 |否||
 | batchSizeBytes |返回数据的大小 | 否||
 | limitNum |返回数据的条数 | 否||
 | isFaultTolerant |查询是否容错  查询失败是否扫描第二个副本  默认false  容错 | 否||

docs/kuduSink.md

@@ -34,14 +34,14 @@ kudu 1.9.0+cdh6.2.0
 
 |参数名称|含义|是否必填|默认值|
 |----|---|---|-----|
-|type | 表名 输出表类型[mysq|hbase|elasticsearch|redis|kudu]|是||
+| type | 表名 输出表类型[mysq|hbase|elasticsearch|redis|kudu]|是||
 | kuduMasters | kudu master节点的地址;格式ip[ip，ip2]|是||
 | tableName | kudu 的表名称|是||
 | writeMode | 写入kudu的模式 insert|update|upsert |否 |upsert
 | workerCount | 工作线程数 |否|
-| defaultOperationTimeoutMs | 写入操作超时时间 |否|
+| defaultOperationTimeoutMs | 操作超时时间 |否|
 | defaultSocketReadTimeoutMs | socket读取超时时间 |否|
-|parallelism | 并行度设置|否|1|
+| parallelism | 并行度设置|否|1|
       
 
 ## 5.样例：

kudu/kudu-side/kudu-all-side/src/main/java/com/dtstack/flink/sql/side/kudu/KuduAllReqRow.java

@@ -93,7 +93,7 @@ protected void reloadCache() {
         loadData(newCache);
 
         cacheRef.set(newCache);
-        LOG.info("----- Mongo all cacheRef reload end:{}", Calendar.getInstance());
+        LOG.info("----- kudu all cacheRef reload end:{}", Calendar.getInstance());
     }
 
 
@@ -177,15 +177,6 @@ private void loadData(Map<String, List<Map<String, Object>>> tmpCache) {
                     LOG.error("Error while closing scanner.", e);
                 }
             }
-            //放置到close中关闭  每次刷新时间较长则可以选择在这里关闭
-//            if (null != client) {
-//                try {
-//                    client.close();
-//                } catch (Exception e) {
-//                    LOG.error("Error while closing client.", e);
-//                }
-//            }
-
         }
 
 

kudu/kudu-side/kudu-side-core/src/main/java/com/dtstack/flink/sql/side/kudu/table/KuduSideTableInfo.java

@@ -142,14 +142,13 @@ public void setPrimaryKey(String primaryKey) {
 
     @Override
     public boolean check() {
-        Preconditions.checkNotNull(kuduMasters, "Cassandra field of kuduMasters is required");
-        Preconditions.checkNotNull(tableName, "Cassandra field of tableName is required");
+        Preconditions.checkNotNull(kuduMasters, "kudu field of kuduMasters is required");
+        Preconditions.checkNotNull(tableName, "kudu field of tableName is required");
         return true;
     }
 
     @Override
     public String getType() {
-        // return super.getType().toLowerCase() + TARGET_SUFFIX;
         return super.getType().toLowerCase();
     }
 }

kudu/kudu-sink/src/main/java/com/dtstack/flink/sql/sink/kudu/KuduOutputFormat.java

@@ -34,8 +34,6 @@ public class KuduOutputFormat extends MetricOutputFormat {
 
     public enum WriteMode {INSERT, UPDATE, UPSERT}
 
-//    public enum Consistency {EVENTUAL, STRONG}
-
     private String kuduMasters;
 
     private String tableName;
@@ -46,15 +44,10 @@ public enum WriteMode {INSERT, UPDATE, UPSERT}
 
     TypeInformation<?>[] fieldTypes;
 
-//    protected List<String> primaryKeys;
-
-//    private Consistency consistency = Consistency.STRONG;
-
     private AsyncKuduClient client;
 
     private KuduTable table;
 
-
     private Integer workerCount;
 
     private Integer defaultOperationTimeoutMs;
@@ -158,11 +151,6 @@ public KuduOutputFormatBuilder setFieldTypes(TypeInformation<?>[] fieldTypes) {
             kuduOutputFormat.fieldTypes = fieldTypes;
             return this;
         }
-//
-//        public KuduOutputFormatBuilder setPrimaryKeys(List<String> primaryKeys) {
-//            kuduOutputFormat.primaryKeys = primaryKeys;
-//            return this;
-//        }
 
         public KuduOutputFormatBuilder setWriteMode(WriteMode writeMode) {
             if (null == writeMode) {
@@ -177,21 +165,6 @@ public KuduOutputFormatBuilder setWorkerCount(Integer workerCount) {
             return this;
         }
 
-//        public KuduOutputFormatBuilder setConsistency(String consistency) {
-//            switch (consistency) {
-//                case "EVENTUAL":
-//                    kuduOutputFormat.consistency = Consistency.EVENTUAL;
-//                    break;
-//                case "STRONG":
-//                    kuduOutputFormat.consistency = Consistency.STRONG;
-//                    break;
-//                default:
-//                    kuduOutputFormat.consistency = Consistency.STRONG;
-//            }
-//            return this;
-//        }
-
-
         public KuduOutputFormatBuilder setDefaultOperationTimeoutMs(Integer defaultOperationTimeoutMs) {
             kuduOutputFormat.defaultOperationTimeoutMs = defaultOperationTimeoutMs;
             return this;

kudu/kudu-sink/src/main/java/com/dtstack/flink/sql/sink/kudu/KuduSink.java

@@ -29,11 +29,6 @@ public class KuduSink implements RetractStreamTableSink<Row>, Serializable, IStr
 
     TypeInformation<?>[] fieldTypes;
 
-//    protected List<String> primaryKeys;
-
-//    private KuduOutputFormat.Consistency consistency = KuduOutputFormat.Consistency.STRONG;
-
-
     private Integer workerCount;
 
     private Integer defaultOperationTimeoutMs;
@@ -78,7 +73,6 @@ public TableSink<Tuple2<Boolean, Row>> configure(String[] fieldNames, TypeInform
         return this;
     }
 
-
     @Override
     public TupleTypeInfo<Tuple2<Boolean, Row>> getOutputType() {
         return new TupleTypeInfo(org.apache.flink.table.api.Types.BOOLEAN(), getRecordType());

kudu/kudu-sink/src/main/java/com/dtstack/flink/sql/sink/kudu/table/KuduTableInfo.java

@@ -14,10 +14,6 @@ public class KuduTableInfo extends TargetTableInfo {
 
     private KuduOutputFormat.WriteMode writeMode;
 
-
-//    private KuduOutputFormat.Consistency consistency = KuduOutputFormat.Consistency.STRONG;
-
-
     private Integer workerCount;
 
     private Integer defaultOperationTimeoutMs;
@@ -79,14 +75,13 @@ public void setDefaultSocketReadTimeoutMs(Integer defaultSocketReadTimeoutMs) {
 
     @Override
     public boolean check() {
-        Preconditions.checkNotNull(kuduMasters, "Cassandra field of kuduMasters is required");
-        Preconditions.checkNotNull(tableName, "Cassandra field of tableName is required");
+        Preconditions.checkNotNull(kuduMasters, "kudu field of kuduMasters is required");
+        Preconditions.checkNotNull(tableName, "kudu field of tableName is required");
         return true;
     }
 
     @Override
     public String getType() {
-        // return super.getType().toLowerCase() + TARGET_SUFFIX;
         return super.getType().toLowerCase();
     }
 }