[opt-1422][file] 调整file source 部分代码

Author: FlechazoW

file/file-source/src/main/java/com/dtstack/flink/sql/source/file/FileSource.java

@@ -1,3 +1,21 @@
+/*
+ * 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.file;
 
 import com.dtstack.flink.sql.metric.MetricConstant;
@@ -57,6 +75,8 @@ public class FileSource extends AbstractRichFunction implements IStreamSourceGen
 
     private InputStream inputStream;
 
+    private BufferedReader bufferedReader;
+
     private String charset;
 
     protected transient Counter errorCounter;
@@ -173,7 +193,7 @@ public void run(SourceContext<Row> ctx) throws Exception {
         String line;
         initMetric();
         inputStream = getInputStream(fileUri);
-        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, charset));
+        bufferedReader = new BufferedReader(new InputStreamReader(inputStream, charset));
 
         if (deserializationSchema instanceof DTCsvRowDeserializationSchema) {
             fromLine = ((DTCsvRowDeserializationSchema) deserializationSchema).getFromLine();
@@ -185,6 +205,7 @@ public void run(SourceContext<Row> ctx) throws Exception {
             if (line == null) {
                 running.compareAndSet(true, false);
                 inputStream.close();
+                bufferedReader.close();
                 break;
             } else {
                 numInRecord.inc();
@@ -220,7 +241,15 @@ public void cancel() {
             try {
                 inputStream.close();
             } catch (IOException ioException) {
-                LOG.error("File input stream close error!");
+                LOG.error("File input stream close error!", ioException);
+            }
+        }
+
+        if (bufferedReader != null) {
+            try {
+                bufferedReader.close();
+            } catch (IOException ioException) {
+                LOG.error("File buffer reader close error!", ioException);
             }
         }
     }

file/file-source/src/main/java/com/dtstack/flink/sql/source/file/table/FileSourceParser.java

@@ -23,6 +23,7 @@
 import com.dtstack.flink.sql.table.AbstractTableInfo;
 import com.dtstack.flink.sql.util.MathUtil;
 
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -50,7 +51,7 @@ public AbstractTableInfo getTableInfo(String tableName,
     private FileSourceTableInfo switchTableType(String tableName,
                                                 String fieldsInfo,
                                                 Map<String, Object> props) {
-        String format = MathUtil.getString(props.getOrDefault(FileSourceConstant.FORMAT_KEY.toLowerCase(), FileSourceConstant.DEFAULT_FILE_FORMAT));
+        String format = MathUtil.getString(props.getOrDefault(FileSourceConstant.FORMAT_KEY.toLowerCase(), FileSourceConstant.DEFAULT_FILE_FORMAT)).toLowerCase(Locale.ROOT);
         switch (format) {
             case "csv": {
                 CsvSourceTableInfo tableInfo = new CsvSourceTableInfo();