This is an automated email from the ASF dual-hosted git repository.
caishunfeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 3756a233d8 [Fix-10863] Command execution result data statistics remove
userId condition. (#10864)
3756a233d8 is described below
commit 3756a233d8a266899ebc75800d55ec4067a3f818
Author: WangJPLeo <[email protected]>
AuthorDate: Sun Jul 10 17:17:35 2022 +0800
[Fix-10863] Command execution result data statistics remove userId
condition. (#10864)
* Command execution result data statistics remove userId condition.
* e2e rerun
---
.../api/service/impl/DataAnalysisServiceImpl.java | 6 ++----
.../dolphinscheduler/api/aspect/AccessLogAspectTest.java | 1 -
.../api/service/DataAnalysisServiceTest.java | 12 ++++++------
.../apache/dolphinscheduler/dao/mapper/CommandMapper.java | 2 --
.../dolphinscheduler/dao/mapper/ErrorCommandMapper.java | 2 --
.../org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml | 3 ---
.../dolphinscheduler/dao/mapper/ErrorCommandMapper.xml | 3 ---
.../dolphinscheduler/dao/mapper/CommandMapperTest.java | 2 +-
.../dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java | 2 --
9 files changed, 9 insertions(+), 24 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java
index 091387203e..c914bcd3d0 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java
@@ -258,15 +258,13 @@ public class DataAnalysisServiceImpl extends
BaseServiceImpl implements DataAnal
return result;
}
Long[] projectCodeArray = getProjectCodesArrays(projectIds.getLeft());
- int userId = loginUser.getUserType() == UserType.ADMIN_USER ? 0 :
loginUser.getId();
-
// count normal command state
- Map<CommandType, Integer> normalCountCommandCounts =
commandMapper.countCommandState(userId, start, end, projectCodeArray)
+ Map<CommandType, Integer> normalCountCommandCounts =
commandMapper.countCommandState(start, end, projectCodeArray)
.stream()
.collect(Collectors.toMap(CommandCount::getCommandType,
CommandCount::getCount));
// count error command state
- Map<CommandType, Integer> errorCommandCounts =
errorCommandMapper.countCommandState(userId, start, end, projectCodeArray)
+ Map<CommandType, Integer> errorCommandCounts =
errorCommandMapper.countCommandState(start, end, projectCodeArray)
.stream()
.collect(Collectors.toMap(CommandCount::getCommandType,
CommandCount::getCount));
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/aspect/AccessLogAspectTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/aspect/AccessLogAspectTest.java
index e272e4256e..b9f4cb5a17 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/aspect/AccessLogAspectTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/aspect/AccessLogAspectTest.java
@@ -36,7 +36,6 @@ public class AccessLogAspectTest {
String actual = accessLogAspect.handleSensitiveData(data);
Assert.assertEquals(expected, actual);
-
}
}
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java
index 34df74d697..9d318b6cef 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java
@@ -290,15 +290,15 @@ public class DataAnalysisServiceTest {
CommandCount commandCount = new CommandCount();
commandCount.setCommandType(CommandType.START_PROCESS);
commandCounts.add(commandCount);
- Mockito.when(commandMapper.countCommandState(0, null, null, new
Long[]{1L})).thenReturn(commandCounts);
- Mockito.when(errorCommandMapper.countCommandState(0, null, null, new
Long[]{1L})).thenReturn(commandCounts);
+ Mockito.when(commandMapper.countCommandState(null, null, new
Long[]{1L})).thenReturn(commandCounts);
+ Mockito.when(errorCommandMapper.countCommandState(null, null, new
Long[]{1L})).thenReturn(commandCounts);
Map<String, Object> result =
dataAnalysisServiceImpl.countCommandState(user);
Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
// when no command found then return all count are 0
- Mockito.when(commandMapper.countCommandState(anyInt(), any(), any(),
any())).thenReturn(Collections.emptyList());
- Mockito.when(errorCommandMapper.countCommandState(anyInt(), any(),
any(), any())).thenReturn(Collections.emptyList());
+ Mockito.when(commandMapper.countCommandState(any(), any(),
any())).thenReturn(Collections.emptyList());
+ Mockito.when(errorCommandMapper.countCommandState(any(), any(),
any())).thenReturn(Collections.emptyList());
Mockito.when(resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS,
1, serviceLogger)).thenReturn(projectIds());
Map<String, Object> result5 =
dataAnalysisServiceImpl.countCommandState(user);
@@ -313,8 +313,8 @@ public class DataAnalysisServiceTest {
CommandCount errorCommandCount = new CommandCount();
errorCommandCount.setCommandType(CommandType.START_PROCESS);
errorCommandCount.setCount(5);
- Mockito.when(commandMapper.countCommandState(anyInt(), any(), any(),
any())).thenReturn(Collections.singletonList(normalCommandCount));
- Mockito.when(errorCommandMapper.countCommandState(anyInt(), any(),
any(), any())).thenReturn(Collections.singletonList(errorCommandCount));
+ Mockito.when(commandMapper.countCommandState(any(), any(),
any())).thenReturn(Collections.singletonList(normalCommandCount));
+ Mockito.when(errorCommandMapper.countCommandState(any(), any(),
any())).thenReturn(Collections.singletonList(errorCommandCount));
Map<String, Object> result6 =
dataAnalysisServiceImpl.countCommandState(user);
diff --git
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java
index 8305ae2965..de0ea222a1 100644
---
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java
+++
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java
@@ -34,14 +34,12 @@ public interface CommandMapper extends BaseMapper<Command> {
/**
* count command state
- * @param userId userId
* @param startTime startTime
* @param endTime endTime
* @param projectCodeArray projectCodeArray
* @return CommandCount list
*/
List<CommandCount> countCommandState(
- @Param("userId") int userId,
@Param("startTime") Date startTime,
@Param("endTime") Date endTime,
@Param("projectCodeArray") Long[] projectCodeArray);
diff --git
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.java
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.java
index f86ce27c67..acd9ce79cb 100644
---
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.java
+++
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.java
@@ -34,14 +34,12 @@ public interface ErrorCommandMapper extends
BaseMapper<ErrorCommand> {
/**
* count command state
- * @param userId
* @param startTime startTime
* @param endTime endTime
* @param projectCodeArray projectCodeArray
* @return CommandCount list
*/
List<CommandCount> countCommandState(
- @Param("userId") int userId,
@Param("startTime") Date startTime,
@Param("endTime") Date endTime,
@Param("projectCodeArray") Long[] projectCodeArray);
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml
index 46d9f2ef5b..aa2bf13bdc 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml
@@ -22,9 +22,6 @@
select cmd.command_type as command_type, count(1) as count
from t_ds_command cmd, t_ds_process_definition process
where cmd.process_definition_code = process.code
- <if test="userId != 0 ">
- and process.user_id= #{userId}
- </if>
<if test="projectCodeArray != null and projectCodeArray.length != 0">
and process.project_code in
<foreach collection="projectCodeArray" index="index" item="i"
open="(" close=")" separator=",">
diff --git
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml
index cd096bb860..8179ff44d1 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml
+++
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml
@@ -22,9 +22,6 @@
select cmd.command_type as command_type, count(1) as count
from t_ds_error_command cmd, t_ds_process_definition process
where cmd.process_definition_code = process.code
- <if test="userId != 0 ">
- and process.user_id= #{userId}
- </if>
<if test="projectCodeArray != null and projectCodeArray.length != 0">
and process.project_code in
<foreach collection="projectCodeArray" index="index" item="i"
open="(" close=")" separator=",">
diff --git
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java
index c937eabf7b..975a910bf1 100644
---
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java
+++
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java
@@ -162,7 +162,7 @@ public class CommandMapperTest extends BaseDaoTest {
Date endTime = DateUtils.stringToDate("2019-12-29 23:59:59");
- List<CommandCount> actualCommandCounts =
commandMapper.countCommandState(0, startTime, endTime, projectCodeArray);
+ List<CommandCount> actualCommandCounts =
commandMapper.countCommandState(startTime, endTime, projectCodeArray);
assertThat(actualCommandCounts.size(),greaterThanOrEqualTo(1));
}
diff --git
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java
index 42d811ad7c..27c9467109 100644
---
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java
+++
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java
@@ -77,7 +77,6 @@ public class ErrorCommandMapperTest extends BaseDaoTest {
errorCommandMapper.updateById(errorCommand);
List<CommandCount> commandCounts =
errorCommandMapper.countCommandState(
- 0,
null,
null,
new Long[0]
@@ -87,7 +86,6 @@ public class ErrorCommandMapperTest extends BaseDaoTest {
projectCodeArray[0] = processDefinition.getProjectCode();
projectCodeArray[1] = 200L;
List<CommandCount> commandCounts2 =
errorCommandMapper.countCommandState(
- 0,
null,
null,
projectCodeArray
