[Fix] [Server] Fix the spell error and add log in SqlTask (#3243)

* fix the spell and modify logger print format
apache · Aug 7, 2020 · 40a2181 · 40a2181
1 parent f784ce5
commit 40a2181
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/...va/org/apache/dolphinscheduler/server/master/cache/impl/TaskInstanceCacheManagerImpl.java b/...va/org/apache/dolphinscheduler/server/master/cache/impl/TaskInstanceCacheManagerImpl.java
@@ -36,7 +36,7 @@
 public class TaskInstanceCacheManagerImpl implements TaskInstanceCacheManager {
 
     /**
-     * taskInstance caceh
+     * taskInstance cache
      */
     private Map<Integer,TaskInstance> taskInstanceCache = new ConcurrentHashMap<>();
 

diff --git a/...pache/dolphinscheduler/server/worker/cache/impl/TaskExecutionContextCacheManagerImpl.java b/...pache/dolphinscheduler/server/worker/cache/impl/TaskExecutionContextCacheManagerImpl.java
@@ -32,7 +32,7 @@ public class TaskExecutionContextCacheManagerImpl implements TaskExecutionContex
 
 
     /**
-     * taskInstance caceh
+     * taskInstance cache
      */
     private Map<Integer,TaskExecutionContext> taskExecutionContextCache = new ConcurrentHashMap<>();
 

diff --git a/...uler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java b/...uler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
@@ -147,8 +147,8 @@ public void handle() throws Exception {
     }
 
     /**
-     *  ready to execute SQL and parameter entity Map
-     * @return
+     * ready to execute SQL and parameter entity Map
+     * @return SqlBinds
      */
     private SqlBinds getSqlAndSqlParamsMap(String sql) {
         Map<Integer,Property> sqlParamsMap =  new HashMap<>();
@@ -250,7 +250,7 @@ public void executeFuncAndSql(SqlBinds mainSqlBinds,
      * result process
      *
      * @param resultSet resultSet
-     * @throws Exception
+     * @throws Exception Exception
      */
     private void resultProcess(ResultSet resultSet) throws Exception{
         ArrayNode resultJSONArray = JSONUtils.createArrayNode();
@@ -293,7 +293,7 @@ private void preSql(Connection connection,
     }
 
     /**
-     * post psql
+     * post sql
      *
      * @param connection connection
      * @param postStatementsBinds postStatementsBinds
@@ -329,7 +329,7 @@ private void createTempFunction(Connection connection,
      * create connection
      *
      * @return connection
-     * @throws Exception
+     * @throws Exception Exception
      */
     private Connection createConnection() throws Exception{
         // if hive , load connection params if exists
@@ -367,33 +367,33 @@ private void close(ResultSet resultSet,
             try {
                 resultSet.close();
             } catch (SQLException e) {
-
+                logger.error("close result set error : {}",e.getMessage(),e);
             }
         }
 
         if (pstmt != null){
             try {
                 pstmt.close();
             } catch (SQLException e) {
-
+                logger.error("close prepared statement error : {}",e.getMessage(),e);
             }
         }
 
         if (connection != null){
             try {
                 connection.close();
             } catch (SQLException e) {
-
+                logger.error("close connection error : {}",e.getMessage(),e);
             }
         }
     }
 
     /**
      * preparedStatement bind
-     * @param connection
-     * @param sqlBinds
-     * @return
-     * @throws Exception
+     * @param connection connection
+     * @param sqlBinds  sqlBinds
+     * @return PreparedStatement
+     * @throws Exception Exception
      */
     private PreparedStatement prepareStatementAndBind(Connection connection, SqlBinds sqlBinds) throws Exception {
         // is the timeout set