【解决Oracle元数据采集当某库中表数据为0时查询异常问题】【30332】

Author: kanata163

flinkx-metadata-oracle/flinkx-metadata-oracle-reader/src/main/java/com/dtstack/flinkx/metadataoracle/inputformat/MetadataoracleInputFormat.java

@@ -21,6 +21,7 @@
 import com.dtstack.flinkx.constants.ConstantValue;
 import com.dtstack.flinkx.metadata.inputformat.BaseMetadataInputFormat;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -105,7 +106,7 @@ protected Map<String, Object> queryMetaData(String tableName) throws SQLExceptio
 
     Map<String, Map<String, String> > queryTableProperties() throws SQLException {
         Map<String, Map<String, String>> tablePropertiesMap = new HashMap<>(16);
-        if(allTable==null){
+        if(StringUtils.isBlank(allTable)){
             sql = String.format(SQL_QUERY_TABLE_PROPERTIES_TOTAL, quote(currentDb.get()));
         }else {
             sql = String.format(SQL_QUERY_TABLE_PROPERTIES, quote(currentDb.get()), allTable);
@@ -126,7 +127,7 @@ Map<String, Map<String, String> > queryTableProperties() throws SQLException {
 
     Map<String, List<Map<String, String>>> queryIndexList() throws SQLException {
         Map<String, List<Map<String, String>>> indexListMap = new HashMap<>(16);
-        if(allTable==null){
+        if(StringUtils.isBlank(allTable)){
             sql = String.format(SQL_QUERY_INDEX_TOTAL, quote(currentDb.get()));
         }else {
             sql = String.format(SQL_QUERY_INDEX, quote(currentDb.get()), allTable);
@@ -152,7 +153,7 @@ Map<String, List<Map<String, String>>> queryIndexList() throws SQLException {
 
     Map<String, List<Map<String, Object>>> queryColumnList() throws SQLException {
         Map<String, List<Map<String, Object>>> columnListMap = new HashMap<>(16);
-        if(allTable==null){
+        if(StringUtils.isBlank(allTable)){
             sql = String.format(SQL_QUERY_COLUMN_TOTAL, quote(currentDb.get()));
         }else {
             sql = String.format(SQL_QUERY_COLUMN, quote(currentDb.get()), allTable);

flinkx-metadata/flinkx-metadata-reader/src/main/java/com/dtstack/flinkx/metadata/inputformat/BaseMetadataInputFormat.java

@@ -82,8 +82,9 @@ protected void openInternal(InputSplit inputSplit) throws IOException {
             tableIterator.set(tableList.iterator());
             init();
         } catch (SQLException | ClassNotFoundException e) {
-            LOG.error("获取table列表异常, dbUrl = {}, username = {}, inputSplit = {}, e = {}", dbUrl, username, inputSplit, ExceptionUtil.getErrorMessage(e));
-            throw new IOException("获取table列表异常", e);
+            String message = String.format("获取table列表异常, dbUrl = %s, username = %s, inputSplit = %s, e = %s", dbUrl, username, inputSplit, ExceptionUtil.getErrorMessage(e));
+            LOG.error(message);
+            throw new IOException(message, e);
         }
     }