You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by GitBox <gi...@apache.org> on 2021/03/31 05:42:33 UTC
[GitHub] [incubator-dolphinscheduler] zombietramp opened a new pull request #5185: 1:修改普通用户,禁用选择其它租户的功能
zombietramp opened a new pull request #5185:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/5185
2:增加流程定义sql语句不能有多条语句的提示,运行时候自动截取以;结尾的第一条语句
3:修改sql语句动态where 代替 where 1=1
4:修改template 不支持v-show命令
<!--Thanks very much for contributing to Apache DolphinScheduler. Please review https://dolphinscheduler.apache.org/en-us/community/development/pull-request.html before opening a pull request.-->
## Purpose of the pull request
<!--(For example: This pull request adds checkstyle plugin).-->
## Brief change log
<!--*(for example:)*
- *Add maven-checkstyle-plugin to root pom.xml*
-->
## Verify this pull request
<!--*(Please pick either of the following options)*-->
This pull request is code cleanup without any test coverage.
*(or)*
This pull request is already covered by existing tests, such as *(please describe tests)*.
(or)
This change added tests and can be verified as follows:
<!--*(example:)*
- *Added dolphinscheduler-dao tests for end-to-end.*
- *Added CronUtilsTest to verify the change.*
- *Manually verified the change by testing locally.* -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] ruanwenjun commented on a change in pull request #5185: 1:修改普通用户,禁用选择其它租户的功能
Posted by GitBox <gi...@apache.org>.
ruanwenjun commented on a change in pull request #5185:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/5185#discussion_r606104535
##########
File path: dolphinscheduler-common/test/testFile.txt
##########
@@ -0,0 +1 @@
+正正正faffdasfasdfas
Review comment:
ignore this file
##########
File path: dolphinscheduler-common/sql/soft_version
##########
@@ -0,0 +1 @@
+32432423
Review comment:
ignore this file
##########
File path: dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
##########
@@ -149,8 +150,7 @@
from t_ds_process_instance t
join t_ds_process_definition d on d.id=t.process_definition_id
join t_ds_project p on p.id=d.project_id
- where 1 = 1
- and t.is_sub_process = 0
+ where and t.is_sub_process = 0
Review comment:
Should remove `and`
##########
File path: dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml
##########
@@ -19,7 +19,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="org.apache.dolphinscheduler.dao.mapper.UserMapper">
<sql id="baseSql">
- id, user_name, user_password, user_type, email, phone, tenant_id, create_time, update_time, queue, state
+ id, user_name, user_password, user_type, email, phone, tenant_id, create_time, update_time, queue, `state`
Review comment:
For the Sql style consistency, maybe it better not to make this modification ~~
##########
File path: dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
##########
@@ -42,17 +42,17 @@
import org.apache.dolphinscheduler.service.alert.AlertClientService;
import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
Review comment:
The use of import * is considered a bad practice
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] CalvinKirs commented on pull request #5185: 1:修改普通用户,禁用选择其它租户的功能
Posted by GitBox <gi...@apache.org>.
CalvinKirs commented on pull request #5185:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/5185#issuecomment-811880236
Thanks for your contribution. Your PR title does not seem to match the description.
Regarding multi-line SQL execution, can you describe your specific implementation?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] chengshiwen edited a comment on pull request #5185: 1:修改普通用户,禁用选择其它租户的功能
Posted by GitBox <gi...@apache.org>.
chengshiwen edited a comment on pull request #5185:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/5185#issuecomment-810817622
@zombietramp Please use English, and resolve the conflicts.
By the way, the v-show problem on template has been solved in pr #5145
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-dolphinscheduler] chengshiwen commented on pull request #5185: 1:修改普通用户,禁用选择其它租户的功能
Posted by GitBox <gi...@apache.org>.
chengshiwen commented on pull request #5185:
URL: https://github.com/apache/incubator-dolphinscheduler/pull/5185#issuecomment-810817622
@zombietramp Please use English, and resolve the conflicts.
By the way, the v-show problem on template has been solved in #5145
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org