code opt

Author: todd5167

core/src/main/java/com/dtstack/flink/sql/format/SerializationMetricWrapper.java

@@ -25,7 +25,6 @@
 import org.apache.flink.metrics.Meter;
 import org.apache.flink.metrics.MeterView;
 import org.apache.flink.table.runtime.types.CRow;
-import org.apache.flink.types.Row;
 
 
 /**

core/src/main/java/com/dtstack/flink/sql/option/OptionParser.java

@@ -29,9 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.io.File;
-import java.io.FileInputStream;
 import java.net.URLEncoder;
-import java.util.stream.Stream;
 
 import org.apache.commons.codec.Charsets;
 import org.apache.flink.util.FileUtils;

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

@@ -22,7 +22,11 @@
 
 import com.dtstack.flink.sql.util.DtStringUtil;
 import org.apache.calcite.config.Lex;
-import org.apache.calcite.sql.*;
+import org.apache.calcite.sql.SqlBasicCall;
+import org.apache.calcite.sql.SqlJoin;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlSelect;
 import org.apache.calcite.sql.parser.SqlParseException;
 import org.apache.calcite.sql.parser.SqlParser;
 import com.google.common.collect.Lists;

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

@@ -21,7 +21,14 @@
 package com.dtstack.flink.sql.parser;
 
 import org.apache.calcite.config.Lex;
-import org.apache.calcite.sql.*;
+import org.apache.calcite.sql.SqlBasicCall;
+import org.apache.calcite.sql.SqlInsert;
+import org.apache.calcite.sql.SqlJoin;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlMatchRecognize;
+import org.apache.calcite.sql.SqlNode;
+import org.apache.calcite.sql.SqlOrderBy;
+import org.apache.calcite.sql.SqlSelect;
 import org.apache.calcite.sql.parser.SqlParseException;
 import org.apache.calcite.sql.parser.SqlParser;
 import org.apache.commons.lang3.StringUtils;

core/src/main/java/com/dtstack/flink/sql/side/JoinInfo.java

@@ -25,7 +25,6 @@
 import com.google.common.base.Strings;
 
 import java.io.Serializable;
-import java.util.Map;
 
 /**
  * Join信息

core/src/main/java/com/dtstack/flink/sql/util/DateUtil.java

@@ -23,10 +23,21 @@
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.*;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
-import java.util.*;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+import java.util.SimpleTimeZone;
+import java.util.TimeZone;
 import java.util.regex.Pattern;
 
 import static java.time.format.DateTimeFormatter.ISO_INSTANT;
@@ -756,7 +767,8 @@ public static java.sql.Timestamp columnToTimestamp(Object column) {
         if (column == null) {
             return null;
         } else if(column instanceof String) {
-            return null == stringToDate((String) column) ? null : new java.sql.Timestamp(stringToDate((String) column).getTime());
+            Date date = stringToDate((String) column);
+            return null == date ? null : new java.sql.Timestamp(date.getTime());
         } else if (column instanceof Integer) {
             Integer rawData = (Integer) column;
             return new java.sql.Timestamp(rawData.longValue());
@@ -790,7 +802,8 @@ public static Timestamp getTimestampFromStr(String timeStr) {
             Instant instant = Instant.from(ISO_INSTANT.parse(timeStr));
             return new Timestamp(instant.getEpochSecond() * MILLIS_PER_SECOND);
         }
-        return null == stringToDate(timeStr) ? null : new Timestamp(stringToDate(timeStr).getTime());
+        Date date = stringToDate(timeStr);
+        return null == date ? null : new Timestamp(date.getTime());
     }
 
     public static java.sql.Date getDateFromStr(String dateStr) {
@@ -802,7 +815,8 @@ public static java.sql.Date getDateFromStr(String dateStr) {
             Instant instant = Instant.from(ISO_INSTANT.parse(dateStr));
             return new java.sql.Date(instant.toEpochMilli());
         }
-        return null == stringToDate(dateStr) ? null : new java.sql.Date(stringToDate(dateStr).getTime());
+        Date date = stringToDate(dateStr);
+        return null == date ? null : new java.sql.Date(date.getTime());
     }
 
 }

core/src/main/java/com/dtstack/flink/sql/util/MathUtil.java

@@ -23,18 +23,6 @@
 import java.math.BigInteger;
 import java.sql.Date;
 import java.sql.Timestamp;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-
-
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZoneOffset;
-import java.util.TimeZone;
-import java.util.regex.Pattern;
-
-import static java.time.format.DateTimeFormatter.ISO_INSTANT;
 
 /**
  * Convert val to specified numeric type

core/src/main/java/com/dtstack/flink/sql/util/ParseUtils.java

@@ -37,16 +37,23 @@
 package com.dtstack.flink.sql.util;
 
 import com.google.common.collect.HashBasedTable;
-import org.apache.calcite.sql.*;
+
+import org.apache.calcite.sql.SqlBasicCall;
+import org.apache.calcite.sql.SqlIdentifier;
+import org.apache.calcite.sql.SqlJoin;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlNode;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.api.java.tuple.Tuple2;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
-import static org.apache.calcite.sql.SqlKind.*;
+import static org.apache.calcite.sql.SqlKind.AS;
+import static org.apache.calcite.sql.SqlKind.IDENTIFIER;
+import static org.apache.calcite.sql.SqlKind.JOIN;
+
 
 /**
  * @Auther: jiangjunjie

core/src/main/java/com/dtstack/flink/sql/watermarker/WaterMarkerAssigner.java

@@ -29,8 +29,6 @@
 import org.apache.flink.types.Row;
 import org.apache.flink.util.Preconditions;
 import java.sql.Timestamp;
-import java.lang.Long;
-
 /**
  * define watermarker
  * Date: 2018/6/29

elasticsearch5/elasticsearch5-sink/src/main/java/com/dtstack/flink/sql/sink/elasticsearch/CustomerSinkFunc.java

@@ -32,7 +32,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;