Browse Source

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

* fix the spell and modify logger print format
pull/3/MERGE
zixi0825 4 years ago committed by GitHub
parent
commit
40a21816ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/cache/impl/TaskInstanceCacheManagerImpl.java
  2. 2
      dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/cache/impl/TaskExecutionContextCacheManagerImpl.java
  3. 24
      dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java

2
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/cache/impl/TaskInstanceCacheManagerImpl.java vendored

@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap;
public class TaskInstanceCacheManagerImpl implements TaskInstanceCacheManager { public class TaskInstanceCacheManagerImpl implements TaskInstanceCacheManager {
/** /**
* taskInstance caceh * taskInstance cache
*/ */
private Map<Integer,TaskInstance> taskInstanceCache = new ConcurrentHashMap<>(); private Map<Integer,TaskInstance> taskInstanceCache = new ConcurrentHashMap<>();

2
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/cache/impl/TaskExecutionContextCacheManagerImpl.java vendored

@ -32,7 +32,7 @@ public class TaskExecutionContextCacheManagerImpl implements TaskExecutionContex
/** /**
* taskInstance caceh * taskInstance cache
*/ */
private Map<Integer,TaskExecutionContext> taskExecutionContextCache = new ConcurrentHashMap<>(); private Map<Integer,TaskExecutionContext> taskExecutionContextCache = new ConcurrentHashMap<>();

24
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java

@ -147,8 +147,8 @@ public class SqlTask extends AbstractTask {
} }
/** /**
* ready to execute SQL and parameter entity Map * ready to execute SQL and parameter entity Map
* @return * @return SqlBinds
*/ */
private SqlBinds getSqlAndSqlParamsMap(String sql) { private SqlBinds getSqlAndSqlParamsMap(String sql) {
Map<Integer,Property> sqlParamsMap = new HashMap<>(); Map<Integer,Property> sqlParamsMap = new HashMap<>();
@ -250,7 +250,7 @@ public class SqlTask extends AbstractTask {
* result process * result process
* *
* @param resultSet resultSet * @param resultSet resultSet
* @throws Exception * @throws Exception Exception
*/ */
private void resultProcess(ResultSet resultSet) throws Exception{ private void resultProcess(ResultSet resultSet) throws Exception{
ArrayNode resultJSONArray = JSONUtils.createArrayNode(); ArrayNode resultJSONArray = JSONUtils.createArrayNode();
@ -293,7 +293,7 @@ public class SqlTask extends AbstractTask {
} }
/** /**
* post psql * post sql
* *
* @param connection connection * @param connection connection
* @param postStatementsBinds postStatementsBinds * @param postStatementsBinds postStatementsBinds
@ -329,7 +329,7 @@ public class SqlTask extends AbstractTask {
* create connection * create connection
* *
* @return connection * @return connection
* @throws Exception * @throws Exception Exception
*/ */
private Connection createConnection() throws Exception{ private Connection createConnection() throws Exception{
// if hive , load connection params if exists // if hive , load connection params if exists
@ -367,7 +367,7 @@ public class SqlTask extends AbstractTask {
try { try {
resultSet.close(); resultSet.close();
} catch (SQLException e) { } catch (SQLException e) {
logger.error("close result set error : {}",e.getMessage(),e);
} }
} }
@ -375,7 +375,7 @@ public class SqlTask extends AbstractTask {
try { try {
pstmt.close(); pstmt.close();
} catch (SQLException e) { } catch (SQLException e) {
logger.error("close prepared statement error : {}",e.getMessage(),e);
} }
} }
@ -383,17 +383,17 @@ public class SqlTask extends AbstractTask {
try { try {
connection.close(); connection.close();
} catch (SQLException e) { } catch (SQLException e) {
logger.error("close connection error : {}",e.getMessage(),e);
} }
} }
} }
/** /**
* preparedStatement bind * preparedStatement bind
* @param connection * @param connection connection
* @param sqlBinds * @param sqlBinds sqlBinds
* @return * @return PreparedStatement
* @throws Exception * @throws Exception Exception
*/ */
private PreparedStatement prepareStatementAndBind(Connection connection, SqlBinds sqlBinds) throws Exception { private PreparedStatement prepareStatementAndBind(Connection connection, SqlBinds sqlBinds) throws Exception {
// is the timeout set // is the timeout set

Loading…
Cancel
Save