Merge branch 'hotfix_1.10_4.1.x_1434' into 1.10_release_4.1.x

Author: gituser

core/pom.xml

@@ -17,7 +17,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.package.name>core</project.package.name>
-        <jackson.version>2.7.9</jackson.version>
+        <jackson.version>2.11.3</jackson.version>
         <guava.version>19.0</guava.version>
         <logger.tool.version>1.0.0-SNAPSHOT</logger.tool.version>
     </properties>

kafka-base/kafka-base-source/src/main/java/com/dtstack/flink/sql/source/kafka/AbstractKafkaSource.java

@@ -63,7 +63,18 @@ protected Properties getKafkaProperties(KafkaSourceTableInfo kafkaSourceTableInf
         if (StringUtils.isNotBlank(kafkaSourceTableInfo.getGroupId())) {
             props.setProperty(ConsumerConfig.GROUP_ID_CONFIG, kafkaSourceTableInfo.getGroupId());
         }
-
+        if("kafka".equalsIgnoreCase(kafkaSourceTableInfo.getType())){
+            String keyDeserializer = kafkaSourceTableInfo.getKafkaParam(KafkaSourceTableInfo.KEY_DESERIALIZER);
+            if(StringUtils.isNotBlank(keyDeserializer)){
+                kafkaSourceTableInfo.putKafkaParam(KafkaSourceTableInfo.KEY_DESERIALIZER, KafkaSourceTableInfo.DT_DESERIALIZER_CLASS_NAME);
+                kafkaSourceTableInfo.putKafkaParam(KafkaSourceTableInfo.DT_KEY_DESERIALIZER, keyDeserializer);
+            }
+            String valueDeserializer = kafkaSourceTableInfo.getKafkaParam(KafkaSourceTableInfo.VALUE_DESERIALIZER);
+            if(StringUtils.isNotBlank(valueDeserializer)){
+                kafkaSourceTableInfo.putKafkaParam(KafkaSourceTableInfo.VALUE_DESERIALIZER, KafkaSourceTableInfo.DT_DESERIALIZER_CLASS_NAME);
+                kafkaSourceTableInfo.putKafkaParam(KafkaSourceTableInfo.DT_VALUE_DESERIALIZER, valueDeserializer);
+            }
+        }
         for (String key : kafkaSourceTableInfo.getKafkaParamKeys()) {
             props.setProperty(key, kafkaSourceTableInfo.getKafkaParam(key));
         }

kafka-base/kafka-base-source/src/main/java/com/dtstack/flink/sql/source/kafka/table/KafkaSourceTableInfo.java

@@ -57,6 +57,16 @@ public class KafkaSourceTableInfo extends AbstractSourceTableInfo {
 
     public static final String TIMESTAMP_OFFSET = "timestampOffset";
 
+    public static final String KEY_DESERIALIZER = "key.deserializer";
+
+    public static final String DT_KEY_DESERIALIZER = "dt.key.deserializer";
+
+    public static final String VALUE_DESERIALIZER = "value.deserializer";
+
+    public static final String DT_VALUE_DESERIALIZER = "dt.value.deserializer";
+
+    public static final String DT_DESERIALIZER_CLASS_NAME = "com.dtstack.flink.sql.source.kafka.deserializer.DtKafkaDeserializer";
+
     private String bootstrapServers;
 
     private String topic;
@@ -127,6 +137,10 @@ public String getKafkaParam(String key) {
         return kafkaParams.get(key);
     }
 
+    public void putKafkaParam(String key, String value) {
+        kafkaParams.put(key, value);
+    }
+
     public Set<String> getKafkaParamKeys() {
         return kafkaParams.keySet();
     }

kafka/kafka-source/src/main/java/com/dtstack/flink/sql/source/kafka/KafkaConsumer.java

@@ -18,6 +18,8 @@
 
 package com.dtstack.flink.sql.source.kafka;
 
+import com.dtstack.flink.sql.format.DeserializationMetricWrapper;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.api.common.serialization.DeserializationSchema;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.metrics.MetricGroup;
@@ -32,9 +34,6 @@
 import org.apache.flink.types.Row;
 import org.apache.flink.util.SerializedValue;
 
-import com.dtstack.flink.sql.format.DeserializationMetricWrapper;
-import org.apache.commons.lang3.StringUtils;
-
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Properties;

kafka/kafka-source/src/main/java/com/dtstack/flink/sql/source/kafka/deserializer/DtKafkaDeserializer.java

@@ -0,0 +1,88 @@
+/*
+ * 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.source.kafka.deserializer;
+
+import com.dtstack.flink.sql.source.kafka.table.KafkaSourceTableInfo;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.kafka.common.errors.SerializationException;
+import org.apache.kafka.common.header.Headers;
+import org.apache.kafka.common.serialization.Deserializer;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+/**
+ * Date: 2021/04/20
+ * Company: www.dtstack.com
+ *
+ * @author tudou
+ */
+public class DtKafkaDeserializer<T> implements Deserializer<byte[]> {
+    protected ObjectMapper objectMapper = new ObjectMapper();
+    private Deserializer<T> deserializer;
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void configure(Map<String, ?> configs, boolean isKey) {
+        String deserializerClassName;
+        if(isKey){
+            deserializerClassName = (String)configs.get(KafkaSourceTableInfo.DT_KEY_DESERIALIZER);
+        }else{
+            deserializerClassName = (String)configs.get(KafkaSourceTableInfo.DT_VALUE_DESERIALIZER);
+        }
+        try {
+            this.deserializer = (Deserializer<T>)Class.forName(deserializerClassName).newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException("Can't create instance: " + deserializerClassName, e);
+        }
+        this.deserializer.configure(configs, isKey);
+    }
+
+    @Override
+    public byte[] deserialize(String topic, Headers headers, byte[] data) {
+        return toBytes(deserializer.deserialize(topic, headers, data));
+    }
+
+    @Override
+    public byte[] deserialize(String topic, byte[] data) {
+        return toBytes(deserializer.deserialize(topic, data));
+    }
+
+    /**
+     * T value to byte[]
+     * @param value
+     * @return
+     */
+    private byte[] toBytes(T value){
+        if(value instanceof byte[]){
+            return  (byte[])value;
+        }else{
+            try {
+                return this.objectMapper.readValue(this.objectMapper.writeValueAsBytes(value), String.class).getBytes(StandardCharsets.UTF_8);
+            } catch (IOException e) {
+                throw new SerializationException("Can't deserialize data", e);
+            }
+        }
+    }
+
+    @Override
+    public void close() {
+        this.deserializer.close();
+    }
+}