Skip to content

Commit 342c471

Browse files
SbloodySSbloodyS
authored
[Improvement-17277]Remove unused testFlag (#17282)
1 parent a073fd3 commit 342c471

67 files changed

Lines changed: 83 additions & 228 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ public class ExecutorController extends BaseController {
100100
* @param workflowInstancePriority workflow instance priority
101101
* @param workerGroup worker group
102102
* @param expectedParallelismNumber the expected parallelism number when execute complement in parallel mode
103-
* @param testFlag testFlag
104103
* @param executionOrder complement data in some kind of order
105104
* @return start workflow result code
106105
*/
@@ -122,7 +121,6 @@ public class ExecutorController extends BaseController {
122121
@Parameter(name = "timeout", description = "TIMEOUT", schema = @Schema(implementation = int.class, example = "100")),
123122
@Parameter(name = "expectedParallelismNumber", description = "EXPECTED_PARALLELISM_NUMBER", schema = @Schema(implementation = int.class, example = "8")),
124123
@Parameter(name = "dryRun", description = "DRY_RUN", schema = @Schema(implementation = int.class, example = "0")),
125-
@Parameter(name = "testFlag", description = "TEST_FLAG", schema = @Schema(implementation = int.class, example = "0")),
126124
@Parameter(name = "complementDependentMode", description = "COMPLEMENT_DEPENDENT_MODE", schema = @Schema(implementation = ComplementDependentMode.class)),
127125
@Parameter(name = "allLevelDependent", description = "ALL_LEVEL_DEPENDENT", schema = @Schema(implementation = boolean.class, example = "false")),
128126
@Parameter(name = "executionOrder", description = "EXECUTION_ORDER", schema = @Schema(implementation = ExecutionOrder.class))
@@ -148,7 +146,6 @@ public Result<List<Integer>> triggerWorkflowDefinition(@Parameter(hidden = true)
148146
@RequestParam(value = "startParams", required = false) String startParams,
149147
@RequestParam(value = "expectedParallelismNumber", required = false) Integer expectedParallelismNumber,
150148
@RequestParam(value = "dryRun", defaultValue = "0", required = false) int dryRun,
151-
@RequestParam(value = "testFlag", defaultValue = "0") int testFlag,
152149
@RequestParam(value = "complementDependentMode", required = false) ComplementDependentMode complementDependentMode,
153150
@RequestParam(value = "allLevelDependent", required = false, defaultValue = "false") boolean allLevelDependent,
154151
@RequestParam(value = "executionOrder", required = false) ExecutionOrder executionOrder) {
@@ -169,7 +166,6 @@ public Result<List<Integer>> triggerWorkflowDefinition(@Parameter(hidden = true)
169166
.environmentCode(environmentCode)
170167
.startParamList(startParams)
171168
.dryRun(Flag.of(dryRun))
172-
.testFlag(Flag.of(testFlag))
173169
.build();
174170
return Result
175171
.success(Lists.newArrayList(execService.triggerWorkflowDefinition(workflowTriggerRequest)));
@@ -190,7 +186,6 @@ public Result<List<Integer>> triggerWorkflowDefinition(@Parameter(hidden = true)
190186
.environmentCode(environmentCode)
191187
.startParamList(startParams)
192188
.dryRun(Flag.of(dryRun))
193-
.testFlag(Flag.of(testFlag))
194189
.backfillTime(WorkflowUtils.parseBackfillTime(scheduleTime))
195190
.expectedParallelismNumber(expectedParallelismNumber)
196191
.backfillDependentMode(complementDependentMode)
@@ -222,7 +217,6 @@ public Result<List<Integer>> triggerWorkflowDefinition(@Parameter(hidden = true)
222217
* @param workerGroup worker group
223218
* @param tenantCode tenant code
224219
* @param expectedParallelismNumber the expected parallelism number when execute complement in parallel mode
225-
* @param testFlag testFlag
226220
* @param executionOrder complement data in some kind of order
227221
* @return start workflow result code
228222
*/
@@ -243,7 +237,6 @@ public Result<List<Integer>> triggerWorkflowDefinition(@Parameter(hidden = true)
243237
@Parameter(name = "environmentCode", description = "ENVIRONMENT_CODE", schema = @Schema(implementation = Long.class, example = "-1")),
244238
@Parameter(name = "expectedParallelismNumber", description = "EXPECTED_PARALLELISM_NUMBER", schema = @Schema(implementation = int.class, example = "8")),
245239
@Parameter(name = "dryRun", description = "DRY_RUN", schema = @Schema(implementation = int.class, example = "0")),
246-
@Parameter(name = "testFlag", description = "TEST_FLAG", schema = @Schema(implementation = int.class, example = "0")),
247240
@Parameter(name = "complementDependentMode", description = "COMPLEMENT_DEPENDENT_MODE", schema = @Schema(implementation = ComplementDependentMode.class)),
248241
@Parameter(name = "allLevelDependent", description = "ALL_LEVEL_DEPENDENT", schema = @Schema(implementation = boolean.class, example = "false")),
249242
@Parameter(name = "executionOrder", description = "EXECUTION_ORDER", schema = @Schema(implementation = ExecutionOrder.class))
@@ -269,7 +262,6 @@ public Result<List<Integer>> batchTriggerWorkflowDefinitions(@Parameter(hidden =
269262
@RequestParam(value = "startParams", required = false) String startParams,
270263
@RequestParam(value = "expectedParallelismNumber", required = false) Integer expectedParallelismNumber,
271264
@RequestParam(value = "dryRun", defaultValue = "0", required = false) int dryRun,
272-
@RequestParam(value = "testFlag", defaultValue = "0") int testFlag,
273265
@RequestParam(value = "complementDependentMode", required = false) ComplementDependentMode complementDependentMode,
274266
@RequestParam(value = "allLevelDependent", required = false, defaultValue = "false") boolean allLevelDependent,
275267
@RequestParam(value = "executionOrder", required = false) ExecutionOrder executionOrder) {
@@ -296,7 +288,6 @@ public Result<List<Integer>> batchTriggerWorkflowDefinitions(@Parameter(hidden =
296288
startParams,
297289
expectedParallelismNumber,
298290
dryRun,
299-
testFlag,
300291
complementDependentMode,
301292
allLevelDependent,
302293
executionOrder);

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/workflow/WorkflowBackFillRequest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ public class WorkflowBackFillRequest {
6767

6868
private Flag dryRun;
6969

70-
private Flag testFlag;
71-
7270
private RunMode backfillRunMode;
7371

7472
private BackfillTime backfillTime;

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/workflow/WorkflowTriggerRequest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,4 @@ public class WorkflowTriggerRequest {
6161
private String startParamList;
6262

6363
private Flag dryRun;
64-
65-
private Flag testFlag;
6664
}

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/BackfillWorkflowExecutorDelegate.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ private Integer doBackfillWorkflow(final BackfillWorkflowDTO backfillWorkflowDTO
130130
.environmentCode(backfillWorkflowDTO.getEnvironmentCode())
131131
.startParamList(backfillWorkflowDTO.getStartParamList())
132132
.dryRun(backfillWorkflowDTO.getDryRun())
133-
.testFlag(backfillWorkflowDTO.getTestFlag())
134133
.build();
135134

136135
final WorkflowBackfillTriggerResponse backfillTriggerResponse = Clients

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/workflow/TriggerWorkflowExecutorDelegate.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ private WorkflowManualTriggerRequest transform2WorkflowTriggerRequest(TriggerWor
7272
.environmentCode(triggerWorkflowDTO.getEnvironmentCode())
7373
.startParamList(triggerWorkflowDTO.getStartParamList())
7474
.dryRun(triggerWorkflowDTO.getDryRun())
75-
.testFlag(triggerWorkflowDTO.getTestFlag())
7675
.build();
7776
}
7877
}

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ public class PythonGateway {
9898
private static final RunMode DEFAULT_RUN_MODE = RunMode.RUN_MODE_SERIAL;
9999
private static final ExecutionOrder DEFAULT_EXECUTION_ORDER = ExecutionOrder.DESC_ORDER;
100100
private static final int DEFAULT_DRY_RUN = 0;
101-
private static final int DEFAULT_TEST_FLAG = 0;
102101
private static final ComplementDependentMode COMPLEMENT_DEPENDENT_MODE = ComplementDependentMode.OFF_MODE;
103102
// We use admin user's user_id to skip some permission issue from python gateway service
104103
private static final int ADMIN_USER_ID = 1;
@@ -392,7 +391,6 @@ public void execWorkflowInstance(String userName,
392391
.execType(CommandType.START_PROCESS)
393392
.taskDependType(TaskDependType.TASK_POST)
394393
.dryRun(Flag.NO)
395-
.testFlag(Flag.NO)
396394
.build();
397395
executorService.triggerWorkflowDefinition(workflowTriggerRequest);
398396
}

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@ public WorkflowExecuteResponse executeTask(User loginUser,
372372
command.setExecutorId(loginUser.getId());
373373
command.setWorkflowDefinitionVersion(workflowDefinition.getVersion());
374374
command.setWorkflowInstanceId(workflowInstanceId);
375-
command.setTestFlag(workflowInstance.getTestFlag());
376375

377376
// Add taskDependType
378377
command.setTaskDependType(taskDependType);

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkflowInstanceServiceImpl.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,8 +467,7 @@ public Map<String, Object> queryTaskListByWorkflowInstanceId(User loginUser, lon
467467
return result;
468468
}
469469
List<TaskInstance> taskInstanceList =
470-
taskInstanceDao.queryValidTaskListByWorkflowInstanceId(workflowInstanceId,
471-
workflowInstance.getTestFlag());
470+
taskInstanceDao.queryValidTaskListByWorkflowInstanceId(workflowInstanceId);
472471
List<TaskInstanceDependentDetails<AbstractTaskInstanceContext>> taskInstanceDependentDetailsList =
473472
setTaskInstanceDependentResult(taskInstanceList);
474473

@@ -917,8 +916,7 @@ private Map<String, Map<String, Object>> getLocalParams(WorkflowInstance workflo
917916
Map<String, String> timeParams) {
918917
Map<String, Map<String, Object>> localUserDefParams = new HashMap<>();
919918
List<TaskInstance> taskInstanceList =
920-
taskInstanceMapper.findValidTaskListByWorkflowInstanceId(workflowInstance.getId(), Flag.YES,
921-
workflowInstance.getTestFlag());
919+
taskInstanceMapper.findValidTaskListByWorkflowInstanceId(workflowInstance.getId(), Flag.YES);
922920
for (TaskInstance taskInstance : taskInstanceList) {
923921
TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(
924922
taskInstance.getTaskCode(), taskInstance.getTaskDefinitionVersion());

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/BackfillWorkflowDTO.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ public class BackfillWorkflowDTO {
7474

7575
private Flag dryRun;
7676

77-
private Flag testFlag;
78-
7977
private Long triggerCode;
8078

8179
private BackfillParamsDTO backfillParams;

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/validator/workflow/BackfillWorkflowRequestTransformer.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ public BackfillWorkflowDTO transform(WorkflowBackFillRequest workflowBackFillReq
7676
.startParamList(
7777
PropertyUtils.startParamsTransformPropertyList(workflowBackFillRequest.getStartParamList()))
7878
.dryRun(workflowBackFillRequest.getDryRun())
79-
.testFlag(workflowBackFillRequest.getTestFlag())
8079
.triggerCode(CodeGenerateUtils.genCode())
8180
.backfillParams(backfillParams)
8281
.build();

0 commit comments

Comments
 (0)